.........T [ZBXNEXT-7414] added new tags to all templates

345 files changed, 69754 insertions, 25491 deletions

diff --git a/templates/app/activemq_jmx/template_app_activemq_jmx.yaml b/templates/app/activemq_jmx/template_app_activemq_jmx.yaml
index 92a6919f658..a67a7bbd2c9 100644
--- a/templates/app/activemq_jmx/template_app_activemq_jmx.yaml
+++ b/templates/app/activemq_jmx/template_app_activemq_jmx.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-14T17:43:19Z'
+  date: '2022-01-26T10:02:13Z'
   groups:
     -
       uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
@@ -18,7 +18,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/411049-discussion-thread-for-official-zabbix-template-amq
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Applications
@@ -65,8 +65,8 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: '{#JMXBROKERNAME}'
+                  tag: component
+                  value: inventory
               trigger_prototypes:
                 -
                   uuid: 7902d81681874aa3acf33d90316f9864
@@ -75,6 +75,10 @@ zabbix_export:
                   priority: INFO
                   description: 'Broker {#JMXBROKERNAME} version has changed. Ack to close.'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 85c19ccb8b6a4242a8ba699e76836427
               name: 'Broker {#JMXBROKERNAME}: Memory limit'
@@ -93,8 +97,8 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: '{#JMXBROKERNAME}'
+                  tag: component
+                  value: memory
             -
               uuid: 5e2a5638adf6405087014bfcfc8ffc93
               name: 'Broker {#JMXBROKERNAME}: Memory usage in percents'
@@ -108,14 +112,18 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: '{#JMXBROKERNAME}'
+                  tag: component
+                  value: memory
               trigger_prototypes:
                 -
                   uuid: e805b8cca9744940affc3bdd234a7587
                   expression: 'min(/Apache ActiveMQ by JMX/jmx[{#JMXOBJ}, MemoryPercentUsage],{$ACTIVEMQ.MEM.TIME:"{#JMXBROKERNAME}"})>{$ACTIVEMQ.MEM.MAX.HIGH:"{#JMXBROKERNAME}"}'
                   name: 'Broker {#JMXBROKERNAME}: Memory usage is too high (over {$ACTIVEMQ.MEM.MAX.HIGH:"{#JMXBROKERNAME}"}%)'
                   priority: HIGH
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 3e741e339fff422fae67b5333faa1e20
                   expression: 'min(/Apache ActiveMQ by JMX/jmx[{#JMXOBJ}, MemoryPercentUsage],{$ACTIVEMQ.MEM.TIME:"{#JMXBROKERNAME}"})>{$ACTIVEMQ.MEM.MAX.WARN:"{#JMXBROKERNAME}"}'
@@ -125,6 +133,10 @@ zabbix_export:
                     -
                       name: 'Broker {#JMXBROKERNAME}: Memory usage is too high (over {$ACTIVEMQ.MEM.MAX.HIGH:"{#JMXBROKERNAME}"}%)'
                       expression: 'min(/Apache ActiveMQ by JMX/jmx[{#JMXOBJ}, MemoryPercentUsage],{$ACTIVEMQ.MEM.TIME:"{#JMXBROKERNAME}"})>{$ACTIVEMQ.MEM.MAX.HIGH:"{#JMXBROKERNAME}"}'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 78806476b5cb4ce48f8ca8dbd173c7c3
               name: 'Broker {#JMXBROKERNAME}: Storage limit'
@@ -143,8 +155,8 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: '{#JMXBROKERNAME}'
+                  tag: component
+                  value: storage
             -
               uuid: fc4c79543a6f4b7b9c22f11b61b644c9
               name: 'Broker {#JMXBROKERNAME}: Storage usage in percents'
@@ -158,14 +170,18 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: '{#JMXBROKERNAME}'
+                  tag: component
+                  value: storage
               trigger_prototypes:
                 -
                   uuid: 2e1c9f92c87f446ebab68ac638c713c5
                   expression: 'min(/Apache ActiveMQ by JMX/jmx[{#JMXOBJ},StorePercentUsage],{$ACTIVEMQ.STORE.TIME:"{#JMXBROKERNAME}"})>{$ACTIVEMQ.STORE.MAX.HIGH:"{#JMXBROKERNAME}"}'
                   name: 'Broker {#JMXBROKERNAME}: Storage usage is too high (over {$ACTIVEMQ.STORE.MAX.HIGH:"{#JMXBROKERNAME}"}%)'
                   priority: HIGH
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
                 -
                   uuid: 271b33edce84439a91d6a253f45e5bf6
                   expression: 'min(/Apache ActiveMQ by JMX/jmx[{#JMXOBJ},StorePercentUsage],{$ACTIVEMQ.STORE.TIME:"{#JMXBROKERNAME}"})>{$ACTIVEMQ.STORE.MAX.WARN:"{#JMXBROKERNAME}"}'
@@ -175,6 +191,10 @@ zabbix_export:
                     -
                       name: 'Broker {#JMXBROKERNAME}: Storage usage is too high (over {$ACTIVEMQ.STORE.MAX.HIGH:"{#JMXBROKERNAME}"}%)'
                       expression: 'min(/Apache ActiveMQ by JMX/jmx[{#JMXOBJ},StorePercentUsage],{$ACTIVEMQ.STORE.TIME:"{#JMXBROKERNAME}"})>{$ACTIVEMQ.STORE.MAX.HIGH:"{#JMXBROKERNAME}"}'
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
             -
               uuid: 09db80ee80ea47189142130d35a8e1c2
               name: 'Broker {#JMXBROKERNAME}: Temp limit'
@@ -193,8 +213,8 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: '{#JMXBROKERNAME}'
+                  tag: component
+                  value: storage
             -
               uuid: 95354144839e4d22a82c4e9a1fab83d9
               name: 'Broker {#JMXBROKERNAME}: Temp usage in percents'
@@ -208,14 +228,18 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: '{#JMXBROKERNAME}'
+                  tag: component
+                  value: storage
               trigger_prototypes:
                 -
                   uuid: 422252a81e3e4261bbd7f331f48c6257
                   expression: 'min(/Apache ActiveMQ by JMX/jmx[{#JMXOBJ},TempPercentUsage],{$ACTIVEMQ.TEMP.TIME:"{#JMXBROKERNAME}"})>{$ACTIVEMQ.TEMP.MAX.HIGH}'
                   name: 'Broker {#JMXBROKERNAME}: Temp usage is too high (over {$ACTIVEMQ.TEMP.MAX.WARN:"{#JMXBROKERNAME}"}%)'
                   priority: HIGH
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
                 -
                   uuid: acb8f6e0762f48c2bd4c03f2a55b2f44
                   expression: 'min(/Apache ActiveMQ by JMX/jmx[{#JMXOBJ},TempPercentUsage],{$ACTIVEMQ.TEMP.TIME:"{#JMXBROKERNAME}"})>{$ACTIVEMQ.TEMP.MAX.WARN}'
@@ -225,6 +249,10 @@ zabbix_export:
                     -
                       name: 'Broker {#JMXBROKERNAME}: Temp usage is too high (over {$ACTIVEMQ.TEMP.MAX.WARN:"{#JMXBROKERNAME}"}%)'
                       expression: 'min(/Apache ActiveMQ by JMX/jmx[{#JMXOBJ},TempPercentUsage],{$ACTIVEMQ.TEMP.TIME:"{#JMXBROKERNAME}"})>{$ACTIVEMQ.TEMP.MAX.HIGH}'
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
             -
               uuid: 64ab04e456804e10a6c78c3190807506
               name: 'Broker {#JMXBROKERNAME}: Consumers count total'
@@ -237,14 +265,18 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: '{#JMXBROKERNAME}'
+                  tag: component
+                  value: broker
               trigger_prototypes:
                 -
                   uuid: 6906f0a1ef804da4a1203ca9d96ab8a0
                   expression: 'max(/Apache ActiveMQ by JMX/jmx[{#JMXOBJ},TotalConsumerCount],{$ACTIVEMQ.BROKER.CONSUMERS.MIN.TIME:"{#JMXBROKERNAME}"})<{$ACTIVEMQ.BROKER.CONSUMERS.MIN.HIGH:"{#JMXBROKERNAME}"}'
                   name: 'Broker {#JMXBROKERNAME}: Consumers count is too low (below {$ACTIVEMQ.BROKER.CONSUMERS.MIN.HIGH:"{#JMXBROKERNAME}"} for {$ACTIVEMQ.BROKER.CONSUMERS.MIN.TIME:"{#JMXBROKERNAME}"})'
                   priority: HIGH
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 48bc7dab4a1a40d8a823e880018cf8e7
               name: 'Broker {#JMXBROKERNAME}: Messages dequeue rate'
@@ -263,8 +295,8 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: '{#JMXBROKERNAME}'
+                  tag: component
+                  value: broker
             -
               uuid: a462499eecbd443e931a9aa831240f65
               name: 'Broker {#JMXBROKERNAME}: Messages enqueue rate'
@@ -283,8 +315,8 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: '{#JMXBROKERNAME}'
+                  tag: component
+                  value: broker
               trigger_prototypes:
                 -
                   uuid: a3ab7bca031c45059418fa82a3c67369
@@ -292,6 +324,10 @@ zabbix_export:
                   name: 'Broker {#JMXBROKERNAME}: Message enqueue rate is higher than dequeue rate for {$ACTIVEMQ.MSG.RATE.WARN.TIME:"{#JMXBROKERNAME}"}'
                   priority: AVERAGE
                   description: 'Enqueue rate is higher than dequeue rate. It may indicate performance problems.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 2453d8221cec4e1ead6622c001ac9a8c
               name: 'Broker {#JMXBROKERNAME}: Producers count total'
@@ -304,14 +340,18 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: '{#JMXBROKERNAME}'
+                  tag: component
+                  value: broker
               trigger_prototypes:
                 -
                   uuid: 2ee6ad72a98143b59d8d1136fffdbe50
                   expression: 'max(/Apache ActiveMQ by JMX/jmx[{#JMXOBJ},TotalProducerCount],{$ACTIVEMQ.BROKER.PRODUCERS.MIN.TIME:"{#JMXBROKERNAME}"})<{$ACTIVEMQ.BROKER.PRODUCERS.MIN.HIGH:"{#JMXBROKERNAME}"}'
                   name: 'Broker {#JMXBROKERNAME}: Producers count is too low (below {$ACTIVEMQ.BROKER.PRODUCERS.MIN.HIGH:"{#JMXBROKERNAME}"} for {$ACTIVEMQ.BROKER.PRODUCERS.MIN.TIME:"{#JMXBROKERNAME}"})'
                   priority: HIGH
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: a46d7281cb234ccaadacbb7d311cbd39
               name: 'Broker {#JMXBROKERNAME}: Uptime'
@@ -330,8 +370,8 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: '{#JMXBROKERNAME}'
+                  tag: component
+                  value: system
               trigger_prototypes:
                 -
                   uuid: 6abb3813bb52465aa4a5f4bebfe999c3
@@ -340,6 +380,10 @@ zabbix_export:
                   priority: INFO
                   description: 'Uptime is less than 10 minutes'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
           graph_prototypes:
             -
               uuid: 465b9319e0dc4728a2733c69521e9e81
@@ -447,8 +491,8 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: '{#JMXBROKERNAME}'
+                  tag: component
+                  value: destination
             -
               uuid: 99f2094b02f848e785e40296958c5450
               name: '{#JMXBROKERNAME}: {#JMXDESTINATIONTYPE} {#JMXDESTINATIONNAME}: Producers count total on {#JMXBROKERNAME}'
@@ -473,8 +517,8 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: '{#JMXBROKERNAME}'
+                  tag: component
+                  value: destination
             -
               uuid: 5e93e53a0c2d49a49d421ded87b6b1f8
               name: '{#JMXBROKERNAME}: {#JMXDESTINATIONTYPE} {#JMXDESTINATIONNAME}: Consumers count'
@@ -487,8 +531,8 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: '{#JMXBROKERNAME}'
+                  tag: component
+                  value: destination
             -
               uuid: 3536ec77069a434e854415f0a3270e67
               name: '{#JMXBROKERNAME}: {#JMXDESTINATIONTYPE} {#JMXDESTINATIONNAME}: Messages dequeue rate'
@@ -507,8 +551,8 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: '{#JMXBROKERNAME}'
+                  tag: component
+                  value: destination
             -
               uuid: a6dacc8c4d1f4724bf49c63449992035
               name: '{#JMXBROKERNAME}: {#JMXDESTINATIONTYPE} {#JMXDESTINATIONNAME}: Messages enqueue rate'
@@ -527,8 +571,8 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: '{#JMXBROKERNAME}'
+                  tag: component
+                  value: destination
             -
               uuid: 1c4ea913a9564d74b31ef82314203a15
               name: '{#JMXBROKERNAME}: {#JMXDESTINATIONTYPE} {#JMXDESTINATIONNAME}: Expired messages count'
@@ -546,8 +590,8 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: '{#JMXBROKERNAME}'
+                  tag: component
+                  value: destination
               trigger_prototypes:
                 -
                   uuid: a498405c5b764c1ea9f0e151adf94ed7
@@ -555,6 +599,10 @@ zabbix_export:
                   name: '{#JMXBROKERNAME}: {#JMXDESTINATIONTYPE} {#JMXDESTINATIONNAME}: Expired messages count higher than {$ACTIVEMQ.EXPIRED.WARN:"{#JMXDESTINATIONNAME}"}'
                   priority: AVERAGE
                   description: 'This metric represents the number of messages that expired before they could be delivered. If you expect all messages to be delivered and acknowledged within a certain amount of time, you can set an expiration for each message, and investigate if your ExpiredCount metric rises above zero.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 158fac5a1b3c4f07a4004a733f9b6995
               name: '{#JMXBROKERNAME}: {#JMXDESTINATIONTYPE} {#JMXDESTINATIONNAME}: Memory usage in percents'
@@ -568,19 +616,27 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: '{#JMXBROKERNAME}'
+                  tag: component
+                  value: memory
               trigger_prototypes:
                 -
                   uuid: 197ab32730a84f79ba1b1e827a10e175
                   expression: 'last(/Apache ActiveMQ by JMX/jmx[{#JMXOBJ},MemoryPercentUsage])>{$ACTIVEMQ.MEM.MAX.HIGH:"{#JMXDESTINATIONNAME}"}'
                   name: '{#JMXBROKERNAME}: {#JMXDESTINATIONTYPE} {#JMXDESTINATIONNAME}: Memory usage is too high (over {$ACTIVEMQ.MEM.MAX.HIGH:"{#JMXDESTINATIONNAME}"}%)'
                   priority: HIGH
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 1e4e3a969b434c6d972251f8c9b3f2a7
                   expression: 'last(/Apache ActiveMQ by JMX/jmx[{#JMXOBJ},MemoryPercentUsage])>{$ACTIVEMQ.MEM.MAX.WARN:"{#JMXDESTINATIONNAME}"}'
                   name: '{#JMXBROKERNAME}: {#JMXDESTINATIONTYPE} {#JMXDESTINATIONNAME}: Memory usage is too high (over {$ACTIVEMQ.MEM.MAX.WARN:"{#JMXDESTINATIONNAME}"}%)'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 82ee74872f6e46efbf16ae0705bcf2a6
               name: '{#JMXBROKERNAME}: {#JMXDESTINATIONTYPE} {#JMXDESTINATIONNAME}: Producers count'
@@ -593,8 +649,8 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: '{#JMXBROKERNAME}'
+                  tag: component
+                  value: destination
             -
               uuid: fdc1e26fbe6545d3bdfc86f6f8c91b8b
               name: '{#JMXBROKERNAME}: {#JMXDESTINATIONTYPE} {#JMXDESTINATIONNAME}: Queue size'
@@ -607,8 +663,8 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: '{#JMXBROKERNAME}'
+                  tag: component
+                  value: destination
               trigger_prototypes:
                 -
                   uuid: f1c49943152c407088e3bf288b650b41
@@ -616,6 +672,10 @@ zabbix_export:
                   name: '{#JMXBROKERNAME}: {#JMXDESTINATIONTYPE} {#JMXDESTINATIONNAME}: Queue size higher than {$ACTIVEMQ.QUEUE.WARN:"{#JMXDESTINATIONNAME}"} for {$ACTIVEMQ.QUEUE.TIME:"{#JMXDESTINATIONNAME}"}'
                   priority: AVERAGE
                   description: 'Queue size is higher than threshold. It may indicate performance problems.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           trigger_prototypes:
             -
               uuid: c366d4b329c0471386566d6795c5787f
@@ -625,12 +685,20 @@ zabbix_export:
               name: '{#JMXBROKERNAME}: {#JMXDESTINATIONTYPE} {#JMXDESTINATIONNAME}: Consumers count is too low (below {$ACTIVEMQ.DESTINATION.CONSUMERS.MIN.HIGH:"{#JMXDESTINATIONNAME}"} for {$ACTIVEMQ.DESTINATION.CONSUMERS.MIN.TIME:"{#JMXDESTINATIONNAME}"})'
               priority: AVERAGE
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 344a0b83a5444d009aa56e97c1c0171b
               expression: 'avg(/Apache ActiveMQ by JMX/jmx[{#JMXOBJ},EnqueueCount],{$ACTIVEMQ.MSG.RATE.WARN.TIME:"{#JMXDESTINATIONNAME}"})>avg(/Apache ActiveMQ by JMX/jmx[{#JMXOBJ},DequeueCount],{$ACTIVEMQ.MSG.RATE.WARN.TIME:"{#JMXDESTINATIONNAME}"})'
               name: '{#JMXBROKERNAME}: {#JMXDESTINATIONTYPE} {#JMXDESTINATIONNAME}: Message enqueue rate is higher than dequeue rate for {$ACTIVEMQ.MSG.RATE.WARN.TIME:"{#JMXDESTINATIONNAME}"}'
               priority: AVERAGE
               description: 'Enqueue rate is higher than dequeue rate. It may indicate performance problems.'
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 725d0270554e4fe59d138becfa3e6377
               expression: 'max(/Apache ActiveMQ by JMX/jmx[{#JMXOBJ},ProducerCount],{$ACTIVEMQ.DESTINATION.PRODUCERS.MIN.TIME:"{#JMXDESTINATIONNAME}"})<{$ACTIVEMQ.DESTINATION.PRODUCERS.MIN.HIGH:"{#JMXDESTINATIONNAME}"} and last(/Apache ActiveMQ by JMX/jmx["org.apache.activemq:type=Broker,brokerName={#JMXBROKERNAME}",{$ACTIVEMQ.TOTAL.PRODUCERS.COUNT: "{#JMXDESTINATIONNAME}"}])>{$ACTIVEMQ.BROKER.PRODUCERS.MIN.HIGH:"{#JMXBROKERNAME}"}'
@@ -639,6 +707,10 @@ zabbix_export:
               name: '{#JMXBROKERNAME}: {#JMXDESTINATIONTYPE} {#JMXDESTINATIONNAME}: Producers count is too low (below {$ACTIVEMQ.DESTINATION.PRODUCERS.MIN.HIGH:"{#JMXDESTINATIONNAME}"} for {$ACTIVEMQ.DESTINATION.PRODUCERS.MIN.TIME:"{#JMXDESTINATIONNAME}"})'
               priority: AVERAGE
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
           graph_prototypes:
             -
               uuid: 006f397fbb664f9981b9228808870239
@@ -685,6 +757,13 @@ zabbix_export:
                     host: 'Apache ActiveMQ by JMX'
                     key: 'jmx[{#JMXOBJ},ConsumerCount]'
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
+      tags:
+        -
+          tag: class
+          value: application
+        -
+          tag: target
+          value: apache-activemq
       macros:
         -
           macro: '{$ACTIVEMQ.BROKER.CONSUMERS.MIN.HIGH}'
diff --git a/templates/app/apache_agent/template_app_apache_agent.yaml b/templates/app/apache_agent/template_app_apache_agent.yaml
index 19ccddde01a..124201379a3 100644
--- a/templates/app/apache_agent/template_app_apache_agent.yaml
+++ b/templates/app/apache_agent/template_app_apache_agent.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-15T07:17:09Z'
+  date: '2022-01-26T10:48:44Z'
   groups:
     -
       uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
@@ -16,7 +16,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/384764-discussion-thread-for-official-zabbix-template-apache
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Applications
@@ -44,8 +44,8 @@ zabbix_export:
             key: 'web.page.get["{$APACHE.STATUS.SCHEME}://{$APACHE.STATUS.HOST}:{$APACHE.STATUS.PORT}/{$APACHE.STATUS.PATH}"]'
           tags:
             -
-              tag: Application
-              value: Apache
+              tag: component
+              value: network
         -
           uuid: be97c53d82f846cdbc2d0ec640435b6f
           name: 'Apache: Bytes per second'
@@ -75,8 +75,8 @@ zabbix_export:
             key: 'web.page.get["{$APACHE.STATUS.SCHEME}://{$APACHE.STATUS.HOST}:{$APACHE.STATUS.PORT}/{$APACHE.STATUS.PATH}"]'
           tags:
             -
-              tag: Application
-              value: Apache
+              tag: component
+              value: network
         -
           uuid: 5919f29c692b468fb5642e83f408c2e5
           name: 'Apache: Total requests'
@@ -94,8 +94,8 @@ zabbix_export:
             key: 'web.page.get["{$APACHE.STATUS.SCHEME}://{$APACHE.STATUS.HOST}:{$APACHE.STATUS.PORT}/{$APACHE.STATUS.PATH}"]'
           tags:
             -
-              tag: Application
-              value: Apache
+              tag: component
+              value: network
         -
           uuid: 7e1e674a23d24fafa31b76a048fe9fd0
           name: 'Apache: Requests per second'
@@ -120,8 +120,8 @@ zabbix_export:
             key: 'web.page.get["{$APACHE.STATUS.SCHEME}://{$APACHE.STATUS.HOST}:{$APACHE.STATUS.PORT}/{$APACHE.STATUS.PATH}"]'
           tags:
             -
-              tag: Application
-              value: Apache
+              tag: component
+              value: network
         -
           uuid: 5a4bd2d6c2874d888ec4c82409e1c711
           name: 'Apache: Uptime'
@@ -140,8 +140,8 @@ zabbix_export:
             key: 'web.page.get["{$APACHE.STATUS.SCHEME}://{$APACHE.STATUS.HOST}:{$APACHE.STATUS.PORT}/{$APACHE.STATUS.PATH}"]'
           tags:
             -
-              tag: Application
-              value: Apache
+              tag: component
+              value: system
           triggers:
             -
               uuid: 7872d9665c234f45941ca26206e0255c
@@ -150,6 +150,10 @@ zabbix_export:
               priority: INFO
               description: 'Uptime is less than 10 minutes'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 78a611c2b15c4ae8949257b6fdf922f1
           name: 'Apache: Version'
@@ -173,8 +177,8 @@ zabbix_export:
             key: 'web.page.get["{$APACHE.STATUS.SCHEME}://{$APACHE.STATUS.HOST}:{$APACHE.STATUS.PORT}/{$APACHE.STATUS.PATH}"]'
           tags:
             -
-              tag: Application
-              value: Apache
+              tag: component
+              value: system
           triggers:
             -
               uuid: 5124b17918f545758ca5c936332f51cd
@@ -183,6 +187,10 @@ zabbix_export:
               priority: INFO
               description: 'Apache version has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 35f48761ec6d451bbb8b0d80cd0ccd91
           name: 'Apache: Workers idle cleanup'
@@ -200,8 +208,8 @@ zabbix_export:
             key: 'web.page.get["{$APACHE.STATUS.SCHEME}://{$APACHE.STATUS.HOST}:{$APACHE.STATUS.PORT}/{$APACHE.STATUS.PATH}"]'
           tags:
             -
-              tag: Application
-              value: Apache
+              tag: component
+              value: system
         -
           uuid: ebd391702cbd432ab458578a3cb45361
           name: 'Apache: Workers closing connection'
@@ -219,8 +227,8 @@ zabbix_export:
             key: 'web.page.get["{$APACHE.STATUS.SCHEME}://{$APACHE.STATUS.HOST}:{$APACHE.STATUS.PORT}/{$APACHE.STATUS.PATH}"]'
           tags:
             -
-              tag: Application
-              value: Apache
+              tag: component
+              value: system
         -
           uuid: 6a961707e7084d8ebc09f572b15ef1fd
           name: 'Apache: Workers DNS lookup'
@@ -238,8 +246,8 @@ zabbix_export:
             key: 'web.page.get["{$APACHE.STATUS.SCHEME}://{$APACHE.STATUS.HOST}:{$APACHE.STATUS.PORT}/{$APACHE.STATUS.PATH}"]'
           tags:
             -
-              tag: Application
-              value: Apache
+              tag: component
+              value: system
         -
           uuid: fd383c9ace4647deb9d3e3882554b8d0
           name: 'Apache: Workers finishing'
@@ -257,8 +265,8 @@ zabbix_export:
             key: 'web.page.get["{$APACHE.STATUS.SCHEME}://{$APACHE.STATUS.HOST}:{$APACHE.STATUS.PORT}/{$APACHE.STATUS.PATH}"]'
           tags:
             -
-              tag: Application
-              value: Apache
+              tag: component
+              value: system
         -
           uuid: 2a02413c0e9144b4a70b8a5a71d680e0
           name: 'Apache: Workers keepalive (read)'
@@ -276,8 +284,8 @@ zabbix_export:
             key: 'web.page.get["{$APACHE.STATUS.SCHEME}://{$APACHE.STATUS.HOST}:{$APACHE.STATUS.PORT}/{$APACHE.STATUS.PATH}"]'
           tags:
             -
-              tag: Application
-              value: Apache
+              tag: component
+              value: system
         -
           uuid: ed71fb2ec75f4537a2937293add75274
           name: 'Apache: Workers logging'
@@ -295,8 +303,8 @@ zabbix_export:
             key: 'web.page.get["{$APACHE.STATUS.SCHEME}://{$APACHE.STATUS.HOST}:{$APACHE.STATUS.PORT}/{$APACHE.STATUS.PATH}"]'
           tags:
             -
-              tag: Application
-              value: Apache
+              tag: component
+              value: system
         -
           uuid: 6c38147f9f3449a194f36a6e6d828865
           name: 'Apache: Workers reading request'
@@ -314,8 +322,8 @@ zabbix_export:
             key: 'web.page.get["{$APACHE.STATUS.SCHEME}://{$APACHE.STATUS.HOST}:{$APACHE.STATUS.PORT}/{$APACHE.STATUS.PATH}"]'
           tags:
             -
-              tag: Application
-              value: Apache
+              tag: component
+              value: system
         -
           uuid: 47856ac3b68644e0861b593d3083d35b
           name: 'Apache: Workers sending reply'
@@ -333,8 +341,8 @@ zabbix_export:
             key: 'web.page.get["{$APACHE.STATUS.SCHEME}://{$APACHE.STATUS.HOST}:{$APACHE.STATUS.PORT}/{$APACHE.STATUS.PATH}"]'
           tags:
             -
-              tag: Application
-              value: Apache
+              tag: component
+              value: system
         -
           uuid: 60cf954a40594cf69afdd1bf0319c031
           name: 'Apache: Workers slot with no current process'
@@ -352,8 +360,8 @@ zabbix_export:
             key: 'web.page.get["{$APACHE.STATUS.SCHEME}://{$APACHE.STATUS.HOST}:{$APACHE.STATUS.PORT}/{$APACHE.STATUS.PATH}"]'
           tags:
             -
-              tag: Application
-              value: Apache
+              tag: component
+              value: system
         -
           uuid: 441c797164bf4c8da8112d78240abc43
           name: 'Apache: Workers starting up'
@@ -371,8 +379,8 @@ zabbix_export:
             key: 'web.page.get["{$APACHE.STATUS.SCHEME}://{$APACHE.STATUS.HOST}:{$APACHE.STATUS.PORT}/{$APACHE.STATUS.PATH}"]'
           tags:
             -
-              tag: Application
-              value: Apache
+              tag: component
+              value: system
         -
           uuid: ec87e89ee9304acd8c7a76e863cb4443
           name: 'Apache: Workers waiting for connection'
@@ -390,8 +398,8 @@ zabbix_export:
             key: 'web.page.get["{$APACHE.STATUS.SCHEME}://{$APACHE.STATUS.HOST}:{$APACHE.STATUS.PORT}/{$APACHE.STATUS.PATH}"]'
           tags:
             -
-              tag: Application
-              value: Apache
+              tag: component
+              value: system
         -
           uuid: b52addb50ccb415fb63eaf67076991c1
           name: 'Apache: Total workers busy'
@@ -409,8 +417,8 @@ zabbix_export:
             key: 'web.page.get["{$APACHE.STATUS.SCHEME}://{$APACHE.STATUS.HOST}:{$APACHE.STATUS.PORT}/{$APACHE.STATUS.PATH}"]'
           tags:
             -
-              tag: Application
-              value: Apache
+              tag: component
+              value: system
         -
           uuid: 6955f78c203b435987b5ab75a1114867
           name: 'Apache: Total workers idle'
@@ -428,8 +436,8 @@ zabbix_export:
             key: 'web.page.get["{$APACHE.STATUS.SCHEME}://{$APACHE.STATUS.HOST}:{$APACHE.STATUS.PORT}/{$APACHE.STATUS.PATH}"]'
           tags:
             -
-              tag: Application
-              value: Apache
+              tag: component
+              value: system
         -
           uuid: 267ca6fe038346e5be1113f3bf9b4023
           name: 'Apache: Service response time'
@@ -439,8 +447,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Apache
+              tag: component
+              value: application
+            -
+              tag: component
+              value: health
           triggers:
             -
               uuid: 128905793a4b4a1db5a49f87e87d3383
@@ -455,6 +466,10 @@ zabbix_export:
                 -
                   name: 'Apache: Service is down'
                   expression: 'last(/Apache by Zabbix agent/net.tcp.service[http,"{$APACHE.STATUS.HOST}","{$APACHE.STATUS.PORT}"])=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 369f00e2970048c786ce3bd609e65566
           name: 'Apache: Service ping'
@@ -469,8 +484,11 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: Apache
+              tag: component
+              value: application
+            -
+              tag: component
+              value: health
           triggers:
             -
               uuid: e24dbf9b89c34d839cb12a22b1103df3
@@ -482,6 +500,10 @@ zabbix_export:
                 -
                   name: 'Apache: Process is not running'
                   expression: 'last(/Apache by Zabbix agent/proc.num["{$APACHE.PROCESS_NAME}"])=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: b73280fb0af64c7899abfc74cc074b13
           name: 'Apache: CPU utilization'
@@ -492,8 +514,8 @@ zabbix_export:
           description: 'Process CPU utilization percentage.'
           tags:
             -
-              tag: Application
-              value: Apache
+              tag: component
+              value: cpu
         -
           uuid: 384bf197e6a241b3b63bb89d009bba6b
           name: 'Apache: Memory usage (rss)'
@@ -503,8 +525,8 @@ zabbix_export:
           description: 'Resident set size memory used by process in bytes.'
           tags:
             -
-              tag: Application
-              value: Apache
+              tag: component
+              value: memory
         -
           uuid: f20b7a01ff134a128c54ea83af8557e2
           name: 'Apache: Memory usage (vsize)'
@@ -514,8 +536,8 @@ zabbix_export:
           description: 'Virtual memory size used by process in bytes.'
           tags:
             -
-              tag: Application
-              value: Apache
+              tag: component
+              value: memory
         -
           uuid: 233b5466014640e4b990ffd81fa19fa1
           name: 'Apache: Number of processes running'
@@ -523,14 +545,18 @@ zabbix_export:
           history: 7d
           tags:
             -
-              tag: Application
-              value: Apache
+              tag: component
+              value: system
           triggers:
             -
               uuid: b62f49b09d6b4c6ca01ff60cd9dd2209
               expression: 'last(/Apache by Zabbix agent/proc.num["{$APACHE.PROCESS_NAME}"])=0'
               name: 'Apache: Process is not running'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 115413a0f5ab4caba418ab841ad81eba
           name: 'Apache: Get status'
@@ -589,8 +615,8 @@ zabbix_export:
                   return JSON.stringify(output);
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
           triggers:
             -
               uuid: 0166ec63913e4bbea25c54b458b3213a
@@ -606,6 +632,10 @@ zabbix_export:
                 -
                   name: 'Apache: Service is down'
                   expression: 'last(/Apache by Zabbix agent/net.tcp.service[http,"{$APACHE.STATUS.HOST}","{$APACHE.STATUS.PORT}"])=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: 36a82bdda7754c51a05da3bb0b65b83e
@@ -636,8 +666,8 @@ zabbix_export:
                 key: 'web.page.get["{$APACHE.STATUS.SCHEME}://{$APACHE.STATUS.HOST}:{$APACHE.STATUS.PORT}/{$APACHE.STATUS.PATH}"]'
               tags:
                 -
-                  tag: Application
-                  value: Apache
+                  tag: component
+                  value: connection
             -
               uuid: 2e0692f36b924b52ab7b2ff7788b641d
               name: 'Apache: Connections async closing'
@@ -655,8 +685,8 @@ zabbix_export:
                 key: 'web.page.get["{$APACHE.STATUS.SCHEME}://{$APACHE.STATUS.HOST}:{$APACHE.STATUS.PORT}/{$APACHE.STATUS.PATH}"]'
               tags:
                 -
-                  tag: Application
-                  value: Apache
+                  tag: component
+                  value: connection
             -
               uuid: 33d3fec8f45c493097bab986d5ea1e55
               name: 'Apache: Connections async keep alive'
@@ -674,8 +704,8 @@ zabbix_export:
                 key: 'web.page.get["{$APACHE.STATUS.SCHEME}://{$APACHE.STATUS.HOST}:{$APACHE.STATUS.PORT}/{$APACHE.STATUS.PATH}"]'
               tags:
                 -
-                  tag: Application
-                  value: Apache
+                  tag: component
+                  value: connection
             -
               uuid: 9ad0e5c49e7c4b939eb7977a5158953f
               name: 'Apache: Connections async writing'
@@ -693,8 +723,8 @@ zabbix_export:
                 key: 'web.page.get["{$APACHE.STATUS.SCHEME}://{$APACHE.STATUS.HOST}:{$APACHE.STATUS.PORT}/{$APACHE.STATUS.PATH}"]'
               tags:
                 -
-                  tag: Application
-                  value: Apache
+                  tag: component
+                  value: connection
             -
               uuid: 0fbfbfae187040c790bb4d68f9e2fae5
               name: 'Apache: Connections total'
@@ -712,8 +742,8 @@ zabbix_export:
                 key: 'web.page.get["{$APACHE.STATUS.SCHEME}://{$APACHE.STATUS.HOST}:{$APACHE.STATUS.PORT}/{$APACHE.STATUS.PATH}"]'
               tags:
                 -
-                  tag: Application
-                  value: Apache
+                  tag: component
+                  value: connection
             -
               uuid: 778a1bfeaa1b474ba529e6c0a55a9949
               name: 'Apache: Number of async processes'
@@ -731,8 +761,8 @@ zabbix_export:
                 key: 'web.page.get["{$APACHE.STATUS.SCHEME}://{$APACHE.STATUS.HOST}:{$APACHE.STATUS.PORT}/{$APACHE.STATUS.PATH}"]'
               tags:
                 -
-                  tag: Application
-                  value: Apache
+                  tag: component
+                  value: system
           graph_prototypes:
             -
               uuid: 4845e6716bd74e7698406e6d8389eba5
@@ -785,6 +815,13 @@ zabbix_export:
               type: DISCARD_UNCHANGED_HEARTBEAT
               parameters:
                 - 3h
+      tags:
+        -
+          tag: class
+          value: software
+        -
+          tag: target
+          value: apache
       macros:
         -
           macro: '{$APACHE.PROCESS_NAME}'
diff --git a/templates/app/apache_http/template_app_apache_http.yaml b/templates/app/apache_http/template_app_apache_http.yaml
index 1a95e245d83..b07c853c579 100644
--- a/templates/app/apache_http/template_app_apache_http.yaml
+++ b/templates/app/apache_http/template_app_apache_http.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-15T06:56:33Z'
+  date: '2022-01-26T10:03:21Z'
   groups:
     -
       uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
@@ -16,7 +16,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/384764-discussion-thread-for-official-zabbix-template-apache
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Applications
@@ -44,8 +44,8 @@ zabbix_export:
             key: apache.get_status
           tags:
             -
-              tag: Application
-              value: Apache
+              tag: component
+              value: network
         -
           uuid: b36010be10874cf188eeacc81f2c366f
           name: 'Apache: Bytes per second'
@@ -75,8 +75,8 @@ zabbix_export:
             key: apache.get_status
           tags:
             -
-              tag: Application
-              value: Apache
+              tag: component
+              value: network
         -
           uuid: e61be8ad92004100aca55fcedd2a3807
           name: 'Apache: Get status'
@@ -138,8 +138,8 @@ zabbix_export:
           retrieve_mode: BOTH
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
           triggers:
             -
               uuid: db396445cc5042f89f31dc12cb99c32e
@@ -152,6 +152,10 @@ zabbix_export:
                 -
                   name: 'Apache: Service is down'
                   expression: 'last(/Apache by HTTP/net.tcp.service[http,"{HOST.CONN}","{$APACHE.STATUS.PORT}"])=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 5fb5101de70a43fab50d55f418462255
           name: 'Apache: Total requests'
@@ -169,8 +173,8 @@ zabbix_export:
             key: apache.get_status
           tags:
             -
-              tag: Application
-              value: Apache
+              tag: component
+              value: network
         -
           uuid: ee15f4958040459da53251cc3561ed39
           name: 'Apache: Requests per second'
@@ -195,8 +199,8 @@ zabbix_export:
             key: apache.get_status
           tags:
             -
-              tag: Application
-              value: Apache
+              tag: component
+              value: network
         -
           uuid: 3dd8ba505d584b028c7ac08d8b959eb3
           name: 'Apache: Uptime'
@@ -215,8 +219,8 @@ zabbix_export:
             key: apache.get_status
           tags:
             -
-              tag: Application
-              value: Apache
+              tag: component
+              value: system
           triggers:
             -
               uuid: 76cfa6ebf39f4c8fbd8fde9e0f36d3ed
@@ -225,6 +229,10 @@ zabbix_export:
               priority: INFO
               description: 'Uptime is less than 10 minutes'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: fe0de2eb1478482f99b38c13bd20564c
           name: 'Apache: Version'
@@ -248,8 +256,8 @@ zabbix_export:
             key: apache.get_status
           tags:
             -
-              tag: Application
-              value: Apache
+              tag: component
+              value: system
           triggers:
             -
               uuid: 5296d69af0704d0e8a07398f0b4c9685
@@ -258,6 +266,10 @@ zabbix_export:
               priority: INFO
               description: 'Apache version has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: f74ffb92e30e48958b5b82f7dfbe5147
           name: 'Apache: Workers idle cleanup'
@@ -275,8 +287,8 @@ zabbix_export:
             key: apache.get_status
           tags:
             -
-              tag: Application
-              value: Apache
+              tag: component
+              value: system
         -
           uuid: d664bee9a330480bbaee7273b871a8d3
           name: 'Apache: Workers closing connection'
@@ -294,8 +306,8 @@ zabbix_export:
             key: apache.get_status
           tags:
             -
-              tag: Application
-              value: Apache
+              tag: component
+              value: system
         -
           uuid: a6fb3444585749be998ec840cd8e4511
           name: 'Apache: Workers DNS lookup'
@@ -313,8 +325,8 @@ zabbix_export:
             key: apache.get_status
           tags:
             -
-              tag: Application
-              value: Apache
+              tag: component
+              value: system
         -
           uuid: fcf771f2a9b64a81a37db679f0494ed3
           name: 'Apache: Workers finishing'
@@ -332,8 +344,8 @@ zabbix_export:
             key: apache.get_status
           tags:
             -
-              tag: Application
-              value: Apache
+              tag: component
+              value: system
         -
           uuid: cb81a6a77395444283bc5e065fcbfc2e
           name: 'Apache: Workers keepalive (read)'
@@ -351,8 +363,8 @@ zabbix_export:
             key: apache.get_status
           tags:
             -
-              tag: Application
-              value: Apache
+              tag: component
+              value: system
         -
           uuid: 7fc0002a279b4541af569a03c1aca2ac
           name: 'Apache: Workers logging'
@@ -370,8 +382,8 @@ zabbix_export:
             key: apache.get_status
           tags:
             -
-              tag: Application
-              value: Apache
+              tag: component
+              value: system
         -
           uuid: 78b0bd7d8bec49549fc003d460af9177
           name: 'Apache: Workers reading request'
@@ -389,8 +401,8 @@ zabbix_export:
             key: apache.get_status
           tags:
             -
-              tag: Application
-              value: Apache
+              tag: component
+              value: system
         -
           uuid: 379ac66397b94463ad17b24fbd20c615
           name: 'Apache: Workers sending reply'
@@ -408,8 +420,8 @@ zabbix_export:
             key: apache.get_status
           tags:
             -
-              tag: Application
-              value: Apache
+              tag: component
+              value: system
         -
           uuid: 1c90055e02a244fc8d18e73b23daa0f1
           name: 'Apache: Workers slot with no current process'
@@ -427,8 +439,8 @@ zabbix_export:
             key: apache.get_status
           tags:
             -
-              tag: Application
-              value: Apache
+              tag: component
+              value: system
         -
           uuid: ae21ea113e8840349aff81ab582d92b4
           name: 'Apache: Workers starting up'
@@ -446,8 +458,8 @@ zabbix_export:
             key: apache.get_status
           tags:
             -
-              tag: Application
-              value: Apache
+              tag: component
+              value: system
         -
           uuid: be1a05a6eab84b64ac4d51c966ea91e8
           name: 'Apache: Workers waiting for connection'
@@ -465,8 +477,8 @@ zabbix_export:
             key: apache.get_status
           tags:
             -
-              tag: Application
-              value: Apache
+              tag: component
+              value: system
         -
           uuid: 1752b9bcf7b34abbaf105f5261638271
           name: 'Apache: Total workers busy'
@@ -484,8 +496,8 @@ zabbix_export:
             key: apache.get_status
           tags:
             -
-              tag: Application
-              value: Apache
+              tag: component
+              value: system
         -
           uuid: b1b1c86a12964ae2813c63481e464ec7
           name: 'Apache: Total workers idle'
@@ -503,8 +515,8 @@ zabbix_export:
             key: apache.get_status
           tags:
             -
-              tag: Application
-              value: Apache
+              tag: component
+              value: system
         -
           uuid: 5039d11bc3964d6e9928a0a46dd0b402
           name: 'Apache: Service response time'
@@ -515,8 +527,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Apache
+              tag: component
+              value: application
+            -
+              tag: component
+              value: health
           triggers:
             -
               uuid: ffbb564032c7462eb0bb9b4c2f700559
@@ -528,6 +543,10 @@ zabbix_export:
                 -
                   name: 'Apache: Service is down'
                   expression: 'last(/Apache by HTTP/net.tcp.service[http,"{HOST.CONN}","{$APACHE.STATUS.PORT}"])=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: fb65918695094026838e2b9e4ca00402
           name: 'Apache: Service ping'
@@ -543,8 +562,11 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: Apache
+              tag: component
+              value: application
+            -
+              tag: component
+              value: health
           triggers:
             -
               uuid: afe2fde35d054333adc8369a0f9af778
@@ -552,6 +574,10 @@ zabbix_export:
               name: 'Apache: Service is down'
               priority: AVERAGE
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: eee8abd3174d426092e8bca9b3ba982e
@@ -582,8 +608,8 @@ zabbix_export:
                 key: apache.get_status
               tags:
                 -
-                  tag: Application
-                  value: Apache
+                  tag: component
+                  value: connection
             -
               uuid: 062d7c941f0c468d8b63fa76ae0610f6
               name: 'Apache: Connections async closing'
@@ -601,8 +627,8 @@ zabbix_export:
                 key: apache.get_status
               tags:
                 -
-                  tag: Application
-                  value: Apache
+                  tag: component
+                  value: connection
             -
               uuid: 6cb8b255ad8343a48e622912bc298366
               name: 'Apache: Connections async keep alive'
@@ -620,8 +646,8 @@ zabbix_export:
                 key: apache.get_status
               tags:
                 -
-                  tag: Application
-                  value: Apache
+                  tag: component
+                  value: connection
             -
               uuid: 997b3452aac24ad6afbad775d649c727
               name: 'Apache: Connections async writing'
@@ -639,8 +665,8 @@ zabbix_export:
                 key: apache.get_status
               tags:
                 -
-                  tag: Application
-                  value: Apache
+                  tag: component
+                  value: connection
             -
               uuid: 31cb044eed904ca19150921fe36f3285
               name: 'Apache: Connections total'
@@ -658,8 +684,8 @@ zabbix_export:
                 key: apache.get_status
               tags:
                 -
-                  tag: Application
-                  value: Apache
+                  tag: component
+                  value: connection
             -
               uuid: 34555340f3ad4b878504df188f54a9c9
               name: 'Apache: Number of async processes'
@@ -677,8 +703,8 @@ zabbix_export:
                 key: apache.get_status
               tags:
                 -
-                  tag: Application
-                  value: Apache
+                  tag: component
+                  value: system
           graph_prototypes:
             -
               uuid: 066b53ed2244414ca3090498eb035c27
@@ -731,6 +757,13 @@ zabbix_export:
               type: DISCARD_UNCHANGED_HEARTBEAT
               parameters:
                 - 3h
+      tags:
+        -
+          tag: class
+          value: software
+        -
+          tag: target
+          value: apache
       macros:
         -
           macro: '{$APACHE.RESPONSE_TIME.MAX.WARN}'
diff --git a/templates/app/aranet_http/template_app_aranet_http.yaml b/templates/app/aranet_http/template_app_aranet_http.yaml
index dab42f5926a..df865260d1e 100644
--- a/templates/app/aranet_http/template_app_aranet_http.yaml
+++ b/templates/app/aranet_http/template_app_aranet_http.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-15T13:50:35Z'
+  date: '2022-01-26T10:47:29Z'
   groups:
     -
       uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
@@ -10,7 +10,7 @@ zabbix_export:
       uuid: af21edc47557400583e537904ea632aa
       template: 'Aranet Cloud'
       name: 'Aranet Cloud'
-      description: 'Template tooling version used: 0.40'
+      description: 'Template tooling version used: 0.41'
       groups:
         -
           name: Templates/Applications
@@ -302,8 +302,8 @@ zabbix_export:
               value: '{$ARANET.API.USERNAME}'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
         -
           uuid: 92fb73948fa74de8a6a219397b77b570
           name: 'Aranet: Sensors discovery'
@@ -346,8 +346,11 @@ zabbix_export:
             key: aranet.get_data
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: discovery
+            -
+              tag: component
+              value: raw
       discovery_rules:
         -
           uuid: c4d177c29cb34e87b6bec0d22bd3ae23
@@ -408,7 +411,7 @@ zabbix_export:
                 key: aranet.get_data
               tags:
                 -
-                  tag: Application
+                  tag: component
                   value: '{#METRIC}'
               trigger_prototypes:
                 -
@@ -416,6 +419,10 @@ zabbix_export:
                   expression: 'max(/Aranet Cloud/aranet.battery.voltage["{#GATEWAY_ID}", "{#SENSOR_ID}"],5m) < {$ARANET.BATT.VOLTAGE.MIN.CRIT:"{#SENSOR_NAME}"}'
                   name: '{#METRIC}: Critically low battery voltage on "[{#GATEWAY_NAME}] {#SENSOR_NAME}" (below {$ARANET.BATT.VOLTAGE.MIN.CRIT:"{#SENSOR_NAME}"}{#UNIT} for 5m)'
                   priority: HIGH
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
                 -
                   uuid: d729130760f9418baa40fb9eeb8a3ca4
                   expression: 'max(/Aranet Cloud/aranet.battery.voltage["{#GATEWAY_ID}", "{#SENSOR_ID}"],5m) < {$ARANET.BATT.VOLTAGE.MIN.WARN:"{#SENSOR_NAME}"}'
@@ -425,6 +432,10 @@ zabbix_export:
                     -
                       name: '{#METRIC}: Critically low battery voltage on "[{#GATEWAY_NAME}] {#SENSOR_NAME}" (below {$ARANET.BATT.VOLTAGE.MIN.CRIT:"{#SENSOR_NAME}"}{#UNIT} for 5m)'
                       expression: 'max(/Aranet Cloud/aranet.battery.voltage["{#GATEWAY_ID}", "{#SENSOR_ID}"],5m) < {$ARANET.BATT.VOLTAGE.MIN.CRIT:"{#SENSOR_NAME}"}'
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
           master_item:
             key: aranet.sensor.discovery
         -
@@ -486,7 +497,7 @@ zabbix_export:
                 key: aranet.get_data
               tags:
                 -
-                  tag: Application
+                  tag: component
                   value: '{#METRIC}'
               trigger_prototypes:
                 -
@@ -494,6 +505,10 @@ zabbix_export:
                   expression: 'min(/Aranet Cloud/aranet.co2["{#GATEWAY_ID}", "{#SENSOR_ID}"],5m) > {$ARANET.CO2.MAX.CRIT:"{#SENSOR_NAME}"}'
                   name: '{#METRIC}: Critically high CO2 level on "[{#GATEWAY_NAME}] {#SENSOR_NAME}" (over {$ARANET.CO2.MAX.CRIT:"{#SENSOR_NAME}"}{#UNIT} for 5m)'
                   priority: HIGH
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: cc54c75ee607485981388da0f7f99ea2
                   expression: 'min(/Aranet Cloud/aranet.co2["{#GATEWAY_ID}", "{#SENSOR_ID}"],5m) > {$ARANET.CO2.MAX.WARN:"{#SENSOR_NAME}"}'
@@ -503,6 +518,10 @@ zabbix_export:
                     -
                       name: '{#METRIC}: Critically high CO2 level on "[{#GATEWAY_NAME}] {#SENSOR_NAME}" (over {$ARANET.CO2.MAX.CRIT:"{#SENSOR_NAME}"}{#UNIT} for 5m)'
                       expression: 'min(/Aranet Cloud/aranet.co2["{#GATEWAY_ID}", "{#SENSOR_ID}"],5m) > {$ARANET.CO2.MAX.CRIT:"{#SENSOR_NAME}"}'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
           master_item:
             key: aranet.sensor.discovery
         -
@@ -564,7 +583,7 @@ zabbix_export:
                 key: aranet.get_data
               tags:
                 -
-                  tag: Application
+                  tag: component
                   value: '{#METRIC}'
           master_item:
             key: aranet.sensor.discovery
@@ -627,7 +646,7 @@ zabbix_export:
                 key: aranet.get_data
               tags:
                 -
-                  tag: Application
+                  tag: component
                   value: '{#METRIC}'
           master_item:
             key: aranet.sensor.discovery
@@ -690,7 +709,7 @@ zabbix_export:
                 key: aranet.get_data
               tags:
                 -
-                  tag: Application
+                  tag: component
                   value: '{#METRIC}'
           master_item:
             key: aranet.sensor.discovery
@@ -753,7 +772,7 @@ zabbix_export:
                 key: aranet.get_data
               tags:
                 -
-                  tag: Application
+                  tag: component
                   value: '{#METRIC}'
               trigger_prototypes:
                 -
@@ -761,6 +780,10 @@ zabbix_export:
                   expression: 'min(/Aranet Cloud/aranet.humidity["{#GATEWAY_ID}", "{#SENSOR_ID}"],5m) > {$ARANET.HUMIDITY.MAX.WARN:"{#SENSOR_NAME}"}'
                   name: '{#METRIC}: High humidity on "[{#GATEWAY_NAME}] {#SENSOR_NAME}" (over {$ARANET.HUMIDITY.MAX.WARN:"{#SENSOR_NAME}"}{#UNIT} for 5m)'
                   priority: HIGH
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: 85c1be625bc940588671bc43e6ed6a8a
                   expression: 'max(/Aranet Cloud/aranet.humidity["{#GATEWAY_ID}", "{#SENSOR_ID}"],5m) < {$ARANET.HUMIDITY.MIN.WARN:"{#SENSOR_NAME}"}'
@@ -770,6 +793,10 @@ zabbix_export:
                     -
                       name: '{#METRIC}: High humidity on "[{#GATEWAY_NAME}] {#SENSOR_NAME}" (over {$ARANET.HUMIDITY.MAX.WARN:"{#SENSOR_NAME}"}{#UNIT} for 5m)'
                       expression: 'min(/Aranet Cloud/aranet.humidity["{#GATEWAY_ID}", "{#SENSOR_ID}"],5m) > {$ARANET.HUMIDITY.MAX.WARN:"{#SENSOR_NAME}"}'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
           master_item:
             key: aranet.sensor.discovery
         -
@@ -831,7 +858,7 @@ zabbix_export:
                 key: aranet.get_data
               tags:
                 -
-                  tag: Application
+                  tag: component
                   value: '{#METRIC}'
           master_item:
             key: aranet.sensor.discovery
@@ -897,7 +924,7 @@ zabbix_export:
                 key: aranet.get_data
               tags:
                 -
-                  tag: Application
+                  tag: component
                   value: '{#METRIC}'
               trigger_prototypes:
                 -
@@ -905,6 +932,10 @@ zabbix_export:
                   expression: 'last(/Aranet Cloud/aranet.last_update["{#GATEWAY_ID}", "{#SENSOR_ID}"]) > {$ARANET.LAST_UPDATE.MAX.WARN:"{#SENSOR_NAME}"}'
                   name: '{#METRIC}: Sensor data "[{#GATEWAY_NAME}] {#SENSOR_NAME}" is not updated (more than {$ARANET.LAST_UPDATE.MAX.WARN:"{#SENSOR_NAME}"})'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
           master_item:
             key: aranet.sensor.discovery
         -
@@ -965,7 +996,7 @@ zabbix_export:
                 key: aranet.get_data
               tags:
                 -
-                  tag: Application
+                  tag: component
                   value: '{#METRIC}'
           master_item:
             key: aranet.sensor.discovery
@@ -1028,7 +1059,7 @@ zabbix_export:
                 key: aranet.get_data
               tags:
                 -
-                  tag: Application
+                  tag: component
                   value: '{#METRIC}'
           master_item:
             key: aranet.sensor.discovery
@@ -1091,7 +1122,7 @@ zabbix_export:
                 key: aranet.get_data
               tags:
                 -
-                  tag: Application
+                  tag: component
                   value: '{#METRIC}'
           master_item:
             key: aranet.sensor.discovery
@@ -1154,7 +1185,7 @@ zabbix_export:
                 key: aranet.get_data
               tags:
                 -
-                  tag: Application
+                  tag: component
                   value: '{#METRIC}'
           master_item:
             key: aranet.sensor.discovery
@@ -1217,7 +1248,7 @@ zabbix_export:
                 key: aranet.get_data
               tags:
                 -
-                  tag: Application
+                  tag: component
                   value: '{#METRIC}'
           master_item:
             key: aranet.sensor.discovery
@@ -1280,7 +1311,7 @@ zabbix_export:
                 key: aranet.get_data
               tags:
                 -
-                  tag: Application
+                  tag: component
                   value: '{#METRIC}'
           master_item:
             key: aranet.sensor.discovery
@@ -1343,7 +1374,7 @@ zabbix_export:
                 key: aranet.get_data
               tags:
                 -
-                  tag: Application
+                  tag: component
                   value: '{#METRIC}'
           master_item:
             key: aranet.sensor.discovery
@@ -1406,7 +1437,7 @@ zabbix_export:
                 key: aranet.get_data
               tags:
                 -
-                  tag: Application
+                  tag: component
                   value: '{#METRIC}'
           master_item:
             key: aranet.sensor.discovery
@@ -1469,7 +1500,7 @@ zabbix_export:
                 key: aranet.get_data
               tags:
                 -
-                  tag: Application
+                  tag: component
                   value: '{#METRIC}'
           master_item:
             key: aranet.sensor.discovery
@@ -1532,7 +1563,7 @@ zabbix_export:
                 key: aranet.get_data
               tags:
                 -
-                  tag: Application
+                  tag: component
                   value: '{#METRIC}'
           master_item:
             key: aranet.sensor.discovery
@@ -1595,7 +1626,7 @@ zabbix_export:
                 key: aranet.get_data
               tags:
                 -
-                  tag: Application
+                  tag: component
                   value: '{#METRIC}'
           master_item:
             key: aranet.sensor.discovery
@@ -1658,7 +1689,7 @@ zabbix_export:
                 key: aranet.get_data
               tags:
                 -
-                  tag: Application
+                  tag: component
                   value: '{#METRIC}'
           master_item:
             key: aranet.sensor.discovery
@@ -1721,10 +1752,17 @@ zabbix_export:
                 key: aranet.get_data
               tags:
                 -
-                  tag: Application
+                  tag: component
                   value: '{#METRIC}'
           master_item:
             key: aranet.sensor.discovery
+      tags:
+        -
+          tag: class
+          value: service
+        -
+          tag: target
+          value: aranet
       macros:
         -
           macro: '{$ARANET.API.ENDPOINT}'
diff --git a/templates/app/ceph_agent2/template_app_ceph_agent2.yaml b/templates/app/ceph_agent2/template_app_ceph_agent2.yaml
index 0ecd8725045..3b8b5bdaabf 100644
--- a/templates/app/ceph_agent2/template_app_ceph_agent2.yaml
+++ b/templates/app/ceph_agent2/template_app_ceph_agent2.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-15T06:56:38Z'
+  date: '2022-01-26T09:59:53Z'
   groups:
     -
       uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
@@ -13,7 +13,7 @@ zabbix_export:
       description: |
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/410059-discussion-thread-for-official-zabbix-template-ceph
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Applications
@@ -27,8 +27,11 @@ zabbix_export:
           value_type: TEXT
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: disk
+            -
+              tag: component
+              value: raw
         -
           uuid: 45c9df734d424e6a8d3fea99c4a66246
           name: 'Ceph: Minimum Mon release version'
@@ -52,8 +55,8 @@ zabbix_export:
             key: 'ceph.status["{$CEPH.CONNSTRING}","{$CEPH.USER}","{$CEPH.API.KEY}"]'
           tags:
             -
-              tag: Application
-              value: Ceph
+              tag: component
+              value: monitors
           triggers:
             -
               uuid: 716f166b3943443aba70a4faed882ffb
@@ -62,6 +65,10 @@ zabbix_export:
               priority: INFO
               description: 'Ceph version has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 5d5276504d6c41eebe8e18846edcff45
           name: 'Ceph: Number of Monitors'
@@ -83,8 +90,8 @@ zabbix_export:
             key: 'ceph.status["{$CEPH.CONNSTRING}","{$CEPH.USER}","{$CEPH.API.KEY}"]'
           tags:
             -
-              tag: Application
-              value: Ceph
+              tag: component
+              value: monitors
         -
           uuid: 09d7a872f35349c6ba7d4a678bf71652
           name: 'Ceph: Number of OSDs'
@@ -106,8 +113,11 @@ zabbix_export:
             key: 'ceph.status["{$CEPH.CONNSTRING}","{$CEPH.USER}","{$CEPH.API.KEY}"]'
           tags:
             -
-              tag: Application
-              value: Ceph
+              tag: component
+              value: cluster
+            -
+              tag: component
+              value: osd
         -
           uuid: 795939e16e70475381e917b213bf6f70
           name: 'Ceph: Number of OSDs in state: IN'
@@ -129,8 +139,11 @@ zabbix_export:
             key: 'ceph.status["{$CEPH.CONNSTRING}","{$CEPH.USER}","{$CEPH.API.KEY}"]'
           tags:
             -
-              tag: Application
-              value: Ceph
+              tag: component
+              value: cluster
+            -
+              tag: component
+              value: osd
         -
           uuid: d2d5caaad2914fb1ba07343956edb5b8
           name: 'Ceph: Number of OSDs in state: UP'
@@ -152,8 +165,11 @@ zabbix_export:
             key: 'ceph.status["{$CEPH.CONNSTRING}","{$CEPH.USER}","{$CEPH.API.KEY}"]'
           tags:
             -
-              tag: Application
-              value: Ceph
+              tag: component
+              value: cluster
+            -
+              tag: component
+              value: osd
         -
           uuid: 46ea920b0951408daa5d678f298b1097
           name: 'Ceph: Number of Placement Groups'
@@ -175,8 +191,11 @@ zabbix_export:
             key: 'ceph.status["{$CEPH.CONNSTRING}","{$CEPH.USER}","{$CEPH.API.KEY}"]'
           tags:
             -
-              tag: Application
-              value: Ceph
+              tag: component
+              value: cluster
+            -
+              tag: component
+              value: placement-groups
         -
           uuid: 97fbecc8ee824e658dd95d8115fec5e9
           name: 'Ceph: Number of Placement Groups in Temporary state'
@@ -194,8 +213,8 @@ zabbix_export:
             key: 'ceph.osd.dump["{$CEPH.CONNSTRING}","{$CEPH.USER}","{$CEPH.API.KEY}"]'
           tags:
             -
-              tag: Application
-              value: Ceph
+              tag: component
+              value: placement-groups
         -
           uuid: b0e36ff76db049ab870fa26c29e5e69c
           name: 'Ceph: Number of Pools'
@@ -213,8 +232,11 @@ zabbix_export:
             key: 'ceph.df.details["{$CEPH.CONNSTRING}","{$CEPH.USER}","{$CEPH.API.KEY}"]'
           tags:
             -
-              tag: Application
-              value: Ceph
+              tag: component
+              value: cluster
+            -
+              tag: component
+              value: pools
         -
           uuid: e7eb1f67d81c4e2ba7c57cfbc81d1a00
           name: 'Ceph: Get OSD dump'
@@ -224,8 +246,11 @@ zabbix_export:
           value_type: TEXT
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: osd
+            -
+              tag: component
+              value: raw
         -
           uuid: 35b63ca6519e4137bb7655e37ed08e51
           name: 'Ceph: Get OSD stats'
@@ -235,8 +260,11 @@ zabbix_export:
           value_type: TEXT
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: osd
+            -
+              tag: component
+              value: raw
         -
           uuid: 0d6cffa1f06748738431524667ea8db0
           name: 'Ceph: Ceph backfill full ratio'
@@ -259,8 +287,8 @@ zabbix_export:
             key: 'ceph.osd.dump["{$CEPH.CONNSTRING}","{$CEPH.USER}","{$CEPH.API.KEY}"]'
           tags:
             -
-              tag: Application
-              value: Ceph
+              tag: component
+              value: cluster
         -
           uuid: 52c5efe132b8404f8fc4ac995c3d5c2c
           name: 'Ceph: Ceph OSD avg fill'
@@ -280,8 +308,11 @@ zabbix_export:
             key: 'ceph.osd.stats["{$CEPH.CONNSTRING}","{$CEPH.USER}","{$CEPH.API.KEY}"]'
           tags:
             -
-              tag: Application
-              value: Ceph
+              tag: component
+              value: cluster
+            -
+              tag: component
+              value: osd
         -
           uuid: 453cebeed3214153ba4e3a5b224c063d
           name: 'Ceph: Ceph OSD max fill'
@@ -301,8 +332,11 @@ zabbix_export:
             key: 'ceph.osd.stats["{$CEPH.CONNSTRING}","{$CEPH.USER}","{$CEPH.API.KEY}"]'
           tags:
             -
-              tag: Application
-              value: Ceph
+              tag: component
+              value: cluster
+            -
+              tag: component
+              value: osd
         -
           uuid: f6efbd37e8104272be131d686a700808
           name: 'Ceph: Ceph OSD min fill'
@@ -322,8 +356,11 @@ zabbix_export:
             key: 'ceph.osd.stats["{$CEPH.CONNSTRING}","{$CEPH.USER}","{$CEPH.API.KEY}"]'
           tags:
             -
-              tag: Application
-              value: Ceph
+              tag: component
+              value: cluster
+            -
+              tag: component
+              value: osd
         -
           uuid: 532891a1d8934211a016524b136cfb1e
           name: 'Ceph: Ceph full ratio'
@@ -346,8 +383,8 @@ zabbix_export:
             key: 'ceph.osd.dump["{$CEPH.CONNSTRING}","{$CEPH.USER}","{$CEPH.API.KEY}"]'
           tags:
             -
-              tag: Application
-              value: Ceph
+              tag: component
+              value: cluster
         -
           uuid: 074c0881384446ea90e99d355afe4f4f
           name: 'Ceph: Ceph OSD Apply latency Avg'
@@ -367,8 +404,11 @@ zabbix_export:
             key: 'ceph.osd.stats["{$CEPH.CONNSTRING}","{$CEPH.USER}","{$CEPH.API.KEY}"]'
           tags:
             -
-              tag: Application
-              value: Ceph
+              tag: component
+              value: cluster
+            -
+              tag: component
+              value: osd
         -
           uuid: ef0a76f0c16147d1a280e00e66d3806f
           name: 'Ceph: Ceph OSD Apply latency Max'
@@ -388,8 +428,11 @@ zabbix_export:
             key: 'ceph.osd.stats["{$CEPH.CONNSTRING}","{$CEPH.USER}","{$CEPH.API.KEY}"]'
           tags:
             -
-              tag: Application
-              value: Ceph
+              tag: component
+              value: cluster
+            -
+              tag: component
+              value: osd
         -
           uuid: d45ad876b0a04345be347af54211aa69
           name: 'Ceph: Ceph OSD Apply latency Min'
@@ -409,8 +452,11 @@ zabbix_export:
             key: 'ceph.osd.stats["{$CEPH.CONNSTRING}","{$CEPH.USER}","{$CEPH.API.KEY}"]'
           tags:
             -
-              tag: Application
-              value: Ceph
+              tag: component
+              value: cluster
+            -
+              tag: component
+              value: osd
         -
           uuid: 52e1b146c36e4c2e82acf36f1c7d12eb
           name: 'Ceph: Ceph OSD Commit latency Avg'
@@ -430,8 +476,11 @@ zabbix_export:
             key: 'ceph.osd.stats["{$CEPH.CONNSTRING}","{$CEPH.USER}","{$CEPH.API.KEY}"]'
           tags:
             -
-              tag: Application
-              value: Ceph
+              tag: component
+              value: cluster
+            -
+              tag: component
+              value: osd
         -
           uuid: 3027a1dbdd8e4f9bbef8927b92eb8e77
           name: 'Ceph: Ceph OSD Commit latency Max'
@@ -451,8 +500,11 @@ zabbix_export:
             key: 'ceph.osd.stats["{$CEPH.CONNSTRING}","{$CEPH.USER}","{$CEPH.API.KEY}"]'
           tags:
             -
-              tag: Application
-              value: Ceph
+              tag: component
+              value: cluster
+            -
+              tag: component
+              value: osd
         -
           uuid: b9900b84c22843dab4ad335b9642e040
           name: 'Ceph: Ceph OSD Commit latency Min'
@@ -472,8 +524,11 @@ zabbix_export:
             key: 'ceph.osd.stats["{$CEPH.CONNSTRING}","{$CEPH.USER}","{$CEPH.API.KEY}"]'
           tags:
             -
-              tag: Application
-              value: Ceph
+              tag: component
+              value: cluster
+            -
+              tag: component
+              value: osd
         -
           uuid: 477d94bd838d4273a556537de36bb1f6
           name: 'Ceph: Ceph nearfull ratio'
@@ -496,8 +551,8 @@ zabbix_export:
             key: 'ceph.osd.dump["{$CEPH.CONNSTRING}","{$CEPH.USER}","{$CEPH.API.KEY}"]'
           tags:
             -
-              tag: Application
-              value: Ceph
+              tag: component
+              value: cluster
         -
           uuid: 27ea5688271347bca429d91ace62d4e2
           name: 'Ceph: Ceph OSD avg PGs'
@@ -516,8 +571,14 @@ zabbix_export:
             key: 'ceph.osd.stats["{$CEPH.CONNSTRING}","{$CEPH.USER}","{$CEPH.API.KEY}"]'
           tags:
             -
-              tag: Application
-              value: Ceph
+              tag: component
+              value: cluster
+            -
+              tag: component
+              value: osd
+            -
+              tag: component
+              value: placement-groups
         -
           uuid: 4174d7d3190e47ccb55b1e50da4cedc5
           name: 'Ceph: Ceph OSD max PGs'
@@ -536,8 +597,14 @@ zabbix_export:
             key: 'ceph.osd.stats["{$CEPH.CONNSTRING}","{$CEPH.USER}","{$CEPH.API.KEY}"]'
           tags:
             -
-              tag: Application
-              value: Ceph
+              tag: component
+              value: cluster
+            -
+              tag: component
+              value: osd
+            -
+              tag: component
+              value: placement-groups
         -
           uuid: 47f56243cd1c430fae217d1a0cbc4a99
           name: 'Ceph: Ceph OSD min PGs'
@@ -556,8 +623,14 @@ zabbix_export:
             key: 'ceph.osd.stats["{$CEPH.CONNSTRING}","{$CEPH.USER}","{$CEPH.API.KEY}"]'
           tags:
             -
-              tag: Application
-              value: Ceph
+              tag: component
+              value: cluster
+            -
+              tag: component
+              value: osd
+            -
+              tag: component
+              value: placement-groups
         -
           uuid: 4023ca309692470eab2651f69d49419a
           name: 'Ceph: Overall cluster status'
@@ -581,8 +654,8 @@ zabbix_export:
             key: 'ceph.status["{$CEPH.CONNSTRING}","{$CEPH.USER}","{$CEPH.API.KEY}"]'
           tags:
             -
-              tag: Application
-              value: Ceph
+              tag: component
+              value: health
           triggers:
             -
               uuid: 6ab06350bd8b426681f1b8bddde76a13
@@ -590,6 +663,10 @@ zabbix_export:
               name: 'Ceph: Cluster in ERROR state'
               priority: AVERAGE
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
             -
               uuid: 8b6ba1a7ae014e80a5287ffd13b5d8aa
               expression: 'last(/Ceph by Zabbix agent 2/ceph.overall_status)=1'
@@ -602,6 +679,10 @@ zabbix_export:
                 -
                   name: 'Ceph: Cluster in ERROR state'
                   expression: 'last(/Ceph by Zabbix agent 2/ceph.overall_status)=2'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 9b073153d7474b0abfccb1844d0e6981
           name: 'Ceph: Number of Placement Groups in Active state'
@@ -619,8 +700,8 @@ zabbix_export:
             key: 'ceph.status["{$CEPH.CONNSTRING}","{$CEPH.USER}","{$CEPH.API.KEY}"]'
           tags:
             -
-              tag: Application
-              value: Ceph
+              tag: component
+              value: placement-groups
         -
           uuid: 1471a13aaadc48c7a265835abcb93a03
           name: 'Ceph: Number of Placement Groups in Backfilling state'
@@ -638,8 +719,8 @@ zabbix_export:
             key: 'ceph.status["{$CEPH.CONNSTRING}","{$CEPH.USER}","{$CEPH.API.KEY}"]'
           tags:
             -
-              tag: Application
-              value: Ceph
+              tag: component
+              value: placement-groups
         -
           uuid: 3b44c79e03d4402ba442331593dbdfa3
           name: 'Ceph: Number of Placement Groups in backfill_toofull state'
@@ -657,8 +738,8 @@ zabbix_export:
             key: 'ceph.status["{$CEPH.CONNSTRING}","{$CEPH.USER}","{$CEPH.API.KEY}"]'
           tags:
             -
-              tag: Application
-              value: Ceph
+              tag: component
+              value: placement-groups
         -
           uuid: ada3f638ee2e48eeb8889526898aed2f
           name: 'Ceph: Number of Placement Groups in backfill_wait state'
@@ -676,8 +757,8 @@ zabbix_export:
             key: 'ceph.status["{$CEPH.CONNSTRING}","{$CEPH.USER}","{$CEPH.API.KEY}"]'
           tags:
             -
-              tag: Application
-              value: Ceph
+              tag: component
+              value: placement-groups
         -
           uuid: b1af2b88fe424723b97c9aa4eee12d83
           name: 'Ceph: Number of Placement Groups in Clean state'
@@ -695,8 +776,8 @@ zabbix_export:
             key: 'ceph.status["{$CEPH.CONNSTRING}","{$CEPH.USER}","{$CEPH.API.KEY}"]'
           tags:
             -
-              tag: Application
-              value: Ceph
+              tag: component
+              value: placement-groups
         -
           uuid: f8acf8f66fbc401799d3515eb3e2ea43
           name: 'Ceph: Number of Placement Groups in degraded state'
@@ -714,8 +795,8 @@ zabbix_export:
             key: 'ceph.status["{$CEPH.CONNSTRING}","{$CEPH.USER}","{$CEPH.API.KEY}"]'
           tags:
             -
-              tag: Application
-              value: Ceph
+              tag: component
+              value: placement-groups
         -
           uuid: 79e056b9e3af40eabab0f927fb326491
           name: 'Ceph: Number of Placement Groups in inconsistent state'
@@ -733,8 +814,8 @@ zabbix_export:
             key: 'ceph.status["{$CEPH.CONNSTRING}","{$CEPH.USER}","{$CEPH.API.KEY}"]'
           tags:
             -
-              tag: Application
-              value: Ceph
+              tag: component
+              value: placement-groups
         -
           uuid: 9ddef3d2e7df43eda7d2835ceac19d32
           name: 'Ceph: Number of Placement Groups in Peering state'
@@ -752,8 +833,8 @@ zabbix_export:
             key: 'ceph.status["{$CEPH.CONNSTRING}","{$CEPH.USER}","{$CEPH.API.KEY}"]'
           tags:
             -
-              tag: Application
-              value: Ceph
+              tag: component
+              value: placement-groups
         -
           uuid: 573461fc94e84f96b8ae6f6d89916424
           name: 'Ceph: Number of Placement Groups in recovering state'
@@ -771,8 +852,8 @@ zabbix_export:
             key: 'ceph.status["{$CEPH.CONNSTRING}","{$CEPH.USER}","{$CEPH.API.KEY}"]'
           tags:
             -
-              tag: Application
-              value: Ceph
+              tag: component
+              value: placement-groups
         -
           uuid: c150a9414fee40acaa65d532fd110c4e
           name: 'Ceph: Number of Placement Groups in recovery_wait state'
@@ -790,8 +871,8 @@ zabbix_export:
             key: 'ceph.status["{$CEPH.CONNSTRING}","{$CEPH.USER}","{$CEPH.API.KEY}"]'
           tags:
             -
-              tag: Application
-              value: Ceph
+              tag: component
+              value: placement-groups
         -
           uuid: bac3270faf854267a466eaa6a4acad91
           name: 'Ceph: Number of Placement Groups in remapped state'
@@ -809,8 +890,8 @@ zabbix_export:
             key: 'ceph.status["{$CEPH.CONNSTRING}","{$CEPH.USER}","{$CEPH.API.KEY}"]'
           tags:
             -
-              tag: Application
-              value: Ceph
+              tag: component
+              value: placement-groups
         -
           uuid: 8a0117845436492d951e96b46eb67e1c
           name: 'Ceph: Number of Placement Groups in Scrubbing state'
@@ -828,8 +909,8 @@ zabbix_export:
             key: 'ceph.status["{$CEPH.CONNSTRING}","{$CEPH.USER}","{$CEPH.API.KEY}"]'
           tags:
             -
-              tag: Application
-              value: Ceph
+              tag: component
+              value: placement-groups
         -
           uuid: 4998e4542ed746f08f82ecf53b553c36
           name: 'Ceph: Number of Placement Groups in Undersized state'
@@ -847,8 +928,8 @@ zabbix_export:
             key: 'ceph.status["{$CEPH.CONNSTRING}","{$CEPH.USER}","{$CEPH.API.KEY}"]'
           tags:
             -
-              tag: Application
-              value: Ceph
+              tag: component
+              value: placement-groups
         -
           uuid: c922613c5ffb4f689c01f13143633ec3
           name: 'Ceph: Number of Placement Groups in Unknown state'
@@ -866,8 +947,8 @@ zabbix_export:
             key: 'ceph.status["{$CEPH.CONNSTRING}","{$CEPH.USER}","{$CEPH.API.KEY}"]'
           tags:
             -
-              tag: Application
-              value: Ceph
+              tag: component
+              value: placement-groups
         -
           uuid: 911e8a654ca44e7ca56b8010ac7381c8
           name: 'Ceph: Ping'
@@ -882,8 +963,11 @@ zabbix_export:
                 - 30m
           tags:
             -
-              tag: Application
-              value: Ceph
+              tag: component
+              value: application
+            -
+              tag: component
+              value: health
           triggers:
             -
               uuid: 9ffc9a5c3d1c47d288c665c8be7d2fbb
@@ -891,6 +975,10 @@ zabbix_export:
               name: 'Ceph: Can not connect to cluster'
               priority: AVERAGE
               description: 'Connection to Ceph RESTful module is broken (if there is any error presented including AUTH and configuration issues).'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 89d7df2ebfbc4aa88b4ff4de44dc4b8b
           name: 'Ceph: Ceph Read bandwidth'
@@ -914,8 +1002,11 @@ zabbix_export:
             key: 'ceph.df.details["{$CEPH.CONNSTRING}","{$CEPH.USER}","{$CEPH.API.KEY}"]'
           tags:
             -
-              tag: Application
-              value: Ceph
+              tag: component
+              value: cluster
+            -
+              tag: component
+              value: disk
         -
           uuid: 8a35a37de63746498291993d4f3fc1cc
           name: 'Ceph: Ceph Read operations per sec'
@@ -935,8 +1026,11 @@ zabbix_export:
             key: 'ceph.df.details["{$CEPH.CONNSTRING}","{$CEPH.USER}","{$CEPH.API.KEY}"]'
           tags:
             -
-              tag: Application
-              value: Ceph
+              tag: component
+              value: cluster
+            -
+              tag: component
+              value: disk
         -
           uuid: 8b43d105f9d64a3a94196f3f3bc7eac3
           name: 'Ceph: Get overall cluster status'
@@ -946,8 +1040,8 @@ zabbix_export:
           value_type: TEXT
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
         -
           uuid: 5e400c932acf4ad498e17daca0ad4943
           name: 'Ceph: Total bytes available'
@@ -966,8 +1060,11 @@ zabbix_export:
             key: 'ceph.df.details["{$CEPH.CONNSTRING}","{$CEPH.USER}","{$CEPH.API.KEY}"]'
           tags:
             -
-              tag: Application
-              value: Ceph
+              tag: component
+              value: cluster
+            -
+              tag: component
+              value: disk
         -
           uuid: c4b1a31efb5f47518cc5dd6082f3a42b
           name: 'Ceph: Total bytes'
@@ -986,8 +1083,11 @@ zabbix_export:
             key: 'ceph.df.details["{$CEPH.CONNSTRING}","{$CEPH.USER}","{$CEPH.API.KEY}"]'
           tags:
             -
-              tag: Application
-              value: Ceph
+              tag: component
+              value: cluster
+            -
+              tag: component
+              value: disk
         -
           uuid: d3910275462b43dba1fa8022a398ed1c
           name: 'Ceph: Total number of objects'
@@ -1005,8 +1105,8 @@ zabbix_export:
             key: 'ceph.df.details["{$CEPH.CONNSTRING}","{$CEPH.USER}","{$CEPH.API.KEY}"]'
           tags:
             -
-              tag: Application
-              value: Ceph
+              tag: component
+              value: cluster
         -
           uuid: 6ad8e289eef349ab8ebfd4cc92a35c18
           name: 'Ceph: Total bytes used'
@@ -1025,8 +1125,11 @@ zabbix_export:
             key: 'ceph.df.details["{$CEPH.CONNSTRING}","{$CEPH.USER}","{$CEPH.API.KEY}"]'
           tags:
             -
-              tag: Application
-              value: Ceph
+              tag: component
+              value: cluster
+            -
+              tag: component
+              value: disk
         -
           uuid: 51e100668e5344d29afd50dc9b9eabc9
           name: 'Ceph: Ceph Write bandwidth'
@@ -1050,8 +1153,11 @@ zabbix_export:
             key: 'ceph.df.details["{$CEPH.CONNSTRING}","{$CEPH.USER}","{$CEPH.API.KEY}"]'
           tags:
             -
-              tag: Application
-              value: Ceph
+              tag: component
+              value: cluster
+            -
+              tag: component
+              value: disk
         -
           uuid: 0a7203defa7147f7b975b404e6706b60
           name: 'Ceph: Ceph Write operations per sec'
@@ -1075,8 +1181,11 @@ zabbix_export:
             key: 'ceph.df.details["{$CEPH.CONNSTRING}","{$CEPH.USER}","{$CEPH.API.KEY}"]'
           tags:
             -
-              tag: Application
-              value: Ceph
+              tag: component
+              value: cluster
+            -
+              tag: component
+              value: disk
       discovery_rules:
         -
           uuid: 374557a43a824d938e9a8e656151e0c9
@@ -1103,8 +1212,17 @@ zabbix_export:
                 key: 'ceph.osd.stats["{$CEPH.CONNSTRING}","{$CEPH.USER}","{$CEPH.API.KEY}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Ceph {#HOST} OSD [{#CLASS}]'
+                  tag: class
+                  value: '{#CLASS}'
+                -
+                  tag: component
+                  value: osd
+                -
+                  tag: host
+                  value: '{#HOST}'
+                -
+                  tag: osd
+                  value: '{#OSDNAME}'
             -
               uuid: fc2518ca8b9341d8befc6f9b1cbd4b79
               name: 'Ceph: [osd.{#OSDNAME}] OSD in'
@@ -1125,8 +1243,17 @@ zabbix_export:
                 key: 'ceph.osd.dump["{$CEPH.CONNSTRING}","{$CEPH.USER}","{$CEPH.API.KEY}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Ceph {#HOST} OSD [{#CLASS}]'
+                  tag: class
+                  value: '{#CLASS}'
+                -
+                  tag: component
+                  value: osd
+                -
+                  tag: host
+                  value: '{#HOST}'
+                -
+                  tag: osd
+                  value: '{#OSDNAME}'
             -
               uuid: 2eb6a0d999d14906a4737ed32834ccc7
               name: 'Ceph: [osd.{#OSDNAME}] OSD latency apply'
@@ -1147,8 +1274,17 @@ zabbix_export:
                 key: 'ceph.osd.stats["{$CEPH.CONNSTRING}","{$CEPH.USER}","{$CEPH.API.KEY}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Ceph {#HOST} OSD [{#CLASS}]'
+                  tag: class
+                  value: '{#CLASS}'
+                -
+                  tag: component
+                  value: osd
+                -
+                  tag: host
+                  value: '{#HOST}'
+                -
+                  tag: osd
+                  value: '{#OSDNAME}'
             -
               uuid: 14f392b369504f10b7e068522ac4a086
               name: 'Ceph: [osd.{#OSDNAME}] OSD latency commit'
@@ -1169,8 +1305,17 @@ zabbix_export:
                 key: 'ceph.osd.stats["{$CEPH.CONNSTRING}","{$CEPH.USER}","{$CEPH.API.KEY}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Ceph {#HOST} OSD [{#CLASS}]'
+                  tag: class
+                  value: '{#CLASS}'
+                -
+                  tag: component
+                  value: osd
+                -
+                  tag: host
+                  value: '{#HOST}'
+                -
+                  tag: osd
+                  value: '{#OSDNAME}'
             -
               uuid: 63234342c0bd49e6b1f8737bf595851f
               name: 'Ceph: [osd.{#OSDNAME}] OSD PGs'
@@ -1188,8 +1333,17 @@ zabbix_export:
                 key: 'ceph.osd.stats["{$CEPH.CONNSTRING}","{$CEPH.USER}","{$CEPH.API.KEY}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Ceph {#HOST} OSD [{#CLASS}]'
+                  tag: class
+                  value: '{#CLASS}'
+                -
+                  tag: component
+                  value: osd
+                -
+                  tag: host
+                  value: '{#HOST}'
+                -
+                  tag: osd
+                  value: '{#OSDNAME}'
             -
               uuid: 12c20b2fbf10466bba7e1097c014e968
               name: 'Ceph: [osd.{#OSDNAME}] OSD up'
@@ -1210,8 +1364,17 @@ zabbix_export:
                 key: 'ceph.osd.dump["{$CEPH.CONNSTRING}","{$CEPH.USER}","{$CEPH.API.KEY}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Ceph {#HOST} OSD [{#CLASS}]'
+                  tag: class
+                  value: '{#CLASS}'
+                -
+                  tag: component
+                  value: osd
+                -
+                  tag: host
+                  value: '{#HOST}'
+                -
+                  tag: osd
+                  value: '{#OSDNAME}'
               trigger_prototypes:
                 -
                   uuid: 21535bb935b44b3aa073542db3cc7827
@@ -1221,6 +1384,10 @@ zabbix_export:
                   description: |
                     OSD osd.{#OSDNAME} is marked "down" in the osdmap.
                     The OSD daemon may have been stopped, or peer OSDs may be unable to reach the OSD over the network.
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
           trigger_prototypes:
             -
               uuid: cd04e8d542a04bdf89abad7ee4719e75
@@ -1231,11 +1398,19 @@ zabbix_export:
                 -
                   name: 'Ceph: OSD osd.{#OSDNAME} is full'
                   expression: 'min(/Ceph by Zabbix agent 2/ceph.osd[{#OSDNAME},fill],15m) > last(/Ceph by Zabbix agent 2/ceph.osd_full_ratio)*100'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
             -
               uuid: 5d7a028166584c29b959914ce904a713
               expression: 'min(/Ceph by Zabbix agent 2/ceph.osd[{#OSDNAME},fill],15m) > last(/Ceph by Zabbix agent 2/ceph.osd_full_ratio)*100'
               name: 'Ceph: OSD osd.{#OSDNAME} is full'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: capacity
           graph_prototypes:
             -
               uuid: c88d53bfa7b8456aa70b4d7a2cb63ef5
@@ -1276,8 +1451,14 @@ zabbix_export:
                 key: 'ceph.df.details["{$CEPH.CONNSTRING}","{$CEPH.USER}","{$CEPH.API.KEY}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Ceph CRUSH [{#CRUSHRULE}] Pool'
+                  tag: component
+                  value: pools
+                -
+                  tag: crushrule
+                  value: '{#CRUSHRULE}'
+                -
+                  tag: pool
+                  value: '{#POOLNAME}'
             -
               uuid: 4e49ce8a11084dd287f89b076cc70535
               name: 'Ceph: [{#POOLNAME}] Max available'
@@ -1296,8 +1477,14 @@ zabbix_export:
                 key: 'ceph.df.details["{$CEPH.CONNSTRING}","{$CEPH.USER}","{$CEPH.API.KEY}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Ceph CRUSH [{#CRUSHRULE}] Pool'
+                  tag: component
+                  value: pools
+                -
+                  tag: crushrule
+                  value: '{#CRUSHRULE}'
+                -
+                  tag: pool
+                  value: '{#POOLNAME}'
             -
               uuid: 5c7bd85f9d944215acaced87b0eb216f
               name: 'Ceph: [{#POOLNAME}] Pool objects'
@@ -1315,8 +1502,14 @@ zabbix_export:
                 key: 'ceph.df.details["{$CEPH.CONNSTRING}","{$CEPH.USER}","{$CEPH.API.KEY}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Ceph CRUSH [{#CRUSHRULE}] Pool'
+                  tag: component
+                  value: pools
+                -
+                  tag: crushrule
+                  value: '{#CRUSHRULE}'
+                -
+                  tag: pool
+                  value: '{#POOLNAME}'
             -
               uuid: eda166ae6c4c46cf8c01c2b928f07ec5
               name: 'Ceph: [{#POOLNAME}] Pool Percent Used'
@@ -1335,8 +1528,14 @@ zabbix_export:
                 key: 'ceph.df.details["{$CEPH.CONNSTRING}","{$CEPH.USER}","{$CEPH.API.KEY}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Ceph CRUSH [{#CRUSHRULE}] Pool'
+                  tag: component
+                  value: pools
+                -
+                  tag: crushrule
+                  value: '{#CRUSHRULE}'
+                -
+                  tag: pool
+                  value: '{#POOLNAME}'
             -
               uuid: 5311f1a539284c5483458e1820496be3
               name: 'Ceph: [{#POOLNAME}] Pool Read bandwidth'
@@ -1360,8 +1559,14 @@ zabbix_export:
                 key: 'ceph.df.details["{$CEPH.CONNSTRING}","{$CEPH.USER}","{$CEPH.API.KEY}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Ceph CRUSH [{#CRUSHRULE}] Pool'
+                  tag: component
+                  value: pools
+                -
+                  tag: crushrule
+                  value: '{#CRUSHRULE}'
+                -
+                  tag: pool
+                  value: '{#POOLNAME}'
             -
               uuid: 76871b86d66d4307a83e813a8d9fc1b0
               name: 'Ceph: [{#POOLNAME}] Pool Read operations'
@@ -1385,8 +1590,14 @@ zabbix_export:
                 key: 'ceph.df.details["{$CEPH.CONNSTRING}","{$CEPH.USER}","{$CEPH.API.KEY}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Ceph CRUSH [{#CRUSHRULE}] Pool'
+                  tag: component
+                  value: pools
+                -
+                  tag: crushrule
+                  value: '{#CRUSHRULE}'
+                -
+                  tag: pool
+                  value: '{#POOLNAME}'
             -
               uuid: 4c053bbaaf6946bcaf5288cc154d6fdd
               name: 'Ceph: [{#POOLNAME}] Pool RAW Used'
@@ -1405,8 +1616,14 @@ zabbix_export:
                 key: 'ceph.df.details["{$CEPH.CONNSTRING}","{$CEPH.USER}","{$CEPH.API.KEY}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Ceph CRUSH [{#CRUSHRULE}] Pool'
+                  tag: component
+                  value: pools
+                -
+                  tag: crushrule
+                  value: '{#CRUSHRULE}'
+                -
+                  tag: pool
+                  value: '{#POOLNAME}'
             -
               uuid: 955353da182243e29d326b3b2807286a
               name: 'Ceph: [{#POOLNAME}] Pool Write bandwidth'
@@ -1430,8 +1647,14 @@ zabbix_export:
                 key: 'ceph.df.details["{$CEPH.CONNSTRING}","{$CEPH.USER}","{$CEPH.API.KEY}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Ceph CRUSH [{#CRUSHRULE}] Pool'
+                  tag: component
+                  value: pools
+                -
+                  tag: crushrule
+                  value: '{#CRUSHRULE}'
+                -
+                  tag: pool
+                  value: '{#POOLNAME}'
             -
               uuid: acb3081d772444dab060a055fb3f4304
               name: 'Ceph: [{#POOLNAME}] Pool Write operations'
@@ -1455,8 +1678,14 @@ zabbix_export:
                 key: 'ceph.df.details["{$CEPH.CONNSTRING}","{$CEPH.USER}","{$CEPH.API.KEY}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Ceph CRUSH [{#CRUSHRULE}] Pool'
+                  tag: component
+                  value: pools
+                -
+                  tag: crushrule
+                  value: '{#CRUSHRULE}'
+                -
+                  tag: pool
+                  value: '{#POOLNAME}'
           graph_prototypes:
             -
               uuid: 1a469f2c99214b1ba7fe3a7520e43439
@@ -1509,6 +1738,13 @@ zabbix_export:
                   item:
                     host: 'Ceph by Zabbix agent 2'
                     key: 'ceph.pool["{#POOLNAME}",stored_raw]'
+      tags:
+        -
+          tag: class
+          value: application
+        -
+          tag: target
+          value: ceph
       macros:
         -
           macro: '{$CEPH.API.KEY}'
diff --git a/templates/app/certificate_agent2/README.md b/templates/app/certificate_agent2/README.md
index a4de43cd2f9..24d0b45dbc8 100644
--- a/templates/app/certificate_agent2/README.md
+++ b/templates/app/certificate_agent2/README.md
@@ -58,7 +58,7 @@ There are no template links in this template.
 |General |Cert: Subject alternative name |<p>The subject alternative name extension allows identities to be bound to the subject of the certificate.  These identities may be included in addition to or in place of the identity in the subject field of the certificate.  Defined options include an Internet electronic mail address, a DNS name, an IP address, and a Uniform Resource Identifier (URI).</p> |DEPENDENT |cert.alternative_names<p>**Preprocessing**:</p><p>- JSONPATH: `$.x509.alternative_names`</p> |
 |General |Cert: Public key algorithm |<p>The digital signature algorithm is used to verify the signature of a certificate.</p> |DEPENDENT |cert.public_key_algorithm<p>**Preprocessing**:</p><p>- JSONPATH: `$.x509.public_key_algorithm`</p> |
 |General |Cert: Fingerprint |<p>The Certificate Signature (SHA1 Fingerprint or Thumbprint) is the hash of the entire certificate in DER form.</p> |DEPENDENT |cert.sha1_fingerprint<p>**Preprocessing**:</p><p>- JSONPATH: `$.sha1_fingerprint`</p> |
-|Zabbix_raw_items |Cert: Get |<p>Returns the JSON with attributes of a certificate of the requested site.</p> |ZABBIX_PASSIVE |web.certificate.get[{$CERT.WEBSITE.HOSTNAME},{$CERT.WEBSITE.PORT},{$CERT.WEBSITE.IP}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Zabbix raw items |Cert: Get |<p>Returns the JSON with attributes of a certificate of the requested site.</p> |ZABBIX_PASSIVE |web.certificate.get[{$CERT.WEBSITE.HOSTNAME},{$CERT.WEBSITE.PORT},{$CERT.WEBSITE.IP}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 
 ## Triggers
 
@@ -72,5 +72,5 @@ There are no template links in this template.
 
 Please report any issues with the template at https://support.zabbix.com
 
-You can also provide a feedback, discuss the template or ask for help with it at [ZABBIX forums](https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/428309-discussion-thread-for-official-zabbix-template-tls-ssl-certificates-monitoring).
+You can also provide feedback, discuss the template or ask for help with it at [ZABBIX forums](https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/428309-discussion-thread-for-official-zabbix-template-tls-ssl-certificates-monitoring).
 
diff --git a/templates/app/certificate_agent2/template_app_certificate_agent2.yaml b/templates/app/certificate_agent2/template_app_certificate_agent2.yaml
index ddb10ec80f9..d31a05475ca 100644
--- a/templates/app/certificate_agent2/template_app_certificate_agent2.yaml
+++ b/templates/app/certificate_agent2/template_app_certificate_agent2.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-15T07:19:56Z'
+  date: '2022-01-26T10:02:35Z'
   groups:
     -
       uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
@@ -16,7 +16,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/428309-discussion-thread-for-official-zabbix-template-tls-ssl-certificates-monitoring
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Applications
@@ -40,17 +40,8 @@ zabbix_export:
             key: 'web.certificate.get[{$CERT.WEBSITE.HOSTNAME},{$CERT.WEBSITE.PORT},{$CERT.WEBSITE.IP}]'
           tags:
             -
-              tag: resource
-              value: general
-            -
-              tag: target
+              tag: component
               value: cert
-            -
-              tag: transport
-              value: dependent
-            -
-              tag: type
-              value: gauge
         -
           uuid: 946e205aaa84433a8bf1fe46b9362acd
           name: 'Cert: Issuer'
@@ -70,17 +61,8 @@ zabbix_export:
             key: 'web.certificate.get[{$CERT.WEBSITE.HOSTNAME},{$CERT.WEBSITE.PORT},{$CERT.WEBSITE.IP}]'
           tags:
             -
-              tag: resource
-              value: general
-            -
-              tag: target
+              tag: component
               value: cert
-            -
-              tag: transport
-              value: dependent
-            -
-              tag: type
-              value: gauge
         -
           uuid: f124443debb447a792beb8265d2918ee
           name: 'Cert: Last validation status'
@@ -100,17 +82,8 @@ zabbix_export:
             key: 'web.certificate.get[{$CERT.WEBSITE.HOSTNAME},{$CERT.WEBSITE.PORT},{$CERT.WEBSITE.IP}]'
           tags:
             -
-              tag: resource
-              value: general
-            -
-              tag: target
+              tag: component
               value: cert
-            -
-              tag: transport
-              value: dependent
-            -
-              tag: type
-              value: gauge
         -
           uuid: e34bffac86ef41e2865fe8410c2d0aa0
           name: 'Cert: Expires on'
@@ -129,17 +102,8 @@ zabbix_export:
             key: 'web.certificate.get[{$CERT.WEBSITE.HOSTNAME},{$CERT.WEBSITE.PORT},{$CERT.WEBSITE.IP}]'
           tags:
             -
-              tag: resource
-              value: general
-            -
-              tag: target
+              tag: component
               value: cert
-            -
-              tag: transport
-              value: dependent
-            -
-              tag: type
-              value: gauge
           triggers:
             -
               uuid: 8a0e3e73527a45618afe94707234f4c6
@@ -151,6 +115,10 @@ zabbix_export:
                 -
                   name: 'Cert: SSL certificate is invalid'
                   expression: 'find(/Website certificate by Zabbix agent 2/cert.validation,,"like","invalid")=1'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: c3ba835b28db4f1486ae4be87c3fe55f
           name: 'Cert: Valid from'
@@ -169,17 +137,8 @@ zabbix_export:
             key: 'web.certificate.get[{$CERT.WEBSITE.HOSTNAME},{$CERT.WEBSITE.PORT},{$CERT.WEBSITE.IP}]'
           tags:
             -
-              tag: resource
-              value: general
-            -
-              tag: target
+              tag: component
               value: cert
-            -
-              tag: transport
-              value: dependent
-            -
-              tag: type
-              value: gauge
         -
           uuid: 08b47b376f0f4f999bd1110696465fd9
           name: 'Cert: Public key algorithm'
@@ -199,17 +158,8 @@ zabbix_export:
             key: 'web.certificate.get[{$CERT.WEBSITE.HOSTNAME},{$CERT.WEBSITE.PORT},{$CERT.WEBSITE.IP}]'
           tags:
             -
-              tag: resource
-              value: general
-            -
-              tag: target
+              tag: component
               value: cert
-            -
-              tag: transport
-              value: dependent
-            -
-              tag: type
-              value: gauge
         -
           uuid: d7d4e592cc6741fcba9c21b5195b8544
           name: 'Cert: Serial number'
@@ -229,17 +179,8 @@ zabbix_export:
             key: 'web.certificate.get[{$CERT.WEBSITE.HOSTNAME},{$CERT.WEBSITE.PORT},{$CERT.WEBSITE.IP}]'
           tags:
             -
-              tag: resource
-              value: general
-            -
-              tag: target
+              tag: component
               value: cert
-            -
-              tag: transport
-              value: dependent
-            -
-              tag: type
-              value: gauge
         -
           uuid: 848cd98e80764f61bbe526316c70da11
           name: 'Cert: Fingerprint'
@@ -259,17 +200,8 @@ zabbix_export:
             key: 'web.certificate.get[{$CERT.WEBSITE.HOSTNAME},{$CERT.WEBSITE.PORT},{$CERT.WEBSITE.IP}]'
           tags:
             -
-              tag: resource
-              value: general
-            -
-              tag: target
+              tag: component
               value: cert
-            -
-              tag: transport
-              value: dependent
-            -
-              tag: type
-              value: gauge
           triggers:
             -
               uuid: 7a4c69a5235e444cb7294e6b7189b2b6
@@ -280,6 +212,10 @@ zabbix_export:
                 The SSL certificate fingerprint has changed. If you did not update the certificate, it may mean your certificate has been hacked. Ack to close.
                 There could be multiple valid certificates on some installations. In this case, the trigger will have a false positive. You can ignore it or disable the trigger.
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 67d4cb73b1e74c5f9e63423e9bbdd3a6
           name: 'Cert: Signature algorithm'
@@ -299,17 +235,8 @@ zabbix_export:
             key: 'web.certificate.get[{$CERT.WEBSITE.HOSTNAME},{$CERT.WEBSITE.PORT},{$CERT.WEBSITE.IP}]'
           tags:
             -
-              tag: resource
-              value: general
-            -
-              tag: target
+              tag: component
               value: cert
-            -
-              tag: transport
-              value: dependent
-            -
-              tag: type
-              value: gauge
         -
           uuid: b44c554d025446c6b1761a5fde250f9f
           name: 'Cert: Subject'
@@ -329,17 +256,8 @@ zabbix_export:
             key: 'web.certificate.get[{$CERT.WEBSITE.HOSTNAME},{$CERT.WEBSITE.PORT},{$CERT.WEBSITE.IP}]'
           tags:
             -
-              tag: resource
-              value: general
-            -
-              tag: target
+              tag: component
               value: cert
-            -
-              tag: transport
-              value: dependent
-            -
-              tag: type
-              value: gauge
         -
           uuid: 4fc3c39291ea4e3aa6ee04fcec4e1a8d
           name: 'Cert: Validation result'
@@ -359,17 +277,8 @@ zabbix_export:
             key: 'web.certificate.get[{$CERT.WEBSITE.HOSTNAME},{$CERT.WEBSITE.PORT},{$CERT.WEBSITE.IP}]'
           tags:
             -
-              tag: resource
-              value: general
-            -
-              tag: target
+              tag: component
               value: cert
-            -
-              tag: transport
-              value: dependent
-            -
-              tag: type
-              value: gauge
           triggers:
             -
               uuid: 854c791b765a4ae2982ce6436d6e78ca
@@ -377,6 +286,10 @@ zabbix_export:
               name: 'Cert: SSL certificate is invalid'
               priority: HIGH
               description: 'SSL certificate has expired or it is issued for another domain.'
+              tags:
+                -
+                  tag: scope
+                  value: security
         -
           uuid: a8b04dfe285d47e39c9d360ea43fcdbe
           name: 'Cert: Version'
@@ -396,17 +309,8 @@ zabbix_export:
             key: 'web.certificate.get[{$CERT.WEBSITE.HOSTNAME},{$CERT.WEBSITE.PORT},{$CERT.WEBSITE.IP}]'
           tags:
             -
-              tag: resource
-              value: general
-            -
-              tag: target
+              tag: component
               value: cert
-            -
-              tag: transport
-              value: dependent
-            -
-              tag: type
-              value: gauge
         -
           uuid: ec072b3b1c6847b79acac9f18d14df8a
           name: 'Cert: Get'
@@ -423,14 +327,15 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: data
+              tag: component
               value: raw
-            -
-              tag: target
-              value: cert
-            -
-              tag: transport
-              value: agent
+      tags:
+        -
+          tag: class
+          value: software
+        -
+          tag: target
+          value: certificate
       macros:
         -
           macro: '{$CERT.EXPIRY.WARN}'
diff --git a/templates/app/cloudflare_http/README.md b/templates/app/cloudflare_http/README.md
index 8d269673bd0..54dd0bad8a0 100644
--- a/templates/app/cloudflare_http/README.md
+++ b/templates/app/cloudflare_http/README.md
@@ -70,7 +70,7 @@ There are no template links in this template.
 |General |Cloudflare: Unencrypted requests |<p>The number of unencrypted requests.</p> |DEPENDENT |cloudflare.requests.ssl.unencrypted<p>**Preprocessing**:</p><p>- JSONPATH: `$.requests.unencrypted`</p> |
 |General |Cloudflare: Total threats |<p>The number of all threats.</p> |DEPENDENT |cloudflare.threats.all<p>**Preprocessing**:</p><p>- JSONPATH: `$.threats.all`</p> |
 |General |Cloudflare: Unique visitors |<p>The number of all visitors IPs.</p> |DEPENDENT |cloudflare.uniques.all<p>**Preprocessing**:</p><p>- JSONPATH: `$.uniques.all`</p> |
-|Zabbix_raw_items |Cloudflare: Get data |<p>The JSON with result of Cloudflare API request.</p> |SCRIPT |cloudflare.get<p>**Expression**:</p>`The text is too long. Please see the template.` |
+|Zabbix raw items |Cloudflare: Get data |<p>The JSON with result of Cloudflare API request.</p> |SCRIPT |cloudflare.get<p>**Expression**:</p>`The text is too long. Please see the template.` |
 
 ## Triggers
 
diff --git a/templates/app/cloudflare_http/template_app_cloudflare_http.yaml b/templates/app/cloudflare_http/template_app_cloudflare_http.yaml
index 0eda686af53..802a3ff7771 100644
--- a/templates/app/cloudflare_http/template_app_cloudflare_http.yaml
+++ b/templates/app/cloudflare_http/template_app_cloudflare_http.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-15T06:56:45Z'
+  date: '2022-01-26T10:46:41Z'
   groups:
     -
       uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
@@ -13,7 +13,7 @@ zabbix_export:
       description: |
         The template to monitor Cloudflare to see your web traffic and DNS metrics. It works without any external scripts and uses Script item.
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Applications
@@ -36,14 +36,8 @@ zabbix_export:
             key: cloudflare.get
           tags:
             -
-              tag: resource
+              tag: component
               value: bandwidth
-            -
-              tag: target
-              value: cloudflare
-            -
-              tag: type
-              value: gauge
         -
           uuid: 7f5900d6c707405789624f84f502b042
           name: 'Cloudflare: Cached bandwidth'
@@ -62,14 +56,8 @@ zabbix_export:
             key: cloudflare.get
           tags:
             -
-              tag: resource
+              tag: component
               value: bandwidth
-            -
-              tag: target
-              value: cloudflare
-            -
-              tag: type
-              value: gauge
         -
           uuid: c5ab8cc281ff4f75bd4ada79d2c0d1e8
           name: 'Cloudflare: Cache hit ratio of bandwidth'
@@ -89,14 +77,8 @@ zabbix_export:
             key: cloudflare.get
           tags:
             -
-              tag: resource
+              tag: component
               value: bandwidth
-            -
-              tag: target
-              value: cloudflare
-            -
-              tag: type
-              value: ratio
           triggers:
             -
               uuid: acf573785c394924aae8ef74b2683fd1
@@ -104,6 +86,10 @@ zabbix_export:
               name: 'Cloudflare: Cached bandwidth is too low (less than {$CLOUDFLARE.CACHED_BANDWIDTH.MIN.WARN}% for 3 last measurements)'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 901db6b121c7473485c91b0f27e7cf50
           name: 'Cloudflare: SSL encrypted bandwidth'
@@ -122,14 +108,8 @@ zabbix_export:
             key: cloudflare.get
           tags:
             -
-              tag: resource
+              tag: component
               value: bandwidth
-            -
-              tag: target
-              value: cloudflare
-            -
-              tag: type
-              value: gauge
         -
           uuid: 4637d88e62204f9d8fb9fc0f179c5319
           name: 'Cloudflare: Unencrypted bandwidth'
@@ -148,14 +128,8 @@ zabbix_export:
             key: cloudflare.get
           tags:
             -
-              tag: resource
+              tag: component
               value: bandwidth
-            -
-              tag: target
-              value: cloudflare
-            -
-              tag: type
-              value: gauge
         -
           uuid: 96e88a64df014997b8c675cbc4bb97a1
           name: 'Cloudflare: Uncached bandwidth'
@@ -174,14 +148,8 @@ zabbix_export:
             key: cloudflare.get
           tags:
             -
-              tag: resource
+              tag: component
               value: bandwidth
-            -
-              tag: target
-              value: cloudflare
-            -
-              tag: type
-              value: gauge
         -
           uuid: 6eff62f2786d42a7925bd516a1c2a958
           name: 'Cloudflare: DNS queries'
@@ -200,14 +168,8 @@ zabbix_export:
             key: cloudflare.get
           tags:
             -
-              tag: resource
+              tag: component
               value: dns
-            -
-              tag: target
-              value: cloudflare
-            -
-              tag: type
-              value: gauge
         -
           uuid: 4612a834ef054740ba5fea529a08e220
           name: 'Cloudflare: Stale DNS queries'
@@ -226,14 +188,8 @@ zabbix_export:
             key: cloudflare.get
           tags:
             -
-              tag: resource
+              tag: component
               value: dns
-            -
-              tag: target
-              value: cloudflare
-            -
-              tag: type
-              value: gauge
         -
           uuid: 4aeb289b631a402390a833e3c5227d38
           name: 'Cloudflare: Uncached DNS queries'
@@ -252,14 +208,8 @@ zabbix_export:
             key: cloudflare.get
           tags:
             -
-              tag: resource
+              tag: component
               value: dns
-            -
-              tag: target
-              value: cloudflare
-            -
-              tag: type
-              value: gauge
         -
           uuid: 9450a68208fd4cb8bde009296d722064
           name: 'Cloudflare: Get data'
@@ -497,14 +447,8 @@ zabbix_export:
               value: '{$CLOUDFLARE.API.URL}'
           tags:
             -
-              tag: data
+              tag: component
               value: raw
-            -
-              tag: target
-              value: cloudflare
-            -
-              tag: transport
-              value: Script
         -
           uuid: 71efacd9f1dc46a7aa29876c8bf7906c
           name: 'Cloudflare: Total page views'
@@ -523,14 +467,8 @@ zabbix_export:
             key: cloudflare.get
           tags:
             -
-              tag: resource
+              tag: component
               value: pageviews
-            -
-              tag: target
-              value: cloudflare
-            -
-              tag: type
-              value: gauge
         -
           uuid: d4a7431b1f6a4d3ab11551a36c98fbf7
           name: 'Cloudflare: Total requests'
@@ -549,14 +487,8 @@ zabbix_export:
             key: cloudflare.get
           tags:
             -
-              tag: resource
+              tag: component
               value: requests
-            -
-              tag: target
-              value: cloudflare
-            -
-              tag: type
-              value: gauge
         -
           uuid: cc9d651cdec94afeb12ead87b3c3e8f3
           name: 'Cloudflare: Cached requests'
@@ -574,14 +506,8 @@ zabbix_export:
             key: cloudflare.get
           tags:
             -
-              tag: resource
+              tag: component
               value: requests
-            -
-              tag: target
-              value: cloudflare
-            -
-              tag: type
-              value: gauge
         -
           uuid: e1c2a1280d25439f8020b3ebc451d892
           name: 'Cloudflare: Cache hit ratio % over time'
@@ -601,14 +527,8 @@ zabbix_export:
             key: cloudflare.get
           tags:
             -
-              tag: resource
+              tag: component
               value: requests
-            -
-              tag: target
-              value: cloudflare
-            -
-              tag: type
-              value: ratio
         -
           uuid: 228912bdae724d70b1abe79510b69082
           name: 'Cloudflare: Non-2xx responses ratio'
@@ -628,14 +548,8 @@ zabbix_export:
             key: cloudflare.get
           tags:
             -
-              tag: resource
+              tag: component
               value: requests
-            -
-              tag: target
-              value: cloudflare
-            -
-              tag: type
-              value: ratio
           triggers:
             -
               uuid: e76f4a61dd094419b6e0af706758e545
@@ -644,6 +558,10 @@ zabbix_export:
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: AVERAGE
               description: 'A large number of errors can indicate a malfunction of the site.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 0f427419265a4ef09f052a03c539125d
           name: 'Cloudflare: Response codes 1xx'
@@ -662,14 +580,8 @@ zabbix_export:
             key: cloudflare.get
           tags:
             -
-              tag: resource
+              tag: component
               value: requests
-            -
-              tag: target
-              value: cloudflare
-            -
-              tag: type
-              value: gauge
         -
           uuid: 3ade3e726d314382a3e841b3d5cb5834
           name: 'Cloudflare: Response codes 2xx'
@@ -688,14 +600,8 @@ zabbix_export:
             key: cloudflare.get
           tags:
             -
-              tag: resource
+              tag: component
               value: requests
-            -
-              tag: target
-              value: cloudflare
-            -
-              tag: type
-              value: gauge
         -
           uuid: 2caff86e7ca5400889f3b2bd4b6ba986
           name: 'Cloudflare: Response codes 3xx'
@@ -714,14 +620,8 @@ zabbix_export:
             key: cloudflare.get
           tags:
             -
-              tag: resource
+              tag: component
               value: requests
-            -
-              tag: target
-              value: cloudflare
-            -
-              tag: type
-              value: gauge
         -
           uuid: b3510ec2adc74e10824365012c13250f
           name: 'Cloudflare: Response codes 4xx'
@@ -740,14 +640,8 @@ zabbix_export:
             key: cloudflare.get
           tags:
             -
-              tag: resource
+              tag: component
               value: requests
-            -
-              tag: target
-              value: cloudflare
-            -
-              tag: type
-              value: gauge
         -
           uuid: 714ef2cbecbe4a93b20988a0bc6863a7
           name: 'Cloudflare: Response codes 5xx'
@@ -766,14 +660,8 @@ zabbix_export:
             key: cloudflare.get
           tags:
             -
-              tag: resource
+              tag: component
               value: requests
-            -
-              tag: target
-              value: cloudflare
-            -
-              tag: type
-              value: gauge
         -
           uuid: d39fcd4fdc594257bea91de0890d326b
           name: 'Cloudflare: SSL encrypted requests'
@@ -792,14 +680,8 @@ zabbix_export:
             key: cloudflare.get
           tags:
             -
-              tag: resource
+              tag: component
               value: requests
-            -
-              tag: target
-              value: cloudflare
-            -
-              tag: type
-              value: gauge
         -
           uuid: acbbc431dfc3431583123380edb6da38
           name: 'Cloudflare: Unencrypted requests'
@@ -818,14 +700,8 @@ zabbix_export:
             key: cloudflare.get
           tags:
             -
-              tag: resource
+              tag: component
               value: requests
-            -
-              tag: target
-              value: cloudflare
-            -
-              tag: type
-              value: gauge
         -
           uuid: 6100ff50001543ae83e84ab2c47260f3
           name: 'Cloudflare: 2xx responses ratio'
@@ -845,14 +721,8 @@ zabbix_export:
             key: cloudflare.get
           tags:
             -
-              tag: resource
+              tag: component
               value: requests
-            -
-              tag: target
-              value: cloudflare
-            -
-              tag: type
-              value: ratio
         -
           uuid: 7907f68e795b40fca1bd520556ea1fff
           name: 'Cloudflare: Uncached requests'
@@ -871,14 +741,8 @@ zabbix_export:
             key: cloudflare.get
           tags:
             -
-              tag: resource
+              tag: component
               value: requests
-            -
-              tag: target
-              value: cloudflare
-            -
-              tag: type
-              value: gauge
         -
           uuid: 328051a78529494e943edda567aa0e24
           name: 'Cloudflare: Total threats'
@@ -896,14 +760,8 @@ zabbix_export:
             key: cloudflare.get
           tags:
             -
-              tag: resource
+              tag: component
               value: threats
-            -
-              tag: target
-              value: cloudflare
-            -
-              tag: type
-              value: gauge
         -
           uuid: d1a2ec213b084701805f3f974af25a21
           name: 'Cloudflare: Unique visitors'
@@ -922,14 +780,15 @@ zabbix_export:
             key: cloudflare.get
           tags:
             -
-              tag: resource
+              tag: component
               value: uniques
-            -
-              tag: target
-              value: cloudflare
-            -
-              tag: type
-              value: gauge
+      tags:
+        -
+          tag: class
+          value: service
+        -
+          tag: target
+          value: claudflare
       macros:
         -
           macro: '{$CLOUDFLARE.API.TOKEN}'
diff --git a/templates/app/docker/template_app_docker.yaml b/templates/app/docker/template_app_docker.yaml
index 0497a3d38ad..62c9a40f438 100644
--- a/templates/app/docker/template_app_docker.yaml
+++ b/templates/app/docker/template_app_docker.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-15T08:07:14Z'
+  date: '2022-01-26T10:00:19Z'
   groups:
     -
       uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
@@ -15,7 +15,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/435429-discussion-thread-for-official-zabbix-template-docker
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Applications
@@ -42,8 +42,8 @@ zabbix_export:
             key: docker.info
           tags:
             -
-              tag: Application
-              value: Docker
+              tag: component
+              value: os
         -
           uuid: 32c441b73b90400fa0e6972798ae1f4c
           name: 'Docker: Cgroup driver'
@@ -66,8 +66,8 @@ zabbix_export:
             key: docker.info
           tags:
             -
-              tag: Application
-              value: Docker
+              tag: component
+              value: os
         -
           uuid: 6edcd2fbe7c446738d323ce7f1c11810
           name: 'Docker: Get containers'
@@ -77,8 +77,8 @@ zabbix_export:
           value_type: TEXT
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
         -
           uuid: 75f55b1f18c54af6ad0b3045cb230bd3
           name: 'Docker: Containers paused'
@@ -96,8 +96,8 @@ zabbix_export:
             key: docker.info
           tags:
             -
-              tag: Application
-              value: Docker
+              tag: component
+              value: containers
         -
           uuid: 976bf10901404fd290b6628af437e8e4
           name: 'Docker: Containers running'
@@ -115,8 +115,8 @@ zabbix_export:
             key: docker.info
           tags:
             -
-              tag: Application
-              value: Docker
+              tag: component
+              value: containers
         -
           uuid: 40179a84ffd14742b9df87f48a2eaa90
           name: 'Docker: Containers stopped'
@@ -134,8 +134,8 @@ zabbix_export:
             key: docker.info
           tags:
             -
-              tag: Application
-              value: Docker
+              tag: component
+              value: containers
         -
           uuid: cacbbf17fd0144c79ecdcbf9e3ef9290
           name: 'Docker: Containers total'
@@ -153,8 +153,8 @@ zabbix_export:
             key: docker.info
           tags:
             -
-              tag: Application
-              value: Docker
+              tag: component
+              value: containers
         -
           uuid: 4d116791a88d4d4e8dd4a9013f9bc39f
           name: 'Docker: Containers size'
@@ -172,8 +172,11 @@ zabbix_export:
             key: docker.data_usage
           tags:
             -
-              tag: Application
-              value: Docker
+              tag: component
+              value: containers
+            -
+              tag: component
+              value: storage
         -
           uuid: fcf42585b871488f91a92d04b0cc748d
           name: 'Docker: CPU CFS Period enabled'
@@ -201,8 +204,8 @@ zabbix_export:
             key: docker.info
           tags:
             -
-              tag: Application
-              value: Docker
+              tag: component
+              value: cpu
         -
           uuid: 54d3fa0099f24f75a6a414b7caf1b85a
           name: 'Docker: CPU CFS Quota enabled'
@@ -230,8 +233,8 @@ zabbix_export:
             key: docker.info
           tags:
             -
-              tag: Application
-              value: Docker
+              tag: component
+              value: cpu
         -
           uuid: ceddc2b06f4a4cb4acec3dc74c02ce3f
           name: 'Docker: CPU Set enabled'
@@ -259,8 +262,8 @@ zabbix_export:
             key: docker.info
           tags:
             -
-              tag: Application
-              value: Docker
+              tag: component
+              value: cpu
         -
           uuid: 2ad923020baf48c5a43f6c875ad45561
           name: 'Docker: CPU Shares enabled'
@@ -288,8 +291,8 @@ zabbix_export:
             key: docker.info
           tags:
             -
-              tag: Application
-              value: Docker
+              tag: component
+              value: cpu
         -
           uuid: 4f7221691d494c60b40abb6dd5c14719
           name: 'Docker: Get data_usage'
@@ -299,8 +302,8 @@ zabbix_export:
           value_type: TEXT
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
         -
           uuid: 0a258c42f6aa4eeeb355fec491710764
           name: 'Docker: Debug enabled'
@@ -327,8 +330,8 @@ zabbix_export:
             key: docker.info
           tags:
             -
-              tag: Application
-              value: Docker
+              tag: component
+              value: application
         -
           uuid: edb61f5ce3504f57bf32ddf2e50e4e3d
           name: 'Docker: Default runtime'
@@ -351,8 +354,8 @@ zabbix_export:
             key: docker.info
           tags:
             -
-              tag: Application
-              value: Docker
+              tag: component
+              value: application
         -
           uuid: 1ce2471ca651487288ad1aef9286da5f
           name: 'Docker: Storage driver'
@@ -378,8 +381,8 @@ zabbix_export:
             key: docker.info
           tags:
             -
-              tag: Application
-              value: Docker
+              tag: component
+              value: storage
         -
           uuid: 14a7686d3bd74533aa8406297d419dfd
           name: 'Docker: Goroutines'
@@ -397,8 +400,8 @@ zabbix_export:
             key: docker.info
           tags:
             -
-              tag: Application
-              value: Docker
+              tag: component
+              value: system
         -
           uuid: 8b2be6316b8d4d019443062f0809b579
           name: 'Docker: Get images'
@@ -408,8 +411,8 @@ zabbix_export:
           value_type: TEXT
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
         -
           uuid: ab4a4d92e4c04ff685b687cf14414b06
           name: 'Docker: Images available'
@@ -427,8 +430,8 @@ zabbix_export:
             key: docker.images
           tags:
             -
-              tag: Application
-              value: Docker
+              tag: component
+              value: images
         -
           uuid: d83337b0ea2c4f16be4b5b9c3a48755b
           name: 'Docker: Images total'
@@ -446,8 +449,8 @@ zabbix_export:
             key: docker.info
           tags:
             -
-              tag: Application
-              value: Docker
+              tag: component
+              value: images
         -
           uuid: bf4f531b727c47f0aa30de14d4b41b49
           name: 'Docker: Images size'
@@ -465,8 +468,11 @@ zabbix_export:
             key: docker.data_usage
           tags:
             -
-              tag: Application
-              value: Docker
+              tag: component
+              value: images
+            -
+              tag: component
+              value: storage
         -
           uuid: 3d8265e0495d4cbe97535f281a957b3e
           name: 'Docker: Get info'
@@ -476,8 +482,8 @@ zabbix_export:
           value_type: TEXT
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
         -
           uuid: 3545c86b7db9494c94dcda09386ac827
           name: 'Docker: IPv4 Forwarding enabled'
@@ -504,8 +510,8 @@ zabbix_export:
             key: docker.info
           tags:
             -
-              tag: Application
-              value: Docker
+              tag: component
+              value: network
         -
           uuid: cb1e486a170b4d668a77d0918f22e51c
           name: 'Docker: Kernel memory enabled'
@@ -532,8 +538,8 @@ zabbix_export:
             key: docker.info
           tags:
             -
-              tag: Application
-              value: Docker
+              tag: component
+              value: memory
         -
           uuid: 77a61a63d6ed4583a0c39ce377b11d4f
           name: 'Docker: Kernel memory TCP enabled'
@@ -560,8 +566,8 @@ zabbix_export:
             key: docker.info
           tags:
             -
-              tag: Application
-              value: Docker
+              tag: component
+              value: memory
         -
           uuid: d645713e25c74686a47cf859725e655f
           name: 'Docker: Kernel version'
@@ -584,8 +590,8 @@ zabbix_export:
             key: docker.info
           tags:
             -
-              tag: Application
-              value: Docker
+              tag: component
+              value: system
         -
           uuid: 2f512e64ba414e86806f19c0be803a3e
           name: 'Docker: Layers size'
@@ -603,8 +609,8 @@ zabbix_export:
             key: docker.data_usage
           tags:
             -
-              tag: Application
-              value: Docker
+              tag: component
+              value: storage
         -
           uuid: 671cd65ddae046f5ba9b0f83241976ac
           name: 'Docker: Live restore enabled'
@@ -631,8 +637,8 @@ zabbix_export:
             key: docker.info
           tags:
             -
-              tag: Application
-              value: Docker
+              tag: component
+              value: application
         -
           uuid: be0cb2d07d12497b8b411e094fed6087
           name: 'Docker: Logging driver'
@@ -655,8 +661,8 @@ zabbix_export:
             key: docker.info
           tags:
             -
-              tag: Application
-              value: Docker
+              tag: component
+              value: application
         -
           uuid: e0da86d370a049e3a2d6a82e49ea1f37
           name: 'Docker: Memory total'
@@ -674,8 +680,8 @@ zabbix_export:
             key: docker.info
           tags:
             -
-              tag: Application
-              value: Docker
+              tag: component
+              value: memory
         -
           uuid: b08c91f28e094c4faa3e004d3fb3057d
           name: 'Docker: Memory limit enabled'
@@ -702,8 +708,8 @@ zabbix_export:
             key: docker.info
           tags:
             -
-              tag: Application
-              value: Docker
+              tag: component
+              value: memory
         -
           uuid: 812a6b9902a44dd7a803c7218555afe7
           name: 'Docker: Name'
@@ -722,8 +728,8 @@ zabbix_export:
             key: docker.info
           tags:
             -
-              tag: Application
-              value: Docker
+              tag: component
+              value: system
           triggers:
             -
               uuid: 2c62bb4d95684e6984447027d117ff4d
@@ -736,6 +742,10 @@ zabbix_export:
                 -
                   name: 'Docker: Service is down'
                   expression: 'last(/Docker by Zabbix agent 2/docker.ping)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 5e4999067e6948f893dc465f8e5a2b5f
           name: 'Docker: NCPU'
@@ -752,8 +762,8 @@ zabbix_export:
             key: docker.info
           tags:
             -
-              tag: Application
-              value: Docker
+              tag: component
+              value: cpu
         -
           uuid: f64919a3a5dc4f429f2992eb7ae5223c
           name: 'Docker: NEvents listener'
@@ -770,8 +780,8 @@ zabbix_export:
             key: docker.info
           tags:
             -
-              tag: Application
-              value: Docker
+              tag: component
+              value: application
         -
           uuid: ce025599e68d447f9a1f5c076502e2f2
           name: 'Docker: Nfd'
@@ -789,8 +799,8 @@ zabbix_export:
             key: docker.info
           tags:
             -
-              tag: Application
-              value: Docker
+              tag: component
+              value: os
         -
           uuid: e164279251ce471abaae599bf1885bbb
           name: 'Docker: OomKill disabled'
@@ -817,8 +827,8 @@ zabbix_export:
             key: docker.info
           tags:
             -
-              tag: Application
-              value: Docker
+              tag: component
+              value: system
         -
           uuid: 78a5af9aa6a741d4ac976d0949414b68
           name: 'Docker: Operating system'
@@ -841,8 +851,8 @@ zabbix_export:
             key: docker.info
           tags:
             -
-              tag: Application
-              value: Docker
+              tag: component
+              value: os
         -
           uuid: 3acc93aa0fe64696a5560adcb3dd5acc
           name: 'Docker: OS type'
@@ -865,8 +875,8 @@ zabbix_export:
             key: docker.info
           tags:
             -
-              tag: Application
-              value: Docker
+              tag: component
+              value: os
         -
           uuid: 58ecaf4ae7f04316b6bf019cabadfd3e
           name: 'Docker: Pids limit enabled'
@@ -891,8 +901,8 @@ zabbix_export:
             key: docker.info
           tags:
             -
-              tag: Application
-              value: Docker
+              tag: component
+              value: system
         -
           uuid: 3c8f26e4b80f4356bde061ccddb95f2c
           name: 'Docker: Ping'
@@ -907,8 +917,11 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: Docker
+              tag: component
+              value: application
+            -
+              tag: component
+              value: health
           triggers:
             -
               uuid: a4f00b4d25b54acfa61475c94651d8a5
@@ -916,6 +929,10 @@ zabbix_export:
               name: 'Docker: Service is down'
               priority: AVERAGE
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 864eae0a62374f729143d6efc4f1655a
           name: 'Docker: Docker root dir'
@@ -938,8 +955,8 @@ zabbix_export:
             key: docker.info
           tags:
             -
-              tag: Application
-              value: Docker
+              tag: component
+              value: system
         -
           uuid: a7e5441fe4d64848a7c5e374ea99ad54
           name: 'Docker: Server version'
@@ -962,8 +979,8 @@ zabbix_export:
             key: docker.info
           tags:
             -
-              tag: Application
-              value: Docker
+              tag: component
+              value: application
           triggers:
             -
               uuid: f5f4fb1337264ac2bec6b6505dfe180b
@@ -972,6 +989,10 @@ zabbix_export:
               priority: INFO
               description: 'Docker version has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: fcbe64ee979a4787a4b0f06836b258bd
           name: 'Docker: Swap limit enabled'
@@ -998,8 +1019,11 @@ zabbix_export:
             key: docker.info
           tags:
             -
-              tag: Application
-              value: Docker
+              tag: component
+              value: memory
+            -
+              tag: component
+              value: storage
         -
           uuid: 6c81479dba77465ebcd335a5f3d08e19
           name: 'Docker: Volumes size'
@@ -1017,8 +1041,8 @@ zabbix_export:
             key: docker.data_usage
           tags:
             -
-              tag: Application
-              value: Docker
+              tag: component
+              value: storage
       discovery_rules:
         -
           uuid: 6f379dce9d3440018deb2c2cbaa91c06
@@ -1065,8 +1089,11 @@ zabbix_export:
                 key: 'docker.container_info["{#NAME}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Docker: Container {#NAME}'
+                  tag: component
+                  value: system
+                -
+                  tag: container
+                  value: '{#NAME}'
             -
               uuid: 1c481ac2b05e4b53b85b7fd37a39bc4a
               name: 'Container {#NAME}: Finished at'
@@ -1089,8 +1116,11 @@ zabbix_export:
                 key: 'docker.container_info["{#NAME}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Docker: Container {#NAME}'
+                  tag: component
+                  value: system
+                -
+                  tag: container
+                  value: '{#NAME}'
             -
               uuid: ee9da156a6134760af1762236d08e566
               name: 'Container {#NAME}: Image'
@@ -1113,8 +1143,11 @@ zabbix_export:
                 key: docker.containers
               tags:
                 -
-                  tag: Application
-                  value: 'Docker: Container {#NAME}'
+                  tag: component
+                  value: images
+                -
+                  tag: container
+                  value: '{#NAME}'
             -
               uuid: 72de0e4e056a4d3799d61cb3ac19a306
               name: 'Container {#NAME}: Restart count'
@@ -1131,8 +1164,11 @@ zabbix_export:
                 key: 'docker.container_info["{#NAME}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Docker: Container {#NAME}'
+                  tag: component
+                  value: system
+                -
+                  tag: container
+                  value: '{#NAME}'
             -
               uuid: 0b6ce9bd73244e79bc9c4e00f56c2465
               name: 'Container {#NAME}: Started at'
@@ -1155,8 +1191,11 @@ zabbix_export:
                 key: 'docker.container_info["{#NAME}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Docker: Container {#NAME}'
+                  tag: component
+                  value: system
+                -
+                  tag: container
+                  value: '{#NAME}'
             -
               uuid: fd9d315125fb40738c00bab16c145255
               name: 'Container {#NAME}: Dead'
@@ -1179,8 +1218,11 @@ zabbix_export:
                 key: 'docker.container_info["{#NAME}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Docker: Container {#NAME}'
+                  tag: component
+                  value: system
+                -
+                  tag: container
+                  value: '{#NAME}'
             -
               uuid: be3eed62681045aaa667a417a7383a58
               name: 'Container {#NAME}: Error'
@@ -1203,8 +1245,11 @@ zabbix_export:
                 key: 'docker.container_info["{#NAME}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Docker: Container {#NAME}'
+                  tag: component
+                  value: system
+                -
+                  tag: container
+                  value: '{#NAME}'
               trigger_prototypes:
                 -
                   uuid: ee70b91196494eccb54772b22051a456
@@ -1213,6 +1258,10 @@ zabbix_export:
                   priority: WARNING
                   description: 'Container {#NAME} has an error. Ack to close.'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 65d5ac15043446658cd8e0d326b1bf04
               name: 'Container {#NAME}: Exit code'
@@ -1233,8 +1282,11 @@ zabbix_export:
                 key: 'docker.container_info["{#NAME}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Docker: Container {#NAME}'
+                  tag: component
+                  value: system
+                -
+                  tag: container
+                  value: '{#NAME}'
             -
               uuid: 69381dd6116f4b0d9d957dd1e768748b
               name: 'Container {#NAME}: OOMKilled'
@@ -1257,8 +1309,11 @@ zabbix_export:
                 key: 'docker.container_info["{#NAME}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Docker: Container {#NAME}'
+                  tag: component
+                  value: system
+                -
+                  tag: container
+                  value: '{#NAME}'
             -
               uuid: 000375ca6899443cac7e02e1239d879e
               name: 'Container {#NAME}: Paused'
@@ -1281,8 +1336,11 @@ zabbix_export:
                 key: 'docker.container_info["{#NAME}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Docker: Container {#NAME}'
+                  tag: component
+                  value: system
+                -
+                  tag: container
+                  value: '{#NAME}'
             -
               uuid: 15dffc2d2aeb4a15954b624c7c273155
               name: 'Container {#NAME}: Pid'
@@ -1303,8 +1361,11 @@ zabbix_export:
                 key: 'docker.container_info["{#NAME}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Docker: Container {#NAME}'
+                  tag: component
+                  value: system
+                -
+                  tag: container
+                  value: '{#NAME}'
             -
               uuid: 38829fadf7f246c99c9776945022fac1
               name: 'Container {#NAME}: Restarting'
@@ -1327,8 +1388,11 @@ zabbix_export:
                 key: 'docker.container_info["{#NAME}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Docker: Container {#NAME}'
+                  tag: component
+                  value: system
+                -
+                  tag: container
+                  value: '{#NAME}'
             -
               uuid: 6d8d5a7523f64968b72f4861e9ae867a
               name: 'Container {#NAME}: Running'
@@ -1351,8 +1415,11 @@ zabbix_export:
                 key: 'docker.container_info["{#NAME}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Docker: Container {#NAME}'
+                  tag: component
+                  value: system
+                -
+                  tag: container
+                  value: '{#NAME}'
             -
               uuid: c7f1d81836d54a528184c7d4be60b792
               name: 'Container {#NAME}: Status'
@@ -1375,8 +1442,11 @@ zabbix_export:
                 key: 'docker.container_info["{#NAME}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Docker: Container {#NAME}'
+                  tag: component
+                  value: system
+                -
+                  tag: container
+                  value: '{#NAME}'
             -
               uuid: 743e2c9545de49c89472e343bf8d38da
               name: 'Container {#NAME}: Get info'
@@ -1387,8 +1457,11 @@ zabbix_export:
               description: 'Return low-level information about a container'
               tags:
                 -
-                  tag: Application
-                  value: 'Docker: Container {#NAME}'
+                  tag: component
+                  value: raw
+                -
+                  tag: container
+                  value: '{#NAME}'
             -
               uuid: d54b82d76c7b44ca8995486e4bf46298
               name: 'Container {#NAME}: CPU percent usage'
@@ -1407,8 +1480,11 @@ zabbix_export:
                 key: 'docker.container_stats["{#NAME}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Docker: Container {#NAME}'
+                  tag: component
+                  value: cpu
+                -
+                  tag: container
+                  value: '{#NAME}'
             -
               uuid: 92510799a44b4b93921d7b4d308ef10d
               name: 'Container {#NAME}: CPU kernelmode usage per second'
@@ -1435,8 +1511,11 @@ zabbix_export:
                 key: 'docker.container_stats["{#NAME}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Docker: Container {#NAME}'
+                  tag: component
+                  value: cpu
+                -
+                  tag: container
+                  value: '{#NAME}'
             -
               uuid: 4c71c95c86d2433da78b0cd3ba5d56fa
               name: 'Container {#NAME}: Throttled periods'
@@ -1454,8 +1533,11 @@ zabbix_export:
                 key: 'docker.container_stats["{#NAME}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Docker: Container {#NAME}'
+                  tag: component
+                  value: cpu
+                -
+                  tag: container
+                  value: '{#NAME}'
             -
               uuid: ff834b708f764ce6b08fcfbc1dfacb60
               name: 'Container {#NAME}: Throttled time'
@@ -1479,8 +1561,11 @@ zabbix_export:
                 key: 'docker.container_stats["{#NAME}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Docker: Container {#NAME}'
+                  tag: component
+                  value: cpu
+                -
+                  tag: container
+                  value: '{#NAME}'
             -
               uuid: 151f2f36bfb2429b8c8e500067489694
               name: 'Container {#NAME}: Throttling periods'
@@ -1498,8 +1583,11 @@ zabbix_export:
                 key: 'docker.container_stats["{#NAME}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Docker: Container {#NAME}'
+                  tag: component
+                  value: cpu
+                -
+                  tag: container
+                  value: '{#NAME}'
             -
               uuid: 2c21d9b3968c43e68231ddc5b2d05808
               name: 'Container {#NAME}: CPU total usage per second'
@@ -1526,8 +1614,11 @@ zabbix_export:
                 key: 'docker.container_stats["{#NAME}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Docker: Container {#NAME}'
+                  tag: component
+                  value: cpu
+                -
+                  tag: container
+                  value: '{#NAME}'
             -
               uuid: 801467fe7cbe48b8b05c5005680b934a
               name: 'Container {#NAME}: CPU usermode usage per second'
@@ -1554,8 +1645,11 @@ zabbix_export:
                 key: 'docker.container_stats["{#NAME}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Docker: Container {#NAME}'
+                  tag: component
+                  value: cpu
+                -
+                  tag: container
+                  value: '{#NAME}'
             -
               uuid: bd57aed03daa47e68acc4dc38a1697b7
               name: 'Container {#NAME}: Memory commit bytes'
@@ -1573,8 +1667,11 @@ zabbix_export:
                 key: 'docker.container_stats["{#NAME}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Docker: Container {#NAME}'
+                  tag: component
+                  value: memory
+                -
+                  tag: container
+                  value: '{#NAME}'
             -
               uuid: 1e110d4d78e74ca8b12a1923f73543f1
               name: 'Container {#NAME}: Memory commit peak bytes'
@@ -1592,8 +1689,11 @@ zabbix_export:
                 key: 'docker.container_stats["{#NAME}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Docker: Container {#NAME}'
+                  tag: component
+                  value: memory
+                -
+                  tag: container
+                  value: '{#NAME}'
             -
               uuid: b463f79d6c0644a394c3c0ba8f1d29d1
               name: 'Container {#NAME}: Memory maximum usage'
@@ -1611,8 +1711,11 @@ zabbix_export:
                 key: 'docker.container_stats["{#NAME}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Docker: Container {#NAME}'
+                  tag: component
+                  value: memory
+                -
+                  tag: container
+                  value: '{#NAME}'
             -
               uuid: 763c8878d2c74d069567cbcd1d53544c
               name: 'Container {#NAME}: Memory private working set'
@@ -1630,8 +1733,11 @@ zabbix_export:
                 key: 'docker.container_stats["{#NAME}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Docker: Container {#NAME}'
+                  tag: component
+                  value: memory
+                -
+                  tag: container
+                  value: '{#NAME}'
             -
               uuid: 6f39422b278b4a4398bfbd993f247fd0
               name: 'Container {#NAME}: Memory usage'
@@ -1649,8 +1755,11 @@ zabbix_export:
                 key: 'docker.container_stats["{#NAME}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Docker: Container {#NAME}'
+                  tag: component
+                  value: memory
+                -
+                  tag: container
+                  value: '{#NAME}'
             -
               uuid: a5999dfeccca44ca8679ef71876da773
               name: 'Container {#NAME}: Online CPUs'
@@ -1667,8 +1776,11 @@ zabbix_export:
                 key: 'docker.container_stats["{#NAME}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Docker: Container {#NAME}'
+                  tag: component
+                  value: cpu
+                -
+                  tag: container
+                  value: '{#NAME}'
             -
               uuid: 4192b5b8be2545568637b7121c1466c1
               name: 'Container {#NAME}: Get stats'
@@ -1679,8 +1791,11 @@ zabbix_export:
               description: 'Get container stats based on resource usage'
               tags:
                 -
-                  tag: Application
-                  value: 'Docker: Container {#NAME}'
+                  tag: component
+                  value: raw
+                -
+                  tag: container
+                  value: '{#NAME}'
             -
               uuid: 4ab3f13ab7714367b971eada3f01c611
               name: 'Container {#NAME}: Networks bytes received per second'
@@ -1705,8 +1820,11 @@ zabbix_export:
                 key: 'docker.container_stats["{#NAME}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Docker: Container {#NAME}'
+                  tag: component
+                  value: network
+                -
+                  tag: container
+                  value: '{#NAME}'
             -
               uuid: cf4517565e3f4fc49e7d6d411302a732
               name: 'Container {#NAME}: Networks incoming packets dropped per second'
@@ -1730,8 +1848,11 @@ zabbix_export:
                 key: 'docker.container_stats["{#NAME}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Docker: Container {#NAME}'
+                  tag: component
+                  value: network
+                -
+                  tag: container
+                  value: '{#NAME}'
             -
               uuid: 9d139e59dc1b46d39832ca668d5a6ce1
               name: 'Container {#NAME}: Networks errors received per second'
@@ -1755,8 +1876,11 @@ zabbix_export:
                 key: 'docker.container_stats["{#NAME}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Docker: Container {#NAME}'
+                  tag: component
+                  value: network
+                -
+                  tag: container
+                  value: '{#NAME}'
             -
               uuid: 13fb8c2c3843481492af82c3308e1257
               name: 'Container {#NAME}: Networks packets received per second'
@@ -1780,8 +1904,11 @@ zabbix_export:
                 key: 'docker.container_stats["{#NAME}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Docker: Container {#NAME}'
+                  tag: component
+                  value: network
+                -
+                  tag: container
+                  value: '{#NAME}'
             -
               uuid: da4bf99b26e540fdafc0ee99d50e1c6c
               name: 'Container {#NAME}: Networks bytes sent per second'
@@ -1806,8 +1933,11 @@ zabbix_export:
                 key: 'docker.container_stats["{#NAME}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Docker: Container {#NAME}'
+                  tag: component
+                  value: network
+                -
+                  tag: container
+                  value: '{#NAME}'
             -
               uuid: 1f4d7848ecfd44ae958cc1bd64d61078
               name: 'Container {#NAME}: Networks outgoing packets dropped per second'
@@ -1831,8 +1961,11 @@ zabbix_export:
                 key: 'docker.container_stats["{#NAME}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Docker: Container {#NAME}'
+                  tag: component
+                  value: network
+                -
+                  tag: container
+                  value: '{#NAME}'
             -
               uuid: bc7273bd3a7d4c9d9d6d6b3a019af947
               name: 'Container {#NAME}: Networks errors sent per second'
@@ -1856,8 +1989,11 @@ zabbix_export:
                 key: 'docker.container_stats["{#NAME}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Docker: Container {#NAME}'
+                  tag: component
+                  value: network
+                -
+                  tag: container
+                  value: '{#NAME}'
             -
               uuid: 9191bd95da9a4ee9a7315d20de23c977
               name: 'Container {#NAME}: Networks packets sent per second'
@@ -1881,8 +2017,11 @@ zabbix_export:
                 key: 'docker.container_stats["{#NAME}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Docker: Container {#NAME}'
+                  tag: component
+                  value: network
+                -
+                  tag: container
+                  value: '{#NAME}'
           trigger_prototypes:
             -
               uuid: db675ff608a14b12bcc02e6b500c557f
@@ -1891,6 +2030,10 @@ zabbix_export:
               opdata: 'Exit code: {ITEM.LASTVALUE1}'
               priority: AVERAGE
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
           graph_prototypes:
             -
               uuid: 72e32a60dc064affb3bb6785bae50e37
@@ -2036,8 +2179,11 @@ zabbix_export:
                 key: docker.images
               tags:
                 -
-                  tag: Application
-                  value: 'Docker: Image {#NAME}'
+                  tag: component
+                  value: system
+                -
+                  tag: image
+                  value: '{#NAME}'
             -
               uuid: 4eb812ba952e417185f6ac499d6cb85a
               name: 'Image {#NAME}: Size'
@@ -2055,8 +2201,18 @@ zabbix_export:
                 key: docker.images
               tags:
                 -
-                  tag: Application
-                  value: 'Docker: Image {#NAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: image
+                  value: '{#NAME}'
+      tags:
+        -
+          tag: class
+          value: software
+        -
+          tag: target
+          value: docker
       macros:
         -
           macro: '{$DOCKER.LLD.FILTER.CONTAINER.MATCHES}'
diff --git a/templates/app/elasticsearch_http/template_app_elasticsearch_http.yaml b/templates/app/elasticsearch_http/template_app_elasticsearch_http.yaml
index b0346327245..a0e11b9ef1e 100644
--- a/templates/app/elasticsearch_http/template_app_elasticsearch_http.yaml
+++ b/templates/app/elasticsearch_http/template_app_elasticsearch_http.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-15T06:56:53Z'
+  date: '2022-01-26T10:02:09Z'
   groups:
     -
       uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
@@ -21,7 +21,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/399473-discussion-thread-for-official-zabbix-template-for-elasticsearch
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Applications
@@ -43,8 +43,8 @@ zabbix_export:
             key: es.cluster.get_health
           tags:
             -
-              tag: Application
-              value: 'ES cluster'
+              tag: component
+              value: shards
         -
           uuid: 7f587fd270be4eb68d81ae1de2a3ca1f
           name: 'ES: Get cluster health'
@@ -61,8 +61,8 @@ zabbix_export:
           url: '{$ELASTICSEARCH.SCHEME}://{HOST.CONN}:{$ELASTICSEARCH.PORT}/_cluster/health?timeout=5s'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
         -
           uuid: 7066a66f352e4d79ba4aec11c0c5c611
           name: 'ES: Get cluster stats'
@@ -79,8 +79,8 @@ zabbix_export:
           url: '{$ELASTICSEARCH.SCHEME}://{HOST.CONN}:{$ELASTICSEARCH.PORT}/_cluster/stats'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
         -
           uuid: 500a763b9bfd4044b2d3bc95d3a0586c
           name: 'ES: Inactive shards percentage'
@@ -104,8 +104,8 @@ zabbix_export:
             key: es.cluster.get_health
           tags:
             -
-              tag: Application
-              value: 'ES cluster'
+              tag: component
+              value: shards
         -
           uuid: e0b684d5992a496981cf6fb9bb85be62
           name: 'ES: Number of initializing shards'
@@ -123,8 +123,8 @@ zabbix_export:
             key: es.cluster.get_health
           tags:
             -
-              tag: Application
-              value: 'ES cluster'
+              tag: component
+              value: shards
           triggers:
             -
               uuid: ee59684bb2044540ad0306a5b6deb408
@@ -132,6 +132,10 @@ zabbix_export:
               name: 'ES: Cluster has the initializing shards'
               priority: AVERAGE
               description: 'The cluster has the initializing shards longer than 10 minutes.'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 7d3c87e2fcae49438a14380f7d5faa81
           name: 'ES: Number of data nodes'
@@ -153,8 +157,8 @@ zabbix_export:
             key: es.cluster.get_health
           tags:
             -
-              tag: Application
-              value: 'ES cluster'
+              tag: component
+              value: nodes
         -
           uuid: 4ec7496b441643f39df3e25c0225e6ec
           name: 'ES: Number of nodes'
@@ -176,8 +180,8 @@ zabbix_export:
             key: es.cluster.get_health
           tags:
             -
-              tag: Application
-              value: 'ES cluster'
+              tag: component
+              value: nodes
           triggers:
             -
               uuid: 5be4cb40e72442aca18ea014adbead23
@@ -185,12 +189,20 @@ zabbix_export:
               name: 'ES: The number of nodes within the cluster has decreased'
               priority: INFO
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 2fba2b29425b4ff9a4008db9bde49d7f
               expression: 'change(/Elasticsearch Cluster by HTTP/es.cluster.number_of_nodes)>0'
               name: 'ES: The number of nodes within the cluster has increased'
               priority: INFO
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 2c84eea7f4a642f8892cb7f50febb562
           name: 'ES: Number of pending tasks'
@@ -208,8 +220,8 @@ zabbix_export:
             key: es.cluster.get_health
           tags:
             -
-              tag: Application
-              value: 'ES cluster'
+              tag: component
+              value: tasks
         -
           uuid: 981818f43a3c4b36b36e4b3c4e3468e9
           name: 'ES: Number of relocating shards'
@@ -227,8 +239,8 @@ zabbix_export:
             key: es.cluster.get_health
           tags:
             -
-              tag: Application
-              value: 'ES cluster'
+              tag: component
+              value: shards
         -
           uuid: b9568a6370dc40efae45ac1e0b719dd7
           name: 'ES: Cluster health status'
@@ -266,8 +278,8 @@ zabbix_export:
             key: es.cluster.get_health
           tags:
             -
-              tag: Application
-              value: 'ES cluster'
+              tag: component
+              value: health
           triggers:
             -
               uuid: f3bb7e96f6074063bad76521e1dce24f
@@ -277,12 +289,20 @@ zabbix_export:
               description: |
                 One or more primary shards are unassigned, so some data is unavailable.
                 This can occur briefly during cluster startup as primary shards are assigned.
+              tags:
+                -
+                  tag: scope
+                  value: availability
             -
               uuid: 33a6ef13f7b240768841919482709411
               expression: 'last(/Elasticsearch Cluster by HTTP/es.cluster.status)=255'
               name: 'ES: Health is UNKNOWN'
               priority: HIGH
               description: 'The health status of the cluster is unknown or cannot be obtained.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
             -
               uuid: 99f36c2aa5d64248b96d1fc97c3b3065
               expression: 'last(/Elasticsearch Cluster by HTTP/es.cluster.status)=1'
@@ -291,6 +311,10 @@ zabbix_export:
               description: |
                 All primary shards are assigned, but one or more replica shards are unassigned.
                 If a node in the cluster fails, some data could be unavailable until that node is repaired.
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 2295e2ba3d4949feb3519ac85ba6ff86
           name: 'ES: Task max waiting in queue'
@@ -314,8 +338,8 @@ zabbix_export:
             key: es.cluster.get_health
           tags:
             -
-              tag: Application
-              value: 'ES cluster'
+              tag: component
+              value: tasks
         -
           uuid: 85e82cba1e5c479caede2a94c58239be
           name: 'ES: Number of unassigned shards'
@@ -333,8 +357,8 @@ zabbix_export:
             key: es.cluster.get_health
           tags:
             -
-              tag: Application
-              value: 'ES cluster'
+              tag: component
+              value: shards
           triggers:
             -
               uuid: 35bdd54f27a64009b96a06a12508f99c
@@ -342,6 +366,10 @@ zabbix_export:
               name: 'ES: Cluster has the unassigned shards'
               priority: AVERAGE
               description: 'The cluster has the unassigned shards longer than 10 minutes.'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: db2f3161eaff4eb0b25d4191b423c733
           name: 'ES: Indices with shards assigned to nodes'
@@ -363,8 +391,8 @@ zabbix_export:
             key: es.cluster.get_stats
           tags:
             -
-              tag: Application
-              value: 'ES cluster'
+              tag: component
+              value: indices
         -
           uuid: 25cb1e0203334efd96d3e626f81b4670
           name: 'ES: Number of non-deleted documents'
@@ -388,8 +416,8 @@ zabbix_export:
             key: es.cluster.get_stats
           tags:
             -
-              tag: Application
-              value: 'ES cluster'
+              tag: component
+              value: documents
         -
           uuid: 54f51a653e014290aa3f91deaca44e47
           name: 'ES: Nodes with the data role'
@@ -411,8 +439,8 @@ zabbix_export:
             key: es.cluster.get_stats
           tags:
             -
-              tag: Application
-              value: 'ES cluster'
+              tag: component
+              value: nodes
         -
           uuid: 613ab3469f234e278af99d61e57b46bd
           name: 'ES: Nodes with the ingest role'
@@ -434,8 +462,8 @@ zabbix_export:
             key: es.cluster.get_stats
           tags:
             -
-              tag: Application
-              value: 'ES cluster'
+              tag: component
+              value: nodes
         -
           uuid: e7b36f37b86845339a306dacf874164a
           name: 'ES: Nodes with the master role'
@@ -457,8 +485,8 @@ zabbix_export:
             key: es.cluster.get_stats
           tags:
             -
-              tag: Application
-              value: 'ES cluster'
+              tag: component
+              value: nodes
           triggers:
             -
               uuid: 8011883baef04aa0bed343d1bb0df288
@@ -466,6 +494,10 @@ zabbix_export:
               name: 'ES: Cluster has only two master nodes'
               priority: DISASTER
               description: 'The cluster has only two nodes with a master role and will be unavailable if one of them breaks.'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: c3ea99e5897b4663a3239d0edd66f1f0
           name: 'ES: Total available size to JVM in all file stores'
@@ -491,8 +523,8 @@ zabbix_export:
             key: es.cluster.get_stats
           tags:
             -
-              tag: Application
-              value: 'ES cluster'
+              tag: component
+              value: storage
         -
           uuid: b8c3c5d8866d4a6b9c6847b5c8da0631
           name: 'ES: Total size of all file stores'
@@ -515,8 +547,8 @@ zabbix_export:
             key: es.cluster.get_stats
           tags:
             -
-              tag: Application
-              value: 'ES cluster'
+              tag: component
+              value: storage
         -
           uuid: 66c22b8b2b8b40fda7ac6f0ae472befd
           name: 'ES: Get nodes stats'
@@ -533,8 +565,8 @@ zabbix_export:
           url: '{$ELASTICSEARCH.SCHEME}://{HOST.CONN}:{$ELASTICSEARCH.PORT}/_nodes/stats'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
         -
           uuid: 2dcf54f21cbd4af9a7931e3a2522685c
           name: 'ES: Cluster uptime'
@@ -558,8 +590,8 @@ zabbix_export:
             key: es.cluster.get_stats
           tags:
             -
-              tag: Application
-              value: 'ES cluster'
+              tag: component
+              value: system
           triggers:
             -
               uuid: d28aa18c85cb4f48a9e7b8ba55d65400
@@ -568,6 +600,10 @@ zabbix_export:
               priority: INFO
               description: 'Uptime is less than 10 minutes'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 671888d47c724e54aca78fbe1b3ecaed
           name: 'ES: Service response time'
@@ -579,8 +615,8 @@ zabbix_export:
           description: 'Checks performance of the TCP service.'
           tags:
             -
-              tag: Application
-              value: 'ES cluster'
+              tag: component
+              value: network
           triggers:
             -
               uuid: 2a3f3b96e5dd47de998ccc17f109e149
@@ -593,6 +629,10 @@ zabbix_export:
                 -
                   name: 'ES: Service is down'
                   expression: 'last(/Elasticsearch Cluster by HTTP/net.tcp.service["{$ELASTICSEARCH.SCHEME}","{HOST.CONN}","{$ELASTICSEARCH.PORT}"])=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: d0d38ce55f844a51a0f2131c86bec1ae
           name: 'ES: Service status'
@@ -609,8 +649,11 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: 'ES cluster'
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: b4d76f68ce94492f96bbfbb778d1f144
@@ -619,6 +662,10 @@ zabbix_export:
               priority: AVERAGE
               description: 'The service is unavailable or does not accept TCP connections.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: 5105173f24d941b2969fe3d190d22e82
@@ -656,8 +703,11 @@ zabbix_export:
                 key: es.nodes.get_stats
               tags:
                 -
-                  tag: Application
-                  value: 'ES {#ES.NODE}'
+                  tag: component
+                  value: storage
+                -
+                  tag: node
+                  value: '{#ES.NODE}'
             -
               uuid: 4f315fdf62884b0284bf04f1a85aeb98
               name: 'ES {#ES.NODE}: Total size'
@@ -680,8 +730,11 @@ zabbix_export:
                 key: es.nodes.get_stats
               tags:
                 -
-                  tag: Application
-                  value: 'ES {#ES.NODE}'
+                  tag: component
+                  value: storage
+                -
+                  tag: node
+                  value: '{#ES.NODE}'
             -
               uuid: 2ba1fc7e2dad4d0ab1807221fb1e4fca
               name: 'ES {#ES.NODE}: Number of open HTTP connections'
@@ -703,8 +756,11 @@ zabbix_export:
                 key: es.nodes.get_stats
               tags:
                 -
-                  tag: Application
-                  value: 'ES {#ES.NODE}'
+                  tag: component
+                  value: connections
+                -
+                  tag: node
+                  value: '{#ES.NODE}'
             -
               uuid: fcf163d5db9b455fa38823e8ad16e578
               name: 'ES {#ES.NODE}: Rate of HTTP connections opened'
@@ -728,8 +784,11 @@ zabbix_export:
                 key: es.nodes.get_stats
               tags:
                 -
-                  tag: Application
-                  value: 'ES {#ES.NODE}'
+                  tag: component
+                  value: connections
+                -
+                  tag: node
+                  value: '{#ES.NODE}'
             -
               uuid: c530311329e348cca74c38fa2260236b
               name: 'ES {#ES.NODE}: Flush latency'
@@ -742,8 +801,11 @@ zabbix_export:
               description: 'The average flush latency calculated from the available flush.total and flush.total_time_in_millis metrics.'
               tags:
                 -
-                  tag: Application
-                  value: 'ES {#ES.NODE}'
+                  tag: component
+                  value: operations
+                -
+                  tag: node
+                  value: '{#ES.NODE}'
               trigger_prototypes:
                 -
                   uuid: 6c2ea291374b4de1ab06ddeccba635b1
@@ -753,6 +815,10 @@ zabbix_export:
                   description: |
                     If you see this metric increasing steadily, it may indicate a problem with slow disks; this problem may escalate
                     and eventually prevent you from being able to add new information to your index.
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 8e270dfff9c84d2a96a134dd6d86533b
               name: 'ES {#ES.NODE}: Total number of index flushes to disk'
@@ -774,8 +840,11 @@ zabbix_export:
                 key: es.nodes.get_stats
               tags:
                 -
-                  tag: Application
-                  value: 'Zabbix raw items'
+                  tag: component
+                  value: operations
+                -
+                  tag: node
+                  value: '{#ES.NODE}'
             -
               uuid: 7e18149dcaee47748e4073f4ce814c03
               name: 'ES {#ES.NODE}: Total time spent on flushing indices to disk'
@@ -798,8 +867,11 @@ zabbix_export:
                 key: es.nodes.get_stats
               tags:
                 -
-                  tag: Application
-                  value: 'Zabbix raw items'
+                  tag: component
+                  value: operations
+                -
+                  tag: node
+                  value: '{#ES.NODE}'
             -
               uuid: e91cc33c088a4f56a9176fd6a09f2411
               name: 'ES {#ES.NODE}: Current indexing operations'
@@ -821,8 +893,11 @@ zabbix_export:
                 key: es.nodes.get_stats
               tags:
                 -
-                  tag: Application
-                  value: 'ES {#ES.NODE}'
+                  tag: component
+                  value: operations
+                -
+                  tag: node
+                  value: '{#ES.NODE}'
             -
               uuid: 23f54c51c30a4dbdbef48611a7907db6
               name: 'ES {#ES.NODE}: Indexing latency'
@@ -835,8 +910,11 @@ zabbix_export:
               description: 'The average indexing latency calculated from the available index_total and index_time_in_millis metrics.'
               tags:
                 -
-                  tag: Application
-                  value: 'ES {#ES.NODE}'
+                  tag: component
+                  value: operations
+                -
+                  tag: node
+                  value: '{#ES.NODE}'
               trigger_prototypes:
                 -
                   uuid: 2755b3f8811a45fba7c48347707ceaf8
@@ -844,8 +922,12 @@ zabbix_export:
                   name: 'ES {#ES.NODE}: Indexing latency is too high (over {$ELASTICSEARCH.INDEXING_LATENCY.MAX.WARN}ms for 5m)'
                   priority: WARNING
                   description: |
-                    If the latency is increasing, it may indicate that you are indexing too many documents at the same time (Elasticsearch’s documentation
+                    If the latency is increasing, it may indicate that you are indexing too many documents at the same time (Elasticsearch's documentation
                     recommends starting with a bulk indexing size of 5 to 15 megabytes and increasing slowly from there).
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: f471dad45ff149b09a479963cb616fc2
               name: 'ES {#ES.NODE}: Total time spent performing indexing'
@@ -868,8 +950,11 @@ zabbix_export:
                 key: es.nodes.get_stats
               tags:
                 -
-                  tag: Application
-                  value: 'Zabbix raw items'
+                  tag: component
+                  value: operations
+                -
+                  tag: node
+                  value: '{#ES.NODE}'
             -
               uuid: ad36b8495eca49c48e7d8a7877a325c2
               name: 'ES {#ES.NODE}: Total number of indexing'
@@ -891,8 +976,11 @@ zabbix_export:
                 key: es.nodes.get_stats
               tags:
                 -
-                  tag: Application
-                  value: 'Zabbix raw items'
+                  tag: component
+                  value: operations
+                -
+                  tag: node
+                  value: '{#ES.NODE}'
             -
               uuid: bb0cb2196b14483f8807a855f2f531a7
               name: 'ES {#ES.NODE}: Time spent throttling operations'
@@ -920,8 +1008,11 @@ zabbix_export:
                 key: es.nodes.get_stats
               tags:
                 -
-                  tag: Application
-                  value: 'ES {#ES.NODE}'
+                  tag: component
+                  value: operations
+                -
+                  tag: node
+                  value: '{#ES.NODE}'
             -
               uuid: 5f3b7dca802343cd905d54e66ac0e113
               name: 'ES {#ES.NODE}: Time spent throttling merge operations'
@@ -949,8 +1040,11 @@ zabbix_export:
                 key: es.nodes.get_stats
               tags:
                 -
-                  tag: Application
-                  value: 'ES {#ES.NODE}'
+                  tag: component
+                  value: operations
+                -
+                  tag: node
+                  value: '{#ES.NODE}'
             -
               uuid: 9c82da45a63947dd91a4e19e6f2d121d
               name: 'ES {#ES.NODE}: Time spent throttling recovery operations'
@@ -978,8 +1072,11 @@ zabbix_export:
                 key: es.nodes.get_stats
               tags:
                 -
-                  tag: Application
-                  value: 'ES {#ES.NODE}'
+                  tag: component
+                  value: operations
+                -
+                  tag: node
+                  value: '{#ES.NODE}'
             -
               uuid: e27361fdce5a4635854960066ac050ca
               name: 'ES {#ES.NODE}: Rate of index refreshes'
@@ -1003,8 +1100,11 @@ zabbix_export:
                 key: es.nodes.get_stats
               tags:
                 -
-                  tag: Application
-                  value: 'ES {#ES.NODE}'
+                  tag: component
+                  value: operations
+                -
+                  tag: node
+                  value: '{#ES.NODE}'
             -
               uuid: fd20bbc5012d4c5693710b321e252193
               name: 'ES {#ES.NODE}: Time spent performing refresh'
@@ -1032,8 +1132,11 @@ zabbix_export:
                 key: es.nodes.get_stats
               tags:
                 -
-                  tag: Application
-                  value: 'ES {#ES.NODE}'
+                  tag: component
+                  value: operations
+                -
+                  tag: node
+                  value: '{#ES.NODE}'
             -
               uuid: 6d3b074aecb44a08a3573aba0ff006f9
               name: 'ES {#ES.NODE}: Rate of fetch'
@@ -1057,8 +1160,11 @@ zabbix_export:
                 key: es.nodes.get_stats
               tags:
                 -
-                  tag: Application
-                  value: 'ES {#ES.NODE}'
+                  tag: component
+                  value: fetches
+                -
+                  tag: node
+                  value: '{#ES.NODE}'
             -
               uuid: 36b2ffa3ed9f4c9781ccded273c395d7
               name: 'ES {#ES.NODE}: Current fetch operations'
@@ -1076,8 +1182,11 @@ zabbix_export:
                 key: es.nodes.get_stats
               tags:
                 -
-                  tag: Application
-                  value: 'ES {#ES.NODE}'
+                  tag: component
+                  value: fetches
+                -
+                  tag: node
+                  value: '{#ES.NODE}'
             -
               uuid: 79b5fd5e04e249da9f73fbe68915fdb1
               name: 'ES {#ES.NODE}: Fetch latency'
@@ -1090,8 +1199,11 @@ zabbix_export:
               description: 'The average fetch latency calculated by sampling the total number of fetches and the total elapsed time at regular intervals.'
               tags:
                 -
-                  tag: Application
-                  value: 'ES {#ES.NODE}'
+                  tag: component
+                  value: fetches
+                -
+                  tag: node
+                  value: '{#ES.NODE}'
               trigger_prototypes:
                 -
                   uuid: 6edd6851f31842659a57e29c444a9b32
@@ -1102,6 +1214,10 @@ zabbix_export:
                     The fetch phase should typically take much less time than the query phase. If you notice this metric consistently increasing,
                     this could indicate a problem with slow disks, enriching of documents (highlighting the relevant text in search results, etc.),
                     or requesting too many results.
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: a10e7dca72c8411a9b7fdcbeb676017e
               name: 'ES {#ES.NODE}: Time spent performing fetch'
@@ -1129,8 +1245,11 @@ zabbix_export:
                 key: es.nodes.get_stats
               tags:
                 -
-                  tag: Application
-                  value: 'ES {#ES.NODE}'
+                  tag: component
+                  value: fetches
+                -
+                  tag: node
+                  value: '{#ES.NODE}'
             -
               uuid: f35e3e9773394632b422dbc4e4442171
               name: 'ES {#ES.NODE}: Total time spent performing fetch'
@@ -1153,8 +1272,11 @@ zabbix_export:
                 key: es.nodes.get_stats
               tags:
                 -
-                  tag: Application
-                  value: 'Zabbix raw items'
+                  tag: component
+                  value: fetches
+                -
+                  tag: node
+                  value: '{#ES.NODE}'
             -
               uuid: b3ac68f3531f478b9ad28fb1988df257
               name: 'ES {#ES.NODE}: Total number of fetch'
@@ -1176,8 +1298,11 @@ zabbix_export:
                 key: es.nodes.get_stats
               tags:
                 -
-                  tag: Application
-                  value: 'Zabbix raw items'
+                  tag: component
+                  value: fetches
+                -
+                  tag: node
+                  value: '{#ES.NODE}'
             -
               uuid: d347df9c9eee4aa89ccfb9147143b5d5
               name: 'ES {#ES.NODE}: Rate of queries'
@@ -1201,8 +1326,11 @@ zabbix_export:
                 key: es.nodes.get_stats
               tags:
                 -
-                  tag: Application
-                  value: 'ES {#ES.NODE}'
+                  tag: component
+                  value: queries
+                -
+                  tag: node
+                  value: '{#ES.NODE}'
             -
               uuid: 20fb738abf7a4aa1bf3ccb84790a26c9
               name: 'ES {#ES.NODE}: Current query operations'
@@ -1220,8 +1348,11 @@ zabbix_export:
                 key: es.nodes.get_stats
               tags:
                 -
-                  tag: Application
-                  value: 'ES {#ES.NODE}'
+                  tag: component
+                  value: queries
+                -
+                  tag: node
+                  value: '{#ES.NODE}'
             -
               uuid: fadb6fe530ab4b1296d4c17728667b12
               name: 'ES {#ES.NODE}: Query latency'
@@ -1236,8 +1367,11 @@ zabbix_export:
               description: 'The average query latency calculated by sampling the total number of queries and the total elapsed time at regular intervals.'
               tags:
                 -
-                  tag: Application
-                  value: 'ES {#ES.NODE}'
+                  tag: component
+                  value: queries
+                -
+                  tag: node
+                  value: '{#ES.NODE}'
               trigger_prototypes:
                 -
                   uuid: 1892000290c843e887d128bf9f97c869
@@ -1245,6 +1379,10 @@ zabbix_export:
                   name: 'ES {#ES.NODE}: Query latency is too high (over {$ELASTICSEARCH.QUERY_LATENCY.MAX.WARN}ms for 5m)'
                   priority: WARNING
                   description: 'If latency exceeds a threshold, look for potential resource bottlenecks, or investigate whether you need to optimize your queries.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: ce807b641b0b4501b6a8e253d8403ce4
               name: 'ES {#ES.NODE}: Time spent performing query'
@@ -1272,8 +1410,11 @@ zabbix_export:
                 key: es.nodes.get_stats
               tags:
                 -
-                  tag: Application
-                  value: 'ES {#ES.NODE}'
+                  tag: component
+                  value: queries
+                -
+                  tag: node
+                  value: '{#ES.NODE}'
             -
               uuid: 7afc767463c64bbb9290975a8cef3cec
               name: 'ES {#ES.NODE}: Total time spent performing query'
@@ -1296,8 +1437,11 @@ zabbix_export:
                 key: es.nodes.get_stats
               tags:
                 -
-                  tag: Application
-                  value: 'Zabbix raw items'
+                  tag: component
+                  value: queries
+                -
+                  tag: node
+                  value: '{#ES.NODE}'
             -
               uuid: 7279b682fa3e4661a1600d6da25e0fc7
               name: 'ES {#ES.NODE}: Total number of query'
@@ -1319,8 +1463,11 @@ zabbix_export:
                 key: es.nodes.get_stats
               tags:
                 -
-                  tag: Application
-                  value: 'Zabbix raw items'
+                  tag: component
+                  value: queries
+                -
+                  tag: node
+                  value: '{#ES.NODE}'
             -
               uuid: 269cc21be4c94ba58a52b9fca9590632
               name: 'ES {#ES.NODE}: Amount of JVM heap committed'
@@ -1343,8 +1490,11 @@ zabbix_export:
                 key: es.nodes.get_stats
               tags:
                 -
-                  tag: Application
-                  value: 'ES {#ES.NODE}'
+                  tag: component
+                  value: memory
+                -
+                  tag: node
+                  value: '{#ES.NODE}'
             -
               uuid: 7f205e21644a4f629e4a419c42670158
               name: 'ES {#ES.NODE}: Maximum JVM memory available for use'
@@ -1367,8 +1517,11 @@ zabbix_export:
                 key: es.nodes.get_stats
               tags:
                 -
-                  tag: Application
-                  value: 'ES {#ES.NODE}'
+                  tag: component
+                  value: memory
+                -
+                  tag: node
+                  value: '{#ES.NODE}'
             -
               uuid: bb55c78c2aca49e49f6200e14c25dee8
               name: 'ES {#ES.NODE}: Amount of JVM heap currently in use'
@@ -1391,8 +1544,11 @@ zabbix_export:
                 key: es.nodes.get_stats
               tags:
                 -
-                  tag: Application
-                  value: 'ES {#ES.NODE}'
+                  tag: component
+                  value: memory
+                -
+                  tag: node
+                  value: '{#ES.NODE}'
             -
               uuid: 71fca039cad847da9623aaeb722168f1
               name: 'ES {#ES.NODE}: Percent of JVM heap currently in use'
@@ -1416,8 +1572,11 @@ zabbix_export:
                 key: es.nodes.get_stats
               tags:
                 -
-                  tag: Application
-                  value: 'ES {#ES.NODE}'
+                  tag: component
+                  value: memory
+                -
+                  tag: node
+                  value: '{#ES.NODE}'
               trigger_prototypes:
                 -
                   uuid: 9d199607ddda48eebe9f93cae6d6575d
@@ -1425,22 +1584,30 @@ zabbix_export:
                   name: 'ES {#ES.NODE}: Percent of JVM heap in use is critical (over {$ELASTICSEARCH.HEAP_USED.MAX.CRIT}% for 1h)'
                   priority: HIGH
                   description: |
-                    This indicates that the rate of garbage collection isn’t keeping up with the rate of garbage creation.
+                    This indicates that the rate of garbage collection isn't keeping up with the rate of garbage creation.
                     To address this problem, you can either increase your heap size (as long as it remains below the recommended
                     guidelines stated above), or scale out the cluster by adding more nodes.
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: bbba4a577a2c4328b2392fdeb1ff9bb4
                   expression: 'min(/Elasticsearch Cluster by HTTP/es.node.jvm.mem.heap_used_percent[{#ES.NODE}],1h)>{$ELASTICSEARCH.HEAP_USED.MAX.WARN}'
                   name: 'ES {#ES.NODE}: Percent of JVM heap in use is high (over {$ELASTICSEARCH.HEAP_USED.MAX.WARN}% for 1h)'
                   priority: WARNING
                   description: |
-                    This indicates that the rate of garbage collection isn’t keeping up with the rate of garbage creation.
+                    This indicates that the rate of garbage collection isn't keeping up with the rate of garbage creation.
                     To address this problem, you can either increase your heap size (as long as it remains below the recommended
                     guidelines stated above), or scale out the cluster by adding more nodes.
                   dependencies:
                     -
                       name: 'ES {#ES.NODE}: Percent of JVM heap in use is critical (over {$ELASTICSEARCH.HEAP_USED.MAX.CRIT}% for 1h)'
                       expression: 'min(/Elasticsearch Cluster by HTTP/es.node.jvm.mem.heap_used_percent[{#ES.NODE}],1h)>{$ELASTICSEARCH.HEAP_USED.MAX.CRIT}'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 3c2f512ae6ff4221a7de4e5dbff2ed48
               name: 'ES {#ES.NODE}: Node uptime'
@@ -1464,8 +1631,11 @@ zabbix_export:
                 key: es.nodes.get_stats
               tags:
                 -
-                  tag: Application
-                  value: 'ES {#ES.NODE}'
+                  tag: component
+                  value: system
+                -
+                  tag: node
+                  value: '{#ES.NODE}'
               trigger_prototypes:
                 -
                   uuid: 580ae8aadf994fbcb34c9c8ad7cd5fad
@@ -1474,6 +1644,10 @@ zabbix_export:
                   priority: INFO
                   description: 'Uptime is less than 10 minutes'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 14ea2732fbfc40ceaafadfff1830ac4d
               name: 'ES {#ES.NODE}: Refresh thread pool active threads'
@@ -1491,8 +1665,11 @@ zabbix_export:
                 key: es.nodes.get_stats
               tags:
                 -
-                  tag: Application
-                  value: 'ES {#ES.NODE}'
+                  tag: component
+                  value: refresh-thread-pool
+                -
+                  tag: node
+                  value: '{#ES.NODE}'
             -
               uuid: b6496d2878914b06bf6301630b4609a8
               name: 'ES {#ES.NODE}: Refresh thread pool executor tasks completed'
@@ -1516,8 +1693,11 @@ zabbix_export:
                 key: es.nodes.get_stats
               tags:
                 -
-                  tag: Application
-                  value: 'ES {#ES.NODE}'
+                  tag: component
+                  value: refresh-thread-pool
+                -
+                  tag: node
+                  value: '{#ES.NODE}'
             -
               uuid: 4b748eeb937e45308e58d699b713cf01
               name: 'ES {#ES.NODE}: Refresh thread pool tasks in queue'
@@ -1535,8 +1715,11 @@ zabbix_export:
                 key: es.nodes.get_stats
               tags:
                 -
-                  tag: Application
-                  value: 'ES {#ES.NODE}'
+                  tag: component
+                  value: refresh-thread-pool
+                -
+                  tag: node
+                  value: '{#ES.NODE}'
             -
               uuid: 593514af005044ce8e6207a5616270f2
               name: 'ES {#ES.NODE}: Refresh thread pool executor tasks rejected'
@@ -1560,8 +1743,11 @@ zabbix_export:
                 key: es.nodes.get_stats
               tags:
                 -
-                  tag: Application
-                  value: 'ES {#ES.NODE}'
+                  tag: component
+                  value: refresh-thread-pool
+                -
+                  tag: node
+                  value: '{#ES.NODE}'
               trigger_prototypes:
                 -
                   uuid: b416941e8e0141c6af27c62f052ac860
@@ -1569,6 +1755,10 @@ zabbix_export:
                   name: 'ES {#ES.NODE}: Refresh thread pool executor has the rejected tasks (for 5m)'
                   priority: WARNING
                   description: 'The number of tasks rejected by the refresh thread pool executor is over 0 for 5m.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 63875f40cf7c4f8f842562be2adfb7c7
               name: 'ES {#ES.NODE}: Search thread pool active threads'
@@ -1586,8 +1776,11 @@ zabbix_export:
                 key: es.nodes.get_stats
               tags:
                 -
-                  tag: Application
-                  value: 'ES {#ES.NODE}'
+                  tag: component
+                  value: search-thread-pool
+                -
+                  tag: node
+                  value: '{#ES.NODE}'
             -
               uuid: dc67ab311d4945aaae3347464785abb1
               name: 'ES {#ES.NODE}: Search thread pool executor tasks completed'
@@ -1611,8 +1804,11 @@ zabbix_export:
                 key: es.nodes.get_stats
               tags:
                 -
-                  tag: Application
-                  value: 'ES {#ES.NODE}'
+                  tag: component
+                  value: search-thread-pool
+                -
+                  tag: node
+                  value: '{#ES.NODE}'
             -
               uuid: d11933b62131425d83ab09c6d5fd5e85
               name: 'ES {#ES.NODE}: Search thread pool tasks in queue'
@@ -1630,8 +1826,11 @@ zabbix_export:
                 key: es.nodes.get_stats
               tags:
                 -
-                  tag: Application
-                  value: 'ES {#ES.NODE}'
+                  tag: component
+                  value: search-thread-pool
+                -
+                  tag: node
+                  value: '{#ES.NODE}'
             -
               uuid: 820ed330abc845919b1dada3cfa81387
               name: 'ES {#ES.NODE}: Search thread pool executor tasks rejected'
@@ -1655,8 +1854,11 @@ zabbix_export:
                 key: es.nodes.get_stats
               tags:
                 -
-                  tag: Application
-                  value: 'ES {#ES.NODE}'
+                  tag: component
+                  value: search-thread-pool
+                -
+                  tag: node
+                  value: '{#ES.NODE}'
               trigger_prototypes:
                 -
                   uuid: 5cfd3f9924614a4283f1255752b672f0
@@ -1664,6 +1866,10 @@ zabbix_export:
                   name: 'ES {#ES.NODE}: Search thread pool executor has the rejected tasks (for 5m)'
                   priority: WARNING
                   description: 'The number of tasks rejected by the search thread pool executor is over 0 for 5m.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 4b7dc34d78a64b24a8fd19af95e0f0bd
               name: 'ES {#ES.NODE}: Write thread pool active threads'
@@ -1681,8 +1887,11 @@ zabbix_export:
                 key: es.nodes.get_stats
               tags:
                 -
-                  tag: Application
-                  value: 'ES {#ES.NODE}'
+                  tag: component
+                  value: write-thread-pool
+                -
+                  tag: node
+                  value: '{#ES.NODE}'
             -
               uuid: 5b5ac74702564bd490c7378adcf75c28
               name: 'ES {#ES.NODE}: Write thread pool executor tasks completed'
@@ -1706,8 +1915,11 @@ zabbix_export:
                 key: es.nodes.get_stats
               tags:
                 -
-                  tag: Application
-                  value: 'ES {#ES.NODE}'
+                  tag: component
+                  value: write-thread-pool
+                -
+                  tag: node
+                  value: '{#ES.NODE}'
             -
               uuid: a0d8f8d896a546d1ade07c355992308d
               name: 'ES {#ES.NODE}: Write thread pool tasks in queue'
@@ -1725,8 +1937,11 @@ zabbix_export:
                 key: es.nodes.get_stats
               tags:
                 -
-                  tag: Application
-                  value: 'ES {#ES.NODE}'
+                  tag: component
+                  value: write-thread-pool
+                -
+                  tag: node
+                  value: '{#ES.NODE}'
             -
               uuid: a21213815a30485a88b183e7b40a4e7e
               name: 'ES {#ES.NODE}: Write thread pool executor tasks rejected'
@@ -1750,8 +1965,11 @@ zabbix_export:
                 key: es.nodes.get_stats
               tags:
                 -
-                  tag: Application
-                  value: 'ES {#ES.NODE}'
+                  tag: component
+                  value: write-thread-pool
+                -
+                  tag: node
+                  value: '{#ES.NODE}'
               trigger_prototypes:
                 -
                   uuid: 1f5e30a34bb84cef831670974ec7c3e8
@@ -1759,6 +1977,10 @@ zabbix_export:
                   name: 'ES {#ES.NODE}: Write thread pool executor has the rejected tasks (for 5m)'
                   priority: WARNING
                   description: 'The number of tasks rejected by the write thread pool executor is over 0 for 5m.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
           graph_prototypes:
             -
               uuid: 0725d91f63b64346bbef2c20d2901e9b
@@ -1898,6 +2120,13 @@ zabbix_export:
               type: DISCARD_UNCHANGED_HEARTBEAT
               parameters:
                 - 1d
+      tags:
+        -
+          tag: class
+          value: software
+        -
+          tag: target
+          value: elasticsearch
       macros:
         -
           macro: '{$ELASTICSEARCH.FETCH_LATENCY.MAX.WARN}'
@@ -1975,6 +2204,10 @@ zabbix_export:
       name: 'ES: Cluster does not have enough space for resharding'
       priority: HIGH
       description: 'There is not enough disk space for index resharding.'
+      tags:
+        -
+          tag: scope
+          value: capacity
   graphs:
     -
       uuid: 50f90b092fa24658b83b131fa7a3f2ce
diff --git a/templates/app/etcd_http/template_app_etcd_http.yaml b/templates/app/etcd_http/template_app_etcd_http.yaml
index 97c3639ab7a..abd6a0d1ad0 100644
--- a/templates/app/etcd_http/template_app_etcd_http.yaml
+++ b/templates/app/etcd_http/template_app_etcd_http.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-10T07:38:28Z'
+  date: '2022-01-26T10:01:32Z'
   groups:
     -
       uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
@@ -13,7 +13,7 @@ zabbix_export:
       description: |
         Get Etcd metrics by HTTP agent.
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Applications
@@ -41,8 +41,8 @@ zabbix_export:
             key: etcd.get_version
           tags:
             -
-              tag: Application
-              value: Etcd
+              tag: component
+              value: application
           triggers:
             -
               uuid: 7c87424c4fb34c56bc9b976755b4ec02
@@ -51,6 +51,10 @@ zabbix_export:
               priority: INFO
               description: 'Etcd version has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 04b0fa552b7d4267b4c5b67ee82ef5f1
           name: 'Etcd: CPU'
@@ -76,8 +80,8 @@ zabbix_export:
             key: etcd.get_metrics
           tags:
             -
-              tag: Application
-              value: Etcd
+              tag: component
+              value: cpu
         -
           uuid: bfa5bd42637642808802f7b2485a0c4d
           name: 'Etcd: DB size'
@@ -99,8 +103,8 @@ zabbix_export:
             key: etcd.get_metrics
           tags:
             -
-              tag: Application
-              value: Etcd
+              tag: component
+              value: database
         -
           uuid: a5bc7ffb090641ab92f537b38b6055e5
           name: 'Etcd: Deletes per second'
@@ -126,8 +130,8 @@ zabbix_export:
             key: etcd.get_metrics
           tags:
             -
-              tag: Application
-              value: Etcd
+              tag: component
+              value: operations
         -
           uuid: 183843bd93f84dc887a03fb638b2d323
           name: 'Etcd: Pending events'
@@ -147,8 +151,8 @@ zabbix_export:
             key: etcd.get_metrics
           tags:
             -
-              tag: Application
-              value: Etcd
+              tag: component
+              value: events
         -
           uuid: 34ffab33275a400ab88e5217dee5ef96
           name: 'Etcd: Get node metrics'
@@ -163,8 +167,8 @@ zabbix_export:
           url: '{$ETCD.SCHEME}://{HOST.CONN}:{$ETCD.PORT}/metrics'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
         -
           uuid: fdf7593420ab42b2a5af8f8b8030b517
           name: 'Etcd: Get version'
@@ -176,8 +180,8 @@ zabbix_export:
           url: '{$ETCD.SCHEME}://{HOST.CONN}:{$ETCD.PORT}/version'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: application
         -
           uuid: d23baf75628043e193ba0a607e1b4215
           name: 'Etcd: RPCs received per second'
@@ -209,8 +213,8 @@ zabbix_export:
             key: etcd.get_metrics
           tags:
             -
-              tag: Application
-              value: Etcd
+              tag: component
+              value: grpc
         -
           uuid: eda81182710e47e1b5f2f21bb05b4775
           name: 'Etcd: RPCs sent per second'
@@ -242,8 +246,8 @@ zabbix_export:
             key: etcd.get_metrics
           tags:
             -
-              tag: Application
-              value: Etcd
+              tag: component
+              value: grpc
         -
           uuid: bf59a130b20d480d93eb9330750e8e28
           name: 'Etcd: RPCs started per second'
@@ -275,8 +279,8 @@ zabbix_export:
             key: etcd.get_metrics
           tags:
             -
-              tag: Application
-              value: Etcd
+              tag: component
+              value: grpc
         -
           uuid: e03575f4c472410eb6fbcf731ac6aab2
           name: 'Etcd: Server has a leader'
@@ -302,8 +306,8 @@ zabbix_export:
             key: etcd.get_metrics
           tags:
             -
-              tag: Application
-              value: Etcd
+              tag: component
+              value: leader
           triggers:
             -
               uuid: 20165719d521453bb239d818ac57805c
@@ -311,6 +315,10 @@ zabbix_export:
               name: 'Etcd: Member has no leader'
               priority: AVERAGE
               description: 'If a member does not have a leader, it is totally unavailable.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 3fde4db8b9684ba4b56ba915e48957b5
           name: 'Etcd: Node health'
@@ -340,8 +348,8 @@ zabbix_export:
           url: '{$ETCD.SCHEME}://{HOST.CONN}:{$ETCD.PORT}/health'
           tags:
             -
-              tag: Application
-              value: Etcd
+              tag: component
+              value: health
           triggers:
             -
               uuid: 6acda7bdc9df4a4ab5b7cca76c6369f0
@@ -354,6 +362,10 @@ zabbix_export:
                 -
                   name: 'Etcd: Service is unavailable'
                   expression: 'last(/Etcd by HTTP/net.tcp.service["{$ETCD.SCHEME}","{HOST.CONN}","{$ETCD.PORT}"])=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 923a408dd4514e808b6e2137a94f8140
           name: 'Etcd: HTTP 4XX'
@@ -385,8 +397,11 @@ zabbix_export:
             key: etcd.get_metrics
           tags:
             -
-              tag: Application
-              value: Etcd
+              tag: component
+              value: http
+            -
+              tag: http-code
+              value: 4XX
         -
           uuid: c0f27d4bfba344079a31ce8c10b22683
           name: 'Etcd: HTTP 5XX'
@@ -418,8 +433,11 @@ zabbix_export:
             key: etcd.get_metrics
           tags:
             -
-              tag: Application
-              value: Etcd
+              tag: component
+              value: http
+            -
+              tag: http-code
+              value: 5XX
           triggers:
             -
               uuid: 0302957e0f6b43389546e1cfb958ed9c
@@ -427,6 +445,10 @@ zabbix_export:
               name: 'Etcd: Too many HTTP requests failures (over {$ETCD.HTTP.FAIL.MAX.WARN} for 5m)'''
               priority: WARNING
               description: 'Too many requests failed on etcd instance with 5xx HTTP code.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 2a19db1c58ee4a509061fcb1b557c1a3
           name: 'Etcd: HTTP requests received'
@@ -458,8 +480,8 @@ zabbix_export:
             key: etcd.get_metrics
           tags:
             -
-              tag: Application
-              value: Etcd
+              tag: component
+              value: http
         -
           uuid: b3760811472440baad6a338f481ba13a
           name: 'Etcd: Server is a leader'
@@ -487,8 +509,8 @@ zabbix_export:
             key: etcd.get_metrics
           tags:
             -
-              tag: Application
-              value: Etcd
+              tag: component
+              value: leader
           triggers:
             -
               uuid: 44d66eb1a332418daf4c3a1110db5458
@@ -501,6 +523,10 @@ zabbix_export:
                 -
                   name: 'Etcd: Service is unavailable'
                   expression: 'last(/Etcd by HTTP/net.tcp.service["{$ETCD.SCHEME}","{HOST.CONN}","{$ETCD.PORT}"])=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: ecd1ae9c038f4fc2b720ad562ced0191
           name: 'Etcd: Keys compacted per second'
@@ -527,8 +553,8 @@ zabbix_export:
             key: etcd.get_metrics
           tags:
             -
-              tag: Application
-              value: Etcd
+              tag: component
+              value: keys
         -
           uuid: a3f910efb0a04cc494c07b8703f9d2ec
           name: 'Etcd: Keys expired per second'
@@ -553,8 +579,8 @@ zabbix_export:
             key: etcd.get_metrics
           tags:
             -
-              tag: Application
-              value: Etcd
+              tag: component
+              value: keys
         -
           uuid: fbda737014544cf1bcf544a48aa6e48b
           name: 'Etcd: Keys total'
@@ -574,8 +600,8 @@ zabbix_export:
             key: etcd.get_metrics
           tags:
             -
-              tag: Application
-              value: Etcd
+              tag: component
+              value: keys
         -
           uuid: e45ba61d99b8432b86f5797a2cfdb416
           name: 'Etcd: Leader changes'
@@ -595,8 +621,8 @@ zabbix_export:
             key: etcd.get_metrics
           tags:
             -
-              tag: Application
-              value: Etcd
+              tag: component
+              value: leader
           triggers:
             -
               uuid: 1ea623927179489890a5a73eeb8177f7
@@ -604,6 +630,10 @@ zabbix_export:
               name: 'Etcd: Instance has seen too many leader changes (over {$ETCD.LEADER.CHANGES.MAX.WARN} for 15m)'''
               priority: WARNING
               description: 'Rapid leadership changes impact the performance of etcd significantly. It also signals that the leader is unstable, perhaps due to network connectivity issues or excessive load hitting the etcd cluster.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 348e15d2ec3a4bb88e2ca371f96c2f00
           name: 'Etcd: Maximum open file descriptors'
@@ -624,8 +654,8 @@ zabbix_export:
             key: etcd.get_metrics
           tags:
             -
-              tag: Application
-              value: Etcd
+              tag: component
+              value: fds
         -
           uuid: d016b8674ebd4251943f2e94b22f5ff2
           name: 'Etcd: Client gRPC received bytes per second'
@@ -651,8 +681,8 @@ zabbix_export:
             key: etcd.get_metrics
           tags:
             -
-              tag: Application
-              value: Etcd
+              tag: component
+              value: grpc
         -
           uuid: e50d2d088c6448dbb3ecaeebc3b2b8f1
           name: 'Etcd: Client gRPC sent bytes per second'
@@ -678,8 +708,8 @@ zabbix_export:
             key: etcd.get_metrics
           tags:
             -
-              tag: Application
-              value: Etcd
+              tag: component
+              value: grpc
         -
           uuid: d5099d4cdb3044ba95935c2aea2b6352
           name: 'Etcd: Open file descriptors'
@@ -700,8 +730,8 @@ zabbix_export:
             key: etcd.get_metrics
           tags:
             -
-              tag: Application
-              value: Etcd
+              tag: component
+              value: fds
         -
           uuid: a2927b1e85af41cab9c28b1b79c229ea
           name: 'Etcd: Proposals applied per second'
@@ -726,8 +756,8 @@ zabbix_export:
             key: etcd.get_metrics
           tags:
             -
-              tag: Application
-              value: Etcd
+              tag: component
+              value: proposals
         -
           uuid: e829f3df055e42dfbce5f27eb7ca487c
           name: 'Etcd: Proposals committed per second'
@@ -752,8 +782,8 @@ zabbix_export:
             key: etcd.get_metrics
           tags:
             -
-              tag: Application
-              value: Etcd
+              tag: component
+              value: proposals
         -
           uuid: 6b45b99526394a219d31b5c22cb98c85
           name: 'Etcd: Proposals failed per second'
@@ -778,8 +808,8 @@ zabbix_export:
             key: etcd.get_metrics
           tags:
             -
-              tag: Application
-              value: Etcd
+              tag: component
+              value: proposals
           triggers:
             -
               uuid: 432cea8bddd742ca98528be2fbc7e35e
@@ -787,6 +817,10 @@ zabbix_export:
               name: 'Etcd: Too many proposal failures (over {$ETCD.PROPOSAL.FAIL.MAX.WARN} for 5m)'''
               priority: WARNING
               description: 'Normally related to two issues: temporary failures related to a leader election or longer downtime caused by a loss of quorum in the cluster.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 1c506ff69e7b4564a6d95fd35b1a11fd
           name: 'Etcd: Proposals pending'
@@ -806,8 +840,8 @@ zabbix_export:
             key: etcd.get_metrics
           tags:
             -
-              tag: Application
-              value: Etcd
+              tag: component
+              value: proposals
           triggers:
             -
               uuid: 5feefc4dd5d14fe2b56dd63029b57026
@@ -815,6 +849,10 @@ zabbix_export:
               name: 'Etcd: Too many proposals are queued to commit (over {$ETCD.PROPOSAL.PENDING.MAX.WARN} for 5m)'''
               priority: WARNING
               description: 'Rising pending proposals suggests there is a high client load or the member cannot commit proposals.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: bd7398507c274bfab53339380df16761
           name: 'Etcd: PUT per second'
@@ -840,8 +878,8 @@ zabbix_export:
             key: etcd.get_metrics
           tags:
             -
-              tag: Application
-              value: Etcd
+              tag: component
+              value: operations
         -
           uuid: b744c07f3290467b96b21ea38ad5d497
           name: 'Etcd: Range per second'
@@ -867,8 +905,8 @@ zabbix_export:
             key: etcd.get_metrics
           tags:
             -
-              tag: Application
-              value: Etcd
+              tag: component
+              value: operations
         -
           uuid: 88c91b36eca94fd2b357a67d171dc621
           name: 'Etcd: Reads per second'
@@ -901,8 +939,8 @@ zabbix_export:
             key: etcd.get_metrics
           tags:
             -
-              tag: Application
-              value: Etcd
+              tag: component
+              value: store
         -
           uuid: 4b881e32094e4f478c5d0849cb5d07a7
           name: 'Etcd: Resident memory'
@@ -924,8 +962,8 @@ zabbix_export:
             key: etcd.get_metrics
           tags:
             -
-              tag: Application
-              value: Etcd
+              tag: component
+              value: memory
         -
           uuid: dee9ed8897cf4d3582957707ea09cdf8
           name: 'Etcd: Server version'
@@ -949,8 +987,8 @@ zabbix_export:
             key: etcd.get_version
           tags:
             -
-              tag: Application
-              value: Etcd
+              tag: component
+              value: application
           triggers:
             -
               uuid: cfb2fc467b224ef694d59b5c081ed965
@@ -959,6 +997,10 @@ zabbix_export:
               priority: INFO
               description: 'Etcd version has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: b14c787c716146e990bc388d277a2803
           name: 'Etcd: Transaction per second'
@@ -984,8 +1026,8 @@ zabbix_export:
             key: etcd.get_metrics
           tags:
             -
-              tag: Application
-              value: Etcd
+              tag: component
+              value: transactions
         -
           uuid: 98ec9085d621446aa462efc86cf93905
           name: 'Etcd: Uptime'
@@ -1013,8 +1055,8 @@ zabbix_export:
             key: etcd.get_metrics
           tags:
             -
-              tag: Application
-              value: Etcd
+              tag: component
+              value: application
           triggers:
             -
               uuid: 6843369969f5410a840494104d71fe1f
@@ -1023,6 +1065,10 @@ zabbix_export:
               priority: INFO
               description: 'Uptime is less than 10 minutes'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: c35810b8b7bc4a62970b5293fb2d8fb2
           name: 'Etcd: Virtual memory'
@@ -1044,8 +1090,8 @@ zabbix_export:
             key: etcd.get_metrics
           tags:
             -
-              tag: Application
-              value: Etcd
+              tag: component
+              value: memory
         -
           uuid: 16c041fc189248bfaaa5826ffaf38459
           name: 'Etcd: Writes per second'
@@ -1077,8 +1123,8 @@ zabbix_export:
             key: etcd.get_metrics
           tags:
             -
-              tag: Application
-              value: Etcd
+              tag: component
+              value: store
         -
           uuid: a0f94f429b99432e86d15ffa74d6eada
           name: 'Etcd: Service''s TCP port state'
@@ -1094,8 +1140,11 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: Etcd
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 74164f0783ae4227ba44f3e865fee3bd
@@ -1103,6 +1152,10 @@ zabbix_export:
               name: 'Etcd: Service is unavailable'
               priority: AVERAGE
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: 5e6121383e5d4f3eb1150a2068a4633b
@@ -1154,14 +1207,21 @@ zabbix_export:
                 key: etcd.get_metrics
               tags:
                 -
-                  tag: Application
-                  value: Etcd
+                  tag: component
+                  value: grpc
+                -
+                  tag: grpc-code
+                  value: '{#GRPC.CODE}'
               trigger_prototypes:
                 -
                   uuid: 459b6ee5735047d597a6a4ab41b76e21
                   expression: 'min(/Etcd by HTTP/etcd.grpc.handled.rate[{#GRPC.CODE}],5m)>{$ETCD.GRPC.ERRORS.MAX.WARN}'
                   name: 'Etcd: Too many failed gRPC requests with code: {#GRPC.CODE} (over {$ETCD.GRPC.ERRORS.MAX.WARN} in 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
           master_item:
             key: etcd.get_metrics
           preprocessing:
@@ -1239,8 +1299,14 @@ zabbix_export:
                 key: etcd.get_metrics
               tags:
                 -
-                  tag: Application
-                  value: 'Etcd peer {#ETCD.PEER}'
+                  tag: component
+                  value: network
+                -
+                  tag: component
+                  value: peers
+                -
+                  tag: peer
+                  value: '{#ETCD.PEER}'
             -
               uuid: 8f5fecbabe474baaab40df46879401af
               name: 'Etcd: Etcd peer {#ETCD.PEER}: Bytes sent'
@@ -1268,8 +1334,14 @@ zabbix_export:
                 key: etcd.get_metrics
               tags:
                 -
-                  tag: Application
-                  value: 'Etcd peer {#ETCD.PEER}'
+                  tag: component
+                  value: network
+                -
+                  tag: component
+                  value: peers
+                -
+                  tag: peer
+                  value: '{#ETCD.PEER}'
             -
               uuid: 2521ccfc16fc43069001883b85aa0243
               name: 'Etcd: Etcd peer {#ETCD.PEER}: Receive failures failures'
@@ -1297,8 +1369,14 @@ zabbix_export:
                 key: etcd.get_metrics
               tags:
                 -
-                  tag: Application
-                  value: 'Etcd peer {#ETCD.PEER}'
+                  tag: component
+                  value: network
+                -
+                  tag: component
+                  value: peers
+                -
+                  tag: peer
+                  value: '{#ETCD.PEER}'
             -
               uuid: 5756f1a16e5c42b79f6d6225c5382599
               name: 'Etcd: Etcd peer {#ETCD.PEER}: Send failures'
@@ -1326,8 +1404,14 @@ zabbix_export:
                 key: etcd.get_metrics
               tags:
                 -
-                  tag: Application
-                  value: 'Etcd peer {#ETCD.PEER}'
+                  tag: component
+                  value: network
+                -
+                  tag: component
+                  value: peers
+                -
+                  tag: peer
+                  value: '{#ETCD.PEER}'
           master_item:
             key: etcd.get_metrics
           lld_macro_paths:
@@ -1339,6 +1423,13 @@ zabbix_export:
               type: PROMETHEUS_TO_JSON
               parameters:
                 - etcd_network_peer_sent_bytes_total
+      tags:
+        -
+          tag: class
+          value: application
+        -
+          tag: target
+          value: etcd
       macros:
         -
           macro: '{$ETCD.GRPC.ERRORS.MAX.WARN}'
@@ -1428,6 +1519,10 @@ zabbix_export:
       description: |
         Heavy file descriptor usage (i.e., near the process's file descriptor limit) indicates a potential file descriptor exhaustion issue.
         If the file descriptors are exhausted, etcd may panic because it cannot create new WAL files.
+      tags:
+        -
+          tag: scope
+          value: capacity
   graphs:
     -
       uuid: 18baccd03c0f4814a42d32b51334787d
diff --git a/templates/app/exchange/template_app_exchange.yaml b/templates/app/exchange/template_app_exchange.yaml
index 9390d1cba60..7bf2c5f54a5 100644
--- a/templates/app/exchange/template_app_exchange.yaml
+++ b/templates/app/exchange/template_app_exchange.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-15T06:56:58Z'
+  date: '2022-01-26T09:59:57Z'
   groups:
     -
       uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
@@ -18,7 +18,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/415007-discussion-thread-for-official-zabbix-template-microsoft-exchange
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Applications
@@ -37,8 +37,8 @@ zabbix_export:
                 - 3h
           tags:
             -
-              tag: Application
-              value: 'MS Exchange'
+              tag: component
+              value: application
         -
           uuid: 9b59700d8db8472fbde41c85c7a06ffc
           name: 'MS Exchange [Client Access Server]: ActiveSync: ping command pending'
@@ -49,8 +49,8 @@ zabbix_export:
           description: 'Shows the number of ping commands currently pending in the queue.'
           tags:
             -
-              tag: Application
-              value: 'MS Exchange'
+              tag: component
+              value: application
         -
           uuid: fa70b4e2d17c44c6945dd2d1c971c34c
           name: 'MS Exchange [Client Access Server]: ActiveSync: requests per second'
@@ -61,8 +61,8 @@ zabbix_export:
           description: 'Shows the number of HTTP requests received from the client via ASP.NET per second. Determines the current Exchange ActiveSync request rate. Used only to determine current user load.'
           tags:
             -
-              tag: Application
-              value: 'MS Exchange'
+              tag: component
+              value: application
         -
           uuid: 8528015c73134a239d7ac235464788dd
           name: 'MS Exchange [Client Access Server]: ActiveSync: sync commands per second'
@@ -73,8 +73,8 @@ zabbix_export:
           description: 'Shows the number of sync commands processed per second. Clients use this command to synchronize items within a folder.'
           tags:
             -
-              tag: Application
-              value: 'MS Exchange'
+              tag: component
+              value: application
         -
           uuid: 456cb7af0b224a59afabae36d24d2cbc
           name: 'MS Exchange [Client Access Server]: Autodiscover: requests per second'
@@ -85,8 +85,8 @@ zabbix_export:
           description: 'Shows the number of Autodiscover service requests processed each second. Determines current user load.'
           tags:
             -
-              tag: Application
-              value: 'MS Exchange'
+              tag: component
+              value: application
         -
           uuid: b9a539175cbb4259b064a787a25e9dbe
           name: 'MS Exchange [Client Access Server]: Availability Service: availability requests per second'
@@ -97,8 +97,8 @@ zabbix_export:
           description: 'Shows the number of requests serviced per second. The request can be only for free/ busy information or include suggestions. One request may contain multiple mailboxes. Determines the rate at which Availability service requests are occurring.'
           tags:
             -
-              tag: Application
-              value: 'MS Exchange'
+              tag: component
+              value: application
         -
           uuid: 3c2a83dfef35497baf8c38b801854882
           name: 'MS Exchange [Client Access Server]: Outlook Web App: current unique users'
@@ -109,8 +109,8 @@ zabbix_export:
           description: 'Shows the number of unique users currently logged on to Outlook Web App. This value monitors the number of unique active user sessions, so that users are only removed from this counter after they log off or their session times out. Determines current user load.'
           tags:
             -
-              tag: Application
-              value: 'MS Exchange'
+              tag: component
+              value: application
         -
           uuid: 2c7fd331673e4d84aa09551222469b08
           name: 'MS Exchange [Client Access Server]: Outlook Web App: requests per second'
@@ -121,8 +121,8 @@ zabbix_export:
           description: 'Shows the number of requests handled by Outlook Web App per second. Determines current user load.'
           tags:
             -
-              tag: Application
-              value: 'MS Exchange'
+              tag: component
+              value: application
         -
           uuid: 9808449df53148a9a988a69d66944371
           name: 'MS Exchange [Client Access Server]: MSExchangeWS: requests per second'
@@ -133,8 +133,8 @@ zabbix_export:
           description: 'Shows the number of requests processed each second. Determines current user load.'
           tags:
             -
-              tag: Application
-              value: 'MS Exchange'
+              tag: component
+              value: application
       discovery_rules:
         -
           uuid: f3d6e34eaff844bfab582cb55d679e82
@@ -160,8 +160,11 @@ zabbix_export:
                     - 3h
               tags:
                 -
-                  tag: Application
-                  value: 'Database {#INSTANCE}'
+                  tag: component
+                  value: database
+                -
+                  tag: database
+                  value: '{#INSTANCE}'
             -
               uuid: 9ad0743878ed411ab1e76b8e774e91e9
               name: 'Information Store [{#INSTANCE}]: Page faults per second'
@@ -172,8 +175,11 @@ zabbix_export:
               description: 'Indicates the rate of page faults that can''t be serviced because there are no pages available for allocation from the database cache. If this counter is above 0, it''s an indication that the MSExchange Database\I/O Database Writes (Attached) Average Latency is too high.'
               tags:
                 -
-                  tag: Application
-                  value: 'Database {#INSTANCE}'
+                  tag: component
+                  value: database
+                -
+                  tag: database
+                  value: '{#INSTANCE}'
               trigger_prototypes:
                 -
                   uuid: 07e0dce4546b4d15bfbb34fa2044c319
@@ -191,8 +197,11 @@ zabbix_export:
               description: 'Indicates the number of log records that can''t be added to the log buffers per second because the log buffers are full. The average value should be below 10 per second. Spikes (maximum values) shouldn''t be higher than 100 per second.'
               tags:
                 -
-                  tag: Application
-                  value: 'Database {#INSTANCE}'
+                  tag: component
+                  value: database
+                -
+                  tag: database
+                  value: '{#INSTANCE}'
               trigger_prototypes:
                 -
                   uuid: 688cbee95ef2432abc03c81d39049a44
@@ -210,8 +219,11 @@ zabbix_export:
               description: 'Indicates the number of threads waiting to complete an update of the database by writing their data to the log.'
               tags:
                 -
-                  tag: Application
-                  value: 'Database {#INSTANCE}'
+                  tag: component
+                  value: database
+                -
+                  tag: database
+                  value: '{#INSTANCE}'
             -
               uuid: 1da31e52e5dd4b72bea5811a9bb06a01
               name: 'Database Counters [{#INSTANCE}]: Active database read operations per second'
@@ -222,8 +234,11 @@ zabbix_export:
               description: 'Shows the number of database read operations.'
               tags:
                 -
-                  tag: Application
-                  value: 'Database {#INSTANCE}'
+                  tag: component
+                  value: database
+                -
+                  tag: database
+                  value: '{#INSTANCE}'
             -
               uuid: 0bc5750ca13f4f738904e45f9860b76a
               name: 'Database Counters [{#INSTANCE}]: Active database read operations latency'
@@ -240,8 +255,11 @@ zabbix_export:
                     - '0.001'
               tags:
                 -
-                  tag: Application
-                  value: 'Database {#INSTANCE}'
+                  tag: component
+                  value: database
+                -
+                  tag: database
+                  value: '{#INSTANCE}'
               trigger_prototypes:
                 -
                   uuid: 053583bbe81d4ce0961ee365cee5a802
@@ -265,8 +283,11 @@ zabbix_export:
                     - '0.001'
               tags:
                 -
-                  tag: Application
-                  value: 'Database {#INSTANCE}'
+                  tag: component
+                  value: database
+                -
+                  tag: database
+                  value: '{#INSTANCE}'
               trigger_prototypes:
                 -
                   uuid: 4a07a86df67b4aa08e538d4463c2d3df
@@ -284,8 +305,11 @@ zabbix_export:
               description: 'Shows the number of database write operations per second for each attached database instance.'
               tags:
                 -
-                  tag: Application
-                  value: 'Database {#INSTANCE}'
+                  tag: component
+                  value: database
+                -
+                  tag: database
+                  value: '{#INSTANCE}'
             -
               uuid: e45413cc0e46458f9a00132b30c7c354
               name: 'Database Counters [{#INSTANCE}]: Active database write operations latency'
@@ -302,8 +326,11 @@ zabbix_export:
                     - '0.001'
               tags:
                 -
-                  tag: Application
-                  value: 'Database {#INSTANCE}'
+                  tag: component
+                  value: database
+                -
+                  tag: database
+                  value: '{#INSTANCE}'
               trigger_prototypes:
                 -
                   uuid: 87cc1ca8b39541e89eb02a1c094892c0
@@ -327,8 +354,11 @@ zabbix_export:
                     - '0.001'
               tags:
                 -
-                  tag: Application
-                  value: 'Database {#INSTANCE}'
+                  tag: component
+                  value: database
+                -
+                  tag: database
+                  value: '{#INSTANCE}'
             -
               uuid: 6128c55bf63a4c48981dfccd077b4635
               name: 'Information Store [{#INSTANCE}]: Active mailboxes count'
@@ -339,8 +369,11 @@ zabbix_export:
               description: 'Number of active mailboxes in this database.'
               tags:
                 -
-                  tag: Application
-                  value: 'Database {#INSTANCE}'
+                  tag: component
+                  value: database
+                -
+                  tag: database
+                  value: '{#INSTANCE}'
             -
               uuid: 4db79306eb044db899be5e7672651959
               name: 'Information Store [{#INSTANCE}]: Database state'
@@ -362,8 +395,11 @@ zabbix_export:
                     - 3m
               tags:
                 -
-                  tag: Application
-                  value: 'Database {#INSTANCE}'
+                  tag: component
+                  value: database
+                -
+                  tag: database
+                  value: '{#INSTANCE}'
             -
               uuid: 6bc9bc6d20df4de89ff03d63f21f6eab
               name: 'Information Store [{#INSTANCE}]: RPC requests latency'
@@ -380,8 +416,11 @@ zabbix_export:
                     - '0.001'
               tags:
                 -
-                  tag: Application
-                  value: 'Database {#INSTANCE}'
+                  tag: component
+                  value: database
+                -
+                  tag: database
+                  value: '{#INSTANCE}'
               trigger_prototypes:
                 -
                   uuid: b9b2f224082a4ec687d121534402170c
@@ -399,8 +438,11 @@ zabbix_export:
               description: 'Shows the number of RPC operations per second for each database instance.'
               tags:
                 -
-                  tag: Application
-                  value: 'Database {#INSTANCE}'
+                  tag: component
+                  value: database
+                -
+                  tag: database
+                  value: '{#INSTANCE}'
             -
               uuid: 701d6a4fcfe14f899e0282eb75e08753
               name: 'Information Store [{#INSTANCE}]: RPC requests total'
@@ -411,8 +453,11 @@ zabbix_export:
               description: 'Indicates the overall RPC requests currently executing within the information store process. Should be below 70 at all times.'
               tags:
                 -
-                  tag: Application
-                  value: 'Database {#INSTANCE}'
+                  tag: component
+                  value: database
+                -
+                  tag: database
+                  value: '{#INSTANCE}'
               trigger_prototypes:
                 -
                   uuid: 6349d2b6cd13413187b8c77e10fa96a2
@@ -509,8 +554,11 @@ zabbix_export:
                     - '0.001'
               tags:
                 -
-                  tag: Application
-                  value: 'MS Exchange'
+                  tag: component
+                  value: ldap
+                -
+                  tag: ldap
+                  value: '{#INSTANCE}'
               trigger_prototypes:
                 -
                   uuid: 799366198fd04746bf265431c00269ab
@@ -534,8 +582,11 @@ zabbix_export:
                     - '0.001'
               tags:
                 -
-                  tag: Application
-                  value: 'MS Exchange'
+                  tag: component
+                  value: ldap
+                -
+                  tag: ldap
+                  value: '{#INSTANCE}'
               trigger_prototypes:
                 -
                   uuid: 0db1b4e3f149481e8b04fe8b5eafa508
@@ -576,8 +627,18 @@ zabbix_export:
               description: 'Shows the current number of connections established to the each Web Service.'
               tags:
                 -
-                  tag: Application
-                  value: 'MS Exchange'
+                  tag: component
+                  value: web
+                -
+                  tag: web
+                  value: '{#INSTANCE}'
+      tags:
+        -
+          tag: class
+          value: application
+        -
+          tag: target
+          value: ms-exchange
       macros:
         -
           macro: '{$MS.EXCHANGE.DB.ACTIVE.READ.TIME}'
diff --git a/templates/app/exchange_active/template_app_exchange_active.yaml b/templates/app/exchange_active/template_app_exchange_active.yaml
index a36d89c698c..7460d8e7cee 100644
--- a/templates/app/exchange_active/template_app_exchange_active.yaml
+++ b/templates/app/exchange_active/template_app_exchange_active.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-15T06:57:00Z'
+  date: '2022-01-26T10:48:49Z'
   groups:
     -
       uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
@@ -18,7 +18,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/415007-discussion-thread-for-official-zabbix-template-microsoft-exchange
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Applications
@@ -38,8 +38,8 @@ zabbix_export:
                 - 3h
           tags:
             -
-              tag: Application
-              value: 'MS Exchange'
+              tag: component
+              value: application
         -
           uuid: bb9de29f56124a77a6ac1d3f8cbd72e9
           name: 'MS Exchange [Client Access Server]: ActiveSync: ping command pending'
@@ -51,8 +51,8 @@ zabbix_export:
           description: 'Shows the number of ping commands currently pending in the queue.'
           tags:
             -
-              tag: Application
-              value: 'MS Exchange'
+              tag: component
+              value: application
         -
           uuid: 038e740be37c40339520b4c4b1b0d18b
           name: 'MS Exchange [Client Access Server]: ActiveSync: requests per second'
@@ -64,8 +64,8 @@ zabbix_export:
           description: 'Shows the number of HTTP requests received from the client via ASP.NET per second. Determines the current Exchange ActiveSync request rate. Used only to determine current user load.'
           tags:
             -
-              tag: Application
-              value: 'MS Exchange'
+              tag: component
+              value: application
         -
           uuid: 953665dbe8f948ff821333a4d50eada6
           name: 'MS Exchange [Client Access Server]: ActiveSync: sync commands per second'
@@ -77,8 +77,8 @@ zabbix_export:
           description: 'Shows the number of sync commands processed per second. Clients use this command to synchronize items within a folder.'
           tags:
             -
-              tag: Application
-              value: 'MS Exchange'
+              tag: component
+              value: application
         -
           uuid: c8ed8a7e36c6453183aee1a778a4749a
           name: 'MS Exchange [Client Access Server]: Autodiscover: requests per second'
@@ -90,8 +90,8 @@ zabbix_export:
           description: 'Shows the number of Autodiscover service requests processed each second. Determines current user load.'
           tags:
             -
-              tag: Application
-              value: 'MS Exchange'
+              tag: component
+              value: application
         -
           uuid: 2260d98130814d369ac1c90324caaa26
           name: 'MS Exchange [Client Access Server]: Availability Service: availability requests per second'
@@ -103,8 +103,8 @@ zabbix_export:
           description: 'Shows the number of requests serviced per second. The request can be only for free/ busy information or include suggestions. One request may contain multiple mailboxes. Determines the rate at which Availability service requests are occurring.'
           tags:
             -
-              tag: Application
-              value: 'MS Exchange'
+              tag: component
+              value: application
         -
           uuid: b4336fce2d27450b95de4f1bbbf947f3
           name: 'MS Exchange [Client Access Server]: Outlook Web App: current unique users'
@@ -116,8 +116,8 @@ zabbix_export:
           description: 'Shows the number of unique users currently logged on to Outlook Web App. This value monitors the number of unique active user sessions, so that users are only removed from this counter after they log off or their session times out. Determines current user load.'
           tags:
             -
-              tag: Application
-              value: 'MS Exchange'
+              tag: component
+              value: application
         -
           uuid: 14344546f3a748fbb8f78e503e92255f
           name: 'MS Exchange [Client Access Server]: Outlook Web App: requests per second'
@@ -129,8 +129,8 @@ zabbix_export:
           description: 'Shows the number of requests handled by Outlook Web App per second. Determines current user load.'
           tags:
             -
-              tag: Application
-              value: 'MS Exchange'
+              tag: component
+              value: application
         -
           uuid: e8c8e348c01e48ad92ee02060717e097
           name: 'MS Exchange [Client Access Server]: MSExchangeWS: requests per second'
@@ -142,8 +142,8 @@ zabbix_export:
           description: 'Shows the number of requests processed each second. Determines current user load.'
           tags:
             -
-              tag: Application
-              value: 'MS Exchange'
+              tag: component
+              value: application
       discovery_rules:
         -
           uuid: 3b23aa50517a4081b8463f694757cd0c
@@ -171,8 +171,8 @@ zabbix_export:
                     - 3h
               tags:
                 -
-                  tag: Application
-                  value: 'Database {#INSTANCE}'
+                  tag: component
+                  value: application
             -
               uuid: 947396e622b24e2090a23607ee7a06a4
               name: 'Information Store [{#INSTANCE}]: Page faults per second'
@@ -184,8 +184,8 @@ zabbix_export:
               description: 'Indicates the rate of page faults that can''t be serviced because there are no pages available for allocation from the database cache. If this counter is above 0, it''s an indication that the MSExchange Database\I/O Database Writes (Attached) Average Latency is too high.'
               tags:
                 -
-                  tag: Application
-                  value: 'Database {#INSTANCE}'
+                  tag: component
+                  value: application
               trigger_prototypes:
                 -
                   uuid: c3540ee98c464c3bbcf680e26ce6165a
@@ -204,8 +204,8 @@ zabbix_export:
               description: 'Indicates the number of log records that can''t be added to the log buffers per second because the log buffers are full. The average value should be below 10 per second. Spikes (maximum values) shouldn''t be higher than 100 per second.'
               tags:
                 -
-                  tag: Application
-                  value: 'Database {#INSTANCE}'
+                  tag: component
+                  value: application
               trigger_prototypes:
                 -
                   uuid: 1e1f575f25d74f7480f9812b54ad8f39
@@ -224,8 +224,8 @@ zabbix_export:
               description: 'Indicates the number of threads waiting to complete an update of the database by writing their data to the log.'
               tags:
                 -
-                  tag: Application
-                  value: 'Database {#INSTANCE}'
+                  tag: component
+                  value: application
             -
               uuid: 9ad96174c29142f6904322d08d76fe8e
               name: 'Database Counters [{#INSTANCE}]: Active database read operations per second'
@@ -237,8 +237,8 @@ zabbix_export:
               description: 'Shows the number of database read operations.'
               tags:
                 -
-                  tag: Application
-                  value: 'Database {#INSTANCE}'
+                  tag: component
+                  value: application
             -
               uuid: 0df865f52f304f97aa01a706e455e153
               name: 'Database Counters [{#INSTANCE}]: Active database read operations latency'
@@ -256,8 +256,8 @@ zabbix_export:
                     - '0.001'
               tags:
                 -
-                  tag: Application
-                  value: 'Database {#INSTANCE}'
+                  tag: component
+                  value: application
               trigger_prototypes:
                 -
                   uuid: 85be5ba2d3e847a485c968ac47afc495
@@ -282,8 +282,8 @@ zabbix_export:
                     - '0.001'
               tags:
                 -
-                  tag: Application
-                  value: 'Database {#INSTANCE}'
+                  tag: component
+                  value: application
               trigger_prototypes:
                 -
                   uuid: 6a4fe761e26c4b6497106da05dac40fe
@@ -302,8 +302,8 @@ zabbix_export:
               description: 'Shows the number of database write operations per second for each attached database instance.'
               tags:
                 -
-                  tag: Application
-                  value: 'Database {#INSTANCE}'
+                  tag: component
+                  value: application
             -
               uuid: 9c83e27f56f94bea9e635158037a0c8b
               name: 'Database Counters [{#INSTANCE}]: Active database write operations latency'
@@ -321,8 +321,8 @@ zabbix_export:
                     - '0.001'
               tags:
                 -
-                  tag: Application
-                  value: 'Database {#INSTANCE}'
+                  tag: component
+                  value: application
               trigger_prototypes:
                 -
                   uuid: 6feb589776294bf0ab31a55af188f1f6
@@ -347,8 +347,8 @@ zabbix_export:
                     - '0.001'
               tags:
                 -
-                  tag: Application
-                  value: 'Database {#INSTANCE}'
+                  tag: component
+                  value: application
             -
               uuid: 9ef13ef1197a4ba1abba1591ae588fa8
               name: 'Information Store [{#INSTANCE}]: Active mailboxes count'
@@ -360,8 +360,8 @@ zabbix_export:
               description: 'Number of active mailboxes in this database.'
               tags:
                 -
-                  tag: Application
-                  value: 'Database {#INSTANCE}'
+                  tag: component
+                  value: application
             -
               uuid: 0e3dbea7e5694cc48c5216d92db67f7f
               name: 'Information Store [{#INSTANCE}]: Database state'
@@ -384,8 +384,8 @@ zabbix_export:
                     - 3m
               tags:
                 -
-                  tag: Application
-                  value: 'Database {#INSTANCE}'
+                  tag: component
+                  value: application
             -
               uuid: 4a08076fdfcb4226a122474f5c2e98d9
               name: 'Information Store [{#INSTANCE}]: RPC requests latency'
@@ -403,8 +403,8 @@ zabbix_export:
                     - '0.001'
               tags:
                 -
-                  tag: Application
-                  value: 'Database {#INSTANCE}'
+                  tag: component
+                  value: application
               trigger_prototypes:
                 -
                   uuid: 42009d7b910743e1803f10b6a918a67b
@@ -423,8 +423,8 @@ zabbix_export:
               description: 'Shows the number of RPC operations per second for each database instance.'
               tags:
                 -
-                  tag: Application
-                  value: 'Database {#INSTANCE}'
+                  tag: component
+                  value: application
             -
               uuid: 0f4970d43155441ab0f860e4e06328e0
               name: 'Information Store [{#INSTANCE}]: RPC requests total'
@@ -436,8 +436,8 @@ zabbix_export:
               description: 'Indicates the overall RPC requests currently executing within the information store process. Should be below 70 at all times.'
               tags:
                 -
-                  tag: Application
-                  value: 'Database {#INSTANCE}'
+                  tag: component
+                  value: application
               trigger_prototypes:
                 -
                   uuid: 127241a9e517424687e56eea393b11db
@@ -536,8 +536,8 @@ zabbix_export:
                     - '0.001'
               tags:
                 -
-                  tag: Application
-                  value: 'MS Exchange'
+                  tag: component
+                  value: application
               trigger_prototypes:
                 -
                   uuid: 3d49bb3d2bdd45998938e531dbaafd33
@@ -562,8 +562,8 @@ zabbix_export:
                     - '0.001'
               tags:
                 -
-                  tag: Application
-                  value: 'MS Exchange'
+                  tag: component
+                  value: application
               trigger_prototypes:
                 -
                   uuid: 8415fc742e154f9a9455ac9c0cdc85fd
@@ -606,8 +606,15 @@ zabbix_export:
               description: 'Shows the current number of connections established to the each Web Service.'
               tags:
                 -
-                  tag: Application
-                  value: 'MS Exchange'
+                  tag: component
+                  value: application
+      tags:
+        -
+          tag: class
+          value: application
+        -
+          tag: target
+          value: ms-exchange
       macros:
         -
           macro: '{$MS.EXCHANGE.DB.ACTIVE.READ.TIME}'
diff --git a/templates/app/ftp_service/README.md b/templates/app/ftp_service/README.md
new file mode 100644
index 00000000000..3d683e165fa
--- /dev/null
+++ b/templates/app/ftp_service/README.md
@@ -0,0 +1,39 @@
+
+# FTP Service
+
+## Overview
+
+For Zabbix version: 6.0 and higher  
+
+## Setup
+
+Refer to the vendor documentation.
+
+## Zabbix configuration
+
+No specific Zabbix configuration is required.
+
+
+## Template links
+
+There are no template links in this template.
+
+## Discovery rules
+
+
+## Items collected
+
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|Services |FTP service is running |<p>-</p> |SIMPLE |net.tcp.service[ftp] |
+
+## Triggers
+
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|FTP service is down on {HOST.NAME} |<p>-</p> |`max(/FTP Service/net.tcp.service[ftp],#3)=0` |AVERAGE | |
+
+## Feedback
+
+Please report any issues with the template at https://support.zabbix.com
+
diff --git a/templates/classic/template_app_ftp_service.yaml b/templates/app/ftp_service/template_app_ftp_service.yaml
index d582d9fa9b4..78b8c2fbe9f 100644
--- a/templates/classic/template_app_ftp_service.yaml
+++ b/templates/app/ftp_service/template_app_ftp_service.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:31Z'
+  version: '6.0'
+  date: '2022-01-26T10:00:29Z'
   groups:
     -
       uuid: 57b7ae836ca64446ba2c296389c009b7
@@ -10,6 +10,10 @@ zabbix_export:
       uuid: 3324b78f737e42fb8e6e05005c581b39
       template: 'FTP Service'
       name: 'FTP Service'
+      description: |
+        Template module for monitoring FTP service
+        
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Modules
@@ -24,14 +28,25 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: 'FTP service'
+              tag: component
+              value: network
           triggers:
             -
               uuid: b299d73cebcd430c8bfc54cf9b84e853
               expression: 'max(/FTP Service/net.tcp.service[ftp],#3)=0'
               name: 'FTP service is down on {HOST.NAME}'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: availability
+      tags:
+        -
+          tag: class
+          value: service
+        -
+          tag: target
+          value: ftp
       valuemaps:
         -
           uuid: c363fc0046f4493eb7ba6379c41d3e58
diff --git a/templates/app/generic_java_jmx/README.md b/templates/app/generic_java_jmx/README.md
index 27c46b0b762..134a8a01bc3 100644
--- a/templates/app/generic_java_jmx/README.md
+++ b/templates/app/generic_java_jmx/README.md
@@ -7,7 +7,6 @@ For Zabbix version: 6.0 and higher
 Official JMX Template from Zabbix distribution. Could be useful for many Java Applications (JMX).
 
 
-
 ## Setup
 
 Refer to the vendor documentation.
@@ -88,7 +87,7 @@ There are no template links in this template.
 |JMX |MemoryPool: Tenured Gen maximum size |<p>Maximum amount of memory that can be used for memory management. This amount of memory is not guaranteed to be available if it is greater than the amount of committed memory. The Java virtual machine may fail to allocate memory even if the amount of used memory does not exceed this maximum size.</p> |JMX |jmx["java.lang:type=MemoryPool,name=Tenured Gen","Usage.max"] |
 |JMX |MemoryPool: Tenured Gen used |<p>Current memory usage</p> |JMX |jmx["java.lang:type=MemoryPool,name=Tenured Gen","Usage.used"] |
 |JMX |OperatingSystem: File descriptors maximum count |<p>This is the number of file descriptors we can have opened in the same process, as determined by the operating system. You can never have more file descriptors than this number.</p> |JMX |jmx["java.lang:type=OperatingSystem","MaxFileDescriptorCount"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `10m`</p> |
-|JMX |OperatingSystem: File descriptors opened |<p>This is the number of opened file descriptors at the moment, if this reaches the MaxFileDescriptorCount, the application will throw an IOException: Too many open files. This could mean you’re are opening file descriptors and never closing them.</p> |JMX |jmx["java.lang:type=OperatingSystem","OpenFileDescriptorCount"] |
+|JMX |OperatingSystem: File descriptors opened |<p>This is the number of opened file descriptors at the moment, if this reaches the MaxFileDescriptorCount, the application will throw an IOException: Too many open files. This could mean you're are opening file descriptors and never closing them.</p> |JMX |jmx["java.lang:type=OperatingSystem","OpenFileDescriptorCount"] |
 |JMX |OperatingSystem: Process CPU Load |<p>ProcessCpuLoad represents the CPU load in this process.</p> |JMX |jmx["java.lang:type=OperatingSystem","ProcessCpuLoad"]<p>**Preprocessing**:</p><p>- MULTIPLIER: `100`</p> |
 |JMX |Runtime: JVM uptime |<p>-</p> |JMX |jmx["java.lang:type=Runtime","Uptime"]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p> |
 |JMX |Runtime: JVM name |<p>-</p> |JMX |jmx["java.lang:type=Runtime","VmName"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `30m`</p> |
diff --git a/templates/app/generic_java_jmx/template_app_generic_java_jmx.yaml b/templates/app/generic_java_jmx/template_app_generic_java_jmx.yaml
index ebe98df581d..7200074fe43 100644
--- a/templates/app/generic_java_jmx/template_app_generic_java_jmx.yaml
+++ b/templates/app/generic_java_jmx/template_app_generic_java_jmx.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-15T06:57:03Z'
+  date: '2022-01-26T10:00:40Z'
   groups:
     -
       uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
@@ -10,7 +10,7 @@ zabbix_export:
       uuid: 72aab08f7f27406a8f2c291648e5ba95
       template: 'Generic Java JMX'
       name: 'Generic Java JMX'
-      description: 'Template tooling version used: 0.40'
+      description: 'Template tooling version used: 0.41'
       groups:
         -
           name: Templates/Applications
@@ -30,8 +30,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: JMX
+              tag: component
+              value: class
         -
           uuid: fc79c5ac074f4266a88d5c239fa0fb70
           name: 'ClassLoading: Total loaded class count'
@@ -47,8 +47,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: JMX
+              tag: component
+              value: class
         -
           uuid: b7620bdebd044fb1b1d2cb293ea8912c
           name: 'ClassLoading: Unloaded class count'
@@ -64,8 +64,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: JMX
+              tag: component
+              value: class
         -
           uuid: 0d6880c07fcd42bebddc41f5f2eb7bdd
           name: 'Compilation: Name of the current JIT compiler'
@@ -83,8 +83,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: JMX
+              tag: component
+              value: compilation
           triggers:
             -
               uuid: 691f051584d74995b757b4be5e3824fe
@@ -92,6 +92,10 @@ zabbix_export:
               name: 'Compilation: {HOST.NAME} uses suboptimal JIT compiler'
               priority: INFO
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: c097ea2de6034d1d94f528533562b896
           name: 'Compilation: Accumulated time spent'
@@ -113,8 +117,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: JMX
+              tag: component
+              value: compilation
         -
           uuid: 4cbe63dbe9184a0ba4df8cedbd86c2e8
           name: 'GarbageCollector: ConcurrentMarkSweep number of collections per second'
@@ -131,8 +135,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: JMX
+              tag: component
+              value: garbage-collector
         -
           uuid: 133c53c035df4e83b6bf99a98f3f5ee0
           name: 'GarbageCollector: ConcurrentMarkSweep accumulated time spent in collection'
@@ -154,8 +158,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: JMX
+              tag: component
+              value: garbage-collector
         -
           uuid: 2b378c3a34ae40fd9d2425298514860e
           name: 'GarbageCollector: Copy number of collections per second'
@@ -172,8 +176,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: JMX
+              tag: component
+              value: garbage-collector
         -
           uuid: 253cd639242848a1905b22b821951f9c
           name: 'GarbageCollector: Copy accumulated time spent in collection'
@@ -195,8 +199,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: JMX
+              tag: component
+              value: garbage-collector
         -
           uuid: fc7adc1d5bab4bd28481b6e37d82210b
           name: 'GarbageCollector: MarkSweepCompact number of collections per second'
@@ -213,8 +217,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: JMX
+              tag: component
+              value: garbage-collector
         -
           uuid: ce72ee1080114604b42fc0c5b9c4b283
           name: 'GarbageCollector: MarkSweepCompact accumulated time spent in collection'
@@ -236,8 +240,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: JMX
+              tag: component
+              value: garbage-collector
         -
           uuid: d55858afe5d14098a75918a4719a4d00
           name: 'GarbageCollector: ParNew number of collections per second'
@@ -254,8 +258,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: JMX
+              tag: component
+              value: garbage-collector
         -
           uuid: 00f5d02eddbe4bac8816c11da6336600
           name: 'GarbageCollector: ParNew accumulated time spent in collection'
@@ -277,8 +281,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: JMX
+              tag: component
+              value: garbage-collector
         -
           uuid: 65f874c8707d44f3ac35e6a48868c3e7
           name: 'GarbageCollector: PS MarkSweep number of collections per second'
@@ -295,8 +299,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: JMX
+              tag: component
+              value: garbage-collector
         -
           uuid: cd4c77af696b4312b2cf050e954bc5c4
           name: 'GarbageCollector: PS MarkSweep accumulated time spent in collection'
@@ -318,8 +322,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: JMX
+              tag: component
+              value: garbage-collector
         -
           uuid: 161555b8c92346e0a4ea51349d99b7af
           name: 'GarbageCollector: PS Scavenge number of collections per second'
@@ -336,8 +340,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: JMX
+              tag: component
+              value: garbage-collector
         -
           uuid: fd1b0b7149bb41b3a2ba674ae83799d2
           name: 'GarbageCollector: PS Scavenge accumulated time spent in collection'
@@ -359,8 +363,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: JMX
+              tag: component
+              value: garbage-collector
         -
           uuid: d98a8d00639742f4b62a29e0c7394d61
           name: 'Memory: Heap memory committed'
@@ -372,8 +376,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: JMX
+              tag: component
+              value: memory
         -
           uuid: e757e0d3d72548df97066632448dd18c
           name: 'Memory: Heap memory maximum size'
@@ -390,8 +394,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: JMX
+              tag: component
+              value: memory
         -
           uuid: 0c24cd559cd74ddb9ff0b167a3d37c23
           name: 'Memory: Heap memory used'
@@ -408,8 +412,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: JMX
+              tag: component
+              value: memory
         -
           uuid: 50bb1ecb0a2141bbba128dfc842a1e34
           name: 'Memory: Non-Heap memory committed'
@@ -426,8 +430,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: JMX
+              tag: component
+              value: memory
         -
           uuid: 0c6301dfec1c4e6c8ab26091e9372e91
           name: 'Memory: Non-Heap memory maximum size'
@@ -444,8 +448,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: JMX
+              tag: component
+              value: memory
         -
           uuid: 58d2bb1791994cbcacb75d029ed8a21b
           name: 'Memory: Non-Heap memory used'
@@ -462,8 +466,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: JMX
+              tag: component
+              value: memory
         -
           uuid: e309472afb794a2c9cd581275931db79
           name: 'Memory: Object pending finalization count'
@@ -479,8 +483,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: JMX
+              tag: component
+              value: memory
         -
           uuid: 5b5b9458cc284cbe90a4732a656c5745
           name: 'MemoryPool: CMS Old Gen committed'
@@ -497,8 +501,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: JMX
+              tag: component
+              value: memory-pool
         -
           uuid: 60ee3f05569f4b99809090d8b5e06f44
           name: 'MemoryPool: CMS Old Gen maximum size'
@@ -510,8 +514,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: JMX
+              tag: component
+              value: memory-pool
         -
           uuid: 31fbaf48b1634d9b8c3cdbb8155f0347
           name: 'MemoryPool: CMS Old Gen used'
@@ -523,8 +527,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: JMX
+              tag: component
+              value: memory-pool
         -
           uuid: 02e3dc52db244bda9fbcb7e926fbb7fa
           name: 'MemoryPool: CMS Perm Gen committed'
@@ -541,8 +545,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: JMX
+              tag: component
+              value: memory-pool
         -
           uuid: cb595bbf821f44e8b00aee3217070be5
           name: 'MemoryPool: CMS Perm Gen maximum size'
@@ -554,8 +558,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: JMX
+              tag: component
+              value: memory-pool
         -
           uuid: ff3ca233f45b473e8952632d515dbdc1
           name: 'MemoryPool: CMS Perm Gen used'
@@ -567,8 +571,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: JMX
+              tag: component
+              value: memory-pool
         -
           uuid: 9012e9453bb7442fb87aca747c148ed7
           name: 'MemoryPool: Code Cache committed'
@@ -585,8 +589,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: JMX
+              tag: component
+              value: memory-pool
         -
           uuid: a6282cd5464747ec955597d933192f18
           name: 'MemoryPool: CodeCache maximum size'
@@ -598,8 +602,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: JMX
+              tag: component
+              value: memory-pool
         -
           uuid: a004c3a23c2d476ca12c0b6bf4d64ebd
           name: 'MemoryPool: Code Cache used'
@@ -611,8 +615,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: JMX
+              tag: component
+              value: memory-pool
         -
           uuid: 119045200b08450b87e35c5580d24162
           name: 'MemoryPool: Perm Gen committed'
@@ -629,8 +633,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: JMX
+              tag: component
+              value: memory-pool
         -
           uuid: 8ca9e2beaa6d48fbb87fc78967c2d544
           name: 'MemoryPool: Perm Gen maximum size'
@@ -642,8 +646,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: JMX
+              tag: component
+              value: memory-pool
         -
           uuid: e17f81cd11b34eb6ae26e46a157cb84b
           name: 'MemoryPool: Perm Gen used'
@@ -655,8 +659,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: JMX
+              tag: component
+              value: memory-pool
         -
           uuid: 26edef50a85745a488b92ab22094edcd
           name: 'MemoryPool: PS Old Gen'
@@ -673,8 +677,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: JMX
+              tag: component
+              value: memory-pool
         -
           uuid: a708c5a695d6441e984d8d24c58f9971
           name: 'MemoryPool: PS Old Gen maximum size'
@@ -686,8 +690,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: JMX
+              tag: component
+              value: memory-pool
         -
           uuid: e4eb87b021aa49fb88e6b97e33dd2392
           name: 'MemoryPool: PS Old Gen used'
@@ -699,8 +703,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: JMX
+              tag: component
+              value: memory-pool
         -
           uuid: 97022584d6314efaaabb216fd28ed3a0
           name: 'MemoryPool: PS Perm Gen committed'
@@ -717,8 +721,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: JMX
+              tag: component
+              value: memory-pool
         -
           uuid: d6f6c199bd7f4eb6a24a75933a53aa3b
           name: 'MemoryPool: PS Perm Gen maximum size'
@@ -730,8 +734,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: JMX
+              tag: component
+              value: memory-pool
         -
           uuid: 598378a9571943e2925951f381616ea3
           name: 'MemoryPool: PS Perm Gen used'
@@ -743,8 +747,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: JMX
+              tag: component
+              value: memory-pool
         -
           uuid: 088933bc2f5d46008ae26f95e1a07ace
           name: 'MemoryPool: Tenured Gen committed'
@@ -761,8 +765,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: JMX
+              tag: component
+              value: memory-pool
         -
           uuid: 0eddc89e4c6640dea5f958e75b779225
           name: 'MemoryPool: Tenured Gen maximum size'
@@ -774,8 +778,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: JMX
+              tag: component
+              value: memory-pool
         -
           uuid: 08cc0edf464c41dc9e19cbcf14c23012
           name: 'MemoryPool: Tenured Gen used'
@@ -787,8 +791,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: JMX
+              tag: component
+              value: memory-pool
         -
           uuid: 4c847c1239654be7b4f4d03fbb45ea4f
           name: 'OperatingSystem: File descriptors maximum count'
@@ -804,20 +808,20 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: JMX
+              tag: component
+              value: os
         -
           uuid: f72ee698db964f3c9ce84bbb4a1274d7
           name: 'OperatingSystem: File descriptors opened'
           type: JMX
           key: 'jmx["java.lang:type=OperatingSystem","OpenFileDescriptorCount"]'
           history: 7d
-          description: 'This is the number of opened file descriptors at the moment, if this reaches the MaxFileDescriptorCount, the application will throw an IOException: Too many open files. This could mean you’re are opening file descriptors and never closing them.'
+          description: 'This is the number of opened file descriptors at the moment, if this reaches the MaxFileDescriptorCount, the application will throw an IOException: Too many open files. This could mean you''re are opening file descriptors and never closing them.'
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: JMX
+              tag: component
+              value: os
         -
           uuid: 3c252493c9304aabbb2930b9a82a1cbf
           name: 'OperatingSystem: Process CPU Load'
@@ -835,14 +839,18 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: JMX
+              tag: component
+              value: os
           triggers:
             -
               uuid: cc6cc7942e434b8589ff28a0b3112fc7
               expression: 'min(/Generic Java JMX/jmx["java.lang:type=OperatingSystem","ProcessCpuLoad"],{$JMX.CPU.LOAD.TIME})>{$JMX.CPU.LOAD.MAX}'
               name: 'OperatingSystem: Process CPU Load more than {$JMX.CPU.LOAD.MAX}% for {$JMX.CPU.LOAD.TIME}'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: capacity
         -
           uuid: 00007954da00442b9631e15995ef6cab
           name: 'Runtime: JVM uptime'
@@ -857,8 +865,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: JMX
+              tag: component
+              value: runtime
           triggers:
             -
               uuid: c82c23dc5be34bb68ec8b152b3be367b
@@ -866,6 +874,10 @@ zabbix_export:
               name: 'Runtime: JVM is not reachable'
               priority: AVERAGE
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: e824c36de524425eaac253bcf3a1f3ec
           name: 'Runtime: JVM name'
@@ -883,8 +895,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: JMX
+              tag: component
+              value: runtime
           triggers:
             -
               uuid: 560edfbeb7654f1eb7315389f08ef1b3
@@ -892,6 +904,10 @@ zabbix_export:
               name: 'Runtime: {HOST.NAME} runs suboptimal VM type'
               priority: INFO
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: a8675d659349414fa10cc11a1cd4ddd7
           name: 'Runtime: JVM version'
@@ -909,8 +925,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: JMX
+              tag: component
+              value: runtime
         -
           uuid: f2f0836103ea4358a740abc0010336ca
           name: 'Threading: Daemon thread count'
@@ -926,8 +942,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: JMX
+              tag: component
+              value: threading
         -
           uuid: 1793243b7ed147f1a182876fda905ebc
           name: 'Threading: Peak thread count'
@@ -938,8 +954,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: JMX
+              tag: component
+              value: threading
         -
           uuid: ca198e0473384025aecbc16913800c0c
           name: 'Threading: Thread count'
@@ -950,8 +966,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: JMX
+              tag: component
+              value: threading
         -
           uuid: 9db83653dfa6449c95ffec2b0e6c8b5d
           name: 'Threading: Total started thread count'
@@ -962,8 +978,15 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: JMX
+              tag: component
+              value: threading
+      tags:
+        -
+          tag: class
+          value: software
+        -
+          tag: target
+          value: java
       macros:
         -
           macro: '{$JMX.CPU.LOAD.MAX}'
@@ -1011,66 +1034,118 @@ zabbix_export:
       expression: 'last(/Generic Java JMX/jmx["java.lang:type=GarbageCollector,name=ConcurrentMarkSweep","CollectionCount"])>last(/Generic Java JMX/jmx["java.lang:type=GarbageCollector,name=ParNew","CollectionCount"])'
       name: 'GarbageCollector: Concurrent Mark Sweep in fire fighting mode'
       priority: AVERAGE
+      tags:
+        -
+          tag: scope
+          value: performance
     -
       uuid: 32f2c8687d634240b430bbbd7881e0d8
       expression: 'last(/Generic Java JMX/jmx["java.lang:type=GarbageCollector,name=MarkSweepCompact","CollectionCount"])>last(/Generic Java JMX/jmx["java.lang:type=GarbageCollector,name=Copy","CollectionCount"])'
       name: 'GarbageCollector: Mark Sweep Compact in fire fighting mode'
       priority: AVERAGE
+      tags:
+        -
+          tag: scope
+          value: performance
     -
       uuid: 3dd80e3ba2b843e1b26212239c23ca24
       expression: 'last(/Generic Java JMX/jmx["java.lang:type=GarbageCollector,name=PS MarkSweep","CollectionCount"])>last(/Generic Java JMX/jmx["java.lang:type=GarbageCollector,name=PS Scavenge","CollectionCount"])'
       name: 'GarbageCollector: PS Mark Sweep in fire fighting mode'
       priority: AVERAGE
+      tags:
+        -
+          tag: scope
+          value: performance
     -
       uuid: 69fda060b5004d12b6af0ba5f73cec6d
       expression: 'min(/Generic Java JMX/jmx["java.lang:type=Memory","HeapMemoryUsage.used"],{$JMX.HEAP.MEM.USAGE.TIME})>(last(/Generic Java JMX/jmx["java.lang:type=Memory","HeapMemoryUsage.max"])*{$JMX.HEAP.MEM.USAGE.MAX}/100)'
       name: 'Memory: Heap memory usage more than {$JMX.HEAP.USAGE.MAX}% for {$JMX.HEAP.MEM.USAGE.TIME}'
       priority: WARNING
+      tags:
+        -
+          tag: scope
+          value: capacity
     -
       uuid: 2b4dfda1100d4feeaa66218e57786f38
       expression: 'min(/Generic Java JMX/jmx["java.lang:type=Memory","NonHeapMemoryUsage.used"],{$JMX.NONHEAP.MEM.USAGE.TIME})>(last(/Generic Java JMX/jmx["java.lang:type=Memory","NonHeapMemoryUsage.max"])*{$JMX.NONHEAP.MEM.USAGE.MAX}/100)'
       name: 'Memory: Non-Heap memory usage more than {$JMX.NONHEAP.MEM.USAGE.MAX}% for {$JMX.NONHEAP.MEM.USAGE.TIME}'
       priority: WARNING
+      tags:
+        -
+          tag: scope
+          value: capacity
     -
       uuid: e8efca02403d44de916b6266e06dd230
       expression: 'min(/Generic Java JMX/jmx["java.lang:type=MemoryPool,name=CMS Old Gen","Usage.used"],{$JMX.MP.USAGE.TIME:"CMS Old Gen"})>(last(/Generic Java JMX/jmx["java.lang:type=MemoryPool,name=CMS Old Gen","Usage.max"])*{$JMX.MP.USAGE.MAX:"CMS Old Gen"}/100)'
       name: 'MemoryPool: CMS Old Gen memory usage more than {$JMX.MP.USAGE.MAX:"CMS Old Gen"}% for {$JMX.MP.USAGE.TIME:"CMS Old Gen"}'
       priority: WARNING
+      tags:
+        -
+          tag: scope
+          value: capacity
     -
       uuid: 1c2d038eaa8546ee81e5498ee1b67433
       expression: 'min(/Generic Java JMX/jmx["java.lang:type=MemoryPool,name=CMS Perm Gen","Usage.used"],{$JMX.MP.USAGE.TIME:"CMS Perm Gen"})>(last(/Generic Java JMX/jmx["java.lang:type=MemoryPool,name=CMS Perm Gen","Usage.max"])*{$JMX.MP.USAGE.MAX:"CMS Perm Gen"}/100)'
       name: 'MemoryPool: CMS Perm Gen memory usage more than {$JMX.MP.USAGE.MAX:"CMS Perm Gen"}% for {$JMX.MP.USAGE.TIME:"CMS Perm Gen"}'
       priority: WARNING
+      tags:
+        -
+          tag: scope
+          value: capacity
     -
       uuid: 2624989d3a3340c1b8bcb3ba8e2c2a4a
       expression: 'min(/Generic Java JMX/jmx["java.lang:type=MemoryPool,name=Code Cache","Usage.used"],{$JMX.MP.USAGE.TIME:"Code Cache"})>(last(/Generic Java JMX/jmx["java.lang:type=MemoryPool,name=Code Cache","Usage.max"])*{$JMX.MP.USAGE.MAX:"Code Cache"}/100)'
       name: 'MemoryPool: Code Cache memory usage more than {$JMX.MP.USAGE.MAX:"Code Cache"}% for {$JMX.MP.USAGE.TIME:"Code Cache"}'
       priority: WARNING
+      tags:
+        -
+          tag: scope
+          value: capacity
     -
       uuid: 385f7b11df2c42d19a52502bd63c861f
       expression: 'min(/Generic Java JMX/jmx["java.lang:type=MemoryPool,name=Perm Gen","Usage.used"],{$JMX.MP.USAGE.TIME:"Perm Gen"})>(last(/Generic Java JMX/jmx["java.lang:type=MemoryPool,name=Perm Gen","Usage.max"])*{$JMX.MP.USAGE.MAX:"Perm Gen"}/100)'
       name: 'MemoryPool: Perm Gen memory usage more than {$JMX.MP.USAGE.MAX:"Perm Gen"}% for {$JMX.MP.USAGE.TIME:"Perm Gen"}'
       priority: WARNING
+      tags:
+        -
+          tag: scope
+          value: capacity
     -
       uuid: 00f060e8925946c3a1d9b0cdfae10f59
       expression: 'min(/Generic Java JMX/jmx["java.lang:type=MemoryPool,name=PS Old Gen","Usage.used"],{$JMX.MP.USAGE.TIME:"PS Old Gen"})>(last(/Generic Java JMX/jmx["java.lang:type=MemoryPool,name=PS Old Gen","Usage.max"])*{$JMX.MP.USAGE.MAX:"PS Old Gen"}/100)'
       name: 'MemoryPool: PS Old Gen memory usage more than {$JMX.MP.USAGE.MAX:"PS Old Gen"}% for {$JMX.MP.USAGE.TIME:"PS Old Gen"}'
       priority: WARNING
+      tags:
+        -
+          tag: scope
+          value: capacity
     -
       uuid: 2e10427bbac64a7a9d44344b6c862952
       expression: 'min(/Generic Java JMX/jmx["java.lang:type=MemoryPool,name=PS Perm Gen","Usage.used"],{$JMX.MP.USAGE.TIME:"PS Perm Gen"})>(last(/Generic Java JMX/jmx["java.lang:type=MemoryPool,name=PS Perm Gen","Usage.max"])*{$JMX.MP.USAGE.MAX:"PS Perm Gen"}/100)'
       name: 'MemoryPool: PS Perm Gen memory usage more than {$JMX.MP.USAGE.MAX:"PS Perm Gen"}% for {$JMX.MP.USAGE.TIME:"PS Perm Gen"}'
       priority: WARNING
+      tags:
+        -
+          tag: scope
+          value: capacity
     -
       uuid: ed73f2cee57c4f7d8c581190bd9a70a6
       expression: 'min(/Generic Java JMX/jmx["java.lang:type=MemoryPool,name=Tenured Gen","Usage.used"],{$JMX.MP.USAGE.TIME:"Tenured Gen"})>(last(/Generic Java JMX/jmx["java.lang:type=MemoryPool,name=Tenured Gen","Usage.max"])*{$JMX.MP.USAGE.MAX:"Tenured Gen"}/100)'
       name: 'MemoryPool: Tenured Gen memory usage more than {$JMX.MP.USAGE.MAX:"Tenured Gen"}% for {$JMX.MP.USAGE.TIME:"Tenured Gen"}'
       priority: WARNING
+      tags:
+        -
+          tag: scope
+          value: capacity
     -
       uuid: 726a3b8a6209451b9a6cca63a3195a0c
       expression: 'min(/Generic Java JMX/jmx["java.lang:type=OperatingSystem","OpenFileDescriptorCount"],{$JMX.FILE.DESCRIPTORS.TIME})>(last(/Generic Java JMX/jmx["java.lang:type=OperatingSystem","MaxFileDescriptorCount"])*{$JMX.FILE.DESCRIPTORS.MAX}/100)'
       name: 'OperatingSystem: Opened file descriptor count more than {$JMX.FILE.DESCRIPTORS.MAX}% of maximum'
       priority: WARNING
+      tags:
+        -
+          tag: scope
+          value: capacity
   graphs:
     -
       uuid: 69184fc10a914cc78637625cc6cc554c
diff --git a/templates/app/gitlab_http/template_app_gitlab_http.yaml b/templates/app/gitlab_http/template_app_gitlab_http.yaml
index 3acf7ed0ae0..9d526a78f3b 100644
--- a/templates/app/gitlab_http/template_app_gitlab_http.yaml
+++ b/templates/app/gitlab_http/template_app_gitlab_http.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-15T08:29:12Z'
+  date: '2022-01-26T10:01:54Z'
   groups:
     -
       uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
@@ -20,7 +20,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Applications
@@ -47,8 +47,8 @@ zabbix_export:
             key: gitlab.get_metrics
           tags:
             -
-              tag: Application
-              value: GitLab
+              tag: component
+              value: cache
         -
           uuid: 9c507412d4544a37bdad49ba47c48302
           name: 'GitLab: Cache: Operations rate, total'
@@ -71,8 +71,8 @@ zabbix_export:
             key: gitlab.get_metrics
           tags:
             -
-              tag: Application
-              value: GitLab
+              tag: component
+              value: cache
         -
           uuid: 2d46dc855ca741839cfe1a19e0dc892f
           name: 'GitLab: Database: Connection pool, busy'
@@ -90,8 +90,8 @@ zabbix_export:
             key: gitlab.get_metrics
           tags:
             -
-              tag: Application
-              value: GitLab
+              tag: component
+              value: database
         -
           uuid: 6ee7a1d3ab20463d83602b751381d821
           name: 'GitLab: Database: Connection pool, current'
@@ -109,8 +109,8 @@ zabbix_export:
             key: gitlab.get_metrics
           tags:
             -
-              tag: Application
-              value: GitLab
+              tag: component
+              value: database
         -
           uuid: 561a1f54c98d4a2b828fe644961404be
           name: 'GitLab: Database: Connection pool, dead'
@@ -128,8 +128,8 @@ zabbix_export:
             key: gitlab.get_metrics
           tags:
             -
-              tag: Application
-              value: GitLab
+              tag: component
+              value: database
         -
           uuid: 3a0b5c8de88b41fa9ebf6f3fca63833e
           name: 'GitLab: Database: Connection pool, idle'
@@ -147,8 +147,8 @@ zabbix_export:
             key: gitlab.get_metrics
           tags:
             -
-              tag: Application
-              value: GitLab
+              tag: component
+              value: database
         -
           uuid: fd1458232de34981a9a00be820e123f1
           name: 'GitLab: Database: Connection pool, size'
@@ -166,8 +166,8 @@ zabbix_export:
             key: gitlab.get_metrics
           tags:
             -
-              tag: Application
-              value: GitLab
+              tag: component
+              value: database
         -
           uuid: 501a2f646ced4207a32a24e900310440
           name: 'GitLab: Database: Connection pool, waiting'
@@ -185,8 +185,8 @@ zabbix_export:
             key: gitlab.get_metrics
           tags:
             -
-              tag: Application
-              value: GitLab
+              tag: component
+              value: database
         -
           uuid: 71a5f82d11914b12a86008bfd488fb1e
           name: 'GitLab: Version'
@@ -210,8 +210,8 @@ zabbix_export:
             key: gitlab.get_metrics
           tags:
             -
-              tag: Application
-              value: GitLab
+              tag: component
+              value: application
           triggers:
             -
               uuid: 88d7ceb3a683436da666e8802b2d29b5
@@ -220,6 +220,10 @@ zabbix_export:
               priority: INFO
               description: 'GitLab version has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 3e409938aba24445a11012bcbf8aa113
           name: 'GitLab: User CAPTCHA logins failed, total'
@@ -238,8 +242,8 @@ zabbix_export:
             key: gitlab.get_metrics
           tags:
             -
-              tag: Application
-              value: GitLab
+              tag: component
+              value: sessions
         -
           uuid: 2aa509b84dc14026b8ff8ed473add2d2
           name: 'GitLab: Get instance metrics'
@@ -260,8 +264,8 @@ zabbix_export:
           url: '{$GITLAB.URL}/-/metrics'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
         -
           uuid: 3ff4d9793af94d339ca225aaf9200554
           name: 'GitLab: HTTP requests rate, 4xx'
@@ -286,8 +290,11 @@ zabbix_export:
             key: gitlab.get_metrics
           tags:
             -
-              tag: Application
-              value: GitLab
+              tag: component
+              value: requests
+            -
+              tag: http-code
+              value: 4xx
         -
           uuid: d0fa18012d6a4b0ba6620b0ef6cb9aef
           name: 'GitLab: HTTP requests rate, 5xx'
@@ -312,8 +319,11 @@ zabbix_export:
             key: gitlab.get_metrics
           tags:
             -
-              tag: Application
-              value: GitLab
+              tag: component
+              value: requests
+            -
+              tag: http-code
+              value: 5xx
           triggers:
             -
               uuid: 7021e3b0b49a4990a1d8ce356b7ae130
@@ -321,6 +331,10 @@ zabbix_export:
               name: 'GitLab: Too many HTTP requests failures (over {$GITLAB.HTTP.FAIL.MAX.WARN} for 5m)'''
               priority: WARNING
               description: '"Too many requests failed on GitLab instance with 5xx HTTP code"'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 2d739e4bedb24b50ab6adfdfdeb39da9
           name: 'GitLab: HTTP requests rate, total'
@@ -344,8 +358,8 @@ zabbix_export:
             key: gitlab.get_metrics
           tags:
             -
-              tag: Application
-              value: GitLab
+              tag: component
+              value: requests
         -
           uuid: c48920e302ff4b9ab16f45b67775b440
           name: 'GitLab: Application server status'
@@ -379,8 +393,8 @@ zabbix_export:
           url: '{$GITLAB.URL}/-/liveness'
           tags:
             -
-              tag: Application
-              value: GitLab
+              tag: component
+              value: health
           triggers:
             -
               uuid: 2f1eb8d6c89a4d8cbda0e951d3f6a109
@@ -388,6 +402,10 @@ zabbix_export:
               name: 'GitLab: Liveness check was failed'
               priority: HIGH
               description: 'The application server is not running or Rails Controllers are deadlocked.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 7ef7142babfd4bc2b5b25be541c0511f
           name: 'GitLab: Pipelines: Auto DevOps pipelines, total'
@@ -406,8 +424,8 @@ zabbix_export:
             key: gitlab.get_metrics
           tags:
             -
-              tag: Application
-              value: GitLab
+              tag: component
+              value: pipelines
         -
           uuid: 0ffa0a5c108644508252a03469e4f394
           name: 'GitLab: Pipelines: Auto DevOps pipelines, failed'
@@ -426,8 +444,8 @@ zabbix_export:
             key: gitlab.get_metrics
           tags:
             -
-              tag: Application
-              value: GitLab
+              tag: component
+              value: pipelines
         -
           uuid: f4265a3167a245c4998958106f6ee265
           name: 'GitLab: Pipelines: Created, total'
@@ -446,8 +464,8 @@ zabbix_export:
             key: gitlab.get_metrics
           tags:
             -
-              tag: Application
-              value: GitLab
+              tag: component
+              value: pipelines
         -
           uuid: 23cb22f8f81e461c86f72a92cdfde7a5
           name: 'GitLab: Pipelines: CI/CD creation duration'
@@ -468,8 +486,8 @@ zabbix_export:
             key: gitlab.get_metrics
           tags:
             -
-              tag: Application
-              value: GitLab
+              tag: component
+              value: pipelines
         -
           uuid: 91c3acbb82524244a1ac400587641ffa
           name: 'GitLab: Pipelines: Pipelines: CI/CD creation count'
@@ -489,8 +507,8 @@ zabbix_export:
             key: gitlab.get_metrics
           tags:
             -
-              tag: Application
-              value: GitLab
+              tag: component
+              value: pipelines
         -
           uuid: c80453c338814951a9e97d9f37e7d68f
           name: 'GitLab: Pipelines: Processing events, total'
@@ -509,8 +527,8 @@ zabbix_export:
             key: gitlab.get_metrics
           tags:
             -
-              tag: Application
-              value: GitLab
+              tag: component
+              value: pipelines
         -
           uuid: 794a8d7f474d490c96e714dac810140d
           name: 'GitLab: Instance readiness check'
@@ -544,8 +562,8 @@ zabbix_export:
           url: '{$GITLAB.URL}/-/readiness'
           tags:
             -
-              tag: Application
-              value: GitLab
+              tag: component
+              value: health
           triggers:
             -
               uuid: 11ff325698534dcd8bbaa12c86704069
@@ -556,6 +574,10 @@ zabbix_export:
                 -
                   name: 'GitLab: Liveness check was failed'
                   expression: 'last(/GitLab by HTTP/gitlab.liveness)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 173b8d5e108f471fbf4c1267dcb9cc37
           name: 'GitLab: Redis: Client exceptions rate, cache'
@@ -579,8 +601,8 @@ zabbix_export:
             key: gitlab.get_metrics
           tags:
             -
-              tag: Application
-              value: GitLab
+              tag: component
+              value: redis
           triggers:
             -
               uuid: a7e460f174fd4e16b2358fd3867390b4
@@ -588,6 +610,10 @@ zabbix_export:
               name: 'GitLab: Too many Redis cache client exceptions (over {$GITLAB.REDIS.FAIL.MAX.WARN} for 5m)'
               priority: WARNING
               description: '"Too many  Redis client exceptions during  to requests to  Redis instance cache."'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 0bff591252dc4cc497527afb1f7d96b2
           name: 'GitLab: Redis: Client exceptions rate, queues'
@@ -611,8 +637,8 @@ zabbix_export:
             key: gitlab.get_metrics
           tags:
             -
-              tag: Application
-              value: GitLab
+              tag: component
+              value: redis
           triggers:
             -
               uuid: 36ec79901f324f27992ea68274eedb71
@@ -620,6 +646,10 @@ zabbix_export:
               name: 'GitLab: Too many Redis queues client exceptions (over {$GITLAB.REDIS.FAIL.MAX.WARN} for 5m)'
               priority: WARNING
               description: '"Too many  Redis client exceptions during  to requests to  Redis instance queues."'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 800b429ea1d044e6a685bc51706f8547
           name: 'GitLab: Redis: client exceptions rate, shared_state'
@@ -643,8 +673,8 @@ zabbix_export:
             key: gitlab.get_metrics
           tags:
             -
-              tag: Application
-              value: GitLab
+              tag: component
+              value: redis
           triggers:
             -
               uuid: b475d6ecbc564f9b8f7fe9b24bcdf013
@@ -652,6 +682,10 @@ zabbix_export:
               name: 'GitLab: Too many Redis shared_state client exceptions (over {$GITLAB.REDIS.FAIL.MAX.WARN} for 5m)'
               priority: WARNING
               description: '"Too many  Redis client exceptions during  to requests to  Redis instance shared_state."'
+              tags:
+                -
+                  tag: component
+                  value: redis
         -
           uuid: 7dcc638e1c174dd5975f85551211a3ba
           name: 'GitLab: Redis: Client requests rate, cache'
@@ -676,8 +710,8 @@ zabbix_export:
             key: gitlab.get_metrics
           tags:
             -
-              tag: Application
-              value: GitLab
+              tag: component
+              value: redis
         -
           uuid: f613303925db46958d181c379e22f942
           name: 'GitLab: Redis: Client requests rate, queues'
@@ -702,8 +736,8 @@ zabbix_export:
             key: gitlab.get_metrics
           tags:
             -
-              tag: Application
-              value: GitLab
+              tag: component
+              value: redis
         -
           uuid: 3ae46654b46e4c769a7308879bc64890
           name: 'GitLab: Redis: Client requests rate, shared_state'
@@ -728,8 +762,8 @@ zabbix_export:
             key: gitlab.get_metrics
           tags:
             -
-              tag: Application
-              value: GitLab
+              tag: component
+              value: redis
         -
           uuid: 950d48c3b5034e769b2bf6a7110ece02
           name: 'GitLab: Ruby: File descriptors opened, avg'
@@ -748,8 +782,8 @@ zabbix_export:
             key: gitlab.get_metrics
           tags:
             -
-              tag: Application
-              value: GitLab
+              tag: component
+              value: fds
         -
           uuid: 67ed35c3f5f444b2b10fb462838758ac
           name: 'GitLab: Ruby: File descriptors opened, max'
@@ -768,8 +802,8 @@ zabbix_export:
             key: gitlab.get_metrics
           tags:
             -
-              tag: Application
-              value: GitLab
+              tag: component
+              value: fds
         -
           uuid: b1576e2b47bd448293c3e88885bfc87e
           name: 'GitLab: Ruby: File descriptors opened, min'
@@ -788,8 +822,8 @@ zabbix_export:
             key: gitlab.get_metrics
           tags:
             -
-              tag: Application
-              value: GitLab
+              tag: component
+              value: fds
         -
           uuid: 98feff3bfe0d4a9ea88733ae8fef8769
           name: 'GitLab: Ruby: CPU  usage per second'
@@ -814,8 +848,8 @@ zabbix_export:
             key: gitlab.get_metrics
           tags:
             -
-              tag: Application
-              value: GitLab
+              tag: component
+              value: cpu
         -
           uuid: 91ed44c1738745119e892eadb88b417f
           name: 'GitLab: Ruby: File descriptors, max'
@@ -834,8 +868,8 @@ zabbix_export:
             key: gitlab.get_metrics
           tags:
             -
-              tag: Application
-              value: GitLab
+              tag: component
+              value: fds
         -
           uuid: 8de84a159b864ed791c07835aa0ec39a
           name: 'GitLab: Ruby: RSS memory, avg'
@@ -855,8 +889,8 @@ zabbix_export:
             key: gitlab.get_metrics
           tags:
             -
-              tag: Application
-              value: GitLab
+              tag: component
+              value: memory
         -
           uuid: 27285f7d3c344d68b7945edde3cb8ecf
           name: 'GitLab: Ruby: RSS memory, max'
@@ -876,8 +910,8 @@ zabbix_export:
             key: gitlab.get_metrics
           tags:
             -
-              tag: Application
-              value: GitLab
+              tag: component
+              value: memory
         -
           uuid: 0cf8d21bcb8d4fb7880784dc82ba8229
           name: 'GitLab: Ruby: RSS memory, min'
@@ -897,8 +931,8 @@ zabbix_export:
             key: gitlab.get_metrics
           tags:
             -
-              tag: Application
-              value: GitLab
+              tag: component
+              value: memory
         -
           uuid: 68267621a5e14494bf57225e71e05ff4
           name: 'GitLab: Ruby: First process start time'
@@ -921,8 +955,8 @@ zabbix_export:
             key: gitlab.get_metrics
           tags:
             -
-              tag: Application
-              value: GitLab
+              tag: component
+              value: application
         -
           uuid: be88084e9b544af68f78c013caf6b59a
           name: 'GitLab: Ruby: Last process start time'
@@ -945,8 +979,8 @@ zabbix_export:
             key: gitlab.get_metrics
           tags:
             -
-              tag: Application
-              value: GitLab
+              tag: component
+              value: application
         -
           uuid: f23849bd9716444f8bf65d3964e3be15
           name: 'GitLab: Ruby: Running_threads'
@@ -964,8 +998,8 @@ zabbix_export:
             key: gitlab.get_metrics
           tags:
             -
-              tag: Application
-              value: GitLab
+              tag: component
+              value: system
           triggers:
             -
               uuid: e24496a9499447b2bbdf70f85bbf2113
@@ -978,6 +1012,10 @@ zabbix_export:
                 -
                   name: 'GitLab: Liveness check was failed'
                   expression: 'last(/GitLab by HTTP/gitlab.liveness)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 56af56ccc23d44bcb636871229fbcde2
           name: 'GitLab: User CAPTCHA logins, total'
@@ -996,8 +1034,8 @@ zabbix_export:
             key: gitlab.get_metrics
           tags:
             -
-              tag: Application
-              value: GitLab
+              tag: component
+              value: sessions
         -
           uuid: 95deb1dc93d34935930b154d1222c8a4
           name: 'GitLab: Transactions per second'
@@ -1022,8 +1060,8 @@ zabbix_export:
             key: gitlab.get_metrics
           tags:
             -
-              tag: Application
-              value: GitLab
+              tag: component
+              value: transactions
         -
           uuid: d1a346edc81d487da115105333e8992d
           name: 'GitLab: Upload file does not exist'
@@ -1042,8 +1080,8 @@ zabbix_export:
             key: gitlab.get_metrics
           tags:
             -
-              tag: Application
-              value: GitLab
+              tag: component
+              value: application
         -
           uuid: 62c9c5a8886e431bb04c40a8045fe207
           name: 'GitLab: User logins, total'
@@ -1062,8 +1100,8 @@ zabbix_export:
             key: gitlab.get_metrics
           tags:
             -
-              tag: Application
-              value: GitLab
+              tag: component
+              value: sessions
       discovery_rules:
         -
           uuid: acd3e31daa8f497bb1ce0f91d104d928
@@ -1090,8 +1128,8 @@ zabbix_export:
                 key: gitlab.get_metrics
               tags:
                 -
-                  tag: Application
-                  value: 'GitLab: Puma stats'
+                  tag: component
+                  value: puma
             -
               uuid: 14194f273b4e47d98cfdcbefff64cc68
               name: 'GitLab: Idle threads'
@@ -1109,8 +1147,8 @@ zabbix_export:
                 key: gitlab.get_metrics
               tags:
                 -
-                  tag: Application
-                  value: 'GitLab: Puma stats'
+                  tag: component
+                  value: puma
             -
               uuid: 33a1be2938e24ce2a3fb650efa4f98d6
               name: 'GitLab: Killer terminations, total'
@@ -1129,8 +1167,8 @@ zabbix_export:
                 key: gitlab.get_metrics
               tags:
                 -
-                  tag: Application
-                  value: 'GitLab: Puma stats'
+                  tag: component
+                  value: puma
             -
               uuid: 7d93438afd73422d90b03e78b1c0f998
               name: 'GitLab: Max threads'
@@ -1148,8 +1186,8 @@ zabbix_export:
                 key: gitlab.get_metrics
               tags:
                 -
-                  tag: Application
-                  value: 'GitLab: Puma stats'
+                  tag: component
+                  value: puma
             -
               uuid: fe381c99c2464e95bac63da2df994b8a
               name: 'GitLab: Pool capacity'
@@ -1167,8 +1205,8 @@ zabbix_export:
                 key: gitlab.get_metrics
               tags:
                 -
-                  tag: Application
-                  value: 'GitLab: Puma stats'
+                  tag: component
+                  value: puma
             -
               uuid: 8c375d8323f9459a8b2a6254b7afed5b
               name: 'GitLab: Queued connections'
@@ -1186,14 +1224,18 @@ zabbix_export:
                 key: gitlab.get_metrics
               tags:
                 -
-                  tag: Application
-                  value: 'GitLab: Puma stats'
+                  tag: component
+                  value: puma
               trigger_prototypes:
                 -
                   uuid: 356c8dc915d84382b3f8dfe45b901f46
                   expression: 'min(/GitLab by HTTP/gitlab.puma.queued_connections[{#SINGLETON}],15m)>{$GITLAB.PUMA.QUEUE.MAX.WARN}'
                   name: 'GitLab: Puma is queueing requests (over {$GITLAB.PUMA.QUEUE.MAX.WARN}% for 15m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: perfomance
             -
               uuid: 02b27e8a68884f399a8359ed6967d614
               name: 'GitLab: Running threads'
@@ -1211,8 +1253,8 @@ zabbix_export:
                 key: gitlab.get_metrics
               tags:
                 -
-                  tag: Application
-                  value: 'GitLab: Puma stats'
+                  tag: component
+                  value: puma
             -
               uuid: b43e4275dd64427bb6eb4890c556c513
               name: 'GitLab: Running workers'
@@ -1230,8 +1272,8 @@ zabbix_export:
                 key: gitlab.get_metrics
               tags:
                 -
-                  tag: Application
-                  value: 'GitLab: Puma stats'
+                  tag: component
+                  value: puma
             -
               uuid: 0169db2581ba48579edc911cad4b41d7
               name: 'GitLab: Stale workers'
@@ -1249,8 +1291,8 @@ zabbix_export:
                 key: gitlab.get_metrics
               tags:
                 -
-                  tag: Application
-                  value: 'GitLab: Puma stats'
+                  tag: component
+                  value: puma
             -
               uuid: 19e0149a6de846c7a39b305037469ecb
               name: 'GitLab: Workers'
@@ -1268,14 +1310,18 @@ zabbix_export:
                 key: gitlab.get_metrics
               tags:
                 -
-                  tag: Application
-                  value: 'GitLab: Puma stats'
+                  tag: component
+                  value: puma
           trigger_prototypes:
             -
               uuid: b69fe81449bd4b6cb6dfddeb333e8898
               expression: 'min(/GitLab by HTTP/gitlab.puma.active_connections[{#SINGLETON}],5m)/last(/GitLab by HTTP/gitlab.puma.max_threads[{#SINGLETON}])*100>{$GITLAB.PUMA.UTILIZATION.MAX.WARN}'
               name: 'GitLab: Puma instance thread utilization is too high (over {$GITLAB.PUMA.UTILIZATION.MAX.WARN}% for 5m)'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: capacity
           url: '{$GITLAB.URL}/-/metrics'
           preprocessing:
             -
@@ -1311,8 +1357,8 @@ zabbix_export:
                 key: gitlab.get_metrics
               tags:
                 -
-                  tag: Application
-                  value: 'GitLab: Unicorn stats'
+                  tag: component
+                  value: unicorn
             -
               uuid: 31e0f545c6c6428c8f9f46426cb97ca7
               name: 'GitLab: Unicorn: Queued connections'
@@ -1330,14 +1376,18 @@ zabbix_export:
                 key: gitlab.get_metrics
               tags:
                 -
-                  tag: Application
-                  value: 'GitLab: Unicorn stats'
+                  tag: component
+                  value: unicorn
               trigger_prototypes:
                 -
                   uuid: 84142d0996c0420c8b07c7e17d1b9a47
                   expression: 'min(/GitLab by HTTP/gitlab.unicorn.queued_connections[{#SINGLETON}],5m)>{$GITLAB.UNICORN.QUEUE.MAX.WARN}'
                   name: 'GitLab: Unicorn is queueing requests (over {$GITLAB.UNICORN.QUEUE.MAX.WARN}% for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: perfomance
             -
               uuid: 44a12fd548b742069cae53a78f7f8ab0
               name: 'GitLab: Unicorn: Workers'
@@ -1355,14 +1405,18 @@ zabbix_export:
                 key: gitlab.get_metrics
               tags:
                 -
-                  tag: Application
-                  value: 'GitLab: Unicorn stats'
+                  tag: component
+                  value: unicorn
           trigger_prototypes:
             -
               uuid: 731bf8eb456c49739a3fcd7aec24c7d7
               expression: 'min(/GitLab by HTTP/gitlab.unicorn.active_connections[{#SINGLETON}],5m)/last(/GitLab by HTTP/gitlab.unicorn.unicorn_workers[{#SINGLETON}])*100>{$GITLAB.UNICORN.UTILIZATION.MAX.WARN}'
               name: 'GitLab: Unicorn worker utilization is too high (over {$GITLAB.UNICORN.UTILIZATION.MAX.WARN}% for 5m)'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: capacity
           url: '{$GITLAB.URL}/-/metrics'
           preprocessing:
             -
@@ -1374,6 +1428,13 @@ zabbix_export:
               type: JAVASCRIPT
               parameters:
                 - 'return JSON.stringify(value != "[]" ? [{''{#SINGLETON}'': ''''}] : []);'
+      tags:
+        -
+          tag: class
+          value: application
+        -
+          tag: target
+          value: gitlab
       macros:
         -
           macro: '{$GITLAB.HTTP.FAIL.MAX.WARN}'
@@ -1424,6 +1485,10 @@ zabbix_export:
       expression: 'min(/GitLab by HTTP/gitlab.ruby.file_descriptors.max,5m)/last(/GitLab by HTTP/gitlab.ruby.process_max_fds)*100>{$GITLAB.OPEN.FDS.MAX.WARN}'
       name: 'GitLab: Current number of open files is too high (over {$GITLAB.OPEN.FDS.MAX.WARN}% for 5m)'
       priority: WARNING
+      tags:
+        -
+          tag: scope
+          value: capacity
   graphs:
     -
       uuid: f6c30e56b54e478ea2708e302197b83b
diff --git a/templates/app/hadoop_http/template_app_hadoop_http.yaml b/templates/app/hadoop_http/template_app_hadoop_http.yaml
index 316f5d86f83..35036f81afd 100644
--- a/templates/app/hadoop_http/template_app_hadoop_http.yaml
+++ b/templates/app/hadoop_http/template_app_hadoop_http.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-15T08:32:52Z'
+  date: '2022-01-26T10:49:32Z'
   groups:
     -
       uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
@@ -15,7 +15,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/413459-discussion-thread-for-official-zabbix-template-hadoop
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Applications
@@ -61,8 +61,8 @@ zabbix_export:
           url: '{$HADOOP.NAMENODE.HOST}:{$HADOOP.NAMENODE.PORT}/jmx?qry=Hadoop:service=NameNode,name=NameNodeInfo'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
         -
           uuid: 2cb55b7ed9cd41878dc985497f45e084
           name: 'NameNode: Total blocks'
@@ -80,8 +80,8 @@ zabbix_export:
             key: hadoop.namenode.get
           tags:
             -
-              tag: Application
-              value: Hadoop
+              tag: component
+              value: namenode
         -
           uuid: 1d098dc6fa134053b6c6be0e7618092e
           name: 'NameNode: Blocks allocable'
@@ -99,8 +99,8 @@ zabbix_export:
             key: hadoop.namenode.get
           tags:
             -
-              tag: Application
-              value: Hadoop
+              tag: component
+              value: namenode
         -
           uuid: 26ca0bbd18e04b49b9eb8d2a74f4fd15
           name: 'NameNode: Capacity remaining'
@@ -119,8 +119,8 @@ zabbix_export:
             key: hadoop.namenode.get
           tags:
             -
-              tag: Application
-              value: Hadoop
+              tag: component
+              value: namenode
         -
           uuid: c73c2b6c24b846e49bdb68c3f5a01419
           name: 'NameNode: Corrupt blocks'
@@ -138,8 +138,8 @@ zabbix_export:
             key: hadoop.namenode.get
           tags:
             -
-              tag: Application
-              value: Hadoop
+              tag: component
+              value: namenode
         -
           uuid: 82198b21427a4e39a173369db42d9de3
           name: 'NameNode: Total files'
@@ -157,8 +157,8 @@ zabbix_export:
             key: hadoop.namenode.get
           tags:
             -
-              tag: Application
-              value: Hadoop
+              tag: component
+              value: namenode
         -
           uuid: 687406d06ce94a8291b2e72bb2f8bec4
           name: 'Get NameNode stats'
@@ -170,8 +170,8 @@ zabbix_export:
           url: '{$HADOOP.NAMENODE.HOST}:{$HADOOP.NAMENODE.PORT}/jmx'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
         -
           uuid: 30ee7e09067e4f00a4f26ad6c00454b2
           name: 'NameNode: Missing blocks'
@@ -189,8 +189,8 @@ zabbix_export:
             key: hadoop.namenode.get
           tags:
             -
-              tag: Application
-              value: Hadoop
+              tag: component
+              value: namenode
           triggers:
             -
               uuid: 3b92daaaddb74105a5e57c4b381e3060
@@ -198,6 +198,10 @@ zabbix_export:
               name: 'NameNode: Cluster has missing blocks'
               priority: AVERAGE
               description: 'A missing block is far worse than a corrupt block, because a missing block cannot be recovered by copying a replica.'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 3473bad0a7c94c8b9fd35cd4398e6215
           name: 'NameNode: Dead DataNodes'
@@ -219,8 +223,8 @@ zabbix_export:
             key: hadoop.namenode.get
           tags:
             -
-              tag: Application
-              value: Hadoop
+              tag: component
+              value: namenode
           triggers:
             -
               uuid: b2d1a26791aa4b16865b4410c50c7ceb
@@ -228,6 +232,10 @@ zabbix_export:
               name: 'NameNode: Cluster has DataNodes in Dead state'
               priority: AVERAGE
               description: 'The death of a DataNode causes a flurry of network activity, as the NameNode initiates replication of blocks lost on the dead nodes.'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 398a8c95db3248b684f222fe7b912fe3
           name: 'NameNode: Alive DataNodes'
@@ -249,8 +257,8 @@ zabbix_export:
             key: hadoop.namenode.get
           tags:
             -
-              tag: Application
-              value: Hadoop
+              tag: component
+              value: namenode
         -
           uuid: 15bcb22fdc7f4e2c8f24560ef641d63d
           name: 'NameNode: Stale DataNodes'
@@ -272,8 +280,8 @@ zabbix_export:
             key: hadoop.namenode.get
           tags:
             -
-              tag: Application
-              value: Hadoop
+              tag: component
+              value: namenode
         -
           uuid: b72d54b849fc48fd8e7cdacd75943c23
           name: 'NameNode: Block Pool Renaming'
@@ -291,8 +299,8 @@ zabbix_export:
             key: hadoop.namenode.get
           tags:
             -
-              tag: Application
-              value: Hadoop
+              tag: component
+              value: namenode
         -
           uuid: 3cfbf084a31b479c91be356556d43c0d
           name: 'NameNode: Percent capacity remaining'
@@ -316,8 +324,8 @@ zabbix_export:
             key: hadoop.namenode.get
           tags:
             -
-              tag: Application
-              value: Hadoop
+              tag: component
+              value: namenode
           triggers:
             -
               uuid: 3104295848c5497085f397b8f3e06ef6
@@ -325,6 +333,10 @@ zabbix_export:
               name: 'NameNode: Cluster capacity remaining is low (below {$HADOOP.CAPACITY_REMAINING.MIN.WARN}% for 15m)'
               priority: WARNING
               description: 'A good practice is to ensure that disk use never exceeds 80 percent capacity.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
         -
           uuid: a9e6c1e2f9544c71844785b4baa9c017
           name: 'NameNode: RPC queue & processing time'
@@ -344,8 +356,8 @@ zabbix_export:
             key: hadoop.namenode.get
           tags:
             -
-              tag: Application
-              value: Hadoop
+              tag: component
+              value: namenode
         -
           uuid: 9f00149ef0c2444ebbc9327b24acd7b9
           name: 'NameNode: Total load'
@@ -363,8 +375,8 @@ zabbix_export:
             key: hadoop.namenode.get
           tags:
             -
-              tag: Application
-              value: Hadoop
+              tag: component
+              value: namenode
         -
           uuid: 6abfe537a36646a0b10fe2c72586d249
           name: 'NameNode: Transactions since last checkpoint'
@@ -382,8 +394,8 @@ zabbix_export:
             key: hadoop.namenode.get
           tags:
             -
-              tag: Application
-              value: Hadoop
+              tag: component
+              value: namenode
         -
           uuid: 249098bbeb7a43cdac59f1297ca95104
           name: 'NameNode: Under-replicated blocks'
@@ -401,8 +413,8 @@ zabbix_export:
             key: hadoop.namenode.get
           tags:
             -
-              tag: Application
-              value: Hadoop
+              tag: component
+              value: namenode
         -
           uuid: 7e8769eb77304b6f9c6e1d5bbd420fd0
           name: 'NameNode: Uptime'
@@ -425,8 +437,8 @@ zabbix_export:
             key: hadoop.namenode.get
           tags:
             -
-              tag: Application
-              value: Hadoop
+              tag: component
+              value: system
           triggers:
             -
               uuid: 9fac0ae651ab40a08551945eb0a93b68
@@ -439,6 +451,10 @@ zabbix_export:
                 -
                   name: 'NameNode: Service is unavailable'
                   expression: 'last(/Hadoop by HTTP/net.tcp.service["tcp","{$HADOOP.NAMENODE.HOST}","{$HADOOP.NAMENODE.PORT}"])=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
             -
               uuid: 84d866bc0dc3486d9c5dc9beefec8d31
               expression: 'last(/Hadoop by HTTP/hadoop.namenode.uptime)<10m'
@@ -446,6 +462,10 @@ zabbix_export:
               priority: INFO
               description: 'Uptime is less than 10 minutes'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 396eb8f791d54254b08ddee553d3d944
           name: 'NameNode: Failed volumes'
@@ -463,8 +483,8 @@ zabbix_export:
             key: hadoop.namenode.get
           tags:
             -
-              tag: Application
-              value: Hadoop
+              tag: component
+              value: namenode
           triggers:
             -
               uuid: fcf791b6d0594dbb9ddfc3f93bc94825
@@ -472,6 +492,10 @@ zabbix_export:
               name: 'NameNode: Cluster has volume failures'
               priority: AVERAGE
               description: 'HDFS now allows for disks to fail in place, without affecting DataNode operations, until a threshold value is reached. This is set on each DataNode via the dfs.datanode.failed.volumes.tolerated property; it defaults to 0, meaning that any volume failure will shut down the DataNode; on a production cluster where DataNodes typically have 6, 8, or 12 disks, setting this parameter to 1 or 2 is typically the best practice.'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 6d7546c5d15d4e478b2e87e35d5306b0
           name: 'Get NodeManagers states'
@@ -488,8 +512,8 @@ zabbix_export:
           url: '{$HADOOP.RESOURCEMANAGER.HOST}:{$HADOOP.RESOURCEMANAGER.PORT}/jmx?qry=Hadoop:service=ResourceManager,name=RMNMInfo'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
         -
           uuid: e693cff98ec74cc198ec6b5e973f116c
           name: 'Get ResourceManager stats'
@@ -501,8 +525,8 @@ zabbix_export:
           url: '{$HADOOP.RESOURCEMANAGER.HOST}:{$HADOOP.RESOURCEMANAGER.PORT}/jmx'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
         -
           uuid: 63d4fe7384044027b08b99698355fd8b
           name: 'ResourceManager: Active NMs'
@@ -524,8 +548,8 @@ zabbix_export:
             key: hadoop.resourcemanager.get
           tags:
             -
-              tag: Application
-              value: Hadoop
+              tag: component
+              value: resourcemanager
           triggers:
             -
               uuid: eb02a30f45394e4d84d9d7239002ed40
@@ -533,6 +557,10 @@ zabbix_export:
               name: 'ResourceManager: Cluster has no active NodeManagers'
               priority: HIGH
               description: 'Cluster is unable to execute any jobs without at least one NodeManager.'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 3fccfdd8738544ca8969ade842430fc8
           name: 'ResourceManager: Decommissioned NMs'
@@ -550,8 +578,8 @@ zabbix_export:
             key: hadoop.resourcemanager.get
           tags:
             -
-              tag: Application
-              value: Hadoop
+              tag: component
+              value: resourcemanager
         -
           uuid: 9aad193a9e074575878e44aa96ff4237
           name: 'ResourceManager: Decommissioning NMs'
@@ -573,8 +601,8 @@ zabbix_export:
             key: hadoop.resourcemanager.get
           tags:
             -
-              tag: Application
-              value: Hadoop
+              tag: component
+              value: resourcemanager
         -
           uuid: c4bbf5295b2a44619e2b641468071f9b
           name: 'ResourceManager: Lost NMs'
@@ -596,8 +624,8 @@ zabbix_export:
             key: hadoop.resourcemanager.get
           tags:
             -
-              tag: Application
-              value: Hadoop
+              tag: component
+              value: resourcemanager
         -
           uuid: b7791ce30e8f4aa7b5eea2ee7ca7eef9
           name: 'ResourceManager: Rebooted NMs'
@@ -615,8 +643,8 @@ zabbix_export:
             key: hadoop.resourcemanager.get
           tags:
             -
-              tag: Application
-              value: Hadoop
+              tag: component
+              value: resourcemanager
         -
           uuid: 666152b3bf544a29b9e58a9f417c0ab8
           name: 'ResourceManager: Shutdown NMs'
@@ -634,8 +662,8 @@ zabbix_export:
             key: hadoop.resourcemanager.get
           tags:
             -
-              tag: Application
-              value: Hadoop
+              tag: component
+              value: resourcemanager
         -
           uuid: e6aa4b4b29414f2fb1f06bd536552c1c
           name: 'ResourceManager: Unhealthy NMs'
@@ -653,8 +681,8 @@ zabbix_export:
             key: hadoop.resourcemanager.get
           tags:
             -
-              tag: Application
-              value: Hadoop
+              tag: component
+              value: resourcemanager
           triggers:
             -
               uuid: 0f35a0fa7a404559a3df225b906f0653
@@ -662,6 +690,10 @@ zabbix_export:
               name: 'ResourceManager: Cluster has unhealthy NodeManagers'
               priority: AVERAGE
               description: 'YARN considers any node with disk utilization exceeding the value specified under the property yarn.nodemanager.disk-health-checker.max-disk-utilization-per-disk-percentage (in yarn-site.xml) to be unhealthy. Ample disk space is critical to ensure uninterrupted operation of a Hadoop cluster, and large numbers of unhealthyNodes (the number to alert on depends on the size of your cluster) should be quickly investigated and resolved.'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: c4c3195326e34ebcb57e5039beffce7c
           name: 'ResourceManager: RPC queue & processing time'
@@ -681,8 +713,8 @@ zabbix_export:
             key: hadoop.resourcemanager.get
           tags:
             -
-              tag: Application
-              value: Hadoop
+              tag: component
+              value: resourcemanager
         -
           uuid: 4e74ca69a84d441e95e2c20afd25fada
           name: 'ResourceManager: Uptime'
@@ -705,8 +737,8 @@ zabbix_export:
             key: hadoop.resourcemanager.get
           tags:
             -
-              tag: Application
-              value: Hadoop
+              tag: component
+              value: system
           triggers:
             -
               uuid: 7d4d026992344602a199966a8308a571
@@ -719,6 +751,10 @@ zabbix_export:
                 -
                   name: 'ResourceManager: Service is unavailable'
                   expression: 'last(/Hadoop by HTTP/net.tcp.service["tcp","{$HADOOP.RESOURCEMANAGER.HOST}","{$HADOOP.RESOURCEMANAGER.PORT}"])=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
             -
               uuid: ade7cc30a4184ef89ed896bae56e0b18
               expression: 'last(/Hadoop by HTTP/hadoop.resourcemanager.uptime)<10m'
@@ -726,6 +762,10 @@ zabbix_export:
               priority: INFO
               description: 'Uptime is less than 10 minutes'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 66a87b21d32c436bb2d2eb23ec328f91
           name: 'NameNode: Service response time'
@@ -737,8 +777,8 @@ zabbix_export:
           description: 'Hadoop NameNode API performance.'
           tags:
             -
-              tag: Application
-              value: Hadoop
+              tag: component
+              value: network
           triggers:
             -
               uuid: 4e4a6ab28fe5492d8fe4e291b8a586dc
@@ -750,6 +790,10 @@ zabbix_export:
                 -
                   name: 'NameNode: Service is unavailable'
                   expression: 'last(/Hadoop by HTTP/net.tcp.service["tcp","{$HADOOP.NAMENODE.HOST}","{$HADOOP.NAMENODE.PORT}"])=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 98b11f1156dc472fbce27ca053e01d4e
           name: 'ResourceManager: Service response time'
@@ -761,8 +805,8 @@ zabbix_export:
           description: 'Hadoop ResourceManager API performance.'
           tags:
             -
-              tag: Application
-              value: Hadoop
+              tag: component
+              value: network
           triggers:
             -
               uuid: e8e55f4c7e9e4823927a8c1345d3b941
@@ -774,6 +818,10 @@ zabbix_export:
                 -
                   name: 'ResourceManager: Service is unavailable'
                   expression: 'last(/Hadoop by HTTP/net.tcp.service["tcp","{$HADOOP.RESOURCEMANAGER.HOST}","{$HADOOP.RESOURCEMANAGER.PORT}"])=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 2c52d856e07e4524abf3c2ae4b47c6b6
           name: 'NameNode: Service status'
@@ -790,8 +838,11 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: Hadoop
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: f7e16c4ec91e4c04b13b73ee817c71d7
@@ -799,6 +850,10 @@ zabbix_export:
               name: 'NameNode: Service is unavailable'
               priority: AVERAGE
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 615b75c42ebe471da798a0613667d499
           name: 'ResourceManager: Service status'
@@ -815,8 +870,11 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: Hadoop
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: a9ac7ede0c004fe18ab9f1fee36ad2b2
@@ -824,6 +882,10 @@ zabbix_export:
               name: 'ResourceManager: Service is unavailable'
               priority: AVERAGE
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: 0f05e90a6fc547d18f291ae2264db9d1
@@ -855,8 +917,8 @@ zabbix_export:
                 key: hadoop.datanodes.get
               tags:
                 -
-                  tag: Application
-                  value: 'Hadoop DataNode {#HOSTNAME}'
+                  tag: component
+                  value: datanode
             -
               uuid: 14904ca75991456784d2082c14b7ec88
               name: '{#HOSTNAME}: Used'
@@ -875,8 +937,8 @@ zabbix_export:
                 key: 'hadoop.datanode.get[{#HOSTNAME}]'
               tags:
                 -
-                  tag: Application
-                  value: 'Hadoop DataNode {#HOSTNAME}'
+                  tag: component
+                  value: capacity
             -
               uuid: 6d2d030b3ddb41a394faede737329bbb
               name: 'Hadoop DataNode {#HOSTNAME}: Get stats'
@@ -888,8 +950,8 @@ zabbix_export:
               url: '{#INFOADDR}/jmx'
               tags:
                 -
-                  tag: Application
-                  value: 'Zabbix raw items'
+                  tag: component
+                  value: raw
             -
               uuid: 01bc20e53e314089a55b270961062c00
               name: '{#HOSTNAME}: JVM Garbage collection time'
@@ -908,8 +970,8 @@ zabbix_export:
                 key: 'hadoop.datanode.get[{#HOSTNAME}]'
               tags:
                 -
-                  tag: Application
-                  value: 'Hadoop DataNode {#HOSTNAME}'
+                  tag: component
+                  value: datanode
             -
               uuid: 4cae9eef95f24810a6607de5348b7b54
               name: '{#HOSTNAME}: JVM Heap usage'
@@ -929,8 +991,8 @@ zabbix_export:
                 key: 'hadoop.datanode.get[{#HOSTNAME}]'
               tags:
                 -
-                  tag: Application
-                  value: 'Hadoop DataNode {#HOSTNAME}'
+                  tag: component
+                  value: capacity
             -
               uuid: dc30742dba2e4e5d99ca237615ffaef3
               name: '{#HOSTNAME}: JVM Threads'
@@ -948,8 +1010,8 @@ zabbix_export:
                 key: 'hadoop.datanode.get[{#HOSTNAME}]'
               tags:
                 -
-                  tag: Application
-                  value: 'Hadoop DataNode {#HOSTNAME}'
+                  tag: component
+                  value: datanode
             -
               uuid: 57c00b46aef94c018806cdae43adfab5
               name: '{#HOSTNAME}: Number of failed volumes'
@@ -967,8 +1029,8 @@ zabbix_export:
                 key: 'hadoop.datanode.get[{#HOSTNAME}]'
               tags:
                 -
-                  tag: Application
-                  value: 'Hadoop DataNode {#HOSTNAME}'
+                  tag: component
+                  value: datanode
             -
               uuid: a6541492d4f7426b8016d1a8932b87ce
               name: '{#HOSTNAME}: Oper state'
@@ -992,8 +1054,8 @@ zabbix_export:
                 key: hadoop.datanodes.get
               tags:
                 -
-                  tag: Application
-                  value: 'Hadoop DataNode {#HOSTNAME}'
+                  tag: component
+                  value: datanode
               trigger_prototypes:
                 -
                   uuid: 9f657289a04041e5bcaa1947f62f607d
@@ -1001,6 +1063,10 @@ zabbix_export:
                   name: '{#HOSTNAME}: DataNode has state {ITEM.VALUE}.'
                   priority: AVERAGE
                   description: 'The state is different from normal.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 5a46ec3c89eb40d4ad57cec2080c66f8
               name: '{#HOSTNAME}: Remaining'
@@ -1019,8 +1085,8 @@ zabbix_export:
                 key: 'hadoop.datanode.get[{#HOSTNAME}]'
               tags:
                 -
-                  tag: Application
-                  value: 'Hadoop DataNode {#HOSTNAME}'
+                  tag: component
+                  value: capacity
             -
               uuid: 2ac19ff8ee7f480f9974be56ab06eaaf
               name: '{#HOSTNAME}: Uptime'
@@ -1043,8 +1109,8 @@ zabbix_export:
                 key: 'hadoop.datanode.get[{#HOSTNAME}]'
               tags:
                 -
-                  tag: Application
-                  value: 'Hadoop DataNode {#HOSTNAME}'
+                  tag: component
+                  value: system
               trigger_prototypes:
                 -
                   uuid: 3eccb9daf76f4bde88b424cf6f2d21f6
@@ -1057,6 +1123,10 @@ zabbix_export:
                     -
                       name: '{#HOSTNAME}: DataNode has state {ITEM.VALUE}.'
                       expression: 'last(/Hadoop by HTTP/hadoop.datanode.oper_state[{#HOSTNAME}])<>"Live"'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
                 -
                   uuid: e40298d300764251abcf93d5df3d9a67
                   expression: 'last(/Hadoop by HTTP/hadoop.datanode.uptime[{#HOSTNAME}])<10m'
@@ -1064,6 +1134,10 @@ zabbix_export:
                   priority: INFO
                   description: 'Uptime is less than 10 minutes'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 62b4ca9b1e8a43aa89fbeb78ac16c8cf
               name: '{#HOSTNAME}: Version'
@@ -1087,8 +1161,8 @@ zabbix_export:
                 key: hadoop.datanodes.get
               tags:
                 -
-                  tag: Application
-                  value: 'Hadoop DataNode {#HOSTNAME}'
+                  tag: component
+                  value: system
           graph_prototypes:
             -
               uuid: c497416bcce1416ebcede7fc491ccdba
@@ -1161,8 +1235,8 @@ zabbix_export:
                 key: hadoop.nodemanagers.get
               tags:
                 -
-                  tag: Application
-                  value: 'Hadoop NodeManager {#HOSTNAME}'
+                  tag: component
+                  value: memory
             -
               uuid: e8d0ea2c96b643f899e370ab73c5c262
               name: '{#HOSTNAME}: Container launch avg duration'
@@ -1180,8 +1254,8 @@ zabbix_export:
                 key: 'hadoop.nodemanager.get[{#HOSTNAME}]'
               tags:
                 -
-                  tag: Application
-                  value: 'Hadoop NodeManager {#HOSTNAME}'
+                  tag: component
+                  value: nodemanager
             -
               uuid: 23c89dfb26a34b77bf34fcf543f719f2
               name: 'Hadoop NodeManager {#HOSTNAME}: Get stats'
@@ -1193,8 +1267,8 @@ zabbix_export:
               url: '{#NODEHTTPADDRESS}/jmx'
               tags:
                 -
-                  tag: Application
-                  value: 'Zabbix raw items'
+                  tag: component
+                  value: raw
             -
               uuid: 82e289c999a246a6bd1feb85349d0348
               name: '{#HOSTNAME}: JVM Garbage collection time'
@@ -1213,8 +1287,8 @@ zabbix_export:
                 key: 'hadoop.nodemanager.get[{#HOSTNAME}]'
               tags:
                 -
-                  tag: Application
-                  value: 'Hadoop NodeManager {#HOSTNAME}'
+                  tag: component
+                  value: nodemanager
             -
               uuid: 4032f0a266c44b34896e8179bbed2419
               name: '{#HOSTNAME}: JVM Heap usage'
@@ -1234,8 +1308,8 @@ zabbix_export:
                 key: 'hadoop.nodemanager.get[{#HOSTNAME}]'
               tags:
                 -
-                  tag: Application
-                  value: 'Hadoop NodeManager {#HOSTNAME}'
+                  tag: component
+                  value: nodemanager
             -
               uuid: d7485913b2db4e31a8f02f63f8c18913
               name: '{#HOSTNAME}: JVM Threads'
@@ -1253,8 +1327,8 @@ zabbix_export:
                 key: 'hadoop.nodemanager.get[{#HOSTNAME}]'
               tags:
                 -
-                  tag: Application
-                  value: 'Hadoop NodeManager {#HOSTNAME}'
+                  tag: component
+                  value: nodemanager
             -
               uuid: 662cafd31e194db8808c75789bf712eb
               name: '{#HOSTNAME}: Number of containers'
@@ -1273,8 +1347,8 @@ zabbix_export:
                 key: hadoop.nodemanagers.get
               tags:
                 -
-                  tag: Application
-                  value: 'Hadoop NodeManager {#HOSTNAME}'
+                  tag: component
+                  value: nodemanager
             -
               uuid: 01a5bcdbfc1c4a84a471738998aed372
               name: '{#HOSTNAME}: RPC queue & processing time'
@@ -1293,8 +1367,8 @@ zabbix_export:
                 key: 'hadoop.nodemanager.get[{#HOSTNAME}]'
               tags:
                 -
-                  tag: Application
-                  value: 'Hadoop NodeManager {#HOSTNAME}'
+                  tag: component
+                  value: nodemanager
             -
               uuid: bab9c705d31e42ce9af65b396e18504b
               name: '{#HOSTNAME}: State'
@@ -1318,8 +1392,8 @@ zabbix_export:
                 key: hadoop.nodemanagers.get
               tags:
                 -
-                  tag: Application
-                  value: 'Hadoop NodeManager {#HOSTNAME}'
+                  tag: component
+                  value: nodemanager
               trigger_prototypes:
                 -
                   uuid: 8752a292093347fcb16d3f06dd97c5c3
@@ -1327,6 +1401,10 @@ zabbix_export:
                   name: '{#HOSTNAME}: NodeManager has state {ITEM.VALUE}.'
                   priority: AVERAGE
                   description: 'The state is different from normal.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: f8f6799130d34848a7dfb65815939c48
               name: '{#HOSTNAME}: Uptime'
@@ -1349,8 +1427,8 @@ zabbix_export:
                 key: 'hadoop.nodemanager.get[{#HOSTNAME}]'
               tags:
                 -
-                  tag: Application
-                  value: 'Hadoop NodeManager {#HOSTNAME}'
+                  tag: component
+                  value: system
               trigger_prototypes:
                 -
                   uuid: 6f8a6308d4334dd9bebe7af2fa3fb831
@@ -1363,6 +1441,10 @@ zabbix_export:
                     -
                       name: '{#HOSTNAME}: NodeManager has state {ITEM.VALUE}.'
                       expression: 'last(/Hadoop by HTTP/hadoop.nodemanager.state[{#HOSTNAME}])<>"RUNNING"'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
                 -
                   uuid: 05f3cf8ed34f4a708df508f0e50e119d
                   expression: 'last(/Hadoop by HTTP/hadoop.nodemanager.uptime[{#HOSTNAME}])<10m'
@@ -1370,6 +1452,10 @@ zabbix_export:
                   priority: INFO
                   description: 'Uptime is less than 10 minutes'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: d92b66e61a5244a995693ab8aedee96e
               name: '{#HOSTNAME}: Used memory'
@@ -1387,8 +1473,8 @@ zabbix_export:
                 key: hadoop.nodemanagers.get
               tags:
                 -
-                  tag: Application
-                  value: 'Hadoop NodeManager {#HOSTNAME}'
+                  tag: component
+                  value: memory
             -
               uuid: c4d46de2d6d341f5a2c1826236f94e5e
               name: '{#HOSTNAME}: Version'
@@ -1411,8 +1497,8 @@ zabbix_export:
                 key: hadoop.nodemanagers.get
               tags:
                 -
-                  tag: Application
-                  value: 'Hadoop NodeManager {#HOSTNAME}'
+                  tag: component
+                  value: system
           url: '{$HADOOP.RESOURCEMANAGER.HOST}:{$HADOOP.RESOURCEMANAGER.PORT}/jmx?qry=Hadoop:service=ResourceManager,name=RMNMInfo'
           preprocessing:
             -
@@ -1439,6 +1525,13 @@ zabbix_export:
                   catch (error) {
                     throw 'Failed to process response received from Hadoop.';
                   }
+      tags:
+        -
+          tag: class
+          value: application
+        -
+          tag: target
+          value: hadoop
       macros:
         -
           macro: '{$HADOOP.CAPACITY_REMAINING.MIN.WARN}'
diff --git a/templates/app/haproxy_agent/template_app_haproxy_agent.yaml b/templates/app/haproxy_agent/template_app_haproxy_agent.yaml
index 5357dd23d6c..d5038320211 100644
--- a/templates/app/haproxy_agent/template_app_haproxy_agent.yaml
+++ b/templates/app/haproxy_agent/template_app_haproxy_agent.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-15T08:55:27Z'
+  date: '2022-01-26T10:47:24Z'
   groups:
     -
       uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
@@ -22,7 +22,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/393527-discussion-thread-for-official-zabbix-template-haproxy
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Applications
@@ -50,14 +50,8 @@ zabbix_export:
             key: 'web.page.get["{$HAPROXY.STATS.SCHEME}://{HOST.CONN}:{$HAPROXY.STATS.PORT}/{$HAPROXY.STATS.PATH};csv"]'
           tags:
             -
-              tag: data
+              tag: component
               value: raw
-            -
-              tag: target
-              value: haproxy
-            -
-              tag: transport
-              value: dependent
         -
           uuid: 29381f1e0bdc4628a82ef1b7724f2e6f
           name: 'HAProxy: Uptime'
@@ -83,17 +77,8 @@ zabbix_export:
             key: 'web.page.get["{$HAPROXY.STATS.SCHEME}://{HOST.CONN}:{$HAPROXY.STATS.PORT}/{$HAPROXY.STATS.PATH}"]'
           tags:
             -
-              tag: resource
-              value: general
-            -
-              tag: target
-              value: haproxy
-            -
-              tag: transport
-              value: dependent
-            -
-              tag: type
-              value: gauge
+              tag: component
+              value: application
           triggers:
             -
               uuid: e76d5b82b0ad421ea62cd1dc069e036b
@@ -102,6 +87,10 @@ zabbix_export:
               priority: INFO
               description: 'Uptime is less than 10 minutes'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: e930e70fb1b44d9cbe673f35133c6e77
           name: 'HAProxy: Version'
@@ -126,17 +115,8 @@ zabbix_export:
             key: 'web.page.get["{$HAPROXY.STATS.SCHEME}://{HOST.CONN}:{$HAPROXY.STATS.PORT}/{$HAPROXY.STATS.PATH}"]'
           tags:
             -
-              tag: resource
-              value: general
-            -
-              tag: target
-              value: haproxy
-            -
-              tag: transport
-              value: dependent
-            -
-              tag: type
-              value: gauge
+              tag: component
+              value: application
           triggers:
             -
               uuid: db6ef8f306f64f0f81a590e4b45b370c
@@ -145,6 +125,10 @@ zabbix_export:
               priority: INFO
               description: 'HAProxy version has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: c224cfe9b7474f9e80618dde78cfcb11
           name: 'HAProxy: Service response time'
@@ -154,17 +138,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: resource
-              value: general
+              tag: component
+              value: health
             -
-              tag: target
-              value: haproxy
-            -
-              tag: transport
-              value: agent
-            -
-              tag: type
-              value: gauge
+              tag: component
+              value: network
           triggers:
             -
               uuid: 4e881047bbd54c5984922d1189567ece
@@ -176,6 +154,10 @@ zabbix_export:
                 -
                   name: 'HAProxy: Service is down'
                   expression: 'last(/HAProxy by Zabbix agent/net.tcp.service["{$HAPROXY.STATS.SCHEME}","{HOST.CONN}","{$HAPROXY.STATS.PORT}"])=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 97e45c508f5a4df78fc783382088e233
           name: 'HAProxy: Service status'
@@ -190,17 +172,11 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: resource
-              value: general
+              tag: component
+              value: health
             -
-              tag: target
-              value: haproxy
-            -
-              tag: transport
-              value: agent
-            -
-              tag: type
-              value: gauge
+              tag: component
+              value: network
           triggers:
             -
               uuid: 8d5c7940e5924b469b3e7804043ea7b6
@@ -208,6 +184,10 @@ zabbix_export:
               name: 'HAProxy: Service is down'
               priority: AVERAGE
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: e70009bd4e3041a3952738673ebb5c29
           name: 'HAProxy: Get stats page'
@@ -218,14 +198,8 @@ zabbix_export:
           description: 'HAProxy Statistics Report HTML'
           tags:
             -
-              tag: data
+              tag: component
               value: raw
-            -
-              tag: target
-              value: haproxy
-            -
-              tag: transport
-              value: agent
         -
           uuid: aabdb5706b6744379561f269e0709141
           name: 'HAProxy: Get stats'
@@ -248,14 +222,8 @@ zabbix_export:
                 - '1'
           tags:
             -
-              tag: data
+              tag: component
               value: raw
-            -
-              tag: target
-              value: haproxy
-            -
-              tag: transport
-              value: agent
       discovery_rules:
         -
           uuid: 9899f0a11ece4b9194ca44a8fc34b066
@@ -300,17 +268,8 @@ zabbix_export:
                   tag: backend
                   value: '{#PXNAME}'
                 -
-                  tag: resource
-                  value: backend
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: gauge
+                  tag: component
+                  value: servers
             -
               uuid: 6c4b8a679428455aadbd307162635e6e
               name: 'HAProxy Backend {#PXNAME}: Number of backup servers'
@@ -335,17 +294,8 @@ zabbix_export:
                   tag: backend
                   value: '{#PXNAME}'
                 -
-                  tag: resource
-                  value: backend
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: gauge
+                  tag: component
+                  value: servers
             -
               uuid: 7d5a7b04e836417b96f2301d91fabab4
               name: 'HAProxy Backend {#PXNAME}: Incoming traffic'
@@ -376,17 +326,8 @@ zabbix_export:
                   tag: backend
                   value: '{#PXNAME}'
                 -
-                  tag: resource
-                  value: backend
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: rate
+                  tag: component
+                  value: network
             -
               uuid: fc353e7b680648698ecf949f784ca0ce
               name: 'HAProxy Backend {#PXNAME}: Outgoing traffic'
@@ -417,17 +358,8 @@ zabbix_export:
                   tag: backend
                   value: '{#PXNAME}'
                 -
-                  tag: resource
-                  value: backend
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: rate
+                  tag: component
+                  value: network
             -
               uuid: 3df452e68f144fc3a8e5ff7644ace606
               name: 'HAProxy Backend {#PXNAME}: Responses denied per second'
@@ -453,17 +385,8 @@ zabbix_export:
                   tag: backend
                   value: '{#PXNAME}'
                 -
-                  tag: resource
-                  value: backend
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: rate
+                  tag: component
+                  value: responses
             -
               uuid: 5e315f24828d45b285e92971d5456234
               name: 'HAProxy Backend {#PXNAME}: Errors connection per second'
@@ -489,17 +412,8 @@ zabbix_export:
                   tag: backend
                   value: '{#PXNAME}'
                 -
-                  tag: resource
-                  value: backend
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: rate
+                  tag: component
+                  value: connections
             -
               uuid: f1ca728c571e4cf4ac9ebc36e96df27e
               name: 'HAProxy Backend {#PXNAME}: Response errors per second'
@@ -525,17 +439,8 @@ zabbix_export:
                   tag: backend
                   value: '{#PXNAME}'
                 -
-                  tag: resource
-                  value: backend
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: rate
+                  tag: component
+                  value: responses
               trigger_prototypes:
                 -
                   uuid: 892d6f67eeff4520aadbf4f3841f8174
@@ -543,6 +448,10 @@ zabbix_export:
                   name: 'HAProxy backend {#PXNAME}: Number of responses with error is more than {$HAPROXY.BACK_ERESP.MAX.WARN} for 5m'
                   priority: WARNING
                   description: 'Number of requests on backend, whose responses yielded an error, is more than {$HAPROXY.BACK_ERESP.MAX.WARN}.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: a32d07355a9c4e9f9f63bac4ef2ef342
               name: 'HAProxy Backend {#PXNAME}: Number of responses with codes 1xx per second'
@@ -568,17 +477,8 @@ zabbix_export:
                   tag: backend
                   value: '{#PXNAME}'
                 -
-                  tag: resource
-                  value: backend
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: rate
+                  tag: component
+                  value: responses
             -
               uuid: 2b02a86c01a245859ad4305d25569ab0
               name: 'HAProxy Backend {#PXNAME}: Number of responses with codes 2xx per second'
@@ -604,17 +504,8 @@ zabbix_export:
                   tag: backend
                   value: '{#PXNAME}'
                 -
-                  tag: resource
-                  value: backend
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: rate
+                  tag: component
+                  value: responses
             -
               uuid: 24de211953f8480c9e1118abde731344
               name: 'HAProxy Backend {#PXNAME}: Number of responses with codes 3xx per second'
@@ -640,17 +531,8 @@ zabbix_export:
                   tag: backend
                   value: '{#PXNAME}'
                 -
-                  tag: resource
-                  value: backend
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: rate
+                  tag: component
+                  value: responses
             -
               uuid: 221ef133420f4140a17146eb976744eb
               name: 'HAProxy Backend {#PXNAME}: Number of responses with codes 4xx per second'
@@ -676,17 +558,8 @@ zabbix_export:
                   tag: backend
                   value: '{#PXNAME}'
                 -
-                  tag: resource
-                  value: backend
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: rate
+                  tag: component
+                  value: responses
             -
               uuid: 3a3f40a93c184673bdbd220add5ef458
               name: 'HAProxy Backend {#PXNAME}: Number of responses with codes 5xx per second'
@@ -712,17 +585,8 @@ zabbix_export:
                   tag: backend
                   value: '{#PXNAME}'
                 -
-                  tag: resource
-                  value: backend
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: rate
+                  tag: component
+                  value: responses
             -
               uuid: 389e5f77b422419386c2fa21db612697
               name: 'HAProxy Backend {#PXNAME}: Unassigned requests'
@@ -743,17 +607,8 @@ zabbix_export:
                   tag: backend
                   value: '{#PXNAME}'
                 -
-                  tag: resource
-                  value: backend
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: gauge
+                  tag: component
+                  value: requests
               trigger_prototypes:
                 -
                   uuid: 89ccc4b4a55349c7869c2202881dcb2a
@@ -761,6 +616,10 @@ zabbix_export:
                   name: 'HAProxy backend {#PXNAME}: Current number of requests unassigned in queue is more than {$HAPROXY.BACK_QCUR.MAX.WARN} for 5m'
                   priority: WARNING
                   description: 'Current number of requests on backend unassigned in queue is more than {$HAPROXY.BACK_QCUR.MAX.WARN}.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: a58ff94387824acb81b27cab5cfc680a
               name: 'HAProxy Backend {#PXNAME}: Time in queue'
@@ -787,17 +646,8 @@ zabbix_export:
                   tag: backend
                   value: '{#PXNAME}'
                 -
-                  tag: resource
-                  value: backend
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: gauge
+                  tag: component
+                  value: requests
               trigger_prototypes:
                 -
                   uuid: 1aff4be13f0f4aee8a512d4b962215a6
@@ -805,6 +655,10 @@ zabbix_export:
                   name: 'HAProxy backend {#PXNAME}: Average time spent in queue is more than {$HAPROXY.BACK_QTIME.MAX.WARN} for 5m'
                   priority: WARNING
                   description: 'Average time spent in queue (in ms) for the last 1,024 requests is more than {$HAPROXY.BACK_QTIME.MAX.WARN}.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 7e801fd81fed448db7dd6c6eeaa398d5
               name: 'HAProxy Backend {#PXNAME}: Responses time'
@@ -831,17 +685,8 @@ zabbix_export:
                   tag: backend
                   value: '{#PXNAME}'
                 -
-                  tag: resource
-                  value: backend
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: gauge
+                  tag: component
+                  value: responses
               trigger_prototypes:
                 -
                   uuid: e0dd27ac272a4fbf9495c09f3291db8f
@@ -849,6 +694,10 @@ zabbix_export:
                   name: 'HAProxy backend {#PXNAME}: Average response time is more than {$HAPROXY.BACK_RTIME.MAX.WARN} for 5m'
                   priority: WARNING
                   description: 'Average backend response time (in ms) for the last 1,024 requests is more than {$HAPROXY.BACK_RTIME.MAX.WARN}.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 5826a63314314ef297c81749561574d2
               name: 'HAProxy Backend {#PXNAME}: Status'
@@ -884,17 +733,8 @@ zabbix_export:
                   tag: backend
                   value: '{#PXNAME}'
                 -
-                  tag: resource
-                  value: backend
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: state
+                  tag: component
+                  value: health
               trigger_prototypes:
                 -
                   uuid: 51452fd94c12448fab0703e867f69fd2
@@ -903,6 +743,10 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Backend is not available.'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: d11c9b4c7027475e897456e712675cc9
               name: 'HAProxy Backend {#PXNAME}: Sessions per second'
@@ -928,17 +772,8 @@ zabbix_export:
                   tag: backend
                   value: '{#PXNAME}'
                 -
-                  tag: resource
-                  value: backend
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: rate
+                  tag: component
+                  value: sessions
             -
               uuid: 21cc9c7a1b7042f0bb14eeab91464ae8
               name: 'HAProxy Backend {#PXNAME}: Weight'
@@ -963,17 +798,8 @@ zabbix_export:
                   tag: backend
                   value: '{#PXNAME}'
                 -
-                  tag: resource
-                  value: backend
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: gauge
+                  tag: component
+                  value: balancer
             -
               uuid: bebad9eb0731474db798eacde7771238
               name: 'HAProxy Backend {#PXNAME}: Redispatched requests per second'
@@ -999,17 +825,8 @@ zabbix_export:
                   tag: backend
                   value: '{#PXNAME}'
                 -
-                  tag: resource
-                  value: backend
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: rate
+                  tag: component
+                  value: requests
             -
               uuid: 0f09a6b800d747f4beed96a25b5cfa49
               name: 'HAProxy Backend {#PXNAME}: Retried connections per second'
@@ -1035,17 +852,8 @@ zabbix_export:
                   tag: backend
                   value: '{#PXNAME}'
                 -
-                  tag: resource
-                  value: backend
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: rate
+                  tag: component
+                  value: connections
           graph_prototypes:
             -
               uuid: 70bf1a17304e495dae74b86b93ac9773
@@ -1188,20 +996,11 @@ zabbix_export:
                 key: 'web.page.get["{$HAPROXY.STATS.SCHEME}://{HOST.CONN}:{$HAPROXY.STATS.PORT}/{$HAPROXY.STATS.PATH};csv"]'
               tags:
                 -
+                  tag: component
+                  value: network
+                -
                   tag: frontend
                   value: '{#PXNAME}'
-                -
-                  tag: resource
-                  value: frontend
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: rate
             -
               uuid: 047ec4b444af4bc38f74eb7fabf2fb94
               name: 'HAProxy Frontend {#PXNAME}: Outgoing traffic'
@@ -1229,20 +1028,11 @@ zabbix_export:
                 key: 'web.page.get["{$HAPROXY.STATS.SCHEME}://{HOST.CONN}:{$HAPROXY.STATS.PORT}/{$HAPROXY.STATS.PATH};csv"]'
               tags:
                 -
+                  tag: component
+                  value: network
+                -
                   tag: frontend
                   value: '{#PXNAME}'
-                -
-                  tag: resource
-                  value: frontend
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: rate
             -
               uuid: 4542ee3da6334468b6a146083bfa1208
               name: 'HAProxy Frontend {#PXNAME}: Denied requests per second'
@@ -1265,20 +1055,11 @@ zabbix_export:
                 key: 'web.page.get["{$HAPROXY.STATS.SCHEME}://{HOST.CONN}:{$HAPROXY.STATS.PORT}/{$HAPROXY.STATS.PATH};csv"]'
               tags:
                 -
+                  tag: component
+                  value: requests
+                -
                   tag: frontend
                   value: '{#PXNAME}'
-                -
-                  tag: resource
-                  value: frontend
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: rate
               trigger_prototypes:
                 -
                   uuid: 269d5e491e3d41b6be5257c8a8a85efb
@@ -1286,6 +1067,10 @@ zabbix_export:
                   name: 'HAProxy frontend {#PXNAME}: Number of requests denied is more than {$HAPROXY.FRONT_DREQ.MAX.WARN} for 5m'
                   priority: WARNING
                   description: 'Number of requests denied due to security concerns (ACL-restricted) is more than {$HAPROXY.FRONT_DREQ.MAX.WARN}.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 2da48ea7b7fb4432b041b9706017778e
               name: 'HAProxy Frontend {#PXNAME}: Request errors per second'
@@ -1308,20 +1093,11 @@ zabbix_export:
                 key: 'web.page.get["{$HAPROXY.STATS.SCHEME}://{HOST.CONN}:{$HAPROXY.STATS.PORT}/{$HAPROXY.STATS.PATH};csv"]'
               tags:
                 -
+                  tag: component
+                  value: requests
+                -
                   tag: frontend
                   value: '{#PXNAME}'
-                -
-                  tag: resource
-                  value: frontend
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: rate
               trigger_prototypes:
                 -
                   uuid: 8361fb028aed4bd9bf3356249699d424
@@ -1329,6 +1105,10 @@ zabbix_export:
                   name: 'HAProxy frontend {#PXNAME}: Number of request errors is more than {$HAPROXY.FRONT_EREQ.MAX.WARN} for 5m'
                   priority: WARNING
                   description: 'Number of request errors is more than {$HAPROXY.FRONT_EREQ.MAX.WARN}.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: d4d6d7092c524a4aa9ac83f9506fcb44
               name: 'HAProxy Frontend {#PXNAME}: Number of responses with codes 1xx per second'
@@ -1351,20 +1131,11 @@ zabbix_export:
                 key: 'web.page.get["{$HAPROXY.STATS.SCHEME}://{HOST.CONN}:{$HAPROXY.STATS.PORT}/{$HAPROXY.STATS.PATH};csv"]'
               tags:
                 -
+                  tag: component
+                  value: responses
+                -
                   tag: frontend
                   value: '{#PXNAME}'
-                -
-                  tag: resource
-                  value: frontend
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: rate
             -
               uuid: 34bb4142cb4c48678f1136ed7a582ff7
               name: 'HAProxy Frontend {#PXNAME}: Number of responses with codes 2xx per second'
@@ -1387,20 +1158,11 @@ zabbix_export:
                 key: 'web.page.get["{$HAPROXY.STATS.SCHEME}://{HOST.CONN}:{$HAPROXY.STATS.PORT}/{$HAPROXY.STATS.PATH};csv"]'
               tags:
                 -
+                  tag: component
+                  value: responses
+                -
                   tag: frontend
                   value: '{#PXNAME}'
-                -
-                  tag: resource
-                  value: frontend
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: rate
             -
               uuid: 3d6966759c864b0d94daceead022e421
               name: 'HAProxy Frontend {#PXNAME}: Number of responses with codes 3xx per second'
@@ -1423,20 +1185,11 @@ zabbix_export:
                 key: 'web.page.get["{$HAPROXY.STATS.SCHEME}://{HOST.CONN}:{$HAPROXY.STATS.PORT}/{$HAPROXY.STATS.PATH};csv"]'
               tags:
                 -
+                  tag: component
+                  value: responses
+                -
                   tag: frontend
                   value: '{#PXNAME}'
-                -
-                  tag: resource
-                  value: frontend
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: rate
             -
               uuid: 3fe3871812254cf0a228b6607f02ea12
               name: 'HAProxy Frontend {#PXNAME}: Number of responses with codes 4xx per second'
@@ -1459,20 +1212,11 @@ zabbix_export:
                 key: 'web.page.get["{$HAPROXY.STATS.SCHEME}://{HOST.CONN}:{$HAPROXY.STATS.PORT}/{$HAPROXY.STATS.PATH};csv"]'
               tags:
                 -
+                  tag: component
+                  value: responses
+                -
                   tag: frontend
                   value: '{#PXNAME}'
-                -
-                  tag: resource
-                  value: frontend
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: rate
             -
               uuid: 85d7aa81598b48ee9d40ce3e5b7fc7ea
               name: 'HAProxy Frontend {#PXNAME}: Number of responses with codes 5xx per second'
@@ -1495,20 +1239,11 @@ zabbix_export:
                 key: 'web.page.get["{$HAPROXY.STATS.SCHEME}://{HOST.CONN}:{$HAPROXY.STATS.PORT}/{$HAPROXY.STATS.PATH};csv"]'
               tags:
                 -
+                  tag: component
+                  value: responses
+                -
                   tag: frontend
                   value: '{#PXNAME}'
-                -
-                  tag: resource
-                  value: frontend
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: rate
             -
               uuid: 24ee024f493e47f4b4405bc469976c8e
               name: 'HAProxy Frontend {#PXNAME}: Sessions rate'
@@ -1526,20 +1261,11 @@ zabbix_export:
                 key: 'web.page.get["{$HAPROXY.STATS.SCHEME}://{HOST.CONN}:{$HAPROXY.STATS.PORT}/{$HAPROXY.STATS.PATH};csv"]'
               tags:
                 -
+                  tag: component
+                  value: sessions
+                -
                   tag: frontend
                   value: '{#PXNAME}'
-                -
-                  tag: resource
-                  value: frontend
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: gauge
             -
               uuid: 2290bc0944774d54a89d5b6195f81ad4
               name: 'HAProxy Frontend {#PXNAME}: Requests rate'
@@ -1557,20 +1283,11 @@ zabbix_export:
                 key: 'web.page.get["{$HAPROXY.STATS.SCHEME}://{HOST.CONN}:{$HAPROXY.STATS.PORT}/{$HAPROXY.STATS.PATH};csv"]'
               tags:
                 -
+                  tag: component
+                  value: requests
+                -
                   tag: frontend
                   value: '{#PXNAME}'
-                -
-                  tag: resource
-                  value: frontend
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: gauge
             -
               uuid: b01d1b02b9da4609acaa278cf5f2ebbd
               name: 'HAProxy Frontend {#PXNAME}: Established sessions'
@@ -1588,20 +1305,11 @@ zabbix_export:
                 key: 'web.page.get["{$HAPROXY.STATS.SCHEME}://{HOST.CONN}:{$HAPROXY.STATS.PORT}/{$HAPROXY.STATS.PATH};csv"]'
               tags:
                 -
+                  tag: component
+                  value: sessions
+                -
                   tag: frontend
                   value: '{#PXNAME}'
-                -
-                  tag: resource
-                  value: frontend
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: gauge
             -
               uuid: 4ed338fd24e14aeda1f6058a36371455
               name: 'HAProxy Frontend {#PXNAME}: Session limits'
@@ -1623,20 +1331,11 @@ zabbix_export:
                 key: 'web.page.get["{$HAPROXY.STATS.SCHEME}://{HOST.CONN}:{$HAPROXY.STATS.PORT}/{$HAPROXY.STATS.PATH};csv"]'
               tags:
                 -
+                  tag: component
+                  value: sessions
+                -
                   tag: frontend
                   value: '{#PXNAME}'
-                -
-                  tag: resource
-                  value: frontend
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: gauge
             -
               uuid: 5a48a087c07c4cbbaf0332930d59244b
               name: 'HAProxy Frontend {#PXNAME}: Status'
@@ -1662,20 +1361,11 @@ zabbix_export:
                 key: 'web.page.get["{$HAPROXY.STATS.SCHEME}://{HOST.CONN}:{$HAPROXY.STATS.PORT}/{$HAPROXY.STATS.PATH};csv"]'
               tags:
                 -
+                  tag: component
+                  value: health
+                -
                   tag: frontend
                   value: '{#PXNAME}'
-                -
-                  tag: resource
-                  value: frontend
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: state
             -
               uuid: 4aedda0904954ade92a4aad6460d759b
               name: 'HAProxy Frontend {#PXNAME}: Session utilization'
@@ -1688,27 +1378,22 @@ zabbix_export:
               description: 'Percentage of sessions used (scur / slim * 100).'
               tags:
                 -
+                  tag: component
+                  value: sessions
+                -
                   tag: frontend
                   value: '{#PXNAME}'
-                -
-                  tag: resource
-                  value: frontend
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: calculated
-                -
-                  tag: type
-                  value: gauge
               trigger_prototypes:
                 -
                   uuid: 9af44a07b1a347979492063ee756b025
                   expression: 'min(/HAProxy by Zabbix agent/haproxy.frontend.sutil[{#PXNAME},{#SVNAME}],5m)>{$HAPROXY.FRONT_SUTIL.MAX.WARN}'
                   name: 'HAProxy frontend {#PXNAME}: Session utilization is more than {$HAPROXY.FRONT_SUTIL.MAX.WARN}% for 5m'
                   priority: WARNING
-                  description: 'Alerting on this metric is essential to ensure your server has sufficient capacity to handle all concurrent sessions. Unlike requests, upon reaching the session limit HAProxy will deny additional clients until resource consumption drops. Furthermore, if you find your session usage percentage to be hovering above 80%, it could be time to either modify HAProxy’s configuration to allow more sessions, or migrate your HAProxy server to a bigger box.'
+                  description: 'Alerting on this metric is essential to ensure your server has sufficient capacity to handle all concurrent sessions. Unlike requests, upon reaching the session limit HAProxy will deny additional clients until resource consumption drops. Furthermore, if you find your session usage percentage to be hovering above 80%, it could be time to either modify HAProxy''s configuration to allow more sessions, or migrate your HAProxy server to a bigger box.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 30141ef1c5bf4c4a9cca0f8ce2ea3373
@@ -1863,20 +1548,14 @@ zabbix_export:
                 key: 'web.page.get["{$HAPROXY.STATS.SCHEME}://{HOST.CONN}:{$HAPROXY.STATS.PORT}/{$HAPROXY.STATS.PATH};csv"]'
               tags:
                 -
-                  tag: resource
-                  value: server
+                  tag: component
+                  value: role
                 -
                   tag: server
-                  value: '{#PXNAME} {#SVNAME}'
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
+                  value: '{#PXNAME}'
                 -
-                  tag: type
-                  value: gauge
+                  tag: service
+                  value: '{#SVNAME}'
             -
               uuid: 3617492e9cfd49b6b5576ed231dc2614
               name: 'HAProxy {#PXNAME} {#SVNAME}: Server is backup'
@@ -1900,20 +1579,14 @@ zabbix_export:
                 key: 'web.page.get["{$HAPROXY.STATS.SCHEME}://{HOST.CONN}:{$HAPROXY.STATS.PORT}/{$HAPROXY.STATS.PATH};csv"]'
               tags:
                 -
-                  tag: resource
-                  value: server
+                  tag: component
+                  value: role
                 -
                   tag: server
-                  value: '{#PXNAME} {#SVNAME}'
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
+                  value: '{#PXNAME}'
                 -
-                  tag: type
-                  value: gauge
+                  tag: service
+                  value: '{#SVNAME}'
             -
               uuid: 20d5a69a9aa24fc6abf21c1c317ac425
               name: 'HAProxy {#PXNAME} {#SVNAME}: Incoming traffic'
@@ -1941,20 +1614,14 @@ zabbix_export:
                 key: 'web.page.get["{$HAPROXY.STATS.SCHEME}://{HOST.CONN}:{$HAPROXY.STATS.PORT}/{$HAPROXY.STATS.PATH};csv"]'
               tags:
                 -
-                  tag: resource
-                  value: server
+                  tag: component
+                  value: network
                 -
                   tag: server
-                  value: '{#PXNAME} {#SVNAME}'
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
+                  value: '{#PXNAME}'
                 -
-                  tag: type
-                  value: rate
+                  tag: service
+                  value: '{#SVNAME}'
             -
               uuid: 7fbc335144b74c08ba6a79a108e8e894
               name: 'HAProxy {#PXNAME} {#SVNAME}: Outgoing traffic'
@@ -1982,20 +1649,14 @@ zabbix_export:
                 key: 'web.page.get["{$HAPROXY.STATS.SCHEME}://{HOST.CONN}:{$HAPROXY.STATS.PORT}/{$HAPROXY.STATS.PATH};csv"]'
               tags:
                 -
-                  tag: resource
-                  value: server
+                  tag: component
+                  value: network
                 -
                   tag: server
-                  value: '{#PXNAME} {#SVNAME}'
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
+                  value: '{#PXNAME}'
                 -
-                  tag: type
-                  value: rate
+                  tag: service
+                  value: '{#SVNAME}'
             -
               uuid: c46228518a3a460b894aea999ca0feab
               name: 'HAProxy {#PXNAME} {#SVNAME}: Status of last health check'
@@ -2035,20 +1696,14 @@ zabbix_export:
                 key: 'web.page.get["{$HAPROXY.STATS.SCHEME}://{HOST.CONN}:{$HAPROXY.STATS.PORT}/{$HAPROXY.STATS.PATH};csv"]'
               tags:
                 -
-                  tag: resource
-                  value: server
+                  tag: component
+                  value: health
                 -
                   tag: server
-                  value: '{#PXNAME} {#SVNAME}'
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
+                  value: '{#PXNAME}'
                 -
-                  tag: type
-                  value: state
+                  tag: service
+                  value: '{#SVNAME}'
               trigger_prototypes:
                 -
                   uuid: 1378f45ad65a498aae7b571a69547352
@@ -2061,6 +1716,10 @@ zabbix_export:
                     -
                       name: 'HAProxy {#PXNAME} {#SVNAME}: Server is DOWN'
                       expression: 'count(/HAProxy by Zabbix agent/haproxy.server.status[{#PXNAME},{#SVNAME}],#5,"eq","DOWN")=5'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 537f0b807f784b6cba1032ff77fad499
               name: 'HAProxy {#PXNAME} {#SVNAME}: Responses denied per second'
@@ -2083,20 +1742,14 @@ zabbix_export:
                 key: 'web.page.get["{$HAPROXY.STATS.SCHEME}://{HOST.CONN}:{$HAPROXY.STATS.PORT}/{$HAPROXY.STATS.PATH};csv"]'
               tags:
                 -
-                  tag: resource
-                  value: server
+                  tag: component
+                  value: responses
                 -
                   tag: server
-                  value: '{#PXNAME} {#SVNAME}'
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
+                  value: '{#PXNAME}'
                 -
-                  tag: type
-                  value: rate
+                  tag: service
+                  value: '{#SVNAME}'
             -
               uuid: f688e1e62fa94d1db1d59735094f0bc4
               name: 'HAProxy {#PXNAME} {#SVNAME}: Errors connection per second'
@@ -2119,20 +1772,14 @@ zabbix_export:
                 key: 'web.page.get["{$HAPROXY.STATS.SCHEME}://{HOST.CONN}:{$HAPROXY.STATS.PORT}/{$HAPROXY.STATS.PATH};csv"]'
               tags:
                 -
-                  tag: resource
-                  value: server
+                  tag: component
+                  value: connections
                 -
                   tag: server
-                  value: '{#PXNAME} {#SVNAME}'
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
+                  value: '{#PXNAME}'
                 -
-                  tag: type
-                  value: rate
+                  tag: service
+                  value: '{#SVNAME}'
             -
               uuid: bdcac24a8b1e4dd5a441edb61ca13156
               name: 'HAProxy {#PXNAME} {#SVNAME}: Response errors per second'
@@ -2155,20 +1802,14 @@ zabbix_export:
                 key: 'web.page.get["{$HAPROXY.STATS.SCHEME}://{HOST.CONN}:{$HAPROXY.STATS.PORT}/{$HAPROXY.STATS.PATH};csv"]'
               tags:
                 -
-                  tag: resource
-                  value: server
+                  tag: component
+                  value: responses
                 -
                   tag: server
-                  value: '{#PXNAME} {#SVNAME}'
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
+                  value: '{#PXNAME}'
                 -
-                  tag: type
-                  value: rate
+                  tag: service
+                  value: '{#SVNAME}'
               trigger_prototypes:
                 -
                   uuid: 5a982a97f812468eb8e7163f06f0ee77
@@ -2176,6 +1817,10 @@ zabbix_export:
                   name: 'HAProxy {#PXNAME} {#SVNAME}: Number of responses with error is more than {$HAPROXY.SERVER_ERESP.MAX.WARN} for 5m'
                   priority: WARNING
                   description: 'Number of requests on server, whose responses yielded an error, is more than {$HAPROXY.SERVER_ERESP.MAX.WARN}.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 71fbb982c23c498fb52b68b3f839c642
               name: 'HAProxy {#PXNAME} {#SVNAME}: Number of responses with codes 1xx per second'
@@ -2198,20 +1843,14 @@ zabbix_export:
                 key: 'web.page.get["{$HAPROXY.STATS.SCHEME}://{HOST.CONN}:{$HAPROXY.STATS.PORT}/{$HAPROXY.STATS.PATH};csv"]'
               tags:
                 -
-                  tag: resource
-                  value: server
+                  tag: component
+                  value: responses
                 -
                   tag: server
-                  value: '{#PXNAME} {#SVNAME}'
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
+                  value: '{#PXNAME}'
                 -
-                  tag: type
-                  value: rate
+                  tag: service
+                  value: '{#SVNAME}'
             -
               uuid: a1aa6301ea1445bdbc509ec31cc9ebfc
               name: 'HAProxy {#PXNAME} {#SVNAME}: Number of responses with codes 2xx per second'
@@ -2234,20 +1873,14 @@ zabbix_export:
                 key: 'web.page.get["{$HAPROXY.STATS.SCHEME}://{HOST.CONN}:{$HAPROXY.STATS.PORT}/{$HAPROXY.STATS.PATH};csv"]'
               tags:
                 -
-                  tag: resource
-                  value: server
+                  tag: component
+                  value: responses
                 -
                   tag: server
-                  value: '{#PXNAME} {#SVNAME}'
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
+                  value: '{#PXNAME}'
                 -
-                  tag: type
-                  value: rate
+                  tag: service
+                  value: '{#SVNAME}'
             -
               uuid: 5b5576604886429ca22db333c9886c25
               name: 'HAProxy {#PXNAME} {#SVNAME}: Number of responses with codes 3xx per second'
@@ -2270,20 +1903,14 @@ zabbix_export:
                 key: 'web.page.get["{$HAPROXY.STATS.SCHEME}://{HOST.CONN}:{$HAPROXY.STATS.PORT}/{$HAPROXY.STATS.PATH};csv"]'
               tags:
                 -
-                  tag: resource
-                  value: server
+                  tag: component
+                  value: responses
                 -
                   tag: server
-                  value: '{#PXNAME} {#SVNAME}'
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
+                  value: '{#PXNAME}'
                 -
-                  tag: type
-                  value: rate
+                  tag: service
+                  value: '{#SVNAME}'
             -
               uuid: 3af9ae3041bb4cd588cc6048370d9be7
               name: 'HAProxy {#PXNAME} {#SVNAME}: Number of responses with codes 4xx per second'
@@ -2306,20 +1933,14 @@ zabbix_export:
                 key: 'web.page.get["{$HAPROXY.STATS.SCHEME}://{HOST.CONN}:{$HAPROXY.STATS.PORT}/{$HAPROXY.STATS.PATH};csv"]'
               tags:
                 -
-                  tag: resource
-                  value: server
+                  tag: component
+                  value: responses
                 -
                   tag: server
-                  value: '{#PXNAME} {#SVNAME}'
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
+                  value: '{#PXNAME}'
                 -
-                  tag: type
-                  value: rate
+                  tag: service
+                  value: '{#SVNAME}'
             -
               uuid: 9f2f6e181dca47ab8e1ae9064ab9fe15
               name: 'HAProxy {#PXNAME} {#SVNAME}: Number of responses with codes 5xx per second'
@@ -2342,20 +1963,14 @@ zabbix_export:
                 key: 'web.page.get["{$HAPROXY.STATS.SCHEME}://{HOST.CONN}:{$HAPROXY.STATS.PORT}/{$HAPROXY.STATS.PATH};csv"]'
               tags:
                 -
-                  tag: resource
-                  value: server
+                  tag: component
+                  value: responses
                 -
                   tag: server
-                  value: '{#PXNAME} {#SVNAME}'
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
+                  value: '{#PXNAME}'
                 -
-                  tag: type
-                  value: rate
+                  tag: service
+                  value: '{#SVNAME}'
             -
               uuid: 8a7257e803b84783a8c9964807a336a5
               name: 'HAProxy {#PXNAME} {#SVNAME}: Server was selected per second'
@@ -2378,20 +1993,14 @@ zabbix_export:
                 key: 'web.page.get["{$HAPROXY.STATS.SCHEME}://{HOST.CONN}:{$HAPROXY.STATS.PORT}/{$HAPROXY.STATS.PATH};csv"]'
               tags:
                 -
-                  tag: resource
-                  value: server
+                  tag: component
+                  value: connections
                 -
                   tag: server
-                  value: '{#PXNAME} {#SVNAME}'
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
+                  value: '{#PXNAME}'
                 -
-                  tag: type
-                  value: rate
+                  tag: service
+                  value: '{#SVNAME}'
             -
               uuid: 03c6d54204104fa0a320ff76204fc825
               name: 'HAProxy {#PXNAME} {#SVNAME}: Unassigned requests'
@@ -2409,20 +2018,14 @@ zabbix_export:
                 key: 'web.page.get["{$HAPROXY.STATS.SCHEME}://{HOST.CONN}:{$HAPROXY.STATS.PORT}/{$HAPROXY.STATS.PATH};csv"]'
               tags:
                 -
-                  tag: resource
-                  value: server
+                  tag: component
+                  value: requests
                 -
                   tag: server
-                  value: '{#PXNAME} {#SVNAME}'
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
+                  value: '{#PXNAME}'
                 -
-                  tag: type
-                  value: gauge
+                  tag: service
+                  value: '{#SVNAME}'
               trigger_prototypes:
                 -
                   uuid: b88e0b4baa2e4738a161a7fc437d6e1c
@@ -2430,6 +2033,10 @@ zabbix_export:
                   name: 'HAProxy {#PXNAME} {#SVNAME}: Current number of requests unassigned in queue is more than {$HAPROXY.SERVER_QCUR.MAX.WARN} for 5m'
                   priority: WARNING
                   description: 'Current number of requests unassigned in queue is more than {$HAPROXY.SERVER_QCUR.MAX.WARN}.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 50a837b40d624492b0248324d8b62694
               name: 'HAProxy {#PXNAME} {#SVNAME}: Configured maxqueue'
@@ -2457,20 +2064,14 @@ zabbix_export:
                 key: 'web.page.get["{$HAPROXY.STATS.SCHEME}://{HOST.CONN}:{$HAPROXY.STATS.PORT}/{$HAPROXY.STATS.PATH};csv"]'
               tags:
                 -
-                  tag: resource
-                  value: server
+                  tag: component
+                  value: queues
                 -
                   tag: server
-                  value: '{#PXNAME} {#SVNAME}'
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
+                  value: '{#PXNAME}'
                 -
-                  tag: type
-                  value: gauge
+                  tag: service
+                  value: '{#SVNAME}'
             -
               uuid: 58c074ebc26145a6847d425d51f7cbca
               name: 'HAProxy {#PXNAME} {#SVNAME}: Time in queue'
@@ -2494,20 +2095,14 @@ zabbix_export:
                 key: 'web.page.get["{$HAPROXY.STATS.SCHEME}://{HOST.CONN}:{$HAPROXY.STATS.PORT}/{$HAPROXY.STATS.PATH};csv"]'
               tags:
                 -
-                  tag: resource
-                  value: server
+                  tag: component
+                  value: requests
                 -
                   tag: server
-                  value: '{#PXNAME} {#SVNAME}'
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
+                  value: '{#PXNAME}'
                 -
-                  tag: type
-                  value: gauge
+                  tag: service
+                  value: '{#SVNAME}'
               trigger_prototypes:
                 -
                   uuid: abf3d9e3f6fa43d8bf722bcc58c37388
@@ -2515,6 +2110,10 @@ zabbix_export:
                   name: 'HAProxy {#PXNAME} {#SVNAME}: Average time spent in queue is more than {$HAPROXY.SERVER_QTIME.MAX.WARN} for 5m'
                   priority: WARNING
                   description: 'Average time spent in queue (in ms) for the last 1,024 requests is more than {$HAPROXY.SERVER_QTIME.MAX.WARN}.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 25c22d3eca2d4eb7b83791d36edcf470
               name: 'HAProxy {#PXNAME} {#SVNAME}: Responses time'
@@ -2538,20 +2137,14 @@ zabbix_export:
                 key: 'web.page.get["{$HAPROXY.STATS.SCHEME}://{HOST.CONN}:{$HAPROXY.STATS.PORT}/{$HAPROXY.STATS.PATH};csv"]'
               tags:
                 -
-                  tag: resource
-                  value: server
+                  tag: component
+                  value: health
                 -
                   tag: server
-                  value: '{#PXNAME} {#SVNAME}'
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
+                  value: '{#PXNAME}'
                 -
-                  tag: type
-                  value: gauge
+                  tag: service
+                  value: '{#SVNAME}'
               trigger_prototypes:
                 -
                   uuid: 51ae2aca459b453cb433c5cc0f043a25
@@ -2559,6 +2152,10 @@ zabbix_export:
                   name: 'HAProxy {#PXNAME} {#SVNAME}: Average response time is more than {$HAPROXY.SERVER_RTIME.MAX.WARN} for 5m'
                   priority: WARNING
                   description: 'Average server response time (in ms) for the last 1,024 requests is more than {$HAPROXY.SERVER_RTIME.MAX.WARN}.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 973e886a54374bd4815f71d9f9174e80
               name: 'HAProxy {#PXNAME} {#SVNAME}: Status'
@@ -2583,20 +2180,14 @@ zabbix_export:
                 key: 'web.page.get["{$HAPROXY.STATS.SCHEME}://{HOST.CONN}:{$HAPROXY.STATS.PORT}/{$HAPROXY.STATS.PATH};csv"]'
               tags:
                 -
-                  tag: resource
-                  value: server
+                  tag: component
+                  value: health
                 -
                   tag: server
-                  value: '{#PXNAME} {#SVNAME}'
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
+                  value: '{#PXNAME}'
                 -
-                  tag: type
-                  value: state
+                  tag: service
+                  value: '{#SVNAME}'
               trigger_prototypes:
                 -
                   uuid: ec64ec00aa164ac09faf90794264907a
@@ -2605,6 +2196,10 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: WARNING
                   description: 'Server is not available.'
+                  tags:
+                    -
+                      tag: scope
+                      value: avialability
             -
               uuid: 6f5c20d65ba34afbb47cd65af1d1b368
               name: 'HAProxy {#PXNAME} {#SVNAME}: Sessions per second'
@@ -2627,20 +2222,14 @@ zabbix_export:
                 key: 'web.page.get["{$HAPROXY.STATS.SCHEME}://{HOST.CONN}:{$HAPROXY.STATS.PORT}/{$HAPROXY.STATS.PATH};csv"]'
               tags:
                 -
-                  tag: resource
-                  value: server
+                  tag: component
+                  value: sessions
                 -
                   tag: server
-                  value: '{#PXNAME} {#SVNAME}'
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
+                  value: '{#PXNAME}'
                 -
-                  tag: type
-                  value: rate
+                  tag: service
+                  value: '{#SVNAME}'
             -
               uuid: 02605cd644e14e2398af89433a6d976d
               name: 'HAProxy {#PXNAME} {#SVNAME}: Weight'
@@ -2662,20 +2251,14 @@ zabbix_export:
                 key: 'web.page.get["{$HAPROXY.STATS.SCHEME}://{HOST.CONN}:{$HAPROXY.STATS.PORT}/{$HAPROXY.STATS.PATH};csv"]'
               tags:
                 -
-                  tag: resource
-                  value: server
+                  tag: component
+                  value: balancer
                 -
                   tag: server
-                  value: '{#PXNAME} {#SVNAME}'
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
+                  value: '{#PXNAME}'
                 -
-                  tag: type
-                  value: gauge
+                  tag: service
+                  value: '{#SVNAME}'
             -
               uuid: 606acc119e0d4d9c934e200e037434fe
               name: 'HAProxy {#PXNAME} {#SVNAME}: Redispatched requests per second'
@@ -2698,20 +2281,14 @@ zabbix_export:
                 key: 'web.page.get["{$HAPROXY.STATS.SCHEME}://{HOST.CONN}:{$HAPROXY.STATS.PORT}/{$HAPROXY.STATS.PATH};csv"]'
               tags:
                 -
-                  tag: resource
-                  value: server
+                  tag: component
+                  value: requests
                 -
                   tag: server
-                  value: '{#PXNAME} {#SVNAME}'
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
+                  value: '{#PXNAME}'
                 -
-                  tag: type
-                  value: rate
+                  tag: service
+                  value: '{#SVNAME}'
             -
               uuid: 1e2188320b834562b6b33e96f90a5b44
               name: 'HAProxy {#PXNAME} {#SVNAME}: Retried connections per second'
@@ -2734,20 +2311,14 @@ zabbix_export:
                 key: 'web.page.get["{$HAPROXY.STATS.SCHEME}://{HOST.CONN}:{$HAPROXY.STATS.PORT}/{$HAPROXY.STATS.PATH};csv"]'
               tags:
                 -
-                  tag: resource
-                  value: server
+                  tag: component
+                  value: connections
                 -
                   tag: server
-                  value: '{#PXNAME} {#SVNAME}'
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
+                  value: '{#PXNAME}'
                 -
-                  tag: type
-                  value: rate
+                  tag: service
+                  value: '{#SVNAME}'
           graph_prototypes:
             -
               uuid: 15210cbf31ab459ca77d35206255f317
@@ -2844,6 +2415,13 @@ zabbix_export:
                   value: 'Number of responses with codes'
                   status: ENABLED
                   discover: NO_DISCOVER
+      tags:
+        -
+          tag: class
+          value: software
+        -
+          tag: target
+          value: haproxy
       macros:
         -
           macro: '{$HAPROXY.BACK_ERESP.MAX.WARN}'
diff --git a/templates/app/haproxy_http/template_app_haproxy_http.yaml b/templates/app/haproxy_http/template_app_haproxy_http.yaml
index 31685533ab9..40805b86cf6 100644
--- a/templates/app/haproxy_http/template_app_haproxy_http.yaml
+++ b/templates/app/haproxy_http/template_app_haproxy_http.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-15T08:55:31Z'
+  date: '2022-01-26T10:00:08Z'
   groups:
     -
       uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
@@ -23,7 +23,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/393527-discussion-thread-for-official-zabbix-template-haproxy
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Applications
@@ -55,14 +55,8 @@ zabbix_export:
           url: '{$HAPROXY.STATS.SCHEME}://{HOST.CONN}:{$HAPROXY.STATS.PORT}/{$HAPROXY.STATS.PATH};csv'
           tags:
             -
-              tag: data
+              tag: component
               value: raw
-            -
-              tag: target
-              value: haproxy
-            -
-              tag: transport
-              value: http
         -
           uuid: 6af51d085a2f41f983bc3b20c6f4cc22
           name: 'HAProxy: Get nodes'
@@ -86,14 +80,8 @@ zabbix_export:
             key: haproxy.get
           tags:
             -
-              tag: data
+              tag: component
               value: raw
-            -
-              tag: target
-              value: haproxy
-            -
-              tag: transport
-              value: dependent
         -
           uuid: 123c03c715494faea6b1d4f8b8fa564d
           name: 'HAProxy: Get stats page'
@@ -109,14 +97,8 @@ zabbix_export:
           url: '{$HAPROXY.STATS.SCHEME}://{HOST.CONN}:{$HAPROXY.STATS.PORT}/{$HAPROXY.STATS.PATH}'
           tags:
             -
-              tag: data
+              tag: component
               value: raw
-            -
-              tag: target
-              value: haproxy
-            -
-              tag: transport
-              value: http
         -
           uuid: 06a33ebaed3148889c19eba2de859d70
           name: 'HAProxy: Uptime'
@@ -142,17 +124,8 @@ zabbix_export:
             key: haproxy.get_html
           tags:
             -
-              tag: resource
-              value: general
-            -
-              tag: target
-              value: haproxy
-            -
-              tag: transport
-              value: dependent
-            -
-              tag: type
-              value: gauge
+              tag: component
+              value: application
           triggers:
             -
               uuid: ff606f3c571340389562fabc9e814463
@@ -161,6 +134,10 @@ zabbix_export:
               priority: INFO
               description: 'Uptime is less than 10 minutes'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: a2cd747feaaf4c278972ac7adbd9015a
           name: 'HAProxy: Version'
@@ -185,17 +162,8 @@ zabbix_export:
             key: haproxy.get_html
           tags:
             -
-              tag: resource
-              value: general
-            -
-              tag: target
-              value: haproxy
-            -
-              tag: transport
-              value: dependent
-            -
-              tag: type
-              value: gauge
+              tag: component
+              value: application
           triggers:
             -
               uuid: c4b8346311a34cd19ebc8fbab53737fe
@@ -204,6 +172,10 @@ zabbix_export:
               priority: INFO
               description: 'HAProxy version has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 6f9c22a840764181be9cf98609e7f691
           name: 'HAProxy: Service response time'
@@ -214,17 +186,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: resource
-              value: general
+              tag: component
+              value: health
             -
-              tag: target
-              value: haproxy
-            -
-              tag: transport
-              value: simple
-            -
-              tag: type
-              value: gauge
+              tag: component
+              value: network
           triggers:
             -
               uuid: 1fed5fffc6414e0babe362c0ad742e43
@@ -236,6 +202,10 @@ zabbix_export:
                 -
                   name: 'HAProxy: Service is down'
                   expression: 'last(/HAProxy by HTTP/net.tcp.service["{$HAPROXY.STATS.SCHEME}","{HOST.CONN}","{$HAPROXY.STATS.PORT}"])=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 68cb52357d7443d79373df3890ed175f
           name: 'HAProxy: Service status'
@@ -251,17 +221,11 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: resource
-              value: general
+              tag: component
+              value: health
             -
-              tag: target
-              value: haproxy
-            -
-              tag: transport
-              value: simple
-            -
-              tag: type
-              value: gauge
+              tag: component
+              value: network
           triggers:
             -
               uuid: b346943ac4d04a96bcef42f3c43fc555
@@ -269,6 +233,10 @@ zabbix_export:
               name: 'HAProxy: Service is down'
               priority: AVERAGE
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: 7b4ab1338cdf4e499c1fdea4c886ae9a
@@ -313,17 +281,8 @@ zabbix_export:
                   tag: backend
                   value: '{#PXNAME}'
                 -
-                  tag: resource
-                  value: backend
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: gauge
+                  tag: component
+                  value: servers
             -
               uuid: 08debce7e9084094b38fd1100e03c553
               name: 'HAProxy Backend {#PXNAME}: Number of backup servers'
@@ -348,17 +307,8 @@ zabbix_export:
                   tag: backend
                   value: '{#PXNAME}'
                 -
-                  tag: resource
-                  value: backend
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: gauge
+                  tag: component
+                  value: servers
             -
               uuid: 8a53b50c1ce441c18fe6e6d5e0ad48d6
               name: 'HAProxy Backend {#PXNAME}: Incoming traffic'
@@ -389,17 +339,8 @@ zabbix_export:
                   tag: backend
                   value: '{#PXNAME}'
                 -
-                  tag: resource
-                  value: backend
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: rate
+                  tag: component
+                  value: network
             -
               uuid: 1c24125e97014d4ba6a8155af5744d38
               name: 'HAProxy Backend {#PXNAME}: Outgoing traffic'
@@ -430,17 +371,8 @@ zabbix_export:
                   tag: backend
                   value: '{#PXNAME}'
                 -
-                  tag: resource
-                  value: backend
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: rate
+                  tag: component
+                  value: network
             -
               uuid: 59eeafe66fe34334a81d736f62b88ec0
               name: 'HAProxy Backend {#PXNAME}: Responses denied per second'
@@ -466,17 +398,8 @@ zabbix_export:
                   tag: backend
                   value: '{#PXNAME}'
                 -
-                  tag: resource
-                  value: backend
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: rate
+                  tag: component
+                  value: responses
             -
               uuid: e885cb2b53a941cd932211c4ccf334f6
               name: 'HAProxy Backend {#PXNAME}: Errors connection per second'
@@ -502,17 +425,8 @@ zabbix_export:
                   tag: backend
                   value: '{#PXNAME}'
                 -
-                  tag: resource
-                  value: backend
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: rate
+                  tag: component
+                  value: connections
             -
               uuid: c42f04d1a00c4d4fa96705746cb32631
               name: 'HAProxy Backend {#PXNAME}: Response errors per second'
@@ -538,17 +452,8 @@ zabbix_export:
                   tag: backend
                   value: '{#PXNAME}'
                 -
-                  tag: resource
-                  value: backend
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: rate
+                  tag: component
+                  value: responses
               trigger_prototypes:
                 -
                   uuid: efe5a794bd47419398aa3aa35a177f08
@@ -556,6 +461,10 @@ zabbix_export:
                   name: 'HAProxy backend {#PXNAME}: Number of responses with error is more than {$HAPROXY.BACK_ERESP.MAX.WARN} for 5m'
                   priority: WARNING
                   description: 'Number of requests on backend, whose responses yielded an error, is more than {$HAPROXY.BACK_ERESP.MAX.WARN}.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 55edb3b8afaa4ee2961d1fead3653dbd
               name: 'HAProxy Backend {#PXNAME}: Number of responses with codes 1xx per second'
@@ -581,17 +490,8 @@ zabbix_export:
                   tag: backend
                   value: '{#PXNAME}'
                 -
-                  tag: resource
-                  value: backend
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: rate
+                  tag: component
+                  value: responses
             -
               uuid: a4e5dd0c25c3471e82e28b88b6b42e39
               name: 'HAProxy Backend {#PXNAME}: Number of responses with codes 2xx per second'
@@ -617,17 +517,8 @@ zabbix_export:
                   tag: backend
                   value: '{#PXNAME}'
                 -
-                  tag: resource
-                  value: backend
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: rate
+                  tag: component
+                  value: responses
             -
               uuid: 7e32a61240004b99bf19caf29c5d1409
               name: 'HAProxy Backend {#PXNAME}: Number of responses with codes 3xx per second'
@@ -653,17 +544,8 @@ zabbix_export:
                   tag: backend
                   value: '{#PXNAME}'
                 -
-                  tag: resource
-                  value: backend
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: rate
+                  tag: component
+                  value: responses
             -
               uuid: 9519222f512e46d8ae1a7ca3a47f3970
               name: 'HAProxy Backend {#PXNAME}: Number of responses with codes 4xx per second'
@@ -689,17 +571,8 @@ zabbix_export:
                   tag: backend
                   value: '{#PXNAME}'
                 -
-                  tag: resource
-                  value: backend
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: rate
+                  tag: component
+                  value: responses
             -
               uuid: fdaa48cf19164fed8c3f00cc42c3bab8
               name: 'HAProxy Backend {#PXNAME}: Number of responses with codes 5xx per second'
@@ -725,17 +598,8 @@ zabbix_export:
                   tag: backend
                   value: '{#PXNAME}'
                 -
-                  tag: resource
-                  value: backend
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: rate
+                  tag: component
+                  value: responses
             -
               uuid: 7985131c621d49419dfe5bcfecb675f2
               name: 'HAProxy Backend {#PXNAME}: Unassigned requests'
@@ -756,17 +620,8 @@ zabbix_export:
                   tag: backend
                   value: '{#PXNAME}'
                 -
-                  tag: resource
-                  value: backend
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: gauge
+                  tag: component
+                  value: requests
               trigger_prototypes:
                 -
                   uuid: be428614e0874726b63d79150813542d
@@ -774,6 +629,10 @@ zabbix_export:
                   name: 'HAProxy backend {#PXNAME}: Current number of requests unassigned in queue is more than {$HAPROXY.BACK_QCUR.MAX.WARN} for 5m'
                   priority: WARNING
                   description: 'Current number of requests on backend unassigned in queue is more than {$HAPROXY.BACK_QCUR.MAX.WARN}.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 1592ee4ff7b2448a9e044a0ad7904693
               name: 'HAProxy Backend {#PXNAME}: Time in queue'
@@ -800,17 +659,8 @@ zabbix_export:
                   tag: backend
                   value: '{#PXNAME}'
                 -
-                  tag: resource
-                  value: backend
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: gauge
+                  tag: component
+                  value: requests
               trigger_prototypes:
                 -
                   uuid: fa8211069df846a1b2ee8afcdd52f4a0
@@ -818,6 +668,10 @@ zabbix_export:
                   name: 'HAProxy backend {#PXNAME}: Average time spent in queue is more than {$HAPROXY.BACK_QTIME.MAX.WARN} for 5m'
                   priority: WARNING
                   description: 'Average time spent in queue (in ms) for the last 1,024 requests is more than {$HAPROXY.BACK_QTIME.MAX.WARN}.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 5ddd3cd8af904faaa69f34df442c9717
               name: 'HAProxy Backend {#PXNAME}: Responses time'
@@ -844,17 +698,8 @@ zabbix_export:
                   tag: backend
                   value: '{#PXNAME}'
                 -
-                  tag: resource
-                  value: backend
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: gauge
+                  tag: component
+                  value: responses
               trigger_prototypes:
                 -
                   uuid: 90c0bd8c280246b7903ac90c32553fd5
@@ -862,6 +707,10 @@ zabbix_export:
                   name: 'HAProxy backend {#PXNAME}: Average response time is more than {$HAPROXY.BACK_RTIME.MAX.WARN} for 5m'
                   priority: WARNING
                   description: 'Average backend response time (in ms) for the last 1,024 requests is more than {$HAPROXY.BACK_RTIME.MAX.WARN}.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 16bb7ee405a84bb4865c46fdf996511f
               name: 'HAProxy Backend {#PXNAME}: Status'
@@ -897,17 +746,8 @@ zabbix_export:
                   tag: backend
                   value: '{#PXNAME}'
                 -
-                  tag: resource
-                  value: backend
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: state
+                  tag: component
+                  value: health
               trigger_prototypes:
                 -
                   uuid: 5ea80b42a6be4df48f048a5aa253c923
@@ -916,6 +756,10 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Backend is not available.'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 76d9497f428142268a5c1eeb24cbbad7
               name: 'HAProxy Backend {#PXNAME}: Sessions per second'
@@ -941,17 +785,8 @@ zabbix_export:
                   tag: backend
                   value: '{#PXNAME}'
                 -
-                  tag: resource
-                  value: backend
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: rate
+                  tag: component
+                  value: sessions
             -
               uuid: f1d26d9c409d4983b7f94ff412ae72f3
               name: 'HAProxy Backend {#PXNAME}: Weight'
@@ -976,17 +811,8 @@ zabbix_export:
                   tag: backend
                   value: '{#PXNAME}'
                 -
-                  tag: resource
-                  value: backend
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: gauge
+                  tag: component
+                  value: balancer
             -
               uuid: 00d3038c7df34512ae39ba1051712674
               name: 'HAProxy Backend {#PXNAME}: Redispatched requests per second'
@@ -1012,17 +838,8 @@ zabbix_export:
                   tag: backend
                   value: '{#PXNAME}'
                 -
-                  tag: resource
-                  value: backend
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: rate
+                  tag: component
+                  value: requests
             -
               uuid: e0eafe2c4d0d40e492822e43f6cf108e
               name: 'HAProxy Backend {#PXNAME}: Retried connections per second'
@@ -1048,17 +865,8 @@ zabbix_export:
                   tag: backend
                   value: '{#PXNAME}'
                 -
-                  tag: resource
-                  value: backend
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: rate
+                  tag: component
+                  value: connections
           graph_prototypes:
             -
               uuid: 47e7dc2c8ff2424eb81f396f83dbb2c0
@@ -1201,20 +1009,11 @@ zabbix_export:
                 key: haproxy.get
               tags:
                 -
+                  tag: component
+                  value: network
+                -
                   tag: frontend
                   value: '{#PXNAME}'
-                -
-                  tag: resource
-                  value: frontend
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: rate
             -
               uuid: 5550e3842d00486999c822b0d514b78e
               name: 'HAProxy Frontend {#PXNAME}: Outgoing traffic'
@@ -1242,20 +1041,11 @@ zabbix_export:
                 key: haproxy.get
               tags:
                 -
+                  tag: component
+                  value: network
+                -
                   tag: frontend
                   value: '{#PXNAME}'
-                -
-                  tag: resource
-                  value: frontend
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: rate
             -
               uuid: 819b1559cf294958ab03cae8663eb7e3
               name: 'HAProxy Frontend {#PXNAME}: Denied requests per second'
@@ -1278,20 +1068,11 @@ zabbix_export:
                 key: haproxy.get
               tags:
                 -
+                  tag: component
+                  value: requests
+                -
                   tag: frontend
                   value: '{#PXNAME}'
-                -
-                  tag: resource
-                  value: frontend
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: rate
               trigger_prototypes:
                 -
                   uuid: 4d8ac22673944752979263b34521af65
@@ -1299,6 +1080,10 @@ zabbix_export:
                   name: 'HAProxy frontend {#PXNAME}: Number of requests denied is more than {$HAPROXY.FRONT_DREQ.MAX.WARN} for 5m'
                   priority: WARNING
                   description: 'Number of requests denied due to security concerns (ACL-restricted) is more than {$HAPROXY.FRONT_DREQ.MAX.WARN}.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 0b2a1b9e1c9045519e4ac52d5d83e86b
               name: 'HAProxy Frontend {#PXNAME}: Request errors per second'
@@ -1321,20 +1106,11 @@ zabbix_export:
                 key: haproxy.get
               tags:
                 -
+                  tag: component
+                  value: requests
+                -
                   tag: frontend
                   value: '{#PXNAME}'
-                -
-                  tag: resource
-                  value: frontend
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: rate
               trigger_prototypes:
                 -
                   uuid: c51ac95f4d4a46e1ac1df1d057197f6e
@@ -1342,6 +1118,10 @@ zabbix_export:
                   name: 'HAProxy frontend {#PXNAME}: Number of request errors is more than {$HAPROXY.FRONT_EREQ.MAX.WARN} for 5m'
                   priority: WARNING
                   description: 'Number of request errors is more than {$HAPROXY.FRONT_EREQ.MAX.WARN}.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: c287463b994c40caaaeb195a4dca5d37
               name: 'HAProxy Frontend {#PXNAME}: Number of responses with codes 1xx per second'
@@ -1364,20 +1144,11 @@ zabbix_export:
                 key: haproxy.get
               tags:
                 -
+                  tag: component
+                  value: responses
+                -
                   tag: frontend
                   value: '{#PXNAME}'
-                -
-                  tag: resource
-                  value: frontend
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: rate
             -
               uuid: 41cd2084595d482ea204f9edc62a985a
               name: 'HAProxy Frontend {#PXNAME}: Number of responses with codes 2xx per second'
@@ -1400,20 +1171,11 @@ zabbix_export:
                 key: haproxy.get
               tags:
                 -
+                  tag: component
+                  value: responses
+                -
                   tag: frontend
                   value: '{#PXNAME}'
-                -
-                  tag: resource
-                  value: frontend
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: rate
             -
               uuid: f1ae1b8f477449c9832e80bfd145211a
               name: 'HAProxy Frontend {#PXNAME}: Number of responses with codes 3xx per second'
@@ -1436,20 +1198,11 @@ zabbix_export:
                 key: haproxy.get
               tags:
                 -
+                  tag: component
+                  value: responses
+                -
                   tag: frontend
                   value: '{#PXNAME}'
-                -
-                  tag: resource
-                  value: frontend
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: rate
             -
               uuid: f1635a2f379b4542b9c44c9d5224fc4d
               name: 'HAProxy Frontend {#PXNAME}: Number of responses with codes 4xx per second'
@@ -1472,20 +1225,11 @@ zabbix_export:
                 key: haproxy.get
               tags:
                 -
+                  tag: component
+                  value: responses
+                -
                   tag: frontend
                   value: '{#PXNAME}'
-                -
-                  tag: resource
-                  value: frontend
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: rate
             -
               uuid: cf9ae6b634fd4acc92c180bc10c9b0f5
               name: 'HAProxy Frontend {#PXNAME}: Number of responses with codes 5xx per second'
@@ -1508,20 +1252,11 @@ zabbix_export:
                 key: haproxy.get
               tags:
                 -
+                  tag: component
+                  value: responses
+                -
                   tag: frontend
                   value: '{#PXNAME}'
-                -
-                  tag: resource
-                  value: frontend
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: rate
             -
               uuid: 6c09de61332c4d56a4b90ee4e9ab6fe2
               name: 'HAProxy Frontend {#PXNAME}: Sessions rate'
@@ -1539,20 +1274,11 @@ zabbix_export:
                 key: haproxy.get
               tags:
                 -
+                  tag: component
+                  value: sessions
+                -
                   tag: frontend
                   value: '{#PXNAME}'
-                -
-                  tag: resource
-                  value: frontend
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: gauge
             -
               uuid: 7097695ee69e4b7895c0d885606b8456
               name: 'HAProxy Frontend {#PXNAME}: Requests rate'
@@ -1570,20 +1296,11 @@ zabbix_export:
                 key: haproxy.get
               tags:
                 -
+                  tag: component
+                  value: requests
+                -
                   tag: frontend
                   value: '{#PXNAME}'
-                -
-                  tag: resource
-                  value: frontend
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: gauge
             -
               uuid: 7985345dcd274811ac6a2e69940f6cb7
               name: 'HAProxy Frontend {#PXNAME}: Established sessions'
@@ -1601,20 +1318,11 @@ zabbix_export:
                 key: haproxy.get
               tags:
                 -
+                  tag: component
+                  value: sessions
+                -
                   tag: frontend
                   value: '{#PXNAME}'
-                -
-                  tag: resource
-                  value: frontend
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: gauge
             -
               uuid: 8b185b2272244229865315cc0139d43f
               name: 'HAProxy Frontend {#PXNAME}: Session limits'
@@ -1636,20 +1344,11 @@ zabbix_export:
                 key: haproxy.get
               tags:
                 -
+                  tag: component
+                  value: sessions
+                -
                   tag: frontend
                   value: '{#PXNAME}'
-                -
-                  tag: resource
-                  value: frontend
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: gauge
             -
               uuid: 6e7372afcd6842c0865a1480973fc8e5
               name: 'HAProxy Frontend {#PXNAME}: Status'
@@ -1675,20 +1374,11 @@ zabbix_export:
                 key: haproxy.get
               tags:
                 -
+                  tag: component
+                  value: health
+                -
                   tag: frontend
                   value: '{#PXNAME}'
-                -
-                  tag: resource
-                  value: frontend
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: state
             -
               uuid: 53efa6139fe3400283c96ec76eb20855
               name: 'HAProxy Frontend {#PXNAME}: Session utilization'
@@ -1701,27 +1391,22 @@ zabbix_export:
               description: 'Percentage of sessions used (scur / slim * 100).'
               tags:
                 -
+                  tag: component
+                  value: sessions
+                -
                   tag: frontend
                   value: '{#PXNAME}'
-                -
-                  tag: resource
-                  value: frontend
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: calculated
-                -
-                  tag: type
-                  value: gauge
               trigger_prototypes:
                 -
                   uuid: ad33db7c356342e78ee19e904c981f1f
                   expression: 'min(/HAProxy by HTTP/haproxy.frontend.sutil[{#PXNAME},{#SVNAME}],5m)>{$HAPROXY.FRONT_SUTIL.MAX.WARN}'
                   name: 'HAProxy frontend {#PXNAME}: Session utilization is more than {$HAPROXY.FRONT_SUTIL.MAX.WARN}% for 5m'
                   priority: WARNING
-                  description: 'Alerting on this metric is essential to ensure your server has sufficient capacity to handle all concurrent sessions. Unlike requests, upon reaching the session limit HAProxy will deny additional clients until resource consumption drops. Furthermore, if you find your session usage percentage to be hovering above 80%, it could be time to either modify HAProxy’s configuration to allow more sessions, or migrate your HAProxy server to a bigger box.'
+                  description: 'Alerting on this metric is essential to ensure your server has sufficient capacity to handle all concurrent sessions. Unlike requests, upon reaching the session limit HAProxy will deny additional clients until resource consumption drops. Furthermore, if you find your session usage percentage to be hovering above 80%, it could be time to either modify HAProxy''s configuration to allow more sessions, or migrate your HAProxy server to a bigger box.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 29c858f57e5447758c9bb39008ba7aa9
@@ -1876,20 +1561,14 @@ zabbix_export:
                 key: haproxy.get
               tags:
                 -
-                  tag: resource
-                  value: server
+                  tag: component
+                  value: role
                 -
                   tag: server
-                  value: '{#PXNAME} {#SVNAME}'
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
+                  value: '{#PXNAME}'
                 -
-                  tag: type
-                  value: gauge
+                  tag: service
+                  value: '{#SVNAME}'
             -
               uuid: 49b7da6cc75c4bb7ad2c3b7c25beccb5
               name: 'HAProxy {#PXNAME} {#SVNAME}: Server is backup'
@@ -1913,20 +1592,14 @@ zabbix_export:
                 key: haproxy.get
               tags:
                 -
-                  tag: resource
-                  value: server
+                  tag: component
+                  value: role
                 -
                   tag: server
-                  value: '{#PXNAME} {#SVNAME}'
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
+                  value: '{#PXNAME}'
                 -
-                  tag: type
-                  value: gauge
+                  tag: service
+                  value: '{#SVNAME}'
             -
               uuid: 355525dba53747c899f19fe4114a3ca4
               name: 'HAProxy {#PXNAME} {#SVNAME}: Incoming traffic'
@@ -1954,20 +1627,14 @@ zabbix_export:
                 key: haproxy.get
               tags:
                 -
-                  tag: resource
-                  value: server
+                  tag: component
+                  value: network
                 -
                   tag: server
-                  value: '{#PXNAME} {#SVNAME}'
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
+                  value: '{#PXNAME}'
                 -
-                  tag: type
-                  value: rate
+                  tag: service
+                  value: '{#SVNAME}'
             -
               uuid: 0d721252dd3946818f87815a56ced8d0
               name: 'HAProxy {#PXNAME} {#SVNAME}: Outgoing traffic'
@@ -1995,20 +1662,14 @@ zabbix_export:
                 key: haproxy.get
               tags:
                 -
-                  tag: resource
-                  value: server
+                  tag: component
+                  value: network
                 -
                   tag: server
-                  value: '{#PXNAME} {#SVNAME}'
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
+                  value: '{#PXNAME}'
                 -
-                  tag: type
-                  value: rate
+                  tag: service
+                  value: '{#SVNAME}'
             -
               uuid: 6fe4502c3b534ee6b9a39a3fcc8d0b98
               name: 'HAProxy {#PXNAME} {#SVNAME}: Status of last health check'
@@ -2048,20 +1709,14 @@ zabbix_export:
                 key: haproxy.get
               tags:
                 -
-                  tag: resource
-                  value: server
+                  tag: component
+                  value: health
                 -
                   tag: server
-                  value: '{#PXNAME} {#SVNAME}'
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
+                  value: '{#PXNAME}'
                 -
-                  tag: type
-                  value: state
+                  tag: service
+                  value: '{#SVNAME}'
               trigger_prototypes:
                 -
                   uuid: 6c4f8cf76ab046aaa4bd51e41cc10de7
@@ -2074,6 +1729,10 @@ zabbix_export:
                     -
                       name: 'HAProxy {#PXNAME} {#SVNAME}: Server is DOWN'
                       expression: 'count(/HAProxy by HTTP/haproxy.server.status[{#PXNAME},{#SVNAME}],#5,"eq","DOWN")=5'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 6e5824eca488428eb61a17d1d4efd055
               name: 'HAProxy {#PXNAME} {#SVNAME}: Responses denied per second'
@@ -2096,20 +1755,14 @@ zabbix_export:
                 key: haproxy.get
               tags:
                 -
-                  tag: resource
-                  value: server
+                  tag: component
+                  value: responses
                 -
                   tag: server
-                  value: '{#PXNAME} {#SVNAME}'
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
+                  value: '{#PXNAME}'
                 -
-                  tag: type
-                  value: rate
+                  tag: service
+                  value: '{#SVNAME}'
             -
               uuid: 18533da75eb142dbb216acc7af3bde4b
               name: 'HAProxy {#PXNAME} {#SVNAME}: Errors connection per second'
@@ -2132,20 +1785,14 @@ zabbix_export:
                 key: haproxy.get
               tags:
                 -
-                  tag: resource
-                  value: server
+                  tag: component
+                  value: connections
                 -
                   tag: server
-                  value: '{#PXNAME} {#SVNAME}'
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
+                  value: '{#PXNAME}'
                 -
-                  tag: type
-                  value: rate
+                  tag: service
+                  value: '{#SVNAME}'
             -
               uuid: 3412ca47e4fe4481b434f95dda566c5e
               name: 'HAProxy {#PXNAME} {#SVNAME}: Response errors per second'
@@ -2168,20 +1815,14 @@ zabbix_export:
                 key: haproxy.get
               tags:
                 -
-                  tag: resource
-                  value: server
+                  tag: component
+                  value: responses
                 -
                   tag: server
-                  value: '{#PXNAME} {#SVNAME}'
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
+                  value: '{#PXNAME}'
                 -
-                  tag: type
-                  value: rate
+                  tag: service
+                  value: '{#SVNAME}'
               trigger_prototypes:
                 -
                   uuid: bf952df23dac4b059d0219b204449830
@@ -2189,6 +1830,10 @@ zabbix_export:
                   name: 'HAProxy {#PXNAME} {#SVNAME}: Number of responses with error is more than {$HAPROXY.SERVER_ERESP.MAX.WARN} for 5m'
                   priority: WARNING
                   description: 'Number of requests on server, whose responses yielded an error, is more than {$HAPROXY.SERVER_ERESP.MAX.WARN}.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: b0a39c6bdf7b4db0a27fce9c0e08aecb
               name: 'HAProxy {#PXNAME} {#SVNAME}: Number of responses with codes 1xx per second'
@@ -2211,20 +1856,14 @@ zabbix_export:
                 key: haproxy.get
               tags:
                 -
-                  tag: resource
-                  value: server
+                  tag: component
+                  value: responses
                 -
                   tag: server
-                  value: '{#PXNAME} {#SVNAME}'
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
+                  value: '{#PXNAME}'
                 -
-                  tag: type
-                  value: rate
+                  tag: service
+                  value: '{#SVNAME}'
             -
               uuid: 786330b63708432c963725c83fa1791e
               name: 'HAProxy {#PXNAME} {#SVNAME}: Number of responses with codes 2xx per second'
@@ -2247,20 +1886,14 @@ zabbix_export:
                 key: haproxy.get
               tags:
                 -
-                  tag: resource
-                  value: server
+                  tag: component
+                  value: responses
                 -
                   tag: server
-                  value: '{#PXNAME} {#SVNAME}'
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
+                  value: '{#PXNAME}'
                 -
-                  tag: type
-                  value: rate
+                  tag: service
+                  value: '{#SVNAME}'
             -
               uuid: 1a96152c277d4018acced2f9d9ffd6cd
               name: 'HAProxy {#PXNAME} {#SVNAME}: Number of responses with codes 3xx per second'
@@ -2283,20 +1916,14 @@ zabbix_export:
                 key: haproxy.get
               tags:
                 -
-                  tag: resource
-                  value: server
+                  tag: component
+                  value: responses
                 -
                   tag: server
-                  value: '{#PXNAME} {#SVNAME}'
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
+                  value: '{#PXNAME}'
                 -
-                  tag: type
-                  value: rate
+                  tag: service
+                  value: '{#SVNAME}'
             -
               uuid: 66076fc3a6fc401cb1423fb015dfe187
               name: 'HAProxy {#PXNAME} {#SVNAME}: Number of responses with codes 4xx per second'
@@ -2319,20 +1946,14 @@ zabbix_export:
                 key: haproxy.get
               tags:
                 -
-                  tag: resource
-                  value: server
+                  tag: component
+                  value: responses
                 -
                   tag: server
-                  value: '{#PXNAME} {#SVNAME}'
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
+                  value: '{#PXNAME}'
                 -
-                  tag: type
-                  value: rate
+                  tag: service
+                  value: '{#SVNAME}'
             -
               uuid: 631d2471fc7346a5b0ce8379a400f13e
               name: 'HAProxy {#PXNAME} {#SVNAME}: Number of responses with codes 5xx per second'
@@ -2355,20 +1976,14 @@ zabbix_export:
                 key: haproxy.get
               tags:
                 -
-                  tag: resource
-                  value: server
+                  tag: component
+                  value: responses
                 -
                   tag: server
-                  value: '{#PXNAME} {#SVNAME}'
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
+                  value: '{#PXNAME}'
                 -
-                  tag: type
-                  value: rate
+                  tag: service
+                  value: '{#SVNAME}'
             -
               uuid: ff7d8b0633ce4e119ad2f8976ce0ea18
               name: 'HAProxy {#PXNAME} {#SVNAME}: Server was selected per second'
@@ -2391,20 +2006,14 @@ zabbix_export:
                 key: haproxy.get
               tags:
                 -
-                  tag: resource
-                  value: server
+                  tag: component
+                  value: connections
                 -
                   tag: server
-                  value: '{#PXNAME} {#SVNAME}'
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
+                  value: '{#PXNAME}'
                 -
-                  tag: type
-                  value: rate
+                  tag: service
+                  value: '{#SVNAME}'
             -
               uuid: 0bc4c4f25d00423b9dc188c9dbe34db0
               name: 'HAProxy {#PXNAME} {#SVNAME}: Unassigned requests'
@@ -2422,20 +2031,14 @@ zabbix_export:
                 key: haproxy.get
               tags:
                 -
-                  tag: resource
-                  value: server
+                  tag: component
+                  value: requests
                 -
                   tag: server
-                  value: '{#PXNAME} {#SVNAME}'
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
+                  value: '{#PXNAME}'
                 -
-                  tag: type
-                  value: gauge
+                  tag: service
+                  value: '{#SVNAME}'
               trigger_prototypes:
                 -
                   uuid: 24e803eab76244d38ff90f2fce396b7f
@@ -2443,6 +2046,10 @@ zabbix_export:
                   name: 'HAProxy {#PXNAME} {#SVNAME}: Current number of requests unassigned in queue is more than {$HAPROXY.SERVER_QCUR.MAX.WARN} for 5m'
                   priority: WARNING
                   description: 'Current number of requests unassigned in queue is more than {$HAPROXY.SERVER_QCUR.MAX.WARN}.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: d2d92c67b546498d929b1e38b7a48561
               name: 'HAProxy {#PXNAME} {#SVNAME}: Configured maxqueue'
@@ -2470,20 +2077,14 @@ zabbix_export:
                 key: haproxy.get
               tags:
                 -
-                  tag: resource
-                  value: server
+                  tag: component
+                  value: queues
                 -
                   tag: server
-                  value: '{#PXNAME} {#SVNAME}'
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
+                  value: '{#PXNAME}'
                 -
-                  tag: type
-                  value: gauge
+                  tag: service
+                  value: '{#SVNAME}'
             -
               uuid: aa3b73b8d06a463f84b10621461c1577
               name: 'HAProxy {#PXNAME} {#SVNAME}: Time in queue'
@@ -2507,20 +2108,14 @@ zabbix_export:
                 key: haproxy.get
               tags:
                 -
-                  tag: resource
-                  value: server
+                  tag: component
+                  value: requests
                 -
                   tag: server
-                  value: '{#PXNAME} {#SVNAME}'
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
+                  value: '{#PXNAME}'
                 -
-                  tag: type
-                  value: gauge
+                  tag: service
+                  value: '{#SVNAME}'
               trigger_prototypes:
                 -
                   uuid: f6d92dc0d2334ca4a7a4c0c81f60c44c
@@ -2528,6 +2123,10 @@ zabbix_export:
                   name: 'HAProxy {#PXNAME} {#SVNAME}: Average time spent in queue is more than {$HAPROXY.SERVER_QTIME.MAX.WARN} for 5m'
                   priority: WARNING
                   description: 'Average time spent in queue (in ms) for the last 1,024 requests is more than {$HAPROXY.SERVER_QTIME.MAX.WARN}.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: f790d237b494452a9b77b4f002a7ca46
               name: 'HAProxy {#PXNAME} {#SVNAME}: Responses time'
@@ -2551,20 +2150,14 @@ zabbix_export:
                 key: haproxy.get
               tags:
                 -
-                  tag: resource
-                  value: server
+                  tag: component
+                  value: health
                 -
                   tag: server
-                  value: '{#PXNAME} {#SVNAME}'
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
+                  value: '{#PXNAME}'
                 -
-                  tag: type
-                  value: gauge
+                  tag: service
+                  value: '{#SVNAME}'
               trigger_prototypes:
                 -
                   uuid: 5a0444417ebf47cab0218e8407f04354
@@ -2572,6 +2165,10 @@ zabbix_export:
                   name: 'HAProxy {#PXNAME} {#SVNAME}: Average response time is more than {$HAPROXY.SERVER_RTIME.MAX.WARN} for 5m'
                   priority: WARNING
                   description: 'Average server response time (in ms) for the last 1,024 requests is more than {$HAPROXY.SERVER_RTIME.MAX.WARN}.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 80ceac1d54e94e50988bf205318392a8
               name: 'HAProxy {#PXNAME} {#SVNAME}: Status'
@@ -2596,20 +2193,14 @@ zabbix_export:
                 key: haproxy.get
               tags:
                 -
-                  tag: resource
-                  value: server
+                  tag: component
+                  value: health
                 -
                   tag: server
-                  value: '{#PXNAME} {#SVNAME}'
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
+                  value: '{#PXNAME}'
                 -
-                  tag: type
-                  value: state
+                  tag: service
+                  value: '{#SVNAME}'
               trigger_prototypes:
                 -
                   uuid: ccf6dbe8970f4f9f9223027e676aa57e
@@ -2618,6 +2209,10 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: WARNING
                   description: 'Server is not available.'
+                  tags:
+                    -
+                      tag: scope
+                      value: avialability
             -
               uuid: 10cfb75db0ef4a9fb33670480303522b
               name: 'HAProxy {#PXNAME} {#SVNAME}: Sessions per second'
@@ -2640,20 +2235,14 @@ zabbix_export:
                 key: haproxy.get
               tags:
                 -
-                  tag: resource
-                  value: server
+                  tag: component
+                  value: sessions
                 -
                   tag: server
-                  value: '{#PXNAME} {#SVNAME}'
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
+                  value: '{#PXNAME}'
                 -
-                  tag: type
-                  value: rate
+                  tag: service
+                  value: '{#SVNAME}'
             -
               uuid: b8b0e8b0c3904335aa391f0727aac871
               name: 'HAProxy {#PXNAME} {#SVNAME}: Weight'
@@ -2675,20 +2264,14 @@ zabbix_export:
                 key: haproxy.get
               tags:
                 -
-                  tag: resource
-                  value: server
+                  tag: component
+                  value: balancer
                 -
                   tag: server
-                  value: '{#PXNAME} {#SVNAME}'
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
+                  value: '{#PXNAME}'
                 -
-                  tag: type
-                  value: gauge
+                  tag: service
+                  value: '{#SVNAME}'
             -
               uuid: d7419ca33427455688a08ecff8ad6fb0
               name: 'HAProxy {#PXNAME} {#SVNAME}: Redispatched requests per second'
@@ -2711,20 +2294,14 @@ zabbix_export:
                 key: haproxy.get
               tags:
                 -
-                  tag: resource
-                  value: server
+                  tag: component
+                  value: requests
                 -
                   tag: server
-                  value: '{#PXNAME} {#SVNAME}'
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
+                  value: '{#PXNAME}'
                 -
-                  tag: type
-                  value: rate
+                  tag: service
+                  value: '{#SVNAME}'
             -
               uuid: 96cfadc919d8457ebb7519e11ac93d79
               name: 'HAProxy {#PXNAME} {#SVNAME}: Retried connections per second'
@@ -2747,20 +2324,14 @@ zabbix_export:
                 key: haproxy.get
               tags:
                 -
-                  tag: resource
-                  value: server
+                  tag: component
+                  value: connections
                 -
                   tag: server
-                  value: '{#PXNAME} {#SVNAME}'
-                -
-                  tag: target
-                  value: haproxy
-                -
-                  tag: transport
-                  value: dependent
+                  value: '{#PXNAME}'
                 -
-                  tag: type
-                  value: rate
+                  tag: service
+                  value: '{#SVNAME}'
           graph_prototypes:
             -
               uuid: b7170d909b78413daa7057320d4280d8
@@ -2857,6 +2428,13 @@ zabbix_export:
                   value: 'Number of responses with codes'
                   status: ENABLED
                   discover: NO_DISCOVER
+      tags:
+        -
+          tag: class
+          value: software
+        -
+          tag: target
+          value: haproxy
       macros:
         -
           macro: '{$HAPROXY.BACK_ERESP.MAX.WARN}'
diff --git a/templates/app/http_service/README.md b/templates/app/http_service/README.md
new file mode 100644
index 00000000000..07832064b85
--- /dev/null
+++ b/templates/app/http_service/README.md
@@ -0,0 +1,39 @@
+
+# HTTP Service
+
+## Overview
+
+For Zabbix version: 6.0 and higher  
+
+## Setup
+
+Refer to the vendor documentation.
+
+## Zabbix configuration
+
+No specific Zabbix configuration is required.
+
+
+## Template links
+
+There are no template links in this template.
+
+## Discovery rules
+
+
+## Items collected
+
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|Services |HTTP service is running |<p>-</p> |SIMPLE |net.tcp.service[http] |
+
+## Triggers
+
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|HTTP service is down on {HOST.NAME} |<p>-</p> |`max(/HTTP Service/net.tcp.service[http],#3)=0` |AVERAGE | |
+
+## Feedback
+
+Please report any issues with the template at https://support.zabbix.com
+
diff --git a/templates/classic/template_app_http_service.yaml b/templates/app/http_service/template_app_http_service.yaml
index fd6c9557f3a..ebd0a43f7f8 100644
--- a/templates/classic/template_app_http_service.yaml
+++ b/templates/app/http_service/template_app_http_service.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:30Z'
+  version: '6.0'
+  date: '2022-01-26T10:49:21Z'
   groups:
     -
       uuid: 57b7ae836ca64446ba2c296389c009b7
@@ -10,12 +10,16 @@ zabbix_export:
       uuid: ae6029df63724ff4a15819939ef74edd
       template: 'HTTP Service'
       name: 'HTTP Service'
+      description: |
+        Template module for monitoring HTTP service
+        
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Modules
       items:
         -
-          uuid: 26ee93987891435ba049c84729559f07
+          uuid: 5cf1d86051e34f47aec2bb0d97cf6b44
           name: 'HTTP service is running'
           type: SIMPLE
           key: 'net.tcp.service[http]'
@@ -24,14 +28,25 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: 'HTTP service'
+              tag: component
+              value: network
           triggers:
             -
-              uuid: 5cf1d86051e34f47aec2bb0d97cf6b44
+              uuid: b299d73cebcd430c8bfc54cf9b84e853
               expression: 'max(/HTTP Service/net.tcp.service[http],#3)=0'
               name: 'HTTP service is down on {HOST.NAME}'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: availability
+      tags:
+        -
+          tag: class
+          value: service
+        -
+          tag: target
+          value: http
       valuemaps:
         -
           uuid: 2ad1e9aeb097470ba36a09c56c67eadd
diff --git a/templates/app/https_service/README.md b/templates/app/https_service/README.md
new file mode 100644
index 00000000000..47f296d80ad
--- /dev/null
+++ b/templates/app/https_service/README.md
@@ -0,0 +1,39 @@
+
+# HTTPS Service
+
+## Overview
+
+For Zabbix version: 6.0 and higher  
+
+## Setup
+
+Refer to the vendor documentation.
+
+## Zabbix configuration
+
+No specific Zabbix configuration is required.
+
+
+## Template links
+
+There are no template links in this template.
+
+## Discovery rules
+
+
+## Items collected
+
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|Services |HTTPS service is running |<p>-</p> |SIMPLE |net.tcp.service[https] |
+
+## Triggers
+
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|HTTPS service is down on {HOST.NAME} |<p>-</p> |`max(/HTTPS Service/net.tcp.service[https],#3)=0` |AVERAGE | |
+
+## Feedback
+
+Please report any issues with the template at https://support.zabbix.com
+
diff --git a/templates/classic/template_app_https_service.yaml b/templates/app/https_service/template_app_https_service.yaml
index acfae4e2275..79373ce9086 100644
--- a/templates/classic/template_app_https_service.yaml
+++ b/templates/app/https_service/template_app_https_service.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:32Z'
+  version: '6.0'
+  date: '2022-01-26T10:46:19Z'
   groups:
     -
       uuid: 57b7ae836ca64446ba2c296389c009b7
@@ -10,6 +10,10 @@ zabbix_export:
       uuid: c3ca7daa5168458f8a00852652a7f99d
       template: 'HTTPS Service'
       name: 'HTTPS Service'
+      description: |
+        Template module for monitoring HTTPS service
+        
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Modules
@@ -24,14 +28,25 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: 'HTTPS service'
+              tag: component
+              value: network
           triggers:
             -
               uuid: 6aa24949292e406b9bb917f641f3da79
               expression: 'max(/HTTPS Service/net.tcp.service[https],#3)=0'
               name: 'HTTPS service is down on {HOST.NAME}'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: availability
+      tags:
+        -
+          tag: class
+          value: service
+        -
+          tag: target
+          value: https
       valuemaps:
         -
           uuid: 3fea65dd433444ac86936134d0a28fd2
diff --git a/templates/app/iis_agent/template_app_iis_agent.yaml b/templates/app/iis_agent/template_app_iis_agent.yaml
index 2dadb41006c..14885f22e29 100644
--- a/templates/app/iis_agent/template_app_iis_agent.yaml
+++ b/templates/app/iis_agent/template_app_iis_agent.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-15T06:57:19Z'
+  date: '2022-01-26T10:02:58Z'
   groups:
     -
       uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
@@ -16,7 +16,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/401862-discussion-thread-for-official-zabbix-template-internet-information-services
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Applications
@@ -36,8 +36,11 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: IIS
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: da7d9c749f884c179a105b0c9475e6bd
@@ -49,6 +52,10 @@ zabbix_export:
                 -
                   name: 'IIS: The World Wide Web Publishing Service (W3SVC) is not running'
                   expression: 'last(/IIS by Zabbix agent/service_state[W3SVC])<>0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 50d8f5a08bbc494b8525f26eedbee781
           name: 'IIS: Anonymous users per second'
@@ -58,8 +65,8 @@ zabbix_export:
           description: 'The number of requests from users over an anonymous connection per second. Average per minute.'
           tags:
             -
-              tag: Application
-              value: IIS
+              tag: component
+              value: users
         -
           uuid: ac80660edbb74c1fb4739368806900d5
           name: 'IIS: Bytes Received per second'
@@ -70,8 +77,8 @@ zabbix_export:
           description: 'The average rate per minute at which data bytes are received by the service at the Application Layer. Does not include protocol headers or control bytes.'
           tags:
             -
-              tag: Application
-              value: IIS
+              tag: component
+              value: network
         -
           uuid: 5a0648316a164446bbf605930469d4c4
           name: 'IIS: Bytes Sent per second'
@@ -82,8 +89,8 @@ zabbix_export:
           description: 'The average rate per minute at which data bytes are sent by the service.'
           tags:
             -
-              tag: Application
-              value: IIS
+              tag: component
+              value: network
         -
           uuid: f086d17b51254e16bd43b57b39dc000e
           name: 'IIS: Bytes Total per second'
@@ -94,8 +101,8 @@ zabbix_export:
           description: 'The average rate per minute of total bytes/sec transferred by the Web service (sum of bytes sent/sec and bytes received/sec).'
           tags:
             -
-              tag: Application
-              value: IIS
+              tag: component
+              value: network
         -
           uuid: b94dc0df81234c7d97197fe30875d5e9
           name: 'IIS: Method CGI requests per second'
@@ -110,8 +117,8 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: IIS
+              tag: component
+              value: requests
         -
           uuid: 1e8244ebb5524c72af1d506df7bb2982
           name: 'IIS: Connection attempts per second'
@@ -126,8 +133,8 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: IIS
+              tag: component
+              value: connections
         -
           uuid: 2b4cb17b486643eda9a560b43af70d74
           name: 'IIS: Method COPY requests per second'
@@ -142,8 +149,8 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: IIS
+              tag: component
+              value: requests
         -
           uuid: 1baed2823f1a4d2ca618cac5ab8bbcbb
           name: 'IIS: Current connections'
@@ -153,8 +160,8 @@ zabbix_export:
           description: 'The number of active connections.'
           tags:
             -
-              tag: Application
-              value: IIS
+              tag: component
+              value: connections
         -
           uuid: 350a6c7fac354570bbba04aa2fd6c98a
           name: 'IIS: Method DELETE requests per second'
@@ -169,11 +176,11 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: IIS
+              tag: component
+              value: requests
         -
           uuid: 6ae641f632ae4422a6f71898078dc2ee
-          name: 'IIS: Method Method GET requests per second'
+          name: 'IIS: Method GET requests per second'
           key: 'perf_counter_en["\Web Service(_Total)\Get Requests/Sec", 60]'
           history: 7d
           value_type: FLOAT
@@ -185,8 +192,8 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: IIS
+              tag: component
+              value: requests
         -
           uuid: 5e37ff2d4d1b4bf6bad855a3d09ec6c7
           name: 'IIS: Method HEAD requests per second'
@@ -201,8 +208,8 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: IIS
+              tag: component
+              value: requests
         -
           uuid: 18217a40ddbc421fb2db1b19d1fb7d59
           name: 'IIS: Method ISAPI requests per second'
@@ -217,8 +224,8 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: IIS
+              tag: component
+              value: requests
         -
           uuid: b7634ae2a9d5454bbac631b55e896277
           name: 'IIS: Locked errors per second'
@@ -233,8 +240,8 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: IIS
+              tag: component
+              value: errors
         -
           uuid: 069548a7c9e840bb8975f9b02b582c51
           name: 'IIS: Method LOCK requests per second'
@@ -249,8 +256,8 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: IIS
+              tag: component
+              value: requests
         -
           uuid: 02c1fe0d15d94744959e4b53b21309fe
           name: 'IIS: Method MKCOL requests per second'
@@ -265,8 +272,8 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: IIS
+              tag: component
+              value: requests
         -
           uuid: 6395e8edb1394396bd7602f621cf4b00
           name: 'IIS: Method MOVE requests per second'
@@ -281,8 +288,8 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: IIS
+              tag: component
+              value: requests
         -
           uuid: d67523ef47464f8c9735d0a0359b5c77
           name: 'IIS: NonAnonymous users per second'
@@ -292,8 +299,8 @@ zabbix_export:
           description: 'The number of requests from users over a non-anonymous connection per second. Average per minute.'
           tags:
             -
-              tag: Application
-              value: IIS
+              tag: component
+              value: users
         -
           uuid: 11d9995d25114e4fad666a1b75734c01
           name: 'IIS: Not Found errors per second'
@@ -308,8 +315,8 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: IIS
+              tag: component
+              value: errors
         -
           uuid: 22ececa2db2d488587b1194883723ea6
           name: 'IIS: Method OPTIONS requests per second'
@@ -324,8 +331,8 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: IIS
+              tag: component
+              value: requests
         -
           uuid: 1653ca4c0c6743f39d9b1e764022da7c
           name: 'IIS: Method Total Other requests per second'
@@ -340,8 +347,8 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: IIS
+              tag: component
+              value: requests
         -
           uuid: 5f1210173665453e84f8f330a8c15eea
           name: 'IIS: Method POST requests per second'
@@ -356,8 +363,8 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: IIS
+              tag: component
+              value: requests
         -
           uuid: f197e93e03d04025bc855d4d77c35010
           name: 'IIS: Method PROPFIND requests per second'
@@ -372,8 +379,8 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: IIS
+              tag: component
+              value: requests
         -
           uuid: 55c71bab45b04a2ca2afb526bf7c3e7f
           name: 'IIS: Method PROPPATCH requests per second'
@@ -388,8 +395,8 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: IIS
+              tag: component
+              value: requests
         -
           uuid: d1d19cf6c920465184aa2b2a8b4439c9
           name: 'IIS: Method PUT requests per second'
@@ -404,8 +411,8 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: IIS
+              tag: component
+              value: requests
         -
           uuid: 20ae8a67912045dc9b69c83d68e5e8ea
           name: 'IIS: Method MS-SEARCH requests per second'
@@ -420,8 +427,8 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: IIS
+              tag: component
+              value: requests
         -
           uuid: 4aa9419482eb484a8fc1773bee8b2993
           name: 'IIS: Uptime'
@@ -432,8 +439,8 @@ zabbix_export:
           description: 'Service uptime in seconds.'
           tags:
             -
-              tag: Application
-              value: IIS
+              tag: component
+              value: application
           triggers:
             -
               uuid: 7bbf8a836c66422abd4469d28afbcc00
@@ -442,6 +449,10 @@ zabbix_export:
               priority: INFO
               description: 'Uptime is less than 10 minutes'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 805f7dca2ac74f5bbfb81c5e7bfa6e09
           name: 'IIS: Total connection attempts'
@@ -456,8 +467,8 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: IIS
+              tag: component
+              value: connections
         -
           uuid: 90eb19d7d37f439da2c78c44d85784ef
           name: 'IIS: Method Total requests per second'
@@ -472,8 +483,8 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: IIS
+              tag: component
+              value: requests
         -
           uuid: c2ddd72243ba4a499a7a1e9ba6e4046c
           name: 'IIS: Method TRACE requests per second'
@@ -488,8 +499,8 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: IIS
+              tag: component
+              value: requests
         -
           uuid: 05a19416695b436daf701d9750b015a8
           name: 'IIS: Method TRACE requests per second'
@@ -504,8 +515,8 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: IIS
+              tag: component
+              value: requests
         -
           uuid: 1e4b39ec2cca49fb9fb5a306c2724568
           name: 'IIS: Files cache hits percentage'
@@ -520,8 +531,8 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: IIS
+              tag: component
+              value: cache
         -
           uuid: d9c46d370afc496ba0a0ad0c141b4490
           name: 'IIS: File cache misses'
@@ -536,8 +547,8 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: IIS
+              tag: component
+              value: cache
         -
           uuid: 566f0bea097e4b0bb7042e4f0302ff26
           name: 'IIS: URIs cache hits percentage'
@@ -552,8 +563,8 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: IIS
+              tag: component
+              value: cache
         -
           uuid: ab1884be28b54ea7bb187bbe843bb6a7
           name: 'IIS: URI cache misses'
@@ -568,8 +579,8 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: IIS
+              tag: component
+              value: cache
         -
           uuid: 7d76ec3d35f6446c842595c4831fabf4
           name: 'IIS: World Wide Web Publishing Service (W3SVC) state'
@@ -585,8 +596,11 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: IIS
+              tag: component
+              value: application
+            -
+              tag: component
+              value: health
           triggers:
             -
               uuid: cac6bbb13ce84772a976275da0805179
@@ -598,6 +612,10 @@ zabbix_export:
                 -
                   name: 'IIS: Windows process Activation Service (WAS) is not the running'
                   expression: 'last(/IIS by Zabbix agent/service_state[WAS])<>0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 38858eb3cc2f4580a0a3c56c11fdeba5
           name: 'IIS: Windows Process Activation Service (WAS) state'
@@ -613,8 +631,11 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: IIS
+              tag: component
+              value: application
+            -
+              tag: component
+              value: health
           triggers:
             -
               uuid: 98fc8e403ac0405e84bf533336c4102c
@@ -622,6 +643,10 @@ zabbix_export:
               name: 'IIS: Windows process Activation Service (WAS) is not the running'
               priority: HIGH
               description: 'Windows Process Activation Service (WAS) is not in the running state. IIS cannot start.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: 6148952d54d54982af404c6c845ccbf2
@@ -656,8 +681,11 @@ zabbix_export:
                     - 10m
               tags:
                 -
-                  tag: Application
+                  tag: application-pool
                   value: '{#APPPOOL}'
+                -
+                  tag: component
+                  value: application
               trigger_prototypes:
                 -
                   uuid: 56c6df39f3d1419ca4ce67c70f464ab7
@@ -668,6 +696,10 @@ zabbix_export:
                     -
                       name: 'IIS: The World Wide Web Publishing Service (W3SVC) is not running'
                       expression: 'last(/IIS by Zabbix agent/service_state[W3SVC])<>0'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: f039a53351d54132ab9ad046282389d8
               name: 'IIS: {#APPPOOL} Uptime'
@@ -678,8 +710,11 @@ zabbix_export:
               description: 'The web application uptime period since the last restart.'
               tags:
                 -
-                  tag: Application
+                  tag: application-pool
                   value: '{#APPPOOL}'
+                -
+                  tag: component
+                  value: application
               trigger_prototypes:
                 -
                   uuid: 53afe8614ac542feaed1d656152bafd2
@@ -688,6 +723,10 @@ zabbix_export:
                   priority: INFO
                   description: 'Uptime is less than 10 minutes'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 4700b5729ca440869de976ae347598cf
               name: 'IIS: AppPool {#APPPOOL} recycles'
@@ -701,14 +740,21 @@ zabbix_export:
                     - 10m
               tags:
                 -
-                  tag: Application
+                  tag: application-pool
                   value: '{#APPPOOL}'
+                -
+                  tag: component
+                  value: application
               trigger_prototypes:
                 -
                   uuid: 665d5fbd0b9247e890a9cfa1b39fa415
                   expression: 'last(/IIS by Zabbix agent/perf_counter_en["\APP_POOL_WAS({#APPPOOL})\Total Application Pool Recycles"],#1)<>last(/IIS by Zabbix agent/perf_counter_en["\APP_POOL_WAS({#APPPOOL})\Total Application Pool Recycles"],#2) and {$IIS.APPPOOL.MONITORED:"{#APPPOOL}"}=1'
                   name: 'IIS: Application pool {#APPPOOL} has been recycled'
                   priority: INFO
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 193642cad7214206a00db4f710bfbef8
               name: 'IIS: AppPool {#APPPOOL} current queue size'
@@ -723,8 +769,11 @@ zabbix_export:
                     - 10m
               tags:
                 -
-                  tag: Application
+                  tag: application-pool
                   value: '{#APPPOOL}'
+                -
+                  tag: component
+                  value: application
               trigger_prototypes:
                 -
                   uuid: 8cebd49164154999903dab2c03fd4be9
@@ -735,10 +784,21 @@ zabbix_export:
                     -
                       name: 'IIS: Application pool {#APPPOOL} is not in Running state'
                       expression: 'last(/IIS by Zabbix agent/perf_counter_en["\APP_POOL_WAS({#APPPOOL})\Current Application Pool State"])<>3 and {$IIS.APPPOOL.MONITORED:"{#APPPOOL}"}=1'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           lld_macro_paths:
             -
               lld_macro: '{#APPPOOL}'
               path: $.Name
+      tags:
+        -
+          tag: class
+          value: application
+        -
+          tag: target
+          value: iis
       macros:
         -
           macro: '{$IIS.APPPOOL.MATCHES}'
diff --git a/templates/app/iis_agent_active/template_app_iis_agent_active.yaml b/templates/app/iis_agent_active/template_app_iis_agent_active.yaml
index 8cc71b9cc7b..40c545f499a 100644
--- a/templates/app/iis_agent_active/template_app_iis_agent_active.yaml
+++ b/templates/app/iis_agent_active/template_app_iis_agent_active.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-15T06:57:23Z'
+  date: '2022-01-26T10:47:50Z'
   groups:
     -
       uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
@@ -16,7 +16,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/401862-discussion-thread-for-official-zabbix-template-internet-information-services
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Applications
@@ -36,8 +36,11 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: IIS
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 2b73bb4c09404d748e019ef2257a9e20
@@ -49,6 +52,10 @@ zabbix_export:
                 -
                   name: 'IIS: The World Wide Web Publishing Service (W3SVC) is not running'
                   expression: 'last(/IIS by Zabbix agent active/service_state[W3SVC])<>0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: e70f872ed9184757b8a62c732658faa5
           name: 'IIS: Anonymous users per second'
@@ -59,8 +66,8 @@ zabbix_export:
           description: 'The number of requests from users over an anonymous connection per second. Average per minute.'
           tags:
             -
-              tag: Application
-              value: IIS
+              tag: component
+              value: users
         -
           uuid: 64816de795864c8fae879e670dfe9e93
           name: 'IIS: Bytes Received per second'
@@ -72,8 +79,8 @@ zabbix_export:
           description: 'The average rate per minute at which data bytes are received by the service at the Application Layer. Does not include protocol headers or control bytes.'
           tags:
             -
-              tag: Application
-              value: IIS
+              tag: component
+              value: network
         -
           uuid: 1b0b636e0bbd4948b3047071a4b964fc
           name: 'IIS: Bytes Sent per second'
@@ -85,8 +92,8 @@ zabbix_export:
           description: 'The average rate per minute at which data bytes are sent by the service.'
           tags:
             -
-              tag: Application
-              value: IIS
+              tag: component
+              value: network
         -
           uuid: 5abf01f6e7a7419d9a1de9803ccf1060
           name: 'IIS: Bytes Total per second'
@@ -98,8 +105,8 @@ zabbix_export:
           description: 'The average rate per minute of total bytes/sec transferred by the Web service (sum of bytes sent/sec and bytes received/sec).'
           tags:
             -
-              tag: Application
-              value: IIS
+              tag: component
+              value: network
         -
           uuid: 37b23949ca94466eb552c6fd8239b650
           name: 'IIS: Method CGI requests per second'
@@ -115,8 +122,8 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: IIS
+              tag: component
+              value: requests
         -
           uuid: d32eb1398fa7454eb91329aa39d1e90e
           name: 'IIS: Connection attempts per second'
@@ -132,8 +139,8 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: IIS
+              tag: component
+              value: connections
         -
           uuid: 182bceaa31194bdd8c906cf226039b0b
           name: 'IIS: Method COPY requests per second'
@@ -149,8 +156,8 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: IIS
+              tag: component
+              value: requests
         -
           uuid: 8b316e2896f041dca9b4adc601093b5c
           name: 'IIS: Current connections'
@@ -161,8 +168,8 @@ zabbix_export:
           description: 'The number of active connections.'
           tags:
             -
-              tag: Application
-              value: IIS
+              tag: component
+              value: connections
         -
           uuid: 7da6cf8a65b94b6f8d89dc53c7de38eb
           name: 'IIS: Method DELETE requests per second'
@@ -178,11 +185,11 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: IIS
+              tag: component
+              value: requests
         -
           uuid: 5381bfc071524f32bb5290379d2e978d
-          name: 'IIS: Method Method GET requests per second'
+          name: 'IIS: Method GET requests per second'
           type: ZABBIX_ACTIVE
           key: 'perf_counter_en["\Web Service(_Total)\Get Requests/Sec", 60]'
           history: 7d
@@ -195,8 +202,8 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: IIS
+              tag: component
+              value: requests
         -
           uuid: 414b17c9eb11460cb55d35aeb7b8c071
           name: 'IIS: Method HEAD requests per second'
@@ -212,8 +219,8 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: IIS
+              tag: component
+              value: requests
         -
           uuid: d5b38b5472214d629e832d2709c64b3c
           name: 'IIS: Method ISAPI requests per second'
@@ -229,8 +236,8 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: IIS
+              tag: component
+              value: requests
         -
           uuid: 74fed9efa0ae4301aab2f73d76fd8357
           name: 'IIS: Locked errors per second'
@@ -246,8 +253,8 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: IIS
+              tag: component
+              value: errors
         -
           uuid: cdf63d485cd1419385caabc050eb533c
           name: 'IIS: Method LOCK requests per second'
@@ -263,8 +270,8 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: IIS
+              tag: component
+              value: requests
         -
           uuid: edbe50383897434cb33378b973628061
           name: 'IIS: Method MKCOL requests per second'
@@ -280,8 +287,8 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: IIS
+              tag: component
+              value: requests
         -
           uuid: 51a74530b894484a9ba101eb1176a982
           name: 'IIS: Method MOVE requests per second'
@@ -297,8 +304,8 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: IIS
+              tag: component
+              value: requests
         -
           uuid: 6dfe3dbde2544c5080c3845d54c83219
           name: 'IIS: NonAnonymous users per second'
@@ -309,8 +316,8 @@ zabbix_export:
           description: 'The number of requests from users over a non-anonymous connection per second. Average per minute.'
           tags:
             -
-              tag: Application
-              value: IIS
+              tag: component
+              value: users
         -
           uuid: 13e65fdff0704e6f87133b8efe34704f
           name: 'IIS: Not Found errors per second'
@@ -326,8 +333,8 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: IIS
+              tag: component
+              value: errors
         -
           uuid: dcb0338dc59d4c95b9f712fed84a3aa2
           name: 'IIS: Method OPTIONS requests per second'
@@ -343,8 +350,8 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: IIS
+              tag: component
+              value: requests
         -
           uuid: eb6a098fef824b2e9abe80b4331190f4
           name: 'IIS: Method Total Other requests per second'
@@ -360,8 +367,8 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: IIS
+              tag: component
+              value: requests
         -
           uuid: 222bb49332214781bc48a0eb610035c2
           name: 'IIS: Method POST requests per second'
@@ -377,8 +384,8 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: IIS
+              tag: component
+              value: requests
         -
           uuid: 011fff85fb0440b78ca7857454577c08
           name: 'IIS: Method PROPFIND requests per second'
@@ -394,8 +401,8 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: IIS
+              tag: component
+              value: requests
         -
           uuid: 3b8a1eea86034a268ac37031c08d3740
           name: 'IIS: Method PROPPATCH requests per second'
@@ -411,8 +418,8 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: IIS
+              tag: component
+              value: requests
         -
           uuid: c4615d7155d14f98b76705df1a5778e4
           name: 'IIS: Method PUT requests per second'
@@ -428,8 +435,8 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: IIS
+              tag: component
+              value: requests
         -
           uuid: a1cfef3952c346ccb39e85038e49ae63
           name: 'IIS: Method MS-SEARCH requests per second'
@@ -445,8 +452,8 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: IIS
+              tag: component
+              value: requests
         -
           uuid: d53040c921324b2195045dacb3738d6f
           name: 'IIS: Uptime'
@@ -458,8 +465,8 @@ zabbix_export:
           description: 'Service uptime in seconds.'
           tags:
             -
-              tag: Application
-              value: IIS
+              tag: component
+              value: application
           triggers:
             -
               uuid: f68768567f334d369d52797309f95c41
@@ -468,6 +475,10 @@ zabbix_export:
               priority: INFO
               description: 'Uptime is less than 10 minutes'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: f181123b522946018d9ac90599693cfe
           name: 'IIS: Total connection attempts'
@@ -483,8 +494,8 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: IIS
+              tag: component
+              value: connections
         -
           uuid: ff70ce9edf1c45ba8263d33847992baf
           name: 'IIS: Method Total requests per second'
@@ -500,8 +511,8 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: IIS
+              tag: component
+              value: requests
         -
           uuid: fff9e968d5474adfbfd4ae9e19d836d9
           name: 'IIS: Method TRACE requests per second'
@@ -517,8 +528,8 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: IIS
+              tag: component
+              value: requests
         -
           uuid: 0b6b770a6b014b8c857277e1d9cf6ffe
           name: 'IIS: Method TRACE requests per second'
@@ -534,8 +545,8 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: IIS
+              tag: component
+              value: requests
         -
           uuid: 5ef9aec68d5b4fe79b17453ab8988b59
           name: 'IIS: Files cache hits percentage'
@@ -551,8 +562,8 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: IIS
+              tag: component
+              value: cache
         -
           uuid: a041713a95e746f5b4797a7aecaed9a5
           name: 'IIS: File cache misses'
@@ -568,8 +579,8 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: IIS
+              tag: component
+              value: cache
         -
           uuid: 5488881cba254b6b8f49ebacae2bc4c4
           name: 'IIS: URIs cache hits percentage'
@@ -585,8 +596,8 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: IIS
+              tag: component
+              value: cache
         -
           uuid: ffd18aef119f4c7c845c6a3e76fb747d
           name: 'IIS: URI cache misses'
@@ -602,8 +613,8 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: IIS
+              tag: component
+              value: cache
         -
           uuid: 31d4f21ce4c6412b912ca65fe9aee83c
           name: 'IIS: World Wide Web Publishing Service (W3SVC) state'
@@ -620,8 +631,11 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: IIS
+              tag: component
+              value: application
+            -
+              tag: component
+              value: health
           triggers:
             -
               uuid: ca139b8b27c44f7fb22938fd3419cff5
@@ -633,6 +647,10 @@ zabbix_export:
                 -
                   name: 'IIS: Windows process Activation Service (WAS) is not the running'
                   expression: 'last(/IIS by Zabbix agent active/service_state[WAS])<>0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 7f016ce3ab3941b78741dfb72c6d7693
           name: 'IIS: Windows Process Activation Service (WAS) state'
@@ -649,8 +667,11 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: IIS
+              tag: component
+              value: application
+            -
+              tag: component
+              value: health
           triggers:
             -
               uuid: d7a16291f196424ca9c39af4271ab78f
@@ -658,6 +679,10 @@ zabbix_export:
               name: 'IIS: Windows process Activation Service (WAS) is not the running'
               priority: HIGH
               description: 'Windows Process Activation Service (WAS) is not in the running state. IIS cannot start.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: 1dfb7339b81b4237a4e90b29328de297
@@ -694,8 +719,11 @@ zabbix_export:
                     - 10m
               tags:
                 -
-                  tag: Application
+                  tag: application-pool
                   value: '{#APPPOOL}'
+                -
+                  tag: component
+                  value: application
               trigger_prototypes:
                 -
                   uuid: a7184495eb684293ada387292c812b0f
@@ -706,6 +734,10 @@ zabbix_export:
                     -
                       name: 'IIS: The World Wide Web Publishing Service (W3SVC) is not running'
                       expression: 'last(/IIS by Zabbix agent active/service_state[W3SVC])<>0'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: f0a6fe8a4cc44582a3048f1a00442736
               name: 'IIS: {#APPPOOL} Uptime'
@@ -717,8 +749,11 @@ zabbix_export:
               description: 'The web application uptime period since the last restart.'
               tags:
                 -
-                  tag: Application
+                  tag: application-pool
                   value: '{#APPPOOL}'
+                -
+                  tag: component
+                  value: application
               trigger_prototypes:
                 -
                   uuid: d2a9854722a44253a39c8eaab67f7677
@@ -727,6 +762,10 @@ zabbix_export:
                   priority: INFO
                   description: 'Uptime is less than 10 minutes'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: e2cfc77aebab4b14bf6a690dbdd0c2b1
               name: 'IIS: AppPool {#APPPOOL} recycles'
@@ -741,14 +780,21 @@ zabbix_export:
                     - 10m
               tags:
                 -
-                  tag: Application
+                  tag: application-pool
                   value: '{#APPPOOL}'
+                -
+                  tag: component
+                  value: application
               trigger_prototypes:
                 -
                   uuid: 27a93967a29849f3aef833db136e1b8e
                   expression: 'last(/IIS by Zabbix agent active/perf_counter_en["\APP_POOL_WAS({#APPPOOL})\Total Application Pool Recycles"],#1)<>last(/IIS by Zabbix agent active/perf_counter_en["\APP_POOL_WAS({#APPPOOL})\Total Application Pool Recycles"],#2) and {$IIS.APPPOOL.MONITORED:"{#APPPOOL}"}=1'
                   name: 'IIS: Application pool {#APPPOOL} has been recycled'
                   priority: INFO
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: d525c1c47ee2402d9635ae276a5e58ec
               name: 'IIS: AppPool {#APPPOOL} current queue size'
@@ -764,8 +810,11 @@ zabbix_export:
                     - 10m
               tags:
                 -
-                  tag: Application
+                  tag: application-pool
                   value: '{#APPPOOL}'
+                -
+                  tag: component
+                  value: application
               trigger_prototypes:
                 -
                   uuid: 68499a4737d24ee6846aaea2a37b7b4f
@@ -776,10 +825,21 @@ zabbix_export:
                     -
                       name: 'IIS: Application pool {#APPPOOL} is not in Running state'
                       expression: 'last(/IIS by Zabbix agent active/perf_counter_en["\APP_POOL_WAS({#APPPOOL})\Current Application Pool State"])<>3 and {$IIS.APPPOOL.MONITORED:"{#APPPOOL}"}=1'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           lld_macro_paths:
             -
               lld_macro: '{#APPPOOL}'
               path: $.Name
+      tags:
+        -
+          tag: class
+          value: application
+        -
+          tag: target
+          value: iis
       macros:
         -
           macro: '{$IIS.APPPOOL.MATCHES}'
diff --git a/templates/app/imap_service/README.md b/templates/app/imap_service/README.md
new file mode 100644
index 00000000000..40003583df8
--- /dev/null
+++ b/templates/app/imap_service/README.md
@@ -0,0 +1,39 @@
+
+# IMAP Service
+
+## Overview
+
+For Zabbix version: 6.0 and higher  
+
+## Setup
+
+Refer to the vendor documentation.
+
+## Zabbix configuration
+
+No specific Zabbix configuration is required.
+
+
+## Template links
+
+There are no template links in this template.
+
+## Discovery rules
+
+
+## Items collected
+
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|Services |IMAP service is running |<p>-</p> |SIMPLE |net.tcp.service[imap] |
+
+## Triggers
+
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|IMAP service is down on {HOST.NAME} |<p>-</p> |`max(/IMAP Service/net.tcp.service[imap],#3)=0` |AVERAGE | |
+
+## Feedback
+
+Please report any issues with the template at https://support.zabbix.com
+
diff --git a/templates/classic/template_app_imap_service.yaml b/templates/app/imap_service/template_app_imap_service.yaml
index 92218a4ea5a..0fc8b722473 100644
--- a/templates/classic/template_app_imap_service.yaml
+++ b/templates/app/imap_service/template_app_imap_service.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:31Z'
+  version: '6.0'
+  date: '2022-01-26T10:47:13Z'
   groups:
     -
       uuid: 57b7ae836ca64446ba2c296389c009b7
@@ -10,6 +10,10 @@ zabbix_export:
       uuid: dd0c49d976444f168535b9c1a2db981b
       template: 'IMAP Service'
       name: 'IMAP Service'
+      description: |
+        Template module for monitoring IMAP service
+        
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Modules
@@ -24,14 +28,25 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: 'IMAP service'
+              tag: component
+              value: network
           triggers:
             -
               uuid: 075e6217564d45fdb713f810a9eef87c
               expression: 'max(/IMAP Service/net.tcp.service[imap],#3)=0'
               name: 'IMAP service is down on {HOST.NAME}'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: availability
+      tags:
+        -
+          tag: class
+          value: service
+        -
+          tag: target
+          value: imap
       valuemaps:
         -
           uuid: 17353d47bd0a4a03a8f3ab799207e157
diff --git a/templates/app/jenkins/template_app_jenkins.yaml b/templates/app/jenkins/template_app_jenkins.yaml
index 31b213c9844..b19224fa750 100644
--- a/templates/app/jenkins/template_app_jenkins.yaml
+++ b/templates/app/jenkins/template_app_jenkins.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-15T06:57:27Z'
+  date: '2022-01-26T10:29:54Z'
   groups:
     -
       uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
@@ -17,7 +17,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Applications
@@ -41,8 +41,11 @@ zabbix_export:
           url: '{$JENKINS.URL}/computer/api/json'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: computers
+            -
+              tag: component
+              value: raw
         -
           uuid: 790aedce97be4e7dae6f4de8238340a7
           name: 'Jenkins: File descriptor ratio'
@@ -66,14 +69,18 @@ zabbix_export:
             key: jenkins.get_metrics
           tags:
             -
-              tag: Application
-              value: Jenkins
+              tag: component
+              value: fds
           triggers:
             -
               uuid: 5ec22ac264d445769039bd4c13e41bf7
               expression: 'min(/Jenkins by HTTP/jenkins.descriptor.ratio,5m)>{$JENKINS.FILE_DESCRIPTORS.MAX.WARN}'
               name: 'Jenkins: Current number of used files is too high (over {$JENKINS.FILE_DESCRIPTORS.MAX.WARN}% for 5m)'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: capacity
         -
           uuid: 0b3cf1992122407795eef5ab9474101d
           name: 'Jenkins: Disk space check'
@@ -101,8 +108,8 @@ zabbix_export:
             key: jenkins.healthcheck
           tags:
             -
-              tag: Application
-              value: Jenkins
+              tag: component
+              value: disk
         -
           uuid: 8095797fe6ef478db4a8acb60e1dcc54
           name: 'Jenkins: Disk space check message'
@@ -127,8 +134,8 @@ zabbix_export:
             key: jenkins.healthcheck
           tags:
             -
-              tag: Application
-              value: Jenkins
+              tag: component
+              value: disk
         -
           uuid: 26902068daf94cf3a5aec360be9abc18
           name: 'Jenkins: Executors count'
@@ -150,8 +157,8 @@ zabbix_export:
             key: jenkins.get_metrics
           tags:
             -
-              tag: Application
-              value: Jenkins
+              tag: component
+              value: executors
         -
           uuid: 7b672586e5194370a0c141570174d21a
           name: 'Jenkins: Executors free'
@@ -169,8 +176,8 @@ zabbix_export:
             key: jenkins.get_metrics
           tags:
             -
-              tag: Application
-              value: Jenkins
+              tag: component
+              value: executors
         -
           uuid: 197470fead89470f94a910e9405498fe
           name: 'Jenkins: Executors in use'
@@ -188,8 +195,8 @@ zabbix_export:
             key: jenkins.get_metrics
           tags:
             -
-              tag: Application
-              value: Jenkins
+              tag: component
+              value: executors
         -
           uuid: db4c0de52dca4c8a853edf918b35bbe4
           name: 'Jenkins: Get service metrics'
@@ -206,8 +213,8 @@ zabbix_export:
           url: '{$JENKINS.URL}/metrics/{$JENKINS.API.KEY}/metrics'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
         -
           uuid: 4be0216b409d46a2a12e2929a9a03295
           name: 'Jenkins: Get healthcheck'
@@ -224,8 +231,8 @@ zabbix_export:
           url: '{$JENKINS.URL}/metrics/{$JENKINS.API.KEY}/healthcheck'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: health
         -
           uuid: d9677f596dae43e4984838061fe19d45
           name: 'Jenkins: HTTP active requests, rate'
@@ -249,8 +256,8 @@ zabbix_export:
             key: jenkins.get_metrics
           tags:
             -
-              tag: Application
-              value: Jenkins
+              tag: component
+              value: requests
         -
           uuid: d95c9a1b19ed4da38bec3217eee2e590
           name: 'Jenkins: HTTP response 400, rate'
@@ -274,8 +281,11 @@ zabbix_export:
             key: jenkins.get_metrics
           tags:
             -
-              tag: Application
-              value: Jenkins
+              tag: component
+              value: requests
+            -
+              tag: http-code
+              value: '400'
         -
           uuid: b3d77a909487431bab2b0b7f7c89bf90
           name: 'Jenkins: HTTP response 201, rate'
@@ -299,8 +309,11 @@ zabbix_export:
             key: jenkins.get_metrics
           tags:
             -
-              tag: Application
-              value: Jenkins
+              tag: component
+              value: requests
+            -
+              tag: http-code
+              value: '201'
         -
           uuid: 3265515d32f840e9ade25c0d2892b372
           name: 'Jenkins: HTTP response 403, rate'
@@ -324,8 +337,11 @@ zabbix_export:
             key: jenkins.get_metrics
           tags:
             -
-              tag: Application
-              value: Jenkins
+              tag: component
+              value: requests
+            -
+              tag: http-code
+              value: '403'
         -
           uuid: 22b8fc85f441484cad8b2641748d75a1
           name: 'Jenkins: HTTP response 404, rate'
@@ -349,8 +365,11 @@ zabbix_export:
             key: jenkins.get_metrics
           tags:
             -
-              tag: Application
-              value: Jenkins
+              tag: component
+              value: requests
+            -
+              tag: http-code
+              value: '404'
         -
           uuid: 1a9a6b663aaa48bbacfc56c1569521c0
           name: 'Jenkins: HTTP response 304, rate'
@@ -374,8 +393,11 @@ zabbix_export:
             key: jenkins.get_metrics
           tags:
             -
-              tag: Application
-              value: Jenkins
+              tag: component
+              value: requests
+            -
+              tag: http-code
+              value: '304'
         -
           uuid: 2a79c1139b44402fa8f31d6b61a0d739
           name: 'Jenkins: HTTP response 204, rate'
@@ -399,8 +421,11 @@ zabbix_export:
             key: jenkins.get_metrics
           tags:
             -
-              tag: Application
-              value: Jenkins
+              tag: component
+              value: requests
+            -
+              tag: http-code
+              value: '204'
         -
           uuid: c4c1dfcf2d904985a0ca6956724adf41
           name: 'Jenkins: HTTP response 200, rate'
@@ -424,8 +449,11 @@ zabbix_export:
             key: jenkins.get_metrics
           tags:
             -
-              tag: Application
-              value: Jenkins
+              tag: component
+              value: requests
+            -
+              tag: http-code
+              value: '200'
         -
           uuid: afdab05416084124887bcec705f2603d
           name: 'Jenkins: HTTP response other, rate'
@@ -449,8 +477,11 @@ zabbix_export:
             key: jenkins.get_metrics
           tags:
             -
-              tag: Application
-              value: Jenkins
+              tag: component
+              value: requests
+            -
+              tag: http-code
+              value: other
         -
           uuid: 5169a969034b4da29eaab59c7c3aa719
           name: 'Jenkins: HTTP requests, rate'
@@ -474,8 +505,8 @@ zabbix_export:
             key: jenkins.get_metrics
           tags:
             -
-              tag: Application
-              value: Jenkins
+              tag: component
+              value: requests
         -
           uuid: 9a4ad856db02403b8b523179bf4b3699
           name: 'Jenkins: HTTP requests, median'
@@ -495,8 +526,8 @@ zabbix_export:
             key: jenkins.get_metrics
           tags:
             -
-              tag: Application
-              value: Jenkins
+              tag: component
+              value: requests
         -
           uuid: 6766b45e349e4a4d88593207df6b35ba
           name: 'Jenkins: HTTP requests, p95'
@@ -516,8 +547,8 @@ zabbix_export:
             key: jenkins.get_metrics
           tags:
             -
-              tag: Application
-              value: Jenkins
+              tag: component
+              value: requests
         -
           uuid: 320cc4d7fafc4c87ab8d92bd76901982
           name: 'Jenkins: HTTP response 500, rate'
@@ -541,8 +572,11 @@ zabbix_export:
             key: jenkins.get_metrics
           tags:
             -
-              tag: Application
-              value: Jenkins
+              tag: component
+              value: requests
+            -
+              tag: http-code
+              value: '500'
         -
           uuid: d4ad6574138443a18e721f3d518d5e61
           name: 'Jenkins: HTTP response 503, rate'
@@ -566,8 +600,11 @@ zabbix_export:
             key: jenkins.get_metrics
           tags:
             -
-              tag: Application
-              value: Jenkins
+              tag: component
+              value: requests
+            -
+              tag: http-code
+              value: '503'
         -
           uuid: ecca8e2341c14ede9e397ddc39df5592
           name: 'Jenkins: Job blocked duration, median'
@@ -587,8 +624,8 @@ zabbix_export:
             key: jenkins.get_metrics
           tags:
             -
-              tag: Application
-              value: Jenkins
+              tag: component
+              value: jobs
         -
           uuid: 859a7845f3d8483ba3378f7077509784
           name: 'Jenkins: Job blocked duration, p95'
@@ -608,8 +645,8 @@ zabbix_export:
             key: jenkins.get_metrics
           tags:
             -
-              tag: Application
-              value: Jenkins
+              tag: component
+              value: jobs
         -
           uuid: ca4e141c83344aeeb32d9ea2d9017cbf
           name: 'Jenkins: Job blocked, m1 rate'
@@ -628,8 +665,8 @@ zabbix_export:
             key: jenkins.get_metrics
           tags:
             -
-              tag: Application
-              value: Jenkins
+              tag: component
+              value: jobs
         -
           uuid: d0a242007b424a0e80dbfb90577eaab2
           name: 'Jenkins: Job blocked, m5 rate'
@@ -648,8 +685,8 @@ zabbix_export:
             key: jenkins.get_metrics
           tags:
             -
-              tag: Application
-              value: Jenkins
+              tag: component
+              value: jobs
         -
           uuid: 3c2ba170a89040089b226871512e237b
           name: 'Jenkins: Job buildable duration, median'
@@ -669,8 +706,8 @@ zabbix_export:
             key: jenkins.get_metrics
           tags:
             -
-              tag: Application
-              value: Jenkins
+              tag: component
+              value: jobs
         -
           uuid: 9047881efcb84822b7da852f4c66dbff
           name: 'Jenkins: Job buildable duration, p95'
@@ -690,8 +727,8 @@ zabbix_export:
             key: jenkins.get_metrics
           tags:
             -
-              tag: Application
-              value: Jenkins
+              tag: component
+              value: jobs
         -
           uuid: 1d8e643a0ddc44aa951ee516372e587b
           name: 'Jenkins: Job buildable, m1 rate'
@@ -710,8 +747,8 @@ zabbix_export:
             key: jenkins.get_metrics
           tags:
             -
-              tag: Application
-              value: Jenkins
+              tag: component
+              value: jobs
         -
           uuid: 0e1d712b9a854922b28e3ddf871bf7b1
           name: 'Jenkins: Job buildable, m5 rate'
@@ -730,8 +767,8 @@ zabbix_export:
             key: jenkins.get_metrics
           tags:
             -
-              tag: Application
-              value: Jenkins
+              tag: component
+              value: jobs
         -
           uuid: c0c0335fd8654cfaa9534c816fbee967
           name: 'Jenkins: Job building duration, median'
@@ -751,8 +788,8 @@ zabbix_export:
             key: jenkins.get_metrics
           tags:
             -
-              tag: Application
-              value: Jenkins
+              tag: component
+              value: jobs
         -
           uuid: 61fb13ee0d0f4e1bb5fdab1ea35371ef
           name: 'Jenkins: Job building duration, p95'
@@ -772,8 +809,8 @@ zabbix_export:
             key: jenkins.get_metrics
           tags:
             -
-              tag: Application
-              value: Jenkins
+              tag: component
+              value: jobs
         -
           uuid: 08ebe2359c4f4134aaf610b50bcba8fe
           name: 'Jenkins: Job building, m1 rate'
@@ -792,8 +829,8 @@ zabbix_export:
             key: jenkins.get_metrics
           tags:
             -
-              tag: Application
-              value: Jenkins
+              tag: component
+              value: jobs
         -
           uuid: 36f551fd55814000b76b5b63c05051d7
           name: 'Jenkins: Job building, m5 rate'
@@ -812,8 +849,8 @@ zabbix_export:
             key: jenkins.get_metrics
           tags:
             -
-              tag: Application
-              value: Jenkins
+              tag: component
+              value: jobs
         -
           uuid: 39bc5fdfbe884c72816d34045438ea7d
           name: 'Jenkins: Jobs count'
@@ -835,8 +872,8 @@ zabbix_export:
             key: jenkins.get_metrics
           tags:
             -
-              tag: Application
-              value: Jenkins
+              tag: component
+              value: jobs
         -
           uuid: af40fcdb50c545bd9b49a6f4b7a26fea
           name: 'Jenkins: Job queuing duration, median'
@@ -856,8 +893,8 @@ zabbix_export:
             key: jenkins.get_metrics
           tags:
             -
-              tag: Application
-              value: Jenkins
+              tag: component
+              value: jobs
         -
           uuid: f797a4698f1b41f885a8cdd3d98924e2
           name: 'Jenkins: Job queuing duration, p95'
@@ -877,8 +914,8 @@ zabbix_export:
             key: jenkins.get_metrics
           tags:
             -
-              tag: Application
-              value: Jenkins
+              tag: component
+              value: jobs
         -
           uuid: d9f785e6f2e148ee98d922524f014037
           name: 'Jenkins: Job queuing, m1 rate'
@@ -897,8 +934,8 @@ zabbix_export:
             key: jenkins.get_metrics
           tags:
             -
-              tag: Application
-              value: Jenkins
+              tag: component
+              value: jobs
         -
           uuid: 10c80e91b2214ab2b43458a1d65c3a18
           name: 'Jenkins: Job queuing, m5 rate'
@@ -917,8 +954,8 @@ zabbix_export:
             key: jenkins.get_metrics
           tags:
             -
-              tag: Application
-              value: Jenkins
+              tag: component
+              value: jobs
         -
           uuid: ff842a648bcc4aaa89f2200e0d4bb661
           name: 'Jenkins: Job scheduled, m1 rate'
@@ -937,8 +974,8 @@ zabbix_export:
             key: jenkins.get_metrics
           tags:
             -
-              tag: Application
-              value: Jenkins
+              tag: component
+              value: jobs
         -
           uuid: bc2de2ce8e9d474d8e2591d76adecabe
           name: 'Jenkins: Jobs scheduled, m5 rate'
@@ -957,8 +994,8 @@ zabbix_export:
             key: jenkins.get_metrics
           tags:
             -
-              tag: Application
-              value: Jenkins
+              tag: component
+              value: jobs
         -
           uuid: 975124750e3e4c969711185ea58bcb49
           name: 'Jenkins: Job total duration, median'
@@ -978,8 +1015,8 @@ zabbix_export:
             key: jenkins.get_metrics
           tags:
             -
-              tag: Application
-              value: Jenkins
+              tag: component
+              value: jobs
         -
           uuid: dbc0aeedccb740b4a7c1b5f84eb2513b
           name: 'Jenkins: Job total duration, p95'
@@ -999,8 +1036,8 @@ zabbix_export:
             key: jenkins.get_metrics
           tags:
             -
-              tag: Application
-              value: Jenkins
+              tag: component
+              value: jobs
         -
           uuid: 19c5a45a673c4af2be5808faf35a3892
           name: 'Jenkins: Job total, m1 rate'
@@ -1019,8 +1056,8 @@ zabbix_export:
             key: jenkins.get_metrics
           tags:
             -
-              tag: Application
-              value: Jenkins
+              tag: component
+              value: jobs
         -
           uuid: 58067833af494a66b4a44bc25ac17a0e
           name: 'Jenkins: Job total, m5 rate'
@@ -1039,8 +1076,8 @@ zabbix_export:
             key: jenkins.get_metrics
           tags:
             -
-              tag: Application
-              value: Jenkins
+              tag: component
+              value: jobs
         -
           uuid: dd7a1e8142f94ef099f6aa0ed1facce3
           name: 'Jenkins: Job waiting duration, median'
@@ -1060,8 +1097,8 @@ zabbix_export:
             key: jenkins.get_metrics
           tags:
             -
-              tag: Application
-              value: Jenkins
+              tag: component
+              value: jobs
         -
           uuid: bb339169024b4461a39261f3fe36de4f
           name: 'Jenkins: Job waiting duration, p95'
@@ -1081,8 +1118,8 @@ zabbix_export:
             key: jenkins.get_metrics
           tags:
             -
-              tag: Application
-              value: Jenkins
+              tag: component
+              value: jobs
         -
           uuid: 2d21f74757374b769ae8e76d4d7afa79
           name: 'Jenkins: Job waiting, m1 rate'
@@ -1101,8 +1138,8 @@ zabbix_export:
             key: jenkins.get_metrics
           tags:
             -
-              tag: Application
-              value: Jenkins
+              tag: component
+              value: jobs
         -
           uuid: 9e16580148964e9aae3a660b18721bee
           name: 'Jenkins: Job waiting, m5 rate'
@@ -1121,8 +1158,8 @@ zabbix_export:
             key: jenkins.get_metrics
           tags:
             -
-              tag: Application
-              value: Jenkins
+              tag: component
+              value: jobs
         -
           uuid: dc47555812a0485e9d77da3e5a1c1227
           name: 'Jenkins: Get jobs info'
@@ -1147,8 +1184,11 @@ zabbix_export:
               value: 'jobs[name,description,url,healthReport[score],lastBuild[number,result,duration,timestamp],lastSuccessfulBuild[number,result,duration,timestamp],lastFailedBuild[number,result,duration,timestamp]]'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: jobs
+            -
+              tag: component
+              value: raw
         -
           uuid: 930fa76b32484155ae3ec8964e3952a1
           name: 'Jenkins: Nodes count'
@@ -1170,8 +1210,8 @@ zabbix_export:
             key: jenkins.get_metrics
           tags:
             -
-              tag: Application
-              value: Jenkins
+              tag: component
+              value: nodes
         -
           uuid: 440bdc39d2444b9e83cc863e34f3b416
           name: 'Jenkins: Nodes offline'
@@ -1193,8 +1233,8 @@ zabbix_export:
             key: jenkins.get_metrics
           tags:
             -
-              tag: Application
-              value: Jenkins
+              tag: component
+              value: nodes
         -
           uuid: 758ead9ea71646be882b9bff280ce4d6
           name: 'Jenkins: Nodes online'
@@ -1216,14 +1256,18 @@ zabbix_export:
             key: jenkins.get_metrics
           tags:
             -
-              tag: Application
-              value: Jenkins
+              tag: component
+              value: nodes
           triggers:
             -
               uuid: 4cee7d0f5faf4595a67c6c0e33153f4d
               expression: 'last(/Jenkins by HTTP/jenkins.node.online)=0'
               name: 'Jenkins: Service has no online nodes'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 21cad39b9c914516827b09d04716a71f
           name: 'Jenkins: Service ping'
@@ -1253,8 +1297,8 @@ zabbix_export:
           url: '{$JENKINS.URL}/metrics/{$JENKINS.API.KEY}/ping'
           tags:
             -
-              tag: Application
-              value: Jenkins
+              tag: component
+              value: health
           triggers:
             -
               uuid: ae12ac7aa5c54858a794eb8fc888f90c
@@ -1262,6 +1306,10 @@ zabbix_export:
               name: 'Jenkins: Service is down'
               priority: AVERAGE
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 81609d18d2004fe28f9cb096cdb03995
           name: 'Jenkins: Plugins check'
@@ -1289,8 +1337,8 @@ zabbix_export:
             key: jenkins.healthcheck
           tags:
             -
-              tag: Application
-              value: Jenkins
+              tag: component
+              value: plugins
         -
           uuid: e3fae3ddf1fa47db9925106098bc31eb
           name: 'Jenkins: Plugins active'
@@ -1312,8 +1360,8 @@ zabbix_export:
             key: jenkins.get_metrics
           tags:
             -
-              tag: Application
-              value: Jenkins
+              tag: component
+              value: plugins
         -
           uuid: e8a9f7bd98004939b75749c29227859c
           name: 'Jenkins: Plugins failed'
@@ -1335,8 +1383,8 @@ zabbix_export:
             key: jenkins.get_metrics
           tags:
             -
-              tag: Application
-              value: Jenkins
+              tag: component
+              value: plugins
         -
           uuid: 0b2ad285bc2b4ef5a01633d57099434c
           name: 'Jenkins: Plugins inactive'
@@ -1358,8 +1406,8 @@ zabbix_export:
             key: jenkins.get_metrics
           tags:
             -
-              tag: Application
-              value: Jenkins
+              tag: component
+              value: plugins
         -
           uuid: d678faf0377a4024a930adcdb1c2db2f
           name: 'Jenkins: Plugins check message'
@@ -1384,8 +1432,8 @@ zabbix_export:
             key: jenkins.healthcheck
           tags:
             -
-              tag: Application
-              value: Jenkins
+              tag: component
+              value: plugins
         -
           uuid: f1bf69d134a848178b21a050c830aa8a
           name: 'Jenkins: Plugins with update'
@@ -1407,8 +1455,8 @@ zabbix_export:
             key: jenkins.get_metrics
           tags:
             -
-              tag: Application
-              value: Jenkins
+              tag: component
+              value: plugins
         -
           uuid: a5b58789e54b43f896d4d7e64f8415d3
           name: 'Jenkins: Projects count'
@@ -1430,8 +1478,8 @@ zabbix_export:
             key: jenkins.get_metrics
           tags:
             -
-              tag: Application
-              value: Jenkins
+              tag: component
+              value: application
         -
           uuid: db758cf660c14d69b37f724545de7662
           name: 'Jenkins: Build queue, blocked'
@@ -1449,8 +1497,8 @@ zabbix_export:
             key: jenkins.get_metrics
           tags:
             -
-              tag: Application
-              value: Jenkins
+              tag: component
+              value: queue
         -
           uuid: 1160d4150fa840b5a4628eeb6e8cdaab
           name: 'Jenkins: Build queue, buildable'
@@ -1468,8 +1516,8 @@ zabbix_export:
             key: jenkins.get_metrics
           tags:
             -
-              tag: Application
-              value: Jenkins
+              tag: component
+              value: queue
         -
           uuid: 456ddd17c4044d578a11d8cac80d229b
           name: 'Jenkins: Build queue, pending'
@@ -1487,8 +1535,8 @@ zabbix_export:
             key: jenkins.get_metrics
           tags:
             -
-              tag: Application
-              value: Jenkins
+              tag: component
+              value: queue
         -
           uuid: f99d731f466445dcb3aeda3f306a5de6
           name: 'Jenkins: Build queue, size'
@@ -1506,8 +1554,8 @@ zabbix_export:
             key: jenkins.get_metrics
           tags:
             -
-              tag: Application
-              value: Jenkins
+              tag: component
+              value: queue
         -
           uuid: 90387bb3b3384adcafa66b4c9543d1ab
           name: 'Jenkins: Build queue, stuck'
@@ -1525,8 +1573,8 @@ zabbix_export:
             key: jenkins.get_metrics
           tags:
             -
-              tag: Application
-              value: Jenkins
+              tag: component
+              value: queue
         -
           uuid: 9c97e12efa624176b95aef3413aec1a8
           name: 'Jenkins: CPU Load'
@@ -1535,7 +1583,7 @@ zabbix_export:
           delay: '0'
           history: 7d
           value_type: FLOAT
-          description: 'The system load on the Jenkins master as reported by the JVM’s Operating System JMX bean. The calculation of system load is operating system dependent. Typically this is the sum of the number of processes that are currently running plus the number that are waiting to run. This is typically comparable against the number of CPU cores.'
+          description: 'The system load on the Jenkins master as reported by the JVM''s Operating System JMX bean. The calculation of system load is operating system dependent. Typically this is the sum of the number of processes that are currently running plus the number that are waiting to run. This is typically comparable against the number of CPU cores.'
           preprocessing:
             -
               type: JSONPATH
@@ -1545,8 +1593,8 @@ zabbix_export:
             key: jenkins.get_metrics
           tags:
             -
-              tag: Application
-              value: Jenkins
+              tag: component
+              value: cpu
         -
           uuid: ca81bc28fbc14dbc9eb7b0fa6a46a65d
           name: 'Jenkins: Uptime'
@@ -1569,8 +1617,8 @@ zabbix_export:
             key: jenkins.get_metrics
           tags:
             -
-              tag: Application
-              value: Jenkins
+              tag: component
+              value: application
           triggers:
             -
               uuid: 7d20942598a648ebb2e03f9acdb3e5e3
@@ -1579,6 +1627,10 @@ zabbix_export:
               priority: INFO
               description: 'Uptime is less than 10 minutes'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: ea80ab8045a44f96a5cb2736c009258f
           name: 'Jenkins: Temporary space check'
@@ -1606,8 +1658,8 @@ zabbix_export:
             key: jenkins.healthcheck
           tags:
             -
-              tag: Application
-              value: Jenkins
+              tag: component
+              value: disk
         -
           uuid: d884c3a9662e48eeaf6c9ba50641a2cb
           name: 'Jenkins: Temporary space check message'
@@ -1632,8 +1684,8 @@ zabbix_export:
             key: jenkins.healthcheck
           tags:
             -
-              tag: Application
-              value: Jenkins
+              tag: component
+              value: disk
         -
           uuid: 39f474c3c6f841af9b14113df04bf078
           name: 'Jenkins: Thread deadlock check'
@@ -1661,8 +1713,8 @@ zabbix_export:
             key: jenkins.healthcheck
           tags:
             -
-              tag: Application
-              value: Jenkins
+              tag: component
+              value: threads
         -
           uuid: 64f62df61b6b4f4c9963e09b827850e1
           name: 'Jenkins: Thread deadlock check message'
@@ -1687,8 +1739,8 @@ zabbix_export:
             key: jenkins.healthcheck
           tags:
             -
-              tag: Application
-              value: Jenkins
+              tag: component
+              value: system
         -
           uuid: ae836e5439cf494a9ed0681836da854e
           name: 'Jenkins: Version'
@@ -1712,8 +1764,8 @@ zabbix_export:
             key: jenkins.get_metrics
           tags:
             -
-              tag: Application
-              value: Jenkins
+              tag: component
+              value: application
           triggers:
             -
               uuid: 3dd66b51ed1b4fc2a250daf3e9999e4f
@@ -1722,6 +1774,10 @@ zabbix_export:
               priority: INFO
               description: 'Jenkins version has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
       discovery_rules:
         -
           uuid: eb3e35534745476c8b205acb88382c77
@@ -1752,8 +1808,14 @@ zabbix_export:
                 key: jenkins.computer_info
               tags:
                 -
-                  tag: Application
-                  value: 'Jenkins: Computer [{#DISPLAY_NAME}]'
+                  tag: component
+                  value: computers
+                -
+                  tag: component
+                  value: memory
+                -
+                  tag: computer
+                  value: '{#DISPLAY_NAME}'
             -
               uuid: 4d00cdff0ed0442ab419754264d78ec9
               name: 'Jenkins: Computer [{#DISPLAY_NAME}]: Available swap space'
@@ -1773,8 +1835,14 @@ zabbix_export:
                 key: jenkins.computer_info
               tags:
                 -
-                  tag: Application
-                  value: 'Jenkins: Computer [{#DISPLAY_NAME}]'
+                  tag: component
+                  value: computers
+                -
+                  tag: component
+                  value: memory
+                -
+                  tag: computer
+                  value: '{#DISPLAY_NAME}'
             -
               uuid: ff5a78519c834902ae607832b67f2558
               name: 'Jenkins: Computer [{#DISPLAY_NAME}]: Clock difference'
@@ -1799,8 +1867,11 @@ zabbix_export:
                 key: jenkins.computer_info
               tags:
                 -
-                  tag: Application
-                  value: 'Jenkins: Computer [{#DISPLAY_NAME}]'
+                  tag: component
+                  value: computers
+                -
+                  tag: computer
+                  value: '{#DISPLAY_NAME}'
             -
               uuid: 4dcf897c9c2c4ce58483ef6de6786000
               name: 'Jenkins: Computer [{#DISPLAY_NAME}]: Available disk space'
@@ -1820,8 +1891,14 @@ zabbix_export:
                 key: jenkins.computer_info
               tags:
                 -
-                  tag: Application
-                  value: 'Jenkins: Computer [{#DISPLAY_NAME}]'
+                  tag: component
+                  value: computers
+                -
+                  tag: component
+                  value: disk
+                -
+                  tag: computer
+                  value: '{#DISPLAY_NAME}'
             -
               uuid: 1bca0941b2d24de5980eeb5cb3516b2c
               name: 'Jenkins: Computer [{#DISPLAY_NAME}]: Idle'
@@ -1849,8 +1926,11 @@ zabbix_export:
                 key: jenkins.computer_info
               tags:
                 -
-                  tag: Application
-                  value: 'Jenkins: Computer [{#DISPLAY_NAME}]'
+                  tag: component
+                  value: computers
+                -
+                  tag: computer
+                  value: '{#DISPLAY_NAME}'
             -
               uuid: 38a5eb0b4fb44b93b9f764edcd3f6c49
               name: 'Jenkins: Computer [{#DISPLAY_NAME}]: Executors'
@@ -1869,8 +1949,11 @@ zabbix_export:
                 key: jenkins.computer_info
               tags:
                 -
-                  tag: Application
-                  value: 'Jenkins: Computer [{#DISPLAY_NAME}]'
+                  tag: component
+                  value: computers
+                -
+                  tag: computer
+                  value: '{#DISPLAY_NAME}'
             -
               uuid: 8ddcfbf9b9d84fb290e9f30db7406ea1
               name: 'Jenkins: Computer [{#DISPLAY_NAME}]: Offline cause reason'
@@ -1894,8 +1977,11 @@ zabbix_export:
                 key: jenkins.computer_info
               tags:
                 -
-                  tag: Application
-                  value: 'Jenkins: Computer [{#DISPLAY_NAME}]'
+                  tag: component
+                  value: computers
+                -
+                  tag: computer
+                  value: '{#DISPLAY_NAME}'
             -
               uuid: a2068445af644089be8501da5b02144a
               name: 'Jenkins: Computer [{#DISPLAY_NAME}]: Response time average'
@@ -1919,8 +2005,11 @@ zabbix_export:
                 key: jenkins.computer_info
               tags:
                 -
-                  tag: Application
-                  value: 'Jenkins: Computer [{#DISPLAY_NAME}]'
+                  tag: component
+                  value: computers
+                -
+                  tag: computer
+                  value: '{#DISPLAY_NAME}'
             -
               uuid: b8af2fb1f6d646978739b9c44ea85a27
               name: 'Jenkins: Computer [{#DISPLAY_NAME}]: State'
@@ -1950,8 +2039,11 @@ zabbix_export:
                 key: jenkins.computer_info
               tags:
                 -
-                  tag: Application
-                  value: 'Jenkins: Computer [{#DISPLAY_NAME}]'
+                  tag: component
+                  value: computers
+                -
+                  tag: computer
+                  value: '{#DISPLAY_NAME}'
             -
               uuid: f1318d38fa5a469a999265896e4546dd
               name: 'Jenkins: Computer [{#DISPLAY_NAME}]: Temporarily offline'
@@ -1979,8 +2071,11 @@ zabbix_export:
                 key: jenkins.computer_info
               tags:
                 -
-                  tag: Application
-                  value: 'Jenkins: Computer [{#DISPLAY_NAME}]'
+                  tag: component
+                  value: computers
+                -
+                  tag: computer
+                  value: '{#DISPLAY_NAME}'
             -
               uuid: 5704446ab4f34eb2bc33b8ed6d8da691
               name: 'Jenkins: Computer [{#DISPLAY_NAME}]: Available temp space'
@@ -2000,8 +2095,14 @@ zabbix_export:
                 key: jenkins.computer_info
               tags:
                 -
-                  tag: Application
-                  value: 'Jenkins: Computer [{#DISPLAY_NAME}]'
+                  tag: component
+                  value: computers
+                -
+                  tag: component
+                  value: disk
+                -
+                  tag: computer
+                  value: '{#DISPLAY_NAME}'
             -
               uuid: 5c3dc14eb6264153a0cd7ddd8effb869
               name: 'Jenkins: Computer [{#DISPLAY_NAME}]: Total physical memory'
@@ -2021,8 +2122,14 @@ zabbix_export:
                 key: jenkins.computer_info
               tags:
                 -
-                  tag: Application
-                  value: 'Jenkins: Computer [{#DISPLAY_NAME}]'
+                  tag: component
+                  value: computers
+                -
+                  tag: component
+                  value: memory
+                -
+                  tag: computer
+                  value: '{#DISPLAY_NAME}'
             -
               uuid: c18b82a205d345fa9c1b92e59521735a
               name: 'Jenkins: Computer [{#DISPLAY_NAME}]: Total swap space'
@@ -2042,8 +2149,14 @@ zabbix_export:
                 key: jenkins.computer_info
               tags:
                 -
-                  tag: Application
-                  value: 'Jenkins: Computer [{#DISPLAY_NAME}]'
+                  tag: component
+                  value: computers
+                -
+                  tag: component
+                  value: memory
+                -
+                  tag: computer
+                  value: '{#DISPLAY_NAME}'
           trigger_prototypes:
             -
               uuid: a2347420d1f14fd2b55cbb0865282268
@@ -2058,6 +2171,10 @@ zabbix_export:
                 -
                   name: 'Jenkins: Service has no online nodes'
                   expression: 'last(/Jenkins by HTTP/jenkins.node.online)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
             -
               uuid: bf04115784bc48ffa27d5d2d65176853
               expression: 'last(/Jenkins by HTTP/jenkins.computer.temp_offline[{#DISPLAY_NAME}])=1 and length(last(/Jenkins by HTTP/jenkins.computer.offline.reason[{#DISPLAY_NAME}]))>0'
@@ -2065,6 +2182,10 @@ zabbix_export:
               priority: INFO
               description: 'Node is temporarily Offline with reason: {{ITEM.LASTVALUE2}.regsub("(.*)",\1)}'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
           graph_prototypes:
             -
               uuid: 6296f12b13934006bd462eb4937ca248
@@ -2148,8 +2269,14 @@ zabbix_export:
                 key: jenkins.job_info
               tags:
                 -
-                  tag: Application
-                  value: 'Jenkins job [{#NAME}]'
+                  tag: component
+                  value: health
+                -
+                  tag: component
+                  value: jobs
+                -
+                  tag: job
+                  value: '{#NAME}'
               trigger_prototypes:
                 -
                   uuid: c440cd7d92884c9594c8616f1ac99d74
@@ -2157,6 +2284,10 @@ zabbix_export:
                   name: 'Jenkins job [{#NAME}]: Job is unhealthy'
                   priority: WARNING
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: a0fa8864c536408895f13758eacb486f
               name: 'Jenkins job [{#NAME}]: Last Build duration'
@@ -2184,8 +2315,11 @@ zabbix_export:
                 key: jenkins.job_info
               tags:
                 -
-                  tag: Application
-                  value: 'Jenkins job [{#NAME}]'
+                  tag: component
+                  value: jobs
+                -
+                  tag: job
+                  value: '{#NAME}'
             -
               uuid: 338020d76f8e4b28b1e1c02f97b889f4
               name: 'Jenkins job [{#NAME}]: Last Build number'
@@ -2208,8 +2342,11 @@ zabbix_export:
                 key: jenkins.job_info
               tags:
                 -
-                  tag: Application
-                  value: 'Jenkins job [{#NAME}]'
+                  tag: component
+                  value: jobs
+                -
+                  tag: job
+                  value: '{#NAME}'
             -
               uuid: a3a70807138548a29e9212f48f07946d
               name: 'Jenkins job [{#NAME}]: Last Build result'
@@ -2233,8 +2370,11 @@ zabbix_export:
                 key: jenkins.job_info
               tags:
                 -
-                  tag: Application
-                  value: 'Jenkins job [{#NAME}]'
+                  tag: component
+                  value: jobs
+                -
+                  tag: job
+                  value: '{#NAME}'
             -
               uuid: d53a3f165052440098d087d4f2b868b6
               name: 'Jenkins job [{#NAME}]: Last Build timestamp'
@@ -2261,8 +2401,11 @@ zabbix_export:
                 key: jenkins.job_info
               tags:
                 -
-                  tag: Application
-                  value: 'Jenkins job [{#NAME}]'
+                  tag: component
+                  value: jobs
+                -
+                  tag: job
+                  value: '{#NAME}'
             -
               uuid: 907e48fadc6e4a04a076ca9368f73395
               name: 'Jenkins job [{#NAME}]: Last Failed Build duration'
@@ -2290,8 +2433,11 @@ zabbix_export:
                 key: jenkins.job_info
               tags:
                 -
-                  tag: Application
-                  value: 'Jenkins job [{#NAME}]'
+                  tag: component
+                  value: jobs
+                -
+                  tag: job
+                  value: '{#NAME}'
             -
               uuid: 2e4afc599bf54ea29b1b8734f5aea121
               name: 'Jenkins job [{#NAME}]: Last Failed Build number'
@@ -2314,8 +2460,11 @@ zabbix_export:
                 key: jenkins.job_info
               tags:
                 -
-                  tag: Application
-                  value: 'Jenkins job [{#NAME}]'
+                  tag: component
+                  value: jobs
+                -
+                  tag: job
+                  value: '{#NAME}'
             -
               uuid: e1885df4d7a440c0805207f0afb28cb5
               name: 'Jenkins job [{#NAME}]: Last Failed Build timestamp'
@@ -2342,8 +2491,11 @@ zabbix_export:
                 key: jenkins.job_info
               tags:
                 -
-                  tag: Application
-                  value: 'Jenkins job [{#NAME}]'
+                  tag: component
+                  value: jobs
+                -
+                  tag: job
+                  value: '{#NAME}'
             -
               uuid: d750d312fa424215931375963100217d
               name: 'Jenkins job [{#NAME}]: Last Successful Build duration'
@@ -2371,8 +2523,11 @@ zabbix_export:
                 key: jenkins.job_info
               tags:
                 -
-                  tag: Application
-                  value: 'Jenkins job [{#NAME}]'
+                  tag: component
+                  value: jobs
+                -
+                  tag: job
+                  value: '{#NAME}'
             -
               uuid: 701c272b59c046e4948a7dc814374d59
               name: 'Jenkins job [{#NAME}]: Last Successful Build number'
@@ -2395,8 +2550,11 @@ zabbix_export:
                 key: jenkins.job_info
               tags:
                 -
-                  tag: Application
-                  value: 'Jenkins job [{#NAME}]'
+                  tag: component
+                  value: jobs
+                -
+                  tag: job
+                  value: '{#NAME}'
             -
               uuid: 1adbf52ee3f946118f8a37cf2487262d
               name: 'Jenkins job [{#NAME}]: Last Successful Build timestamp'
@@ -2423,8 +2581,11 @@ zabbix_export:
                 key: jenkins.job_info
               tags:
                 -
-                  tag: Application
-                  value: 'Jenkins job [{#NAME}]'
+                  tag: component
+                  value: jobs
+                -
+                  tag: job
+                  value: '{#NAME}'
           url: '{$JENKINS.URL}/api/json'
           query_fields:
             -
@@ -2445,6 +2606,13 @@ zabbix_export:
               type: JSONPATH
               parameters:
                 - '$.jobs.[*]'
+      tags:
+        -
+          tag: class
+          value: application
+        -
+          tag: target
+          value: jenkins
       macros:
         -
           macro: '{$JENKINS.API.KEY}'
@@ -2521,6 +2689,10 @@ zabbix_export:
       description: |
         Jenkins disk space monitors are reporting the disk space as less than the configured threshold. The message will reference the first node which fails this check.
         Health check message: {{ITEM.LASTVALUE2}.regsub("(.*)",\1)}
+      tags:
+        -
+          tag: scope
+          value: capacity
     -
       uuid: 121e23bd172d447cb975595685495a93
       expression: 'last(/Jenkins by HTTP/jenkins.plugins)=0 and length(last(/Jenkins by HTTP/jenkins.plugins.message))>0'
@@ -2530,6 +2702,10 @@ zabbix_export:
         A failure is typically indicative of a potential issue within the Jenkins installation that will either be solved by explicitly disabling the failing plugin(s) or by resolving the corresponding plugin dependency issues.
         Health check message: {{ITEM.LASTVALUE2}.regsub("(.*)",\1)}
       manual_close: 'YES'
+      tags:
+        -
+          tag: scope
+          value: notice
     -
       uuid: 34de8503a2c84fffb1beb701a4a991ab
       expression: 'last(/Jenkins by HTTP/jenkins.temporary_space)=0 and length(last(/Jenkins by HTTP/jenkins.temporary_space.message))>0'
@@ -2538,6 +2714,10 @@ zabbix_export:
       description: |
         Jenkins temporary space monitors are reporting the temporary space as less than the configured threshold. The message will reference the first node which fails this check.
         Health check message: {{ITEM.LASTVALUE2}.regsub("(.*)",\1)}
+      tags:
+        -
+          tag: scope
+          value: capacity
     -
       uuid: f0a09eb0743948bb8f52a4c28aa728c5
       expression: 'last(/Jenkins by HTTP/jenkins.thread_deadlock)=0 and length(last(/Jenkins by HTTP/jenkins.thread_deadlock.message))>0'
@@ -2546,6 +2726,10 @@ zabbix_export:
       description: |
         There are any deadlocked threads in the Jenkins master JVM.
         Health check message: {{ITEM.LASTVALUE2}.regsub('(.*)',\1)}
+      tags:
+        -
+          tag: scope
+          value: performance
   graphs:
     -
       uuid: 3fdcf5d5d81f4bf3b854984917cb3d32
diff --git a/templates/app/kafka_jmx/template_app_kafka_jmx.yaml b/templates/app/kafka_jmx/template_app_kafka_jmx.yaml
index 2cc3963923b..b85cc394e48 100644
--- a/templates/app/kafka_jmx/template_app_kafka_jmx.yaml
+++ b/templates/app/kafka_jmx/template_app_kafka_jmx.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-10T07:39:26Z'
+  date: '2022-01-26T09:59:20Z'
   groups:
     -
       uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
@@ -18,7 +18,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Applications
@@ -36,8 +36,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Kafka
+              tag: component
+              value: controller
         -
           uuid: 57efca0b4b1e4d1298d7cf77d8d04c98
           name: 'Kafka: Unclean leader election per second'
@@ -56,8 +56,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Kafka
+              tag: component
+              value: controller
           triggers:
             -
               uuid: d984a7834d7846f787ca6649bacebf7b
@@ -65,6 +65,10 @@ zabbix_export:
               name: 'Kafka: Unclean leader election detected'
               priority: AVERAGE
               description: 'Unclean leader elections occur when there is no qualified partition leader among Kafka brokers. If Kafka is configured to allow an unclean leader election, a leader is chosen from the out-of-sync replicas, and any messages that were not synced prior to the loss of the former leader are lost forever. Essentially, unclean leader elections sacrifice consistency for availability.'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 9b3ae38007db4fd5a4e0d3baf026b732
           name: 'Kafka: Controller state on broker'
@@ -84,8 +88,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Kafka
+              tag: component
+              value: controller
         -
           uuid: 765a10af1fa6444bbeaa7b1669e3c8b2
           name: 'Kafka: Offline partitions count'
@@ -98,8 +102,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Kafka
+              tag: component
+              value: controller
           triggers:
             -
               uuid: 5eef377125814830be8167d4d74b0d05
@@ -107,6 +111,10 @@ zabbix_export:
               name: 'Kafka: One or more partitions have no leader'
               priority: WARNING
               description: 'Any partition without an active leader will be completely inaccessible, and both consumers and producers of that partition will be blocked until a leader becomes available.'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 6f4b742f64a04254b607fd49fd7fbfa3
           name: 'Kafka: Ineligible pending replica deletes'
@@ -119,8 +127,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Kafka
+              tag: component
+              value: controller
         -
           uuid: 77069f977a4b4277a13ef329c4cc810f
           name: 'Kafka: Pending replica deletes'
@@ -133,8 +141,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Kafka
+              tag: component
+              value: controller
         -
           uuid: ddfd3ce0b846434fb4dddf391b956d6f
           name: 'Kafka: Ineligible pending topic deletes'
@@ -147,8 +155,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Kafka
+              tag: component
+              value: controller
         -
           uuid: 96c5cb8b0647481e90e0878c8bbc4d4b
           name: 'Kafka: Pending topic deletes'
@@ -161,8 +169,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Kafka
+              tag: component
+              value: controller
         -
           uuid: c11c8666c0ba4f03b8ba15573b7a6ffd
           name: 'Kafka: Offline log directory count'
@@ -175,8 +183,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Kafka
+              tag: component
+              value: logmanager
           triggers:
             -
               uuid: 03fa9ceadba34643b4d3baa7be7c6bb7
@@ -184,6 +192,10 @@ zabbix_export:
               name: 'Kafka: There are offline log directories'
               priority: WARNING
               description: 'The offline log directory count metric indicate the number of log directories which are offline (due to an hardware failure for example) so that the broker cannot store incoming messages anymore.'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 4fd9235510964af99e3c174c6a18773b
           name: 'Kafka: Fetch-Consumer response send time, p95'
@@ -198,8 +210,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Kafka
+              tag: component
+              value: request
         -
           uuid: 3674bdbc6d7742399478a960c1a24647
           name: 'Kafka: Fetch-Consumer response send time, p99'
@@ -214,8 +226,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Kafka
+              tag: component
+              value: request
         -
           uuid: 04dea48528bb4f56bfcbf93576ba328f
           name: 'Kafka: Fetch-Consumer response send time, mean'
@@ -230,8 +242,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Kafka
+              tag: component
+              value: request
         -
           uuid: 57af4d4b76f548e897d9e66459928b40
           name: 'Kafka: Fetch-Follower response send time, p95'
@@ -246,8 +258,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Kafka
+              tag: component
+              value: request
         -
           uuid: 5222217c516a4ab9926afd9ddbe6bfdb
           name: 'Kafka: Fetch-Follower response send time, p99'
@@ -262,8 +274,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Kafka
+              tag: component
+              value: request
         -
           uuid: b11586ce79e846b495ed15a112959685
           name: 'Kafka: Fetch-Follower response send time, mean'
@@ -278,8 +290,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Kafka
+              tag: component
+              value: request
         -
           uuid: 410c2ecf84fa4f67a9d0b0ca69d77338
           name: 'Kafka: Produce response send time, p95'
@@ -294,8 +306,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Kafka
+              tag: component
+              value: request
         -
           uuid: e5d7139fbd5a4688bba04d5837a21d3b
           name: 'Kafka: Produce response send time, p99'
@@ -310,8 +322,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Kafka
+              tag: component
+              value: request
         -
           uuid: 6e51118940ed4bd192774b8fa44aeb26
           name: 'Kafka: Produce response send time, mean'
@@ -326,8 +338,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Kafka
+              tag: component
+              value: request
         -
           uuid: 10cd80d9dd0e4b918138aa99dcd28b2a
           name: 'Kafka: Temporary memory size in bytes (Fetch), max'
@@ -341,8 +353,11 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Kafka
+              tag: component
+              value: memory
+            -
+              tag: component
+              value: request
         -
           uuid: 9034049c16424d81a22b0f0063657ed6
           name: 'Kafka: Temporary memory size in bytes (Fetch), min'
@@ -356,8 +371,11 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Kafka
+              tag: component
+              value: memory
+            -
+              tag: component
+              value: request
         -
           uuid: 57a5c2d51b4f424baf34ab963eed45a4
           name: 'Kafka: Temporary memory size in bytes (Produce), max'
@@ -371,8 +389,11 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Kafka
+              tag: component
+              value: memory
+            -
+              tag: component
+              value: request
         -
           uuid: f28dcdf12db44b30a82b7a1bead52521
           name: 'Kafka: Temporary memory size in bytes (Produce), avg'
@@ -386,8 +407,11 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Kafka
+              tag: component
+              value: memory
+            -
+              tag: component
+              value: request
         -
           uuid: eddaa3dce4be472ba2133674c845a53f
           name: 'Kafka: Temporary memory size in bytes (Produce), min'
@@ -401,8 +425,11 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Kafka
+              tag: component
+              value: memory
+            -
+              tag: component
+              value: request
         -
           uuid: 36b32cc516ce48859fda10b348564446
           name: 'Kafka: Fetch-Consumer request total time, p95'
@@ -417,8 +444,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Kafka
+              tag: component
+              value: request
         -
           uuid: e08291248e4e42858303c27de441aa1b
           name: 'Kafka: Fetch-Consumer request total time, p99'
@@ -433,8 +460,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Kafka
+              tag: component
+              value: request
         -
           uuid: 16c3eb799dca4ed7b167e1127406766e
           name: 'Kafka: Fetch-Consumer request total time, mean'
@@ -449,8 +476,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Kafka
+              tag: component
+              value: request
         -
           uuid: 01704212d78343c597f92fa151f3372a
           name: 'Kafka: Fetch-Follower request total time, p95'
@@ -465,8 +492,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Kafka
+              tag: component
+              value: request
         -
           uuid: c7d9215ee14a4d86b5ad38dbad26c247
           name: 'Kafka: Fetch-Follower request total time, p99'
@@ -481,8 +508,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Kafka
+              tag: component
+              value: request
         -
           uuid: 487274528ec646afb5e04f6edd6619b5
           name: 'Kafka: Fetch-Follower request total time, mean'
@@ -497,8 +524,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Kafka
+              tag: component
+              value: request
         -
           uuid: 3680508a52524de08819abc3d81056be
           name: 'Kafka: Produce request total time, p95'
@@ -513,8 +540,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Kafka
+              tag: component
+              value: request
         -
           uuid: b59938aa9192429890367ca1dc2e74b7
           name: 'Kafka: Produce request total time, p99'
@@ -529,8 +556,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Kafka
+              tag: component
+              value: request
         -
           uuid: 5bcb9ecd5d77460fb25d2afa5173832b
           name: 'Kafka: Produce request total time, mean'
@@ -545,8 +572,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Kafka
+              tag: component
+              value: request
         -
           uuid: 230f713f85c748bd9d29d8d086fcc80a
           name: 'Kafka: UpdateMetadata request total time, p95'
@@ -561,8 +588,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Kafka
+              tag: component
+              value: request
         -
           uuid: 8e654055b20748a085178882d7b5bed9
           name: 'Kafka: UpdateMetadata request total time, p99'
@@ -577,8 +604,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Kafka
+              tag: component
+              value: request
         -
           uuid: c66e750dccd0461e82f8a3b5bd432333
           name: 'Kafka: Fetch-Consumer request total time, mean'
@@ -593,8 +620,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Kafka
+              tag: component
+              value: request
         -
           uuid: 46a7230e12f8404c813e60fae1eaf91d
           name: 'Kafka: Network processor average idle percent'
@@ -614,8 +641,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Kafka
+              tag: component
+              value: network
           triggers:
             -
               uuid: 39bfa825d88145d5a687ba07f6b5596e
@@ -623,12 +650,20 @@ zabbix_export:
               name: 'Kafka: Failed to fetch info data (or no data for 15m)'
               priority: WARNING
               description: 'Zabbix has not received data for items for the last 15 minutes'
+              tags:
+                -
+                  tag: scope
+                  value: availability
             -
               uuid: 91c95d4543ae436d986881e76f090aec
               expression: 'max(/Apache Kafka by JMX/jmx["kafka.network:type=SocketServer,name=NetworkProcessorAvgIdlePercent","Value"],15m)<{$KAFKA.NET_PROC_AVG_IDLE.MIN.WARN}'
               name: 'Kafka: Network processor average idle percent is too low (under {$KAFKA.NET_PROC_AVG_IDLE.MIN.WARN} for 15m)'
               priority: AVERAGE
               description: 'The network processor idle ratio metric indicates the percentage of time the network processor are not in use. The lower this number, the more loaded the broker is.'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: deca38d699f44dea90961be921d096e4
           name: 'Kafka: Uptime'
@@ -647,8 +682,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Kafka
+              tag: component
+              value: system
           triggers:
             -
               uuid: b2fa6148a2b24fa6890b4078c235dcd8
@@ -657,6 +692,10 @@ zabbix_export:
               priority: INFO
               description: 'Uptime is less than 10 minutes'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 75bf053e436e4bb8bb2a94e86a0b194c
           name: 'Kafka: Version'
@@ -676,8 +715,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Kafka
+              tag: component
+              value: inventory
           triggers:
             -
               uuid: 92ecd7eb1eae49d9886ecac7b8f2084a
@@ -686,6 +725,10 @@ zabbix_export:
               priority: INFO
               description: 'Kafka version has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 47dcd92e0ca64833af8d8112b7c66731
           name: 'Kafka: Bytes in per second'
@@ -705,8 +748,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Kafka
+              tag: component
+              value: broker
         -
           uuid: d71ed49d3a1f4599b239105ab7435724
           name: 'Kafka: Bytes out per second'
@@ -726,8 +769,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Kafka
+              tag: component
+              value: broker
         -
           uuid: 15d9fe23872541f0bb3dd1ce33598a61
           name: 'Kafka: Bytes rejected per second'
@@ -746,8 +789,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Kafka
+              tag: component
+              value: broker
         -
           uuid: 2ce7bb5db0674cb1a9504c4d8af72a00
           name: 'Kafka: Client fetch request failed per second'
@@ -766,8 +809,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Kafka
+              tag: component
+              value: broker
         -
           uuid: a26150db6e464090910b837b69e6df8f
           name: 'Kafka: Produce requests failed per second'
@@ -786,8 +829,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Kafka
+              tag: component
+              value: broker
         -
           uuid: 28e488bbe6544d688e741b2ab0397275
           name: 'Kafka: Messages in per second'
@@ -806,8 +849,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Kafka
+              tag: component
+              value: broker
         -
           uuid: a3d88b98436040e494911b94ce72de8b
           name: 'Kafka: Requests in producer purgatory'
@@ -820,8 +863,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Kafka
+              tag: component
+              value: request
         -
           uuid: d68c2995725745a5b1f3f4507a5fe49c
           name: 'Kafka: Requests in fetch purgatory'
@@ -834,8 +877,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Kafka
+              tag: component
+              value: request
         -
           uuid: 2e7433fbf07d415ea40251a29364264c
           name: 'Kafka: Request handler average idle percent'
@@ -855,8 +898,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Kafka
+              tag: component
+              value: request
           triggers:
             -
               uuid: 8f070e06520b4b299fcfffa952d318fc
@@ -864,6 +907,10 @@ zabbix_export:
               name: 'Kafka: Request handler average idle percent is too low (under {$KAFKA.REQUEST_HANDLER_AVG_IDLE.MIN.WARN} for 15m)'
               priority: AVERAGE
               description: 'The request handler idle ratio metric indicates the percentage of time the request handlers are not in use. The lower this number, the more loaded the broker is.'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: fb83a988422c40b792e23b10a0f2ba64
           name: 'Kafka: Replication maximum lag'
@@ -877,8 +924,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Kafka
+              tag: component
+              value: replica
         -
           uuid: 6125c4144c42452ea20c53c5365ad970
           name: 'Kafka: ISR expands per second'
@@ -897,8 +944,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Kafka
+              tag: component
+              value: replica
         -
           uuid: 81eb0364269b40988404bd902ba409f4
           name: 'Kafka: ISR shrink per second'
@@ -917,8 +964,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Kafka
+              tag: component
+              value: replica
         -
           uuid: 9489608614ac4d96810362fc52901c55
           name: 'Kafka: Leader count'
@@ -931,8 +978,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Kafka
+              tag: component
+              value: replica
         -
           uuid: 1a737ce50a274c3696beade89187afd1
           name: 'Kafka: Partition count'
@@ -945,8 +992,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Kafka
+              tag: component
+              value: replica
         -
           uuid: 05fb33b225264059a2eef04a91963dbb
           name: 'Kafka: Number of reassigning partitions'
@@ -959,8 +1006,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Kafka
+              tag: component
+              value: replica
         -
           uuid: b22cee3e3aa849a1b5098e18f42b3b3d
           name: 'Kafka: Under minimum ISR partition count'
@@ -973,8 +1020,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Kafka
+              tag: component
+              value: replica
           triggers:
             -
               uuid: b401a90e75cd4a478d4f8b8cc4f15dc2
@@ -982,6 +1029,10 @@ zabbix_export:
               name: 'Kafka: There are partitions under the min ISR'
               priority: AVERAGE
               description: 'The Under min ISR partitions metric displays the number of partitions, where the number of In-Sync Replicas (ISR) is less than the minimum number of in-sync replicas specified. The two most common causes of under-min ISR partitions are that one or more brokers is unresponsive, or the cluster is experiencing performance issues and one or more brokers are falling behind.'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: f55e42503d7d4091bd4487a30bb144b9
           name: 'Kafka: Under replicated partitions'
@@ -994,8 +1045,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Kafka
+              tag: component
+              value: replica
           triggers:
             -
               uuid: 0ecd8b4b3db6489b83d4a1f78faee03c
@@ -1015,8 +1066,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Kafka
+              tag: component
+              value: request
         -
           uuid: e96464452c844cb7bdeaab62f7c7e5ed
           name: 'Kafka: ZooKeeper connection status'
@@ -1036,14 +1087,21 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Kafka
+              tag: component
+              value: health
+            -
+              tag: component
+              value: zookeeper
           triggers:
             -
               uuid: 423144ac14694a71b9ab563eacfa840d
               expression: 'find(/Apache Kafka by JMX/jmx["kafka.server:type=SessionExpireListener,name=SessionState","Value"],,"regexp","CONNECTED")=0'
               name: 'Kafka: Broker is not connected to ZooKeeper'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 9852aa0bf3074a319b83f695a9d0deca
           name: 'Kafka: ZooKeeper disconnect rate'
@@ -1063,8 +1121,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Kafka
+              tag: component
+              value: zookeeper
         -
           uuid: 3e612950b2c5476e9634ce11f93dfd61
           name: 'Kafka: ZooKeeper session expiration rate'
@@ -1075,7 +1133,7 @@ zabbix_export:
           units: rps
           username: '{$KAFKA.USER}'
           password: '{$KAFKA.PASSWORD}'
-          description: 'ZooKeeper client session expiration  per second.'
+          description: 'ZooKeeper client session expiration per second.'
           preprocessing:
             -
               type: CHANGE_PER_SECOND
@@ -1084,8 +1142,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Kafka
+              tag: component
+              value: zookeeper
         -
           uuid: e9f647cf41214ef7aab480d349f48c21
           name: 'Kafka: ZooKeeper readonly rate'
@@ -1096,7 +1154,7 @@ zabbix_export:
           units: rps
           username: '{$KAFKA.USER}'
           password: '{$KAFKA.PASSWORD}'
-          description: 'ZooKeeper client readonly  per second.'
+          description: 'ZooKeeper client readonly per second.'
           preprocessing:
             -
               type: CHANGE_PER_SECOND
@@ -1105,8 +1163,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Kafka
+              tag: component
+              value: zookeeper
         -
           uuid: b156305285bf4d508afd1d9c91ae34c0
           name: 'Kafka: ZooKeeper sync rate'
@@ -1117,7 +1175,7 @@ zabbix_export:
           units: rps
           username: '{$KAFKA.USER}'
           password: '{$KAFKA.PASSWORD}'
-          description: 'ZooKeeper client sync  per second.'
+          description: 'ZooKeeper client sync per second.'
           preprocessing:
             -
               type: CHANGE_PER_SECOND
@@ -1126,8 +1184,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Kafka
+              tag: component
+              value: zookeeper
         -
           uuid: 3b6de5f72ed94b928684083fbb65b6cb
           name: 'Kafka: ZooKeeper client request latency'
@@ -1141,12 +1199,12 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Kafka
+              tag: component
+              value: zookeeper
       discovery_rules:
         -
           uuid: c4421eb9f9ab4bf2b6d4ba101c897ca7
-          name: 'Topic Metrics  (read)'
+          name: 'Topic Metrics (read)'
           type: JMX
           key: 'jmx.discovery[beans,"kafka.server:type=BrokerTopicMetrics,name=BytesOutPerSec,topic=*"]'
           delay: 1h
@@ -1184,8 +1242,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Kafka topic [{#JMXTOPIC}]'
+                  tag: component
+                  value: broker
+                -
+                  tag: component
+                  value: topic
+                -
+                  tag: topic
+                  value: '{#JMXTOPIC}'
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
         -
           uuid: 82037c202489462fa9c4afbb23618315
@@ -1226,8 +1290,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Kafka topic [{#JMXTOPIC}]'
+                  tag: component
+                  value: broker
+                -
+                  tag: component
+                  value: topic
+                -
+                  tag: topic
+                  value: '{#JMXTOPIC}'
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
         -
           uuid: d5ec81baadad41f29882757979443b5b
@@ -1269,8 +1339,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Kafka topic [{#JMXTOPIC}]'
+                  tag: component
+                  value: broker
+                -
+                  tag: component
+                  value: topic
+                -
+                  tag: topic
+                  value: '{#JMXTOPIC}'
             -
               uuid: 5c18b5eca61b4ed2ae1aae197b7c9958
               name: 'Kafka {#JMXTOPIC}: Messages in per second'
@@ -1289,9 +1365,22 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Kafka topic [{#JMXTOPIC}]'
+                  tag: component
+                  value: broker
+                -
+                  tag: component
+                  value: topic
+                -
+                  tag: topic
+                  value: '{#JMXTOPIC}'
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
+      tags:
+        -
+          tag: class
+          value: application
+        -
+          tag: target
+          value: apache-kafka
       macros:
         -
           macro: '{$KAFKA.NET_PROC_AVG_IDLE.MIN.WARN}'
diff --git a/templates/app/ldap_service/README.md b/templates/app/ldap_service/README.md
new file mode 100644
index 00000000000..128842134ba
--- /dev/null
+++ b/templates/app/ldap_service/README.md
@@ -0,0 +1,39 @@
+
+# LDAP Service
+
+## Overview
+
+For Zabbix version: 6.0 and higher  
+
+## Setup
+
+Refer to the vendor documentation.
+
+## Zabbix configuration
+
+No specific Zabbix configuration is required.
+
+
+## Template links
+
+There are no template links in this template.
+
+## Discovery rules
+
+
+## Items collected
+
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|Services |LDAP service is running |<p>-</p> |SIMPLE |net.tcp.service[ldap] |
+
+## Triggers
+
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|LDAP service is down on {HOST.NAME} |<p>-</p> |`max(/LDAP Service/net.tcp.service[ldap],#3)=0` |AVERAGE | |
+
+## Feedback
+
+Please report any issues with the template at https://support.zabbix.com
+
diff --git a/templates/classic/template_app_ldap_service.yaml b/templates/app/ldap_service/template_app_ldap_service.yaml
index bd0d9a4fa31..6cf97ed2052 100644
--- a/templates/classic/template_app_ldap_service.yaml
+++ b/templates/app/ldap_service/template_app_ldap_service.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:30Z'
+  version: '6.0'
+  date: '2022-01-26T10:51:19Z'
   groups:
     -
       uuid: 57b7ae836ca64446ba2c296389c009b7
@@ -10,6 +10,10 @@ zabbix_export:
       uuid: 736d92e82cfb48a592c8a976c45ef76f
       template: 'LDAP Service'
       name: 'LDAP Service'
+      description: |
+        Template module for monitoring LDAP service
+        
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Modules
@@ -24,14 +28,25 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: 'LDAP service'
+              tag: component
+              value: network
           triggers:
             -
               uuid: ea88df0a4c87424c891ac2197e5b6966
               expression: 'max(/LDAP Service/net.tcp.service[ldap],#3)=0'
               name: 'LDAP service is down on {HOST.NAME}'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: availability
+      tags:
+        -
+          tag: class
+          value: service
+        -
+          tag: target
+          value: ldap
       valuemaps:
         -
           uuid: ddbdab3aa88f4ad0b331a65504cceca5
diff --git a/templates/app/memcached/template_app_memcached.yaml b/templates/app/memcached/template_app_memcached.yaml
index 939212642e1..5a201621014 100644
--- a/templates/app/memcached/template_app_memcached.yaml
+++ b/templates/app/memcached/template_app_memcached.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-15T06:57:35Z'
+  date: '2022-01-26T10:47:39Z'
   groups:
     -
       uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
@@ -15,7 +15,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/398623-discussion-thread-for-official-zabbix-template-memcached
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Applications
@@ -28,7 +28,7 @@ zabbix_export:
           delay: '0'
           history: 7d
           value_type: FLOAT
-          description: 'The flush_all command invalidates all items in the database. This operation incurs a performance penalty and shouldn’t take place in production, so check your debug scripts.'
+          description: 'The flush_all command invalidates all items in the database. This operation incurs a performance penalty and shouldn''t take place in production, so check your debug scripts.'
           preprocessing:
             -
               type: JSONPATH
@@ -42,8 +42,8 @@ zabbix_export:
             key: 'memcached.stats["{$MEMCACHED.CONN.URI}"]'
           tags:
             -
-              tag: Application
-              value: Memcached
+              tag: component
+              value: commands
         -
           uuid: 1f636f46889e41cda9abf80df4ae53a7
           name: 'Memcached: Commands: GET per second'
@@ -66,8 +66,8 @@ zabbix_export:
             key: 'memcached.stats["{$MEMCACHED.CONN.URI}"]'
           tags:
             -
-              tag: Application
-              value: Memcached
+              tag: component
+              value: commands
         -
           uuid: 82988c3b793841c4b99a7cbf18f9ac5f
           name: 'Memcached: Commands: SET per second'
@@ -90,8 +90,8 @@ zabbix_export:
             key: 'memcached.stats["{$MEMCACHED.CONN.URI}"]'
           tags:
             -
-              tag: Application
-              value: Memcached
+              tag: component
+              value: commands
         -
           uuid: d19885f5dc5b4afaa68ae180c60117ca
           name: 'Memcached: Maximum number of bytes'
@@ -114,8 +114,8 @@ zabbix_export:
             key: 'memcached.stats["{$MEMCACHED.CONN.URI}"]'
           tags:
             -
-              tag: Application
-              value: Memcached
+              tag: component
+              value: cache
         -
           uuid: 4ac11cc6469346aa88ad804c8af749a8
           name: 'Memcached: Open connections'
@@ -133,8 +133,8 @@ zabbix_export:
             key: 'memcached.stats["{$MEMCACHED.CONN.URI}"]'
           tags:
             -
-              tag: Application
-              value: Memcached
+              tag: component
+              value: connections
         -
           uuid: 2d9fee94ab6e458b953bf6f4808e9300
           name: 'Memcached: Max connections'
@@ -156,8 +156,8 @@ zabbix_export:
             key: 'memcached.stats["{$MEMCACHED.CONN.URI}"]'
           tags:
             -
-              tag: Application
-              value: Memcached
+              tag: component
+              value: connections
         -
           uuid: 166f2d677f0d4d31bdd5313fa7755d56
           name: 'Memcached: Queued connections per second'
@@ -180,8 +180,8 @@ zabbix_export:
             key: 'memcached.stats["{$MEMCACHED.CONN.URI}"]'
           tags:
             -
-              tag: Application
-              value: Memcached
+              tag: component
+              value: connections
           triggers:
             -
               uuid: 922a59008cd94e0688db8528be296f89
@@ -189,6 +189,10 @@ zabbix_export:
               name: 'Memcached: Too many queued connections (over {$MEMCACHED.CONN.QUEUED.MAX.WARN} in 5m)'
               priority: WARNING
               description: 'The max number of connections is reachedand and a new connection had to wait in the queue as a result.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
         -
           uuid: 7ecc849f54be41dcbc6c037d89a6c240
           name: 'Memcached: New connections per second'
@@ -211,8 +215,8 @@ zabbix_export:
             key: 'memcached.stats["{$MEMCACHED.CONN.URI}"]'
           tags:
             -
-              tag: Application
-              value: Memcached
+              tag: component
+              value: connections
         -
           uuid: 8c224388b06b417fbf89dd25631b10ad
           name: 'Memcached: Connection structures'
@@ -230,8 +234,8 @@ zabbix_export:
             key: 'memcached.stats["{$MEMCACHED.CONN.URI}"]'
           tags:
             -
-              tag: Application
-              value: Memcached
+              tag: component
+              value: connections
         -
           uuid: 891b3347dac6440caef69c9dd7ec0a18
           name: 'Memcached: Throttled connections'
@@ -254,8 +258,8 @@ zabbix_export:
             key: 'memcached.stats["{$MEMCACHED.CONN.URI}"]'
           tags:
             -
-              tag: Application
-              value: Memcached
+              tag: component
+              value: connections
           triggers:
             -
               uuid: 33c9b918d21343dea3bcd2c3e3505fc5
@@ -265,6 +269,10 @@ zabbix_export:
               description: |
                 Number of times a client connection was throttled is too high.
                 When sending GETs in batch mode and the connection contains too many requests (limited by -R parameter) the connection might be throttled to prevent starvation.
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: f67cae24aa3d4b56b00ef7a3e3a45432
           name: 'Memcached: CPU sys'
@@ -284,8 +292,8 @@ zabbix_export:
             key: 'memcached.stats["{$MEMCACHED.CONN.URI}"]'
           tags:
             -
-              tag: Application
-              value: Memcached
+              tag: component
+              value: cpu
           triggers:
             -
               uuid: a30bb4344e714b7f984e86046797b9b1
@@ -298,6 +306,10 @@ zabbix_export:
                 -
                   name: 'Memcached: Service is down'
                   expression: 'last(/Memcached by Zabbix agent 2/memcached.ping["{$MEMCACHED.CONN.URI}"])=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: d7b2094d846243e59a092dc42bbe30c3
           name: 'Memcached: CPU user'
@@ -317,8 +329,8 @@ zabbix_export:
             key: 'memcached.stats["{$MEMCACHED.CONN.URI}"]'
           tags:
             -
-              tag: Application
-              value: Memcached
+              tag: component
+              value: cpu
         -
           uuid: 57a4c2e763c3430daacd4495b91c3e74
           name: 'Memcached: Ping'
@@ -333,8 +345,8 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: Memcached
+              tag: component
+              value: health
           triggers:
             -
               uuid: c6184e4c3cc54e199244dc8efb3cacf8
@@ -342,6 +354,10 @@ zabbix_export:
               name: 'Memcached: Service is down'
               priority: AVERAGE
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 7ecd604d8f1143d6b3cf02c4d0ef22dc
           name: 'Memcached: Process id'
@@ -363,8 +379,8 @@ zabbix_export:
             key: 'memcached.stats["{$MEMCACHED.CONN.URI}"]'
           tags:
             -
-              tag: Application
-              value: Memcached
+              tag: component
+              value: application
         -
           uuid: ce294455f98a4c8c98a4ec70abb2b996
           name: 'Memcached: Bytes used'
@@ -384,8 +400,8 @@ zabbix_export:
             key: 'memcached.stats["{$MEMCACHED.CONN.URI}"]'
           tags:
             -
-              tag: Application
-              value: Memcached
+              tag: component
+              value: memory
         -
           uuid: 7977b28169a9411d98549d0c85ffb78b
           name: 'Memcached: Read bytes per second'
@@ -409,8 +425,8 @@ zabbix_export:
             key: 'memcached.stats["{$MEMCACHED.CONN.URI}"]'
           tags:
             -
-              tag: Application
-              value: Memcached
+              tag: component
+              value: network
         -
           uuid: e81a3fa33a124cdfba36e40d1be6edd8
           name: 'Memcached: Written bytes per second'
@@ -434,8 +450,8 @@ zabbix_export:
             key: 'memcached.stats["{$MEMCACHED.CONN.URI}"]'
           tags:
             -
-              tag: Application
-              value: Memcached
+              tag: component
+              value: network
         -
           uuid: efc05c70a56d4be4a6ad59fa1c2915a3
           name: 'Memcached: Current number of items stored'
@@ -453,8 +469,8 @@ zabbix_export:
             key: 'memcached.stats["{$MEMCACHED.CONN.URI}"]'
           tags:
             -
-              tag: Application
-              value: Memcached
+              tag: component
+              value: keyspace
         -
           uuid: ce47a49ce6af46b7bc9757ed1b5cd02e
           name: 'Memcached: Evictions per second'
@@ -479,8 +495,8 @@ zabbix_export:
             key: 'memcached.stats["{$MEMCACHED.CONN.URI}"]'
           tags:
             -
-              tag: Application
-              value: Memcached
+              tag: component
+              value: keyspace
         -
           uuid: 07acbb8eb36049258ca414d9e314ed79
           name: 'Memcached: Hits per second'
@@ -502,8 +518,8 @@ zabbix_export:
             key: 'memcached.stats["{$MEMCACHED.CONN.URI}"]'
           tags:
             -
-              tag: Application
-              value: Memcached
+              tag: component
+              value: requests
         -
           uuid: 3988a6c751814573869ed3533039faac
           name: 'Memcached: Misses per second'
@@ -525,8 +541,8 @@ zabbix_export:
             key: 'memcached.stats["{$MEMCACHED.CONN.URI}"]'
           tags:
             -
-              tag: Application
-              value: Memcached
+              tag: component
+              value: requests
         -
           uuid: 7c28164178fc493c9f202df0c7103bb5
           name: 'Memcached: Threads'
@@ -544,8 +560,8 @@ zabbix_export:
             key: 'memcached.stats["{$MEMCACHED.CONN.URI}"]'
           tags:
             -
-              tag: Application
-              value: Memcached
+              tag: component
+              value: threads
         -
           uuid: 6bbc3deb32f947b2bc966c15f6e76726
           name: 'Memcached: New items per second'
@@ -567,8 +583,8 @@ zabbix_export:
             key: 'memcached.stats["{$MEMCACHED.CONN.URI}"]'
           tags:
             -
-              tag: Application
-              value: Memcached
+              tag: component
+              value: keyspace
         -
           uuid: 3a096b6d7d9945fe9a25d1fb5c835f1a
           name: 'Memcached: Get status'
@@ -578,8 +594,8 @@ zabbix_export:
           value_type: TEXT
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
         -
           uuid: 4e90d731c49447cf9bb6a72cb9675586
           name: 'Memcached: Uptime'
@@ -598,8 +614,8 @@ zabbix_export:
             key: 'memcached.stats["{$MEMCACHED.CONN.URI}"]'
           tags:
             -
-              tag: Application
-              value: Memcached
+              tag: component
+              value: application
           triggers:
             -
               uuid: c53a2d7b861b41458976bfa03ab1a105
@@ -608,6 +624,10 @@ zabbix_export:
               priority: INFO
               description: 'Uptime is less than 10 minutes'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 64986809298145ebbf8f6ded1c41f2df
           name: 'Memcached: Memcached version'
@@ -631,8 +651,8 @@ zabbix_export:
             key: 'memcached.stats["{$MEMCACHED.CONN.URI}"]'
           tags:
             -
-              tag: Application
-              value: Memcached
+              tag: component
+              value: application
           triggers:
             -
               uuid: 086e757b4a2048eabd5e91b4a0ccc07b
@@ -641,6 +661,17 @@ zabbix_export:
               priority: INFO
               description: 'Memcached version has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+      tags:
+        -
+          tag: class
+          value: application
+        -
+          tag: target
+          value: memcached
       macros:
         -
           macro: '{$MEMCACHED.CONN.PRC.MAX.WARN}'
@@ -679,12 +710,20 @@ zabbix_export:
       expression: 'min(/Memcached by Zabbix agent 2/memcached.stats.bytes,5m)/last(/Memcached by Zabbix agent 2/memcached.config.limit_maxbytes)*100>{$MEMCACHED.MEM.PUSED.MAX.WARN}'
       name: 'Memcached: Memory usage is too high (over {$MEMCACHED.MEM.PUSED.MAX.WARN} in 5m)'
       priority: WARNING
+      tags:
+        -
+          tag: scope
+          value: capacity
     -
       uuid: 61021d383c9f41b990292bab2738356d
       expression: 'min(/Memcached by Zabbix agent 2/memcached.connections.current,5m)/last(/Memcached by Zabbix agent 2/memcached.connections.max)*100>{$MEMCACHED.CONN.PRC.MAX.WARN}'
       name: 'Memcached: Total number of connected clients is too high (over {$MEMCACHED.CONN.PRC.MAX.WARN}% in 5m)'
       priority: WARNING
       description: 'When the number of connections reaches the value of the "max_connections" parameter, new connections will be rejected.'
+      tags:
+        -
+          tag: scope
+          value: capacity
   graphs:
     -
       uuid: 72cf2b87802c4eeca5411946e6b1a29b
diff --git a/templates/app/nginx_agent/template_app_nginx_agent.yaml b/templates/app/nginx_agent/template_app_nginx_agent.yaml
index 8d41437a1d0..5f30f0853bc 100644
--- a/templates/app/nginx_agent/template_app_nginx_agent.yaml
+++ b/templates/app/nginx_agent/template_app_nginx_agent.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-15T09:19:04Z'
+  date: '2022-01-26T10:48:34Z'
   groups:
     -
       uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
@@ -17,7 +17,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/384765-discussion-thread-for-official-zabbix-template-nginx
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Applications
@@ -31,8 +31,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Nginx
+              tag: component
+              value: application
+            -
+              tag: component
+              value: health
           triggers:
             -
               uuid: f5db329410a14609a5f3e883ca493cc8
@@ -47,6 +50,10 @@ zabbix_export:
                 -
                   name: 'Nginx: Service is down'
                   expression: 'last(/Nginx by Zabbix agent/net.tcp.service[http,"{$NGINX.STUB_STATUS.HOST}","{$NGINX.STUB_STATUS.PORT}"])=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: f06e76888f464e13b7cc4c3db33e8131
           name: 'Nginx: Service status'
@@ -61,8 +68,11 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: Nginx
+              tag: component
+              value: application
+            -
+              tag: component
+              value: health
           triggers:
             -
               uuid: c043191c22f34522ba4f83430d9f88b1
@@ -74,6 +84,10 @@ zabbix_export:
                 -
                   name: 'Nginx: Process is not running'
                   expression: 'last(/Nginx by Zabbix agent/proc.num[nginx])=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 9e2be446ac79491c8be1bcd789392066
           name: 'Nginx: Connections accepted per second'
@@ -97,8 +111,8 @@ zabbix_export:
             key: 'web.page.get["{$NGINX.STUB_STATUS.HOST}","{$NGINX.STUB_STATUS.PATH}","{$NGINX.STUB_STATUS.PORT}"]'
           tags:
             -
-              tag: Application
-              value: Nginx
+              tag: component
+              value: connections
         -
           uuid: 436f2dc87cda418eb8f19ed6910c7bd0
           name: 'Nginx: Connections active'
@@ -117,8 +131,8 @@ zabbix_export:
             key: 'web.page.get["{$NGINX.STUB_STATUS.HOST}","{$NGINX.STUB_STATUS.PATH}","{$NGINX.STUB_STATUS.PORT}"]'
           tags:
             -
-              tag: Application
-              value: Nginx
+              tag: component
+              value: connections
         -
           uuid: 4027e6db5e024aff98056faa2d4b43cd
           name: 'Nginx: Connections dropped per second'
@@ -145,8 +159,8 @@ zabbix_export:
             key: 'web.page.get["{$NGINX.STUB_STATUS.HOST}","{$NGINX.STUB_STATUS.PATH}","{$NGINX.STUB_STATUS.PORT}"]'
           tags:
             -
-              tag: Application
-              value: Nginx
+              tag: component
+              value: connections
           triggers:
             -
               uuid: f2d431fa9bc446608caa3f80ef27c41b
@@ -162,6 +176,10 @@ zabbix_export:
                 -
                   name: 'Nginx: Service is down'
                   expression: 'last(/Nginx by Zabbix agent/net.tcp.service[http,"{$NGINX.STUB_STATUS.HOST}","{$NGINX.STUB_STATUS.PORT}"])=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 06191636a7104e1bb40d197493b80958
           name: 'Nginx: Connections handled per second'
@@ -185,8 +203,8 @@ zabbix_export:
             key: 'web.page.get["{$NGINX.STUB_STATUS.HOST}","{$NGINX.STUB_STATUS.PATH}","{$NGINX.STUB_STATUS.PORT}"]'
           tags:
             -
-              tag: Application
-              value: Nginx
+              tag: component
+              value: connections
         -
           uuid: f5925c78389143c7924432483a5c716c
           name: 'Nginx: Connections reading'
@@ -205,8 +223,8 @@ zabbix_export:
             key: 'web.page.get["{$NGINX.STUB_STATUS.HOST}","{$NGINX.STUB_STATUS.PATH}","{$NGINX.STUB_STATUS.PORT}"]'
           tags:
             -
-              tag: Application
-              value: Nginx
+              tag: component
+              value: connections
         -
           uuid: d6cfa828ba344ffe948d8d985b849316
           name: 'Nginx: Connections waiting'
@@ -225,8 +243,8 @@ zabbix_export:
             key: 'web.page.get["{$NGINX.STUB_STATUS.HOST}","{$NGINX.STUB_STATUS.PATH}","{$NGINX.STUB_STATUS.PORT}"]'
           tags:
             -
-              tag: Application
-              value: Nginx
+              tag: component
+              value: connections
         -
           uuid: c038a572f73f4a418ddcc5aeb8b0a547
           name: 'Nginx: Connections writing'
@@ -245,8 +263,8 @@ zabbix_export:
             key: 'web.page.get["{$NGINX.STUB_STATUS.HOST}","{$NGINX.STUB_STATUS.PATH}","{$NGINX.STUB_STATUS.PORT}"]'
           tags:
             -
-              tag: Application
-              value: Nginx
+              tag: component
+              value: connections
         -
           uuid: b28444fb9b834d03a72036882c80b921
           name: 'Nginx: Requests total'
@@ -265,8 +283,8 @@ zabbix_export:
             key: 'web.page.get["{$NGINX.STUB_STATUS.HOST}","{$NGINX.STUB_STATUS.PATH}","{$NGINX.STUB_STATUS.PORT}"]'
           tags:
             -
-              tag: Application
-              value: Nginx
+              tag: component
+              value: requests
         -
           uuid: 2600a696278f490f86cadd8c8836f269
           name: 'Nginx: Requests per second'
@@ -290,8 +308,8 @@ zabbix_export:
             key: 'web.page.get["{$NGINX.STUB_STATUS.HOST}","{$NGINX.STUB_STATUS.PATH}","{$NGINX.STUB_STATUS.PORT}"]'
           tags:
             -
-              tag: Application
-              value: Nginx
+              tag: component
+              value: requests
         -
           uuid: 3dcc81006977478f92be6dd040d66eb5
           name: 'Nginx: Version'
@@ -315,8 +333,8 @@ zabbix_export:
             key: 'web.page.get["{$NGINX.STUB_STATUS.HOST}","{$NGINX.STUB_STATUS.PATH}","{$NGINX.STUB_STATUS.PORT}"]'
           tags:
             -
-              tag: Application
-              value: Nginx
+              tag: component
+              value: application
           triggers:
             -
               uuid: 7ad80c508f2f48b59f7659c673db9f36
@@ -325,6 +343,10 @@ zabbix_export:
               priority: INFO
               description: 'Nginx version has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 84c95c1955bf4ccaa12a060a9acdb478
           name: 'Nginx: CPU utilization'
@@ -335,8 +357,8 @@ zabbix_export:
           description: 'Process CPU utilization percentage.'
           tags:
             -
-              tag: Application
-              value: Nginx
+              tag: component
+              value: cpu
         -
           uuid: 64d208475c034bae953a64cde1833ebb
           name: 'Nginx: Memory usage (rss)'
@@ -346,8 +368,8 @@ zabbix_export:
           description: 'Resident set size memory used by process in bytes.'
           tags:
             -
-              tag: Application
-              value: Nginx
+              tag: component
+              value: memory
         -
           uuid: 21fccb0286fb407c85f1972e994c698e
           name: 'Nginx: Memory usage (vsize)'
@@ -357,8 +379,8 @@ zabbix_export:
           description: 'Virtual memory size used by process in bytes.'
           tags:
             -
-              tag: Application
-              value: Nginx
+              tag: component
+              value: memory
         -
           uuid: ba3da6baccee4b31947bf20d3cae0e5f
           name: 'Nginx: Number of processes running'
@@ -367,14 +389,18 @@ zabbix_export:
           description: 'Number of the Nginx processes running.'
           tags:
             -
-              tag: Application
-              value: Nginx
+              tag: component
+              value: system
           triggers:
             -
               uuid: 903e6a1f30154ee49df3f8d87e0164cc
               expression: 'last(/Nginx by Zabbix agent/proc.num[nginx])=0'
               name: 'Nginx: Process is not running'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 52a23a9f6d60490c8f5565b938154f61
           name: 'Nginx: Get stub status page'
@@ -394,8 +420,11 @@ zabbix_export:
             https://nginx.org/en/docs/http/ngx_http_stub_status_module.html
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: application
+            -
+              tag: component
+              value: health
           triggers:
             -
               uuid: a497b80eb03f469c9552881b498003b2
@@ -413,6 +442,17 @@ zabbix_export:
                 -
                   name: 'Nginx: Service is down'
                   expression: 'last(/Nginx by Zabbix agent/net.tcp.service[http,"{$NGINX.STUB_STATUS.HOST}","{$NGINX.STUB_STATUS.PORT}"])=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+      tags:
+        -
+          tag: class
+          value: software
+        -
+          tag: target
+          value: nginx
       macros:
         -
           macro: '{$NGINX.DROP_RATE.MAX.WARN}'
diff --git a/templates/app/nginx_http/template_app_nginx_http.yaml b/templates/app/nginx_http/template_app_nginx_http.yaml
index cbf27a6b4ec..371a8de02d2 100644
--- a/templates/app/nginx_http/template_app_nginx_http.yaml
+++ b/templates/app/nginx_http/template_app_nginx_http.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-15T06:57:46Z'
+  date: '2022-01-26T10:31:29Z'
   groups:
     -
       uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
@@ -17,7 +17,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/384765-discussion-thread-for-official-zabbix-template-nginx
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Applications
@@ -32,8 +32,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Nginx
+              tag: component
+              value: application
+            -
+              tag: component
+              value: health
           triggers:
             -
               uuid: fc1f7927b8864996986c1da44df57279
@@ -45,6 +48,10 @@ zabbix_export:
                 -
                   name: 'Nginx: Service is down'
                   expression: 'last(/Nginx by HTTP/net.tcp.service[http,"{HOST.CONN}","{$NGINX.STUB_STATUS.PORT}"])=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: e4a09193bc8f42f2888ece83f89f84af
           name: 'Nginx: Service status'
@@ -60,8 +67,11 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: Nginx
+              tag: component
+              value: application
+            -
+              tag: component
+              value: health
           triggers:
             -
               uuid: 7b3de87ba0ea425280d42235bb626b8b
@@ -69,6 +79,10 @@ zabbix_export:
               name: 'Nginx: Service is down'
               priority: AVERAGE
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: e054b58ebbbe4b45961ba697b468ab9e
           name: 'Nginx: Connections accepted per second'
@@ -92,8 +106,8 @@ zabbix_export:
             key: nginx.get_stub_status
           tags:
             -
-              tag: Application
-              value: Nginx
+              tag: component
+              value: connections
         -
           uuid: 2e4b049ab60947d9a05165f67388e531
           name: 'Nginx: Connections active'
@@ -112,8 +126,8 @@ zabbix_export:
             key: nginx.get_stub_status
           tags:
             -
-              tag: Application
-              value: Nginx
+              tag: component
+              value: connections
         -
           uuid: eecc0e887a744627be7f3b01cec6d46e
           name: 'Nginx: Connections dropped per second'
@@ -140,8 +154,8 @@ zabbix_export:
             key: nginx.get_stub_status
           tags:
             -
-              tag: Application
-              value: Nginx
+              tag: component
+              value: connections
           triggers:
             -
               uuid: 79767fbc18594069a1fc0cbec832f8ff
@@ -154,6 +168,10 @@ zabbix_export:
                 -
                   name: 'Nginx: Service is down'
                   expression: 'last(/Nginx by HTTP/net.tcp.service[http,"{HOST.CONN}","{$NGINX.STUB_STATUS.PORT}"])=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: a53cf4f2d2ad4a84a70ff57df6299adc
           name: 'Nginx: Connections handled per second'
@@ -177,8 +195,8 @@ zabbix_export:
             key: nginx.get_stub_status
           tags:
             -
-              tag: Application
-              value: Nginx
+              tag: component
+              value: connections
         -
           uuid: 73493cbf8508419a8fed3abff8cc5851
           name: 'Nginx: Connections reading'
@@ -197,8 +215,8 @@ zabbix_export:
             key: nginx.get_stub_status
           tags:
             -
-              tag: Application
-              value: Nginx
+              tag: component
+              value: connections
         -
           uuid: cf393814511a48b498da8aab94d7ca00
           name: 'Nginx: Connections waiting'
@@ -217,8 +235,8 @@ zabbix_export:
             key: nginx.get_stub_status
           tags:
             -
-              tag: Application
-              value: Nginx
+              tag: component
+              value: connections
         -
           uuid: b0d63efb16984042945fe42e192f7d4e
           name: 'Nginx: Connections writing'
@@ -237,8 +255,8 @@ zabbix_export:
             key: nginx.get_stub_status
           tags:
             -
-              tag: Application
-              value: Nginx
+              tag: component
+              value: connections
         -
           uuid: 86f93d1941d147fe94d754eddd3e8ff2
           name: 'Nginx: Get stub status page'
@@ -261,8 +279,11 @@ zabbix_export:
           retrieve_mode: BOTH
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: application
+            -
+              tag: component
+              value: health
           triggers:
             -
               uuid: 78e0a6322a1941469a0e108a9367c420
@@ -277,6 +298,10 @@ zabbix_export:
                 -
                   name: 'Nginx: Service is down'
                   expression: 'last(/Nginx by HTTP/net.tcp.service[http,"{HOST.CONN}","{$NGINX.STUB_STATUS.PORT}"])=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 071b3d77324740a59045be19da231d76
           name: 'Nginx: Requests total'
@@ -295,8 +320,8 @@ zabbix_export:
             key: nginx.get_stub_status
           tags:
             -
-              tag: Application
-              value: Nginx
+              tag: component
+              value: requests
         -
           uuid: 81b17056ec664f9f926a74ee390ab9c1
           name: 'Nginx: Requests per second'
@@ -320,8 +345,8 @@ zabbix_export:
             key: nginx.get_stub_status
           tags:
             -
-              tag: Application
-              value: Nginx
+              tag: component
+              value: requests
         -
           uuid: 716b627d6d894ac2af3ae8c4aeaa8c0c
           name: 'Nginx: Version'
@@ -345,8 +370,8 @@ zabbix_export:
             key: nginx.get_stub_status
           tags:
             -
-              tag: Application
-              value: Nginx
+              tag: component
+              value: application
           triggers:
             -
               uuid: 0f2689d4967a446e98a107b933179817
@@ -355,6 +380,17 @@ zabbix_export:
               priority: INFO
               description: 'Nginx version has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+      tags:
+        -
+          tag: class
+          value: software
+        -
+          tag: target
+          value: nginx
       macros:
         -
           macro: '{$NGINX.DROP_RATE.MAX.WARN}'
diff --git a/templates/app/nginx_plus_http/README.md b/templates/app/nginx_plus_http/README.md
index 9b42e5d1139..6dbb7a7dd00 100644
--- a/templates/app/nginx_plus_http/README.md
+++ b/templates/app/nginx_plus_http/README.md
@@ -74,14 +74,14 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|HTTP server zones discovery |<p>-</p> |DEPENDENT |nginx.http.server_zones.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `30m`</p><p>**Filter**:</p>AND <p>- {#NAME} MATCHES_REGEX `{$NGINX.LLD.FILTER.HTTP.ZONE.MATCHES}`</p><p>- {#NAME} NOT_MATCHES_REGEX `{$NGINX.LLD.FILTER.HTTP.ZONE.NOT_MATCHES}`</p> |
 |HTTP location zones discovery |<p>-</p> |DEPENDENT |nginx.http.location_zones.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `30m`</p><p>**Filter**:</p>AND <p>- {#NAME} MATCHES_REGEX `{$NGINX.LLD.FILTER.HTTP.LOCATION.ZONE.MATCHES}`</p><p>- {#NAME} NOT_MATCHES_REGEX `{$NGINX.LLD.FILTER.HTTP.LOCATION.ZONE.NOT_MATCHES}`</p> |
-|HTTP upstreams discovery |<p>-</p> |DEPENDENT |nginx.http.upstreams.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `30m`</p><p>**Filter**:</p>AND <p>- {#NAME} MATCHES_REGEX `{$NGINX.LLD.FILTER.HTTP.UPSTREAM.MATCHES}`</p><p>- {#NAME} NOT_MATCHES_REGEX `{$NGINX.LLD.FILTER.HTTP.UPSTREAM.NOT_MATCHES}`</p> |
+|HTTP server zones discovery |<p>-</p> |DEPENDENT |nginx.http.server_zones.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `30m`</p><p>**Filter**:</p>AND <p>- {#NAME} MATCHES_REGEX `{$NGINX.LLD.FILTER.HTTP.ZONE.MATCHES}`</p><p>- {#NAME} NOT_MATCHES_REGEX `{$NGINX.LLD.FILTER.HTTP.ZONE.NOT_MATCHES}`</p> |
 |HTTP upstream peers discovery |<p>-</p> |DEPENDENT |nginx.http.upstream.peers.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `30m`</p><p>**Filter**:</p>AND <p>- {#UPSTREAM} MATCHES_REGEX `{$NGINX.LLD.FILTER.HTTP.UPSTREAM.MATCHES}`</p><p>- {#UPSTREAM} NOT_MATCHES_REGEX `{$NGINX.LLD.FILTER.HTTP.UPSTREAM.NOT_MATCHES}`</p> |
+|HTTP upstreams discovery |<p>-</p> |DEPENDENT |nginx.http.upstreams.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `30m`</p><p>**Filter**:</p>AND <p>- {#NAME} MATCHES_REGEX `{$NGINX.LLD.FILTER.HTTP.UPSTREAM.MATCHES}`</p><p>- {#NAME} NOT_MATCHES_REGEX `{$NGINX.LLD.FILTER.HTTP.UPSTREAM.NOT_MATCHES}`</p> |
+|Resolvers discovery |<p>-</p> |DEPENDENT |nginx.resolvers.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `30m`</p><p>**Filter**:</p>AND <p>- {#NAME} MATCHES_REGEX `{$NGINX.LLD.FILTER.RESOLVER.MATCHES}`</p><p>- {#NAME} NOT_MATCHES_REGEX `{$NGINX.LLD.FILTER.RESOLVER.NOT_MATCHES}`</p> |
 |Stream server zones discovery |<p>-</p> |DEPENDENT |nginx.stream.server_zones.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `30m`</p><p>**Filter**:</p>AND <p>- {#NAME} MATCHES_REGEX `{$NGINX.LLD.FILTER.STREAM.ZONE.MATCHES}`</p><p>- {#NAME} NOT_MATCHES_REGEX `{$NGINX.LLD.FILTER.STREAM.ZONE.NOT_MATCHES}`</p> |
-|Stream upstreams discovery |<p>-</p> |DEPENDENT |nginx.stream.upstreams.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `30m`</p><p>**Filter**:</p>AND <p>- {#NAME} MATCHES_REGEX `{$NGINX.LLD.FILTER.STREAM.UPSTREAM.MATCHES}`</p><p>- {#NAME} NOT_MATCHES_REGEX `{$NGINX.LLD.FILTER.STREAM.UPSTREAM.NOT_MATCHES}`</p> |
 |Stream upstream peers discovery |<p>-</p> |DEPENDENT |nginx.stream.upstream.peers.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `30m`</p><p>**Filter**:</p>AND <p>- {#UPSTREAM} MATCHES_REGEX `{$NGINX.LLD.FILTER.STREAM.UPSTREAM.MATCHES}`</p><p>- {#UPSTREAM} NOT_MATCHES_REGEX `{$NGINX.LLD.FILTER.STREAM.UPSTREAM.NOT_MATCHES}`</p> |
-|Resolvers discovery |<p>-</p> |DEPENDENT |nginx.resolvers.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `30m`</p><p>**Filter**:</p>AND <p>- {#NAME} MATCHES_REGEX `{$NGINX.LLD.FILTER.RESOLVER.MATCHES}`</p><p>- {#NAME} NOT_MATCHES_REGEX `{$NGINX.LLD.FILTER.RESOLVER.NOT_MATCHES}`</p> |
+|Stream upstreams discovery |<p>-</p> |DEPENDENT |nginx.stream.upstreams.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `30m`</p><p>**Filter**:</p>AND <p>- {#NAME} MATCHES_REGEX `{$NGINX.LLD.FILTER.STREAM.UPSTREAM.MATCHES}`</p><p>- {#NAME} NOT_MATCHES_REGEX `{$NGINX.LLD.FILTER.STREAM.UPSTREAM.NOT_MATCHES}`</p> |
 
 ## Items collected
 
@@ -124,7 +124,7 @@ There are no template links in this template.
 |Nginx |Nginx: HTTP location zone [{#NAME}]: Sent, rate |<p>The total number of bytes sent to clients per second.</p> |DEPENDENT |nginx.http.location_zones.sent.rate[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].sent`</p><p>- CHANGE_PER_SECOND</p> |
 |Nginx |Nginx: HTTP upstream [{#NAME}]: Keepalive |<p>The current number of idle keepalive connections.</p> |DEPENDENT |nginx.http.upstreams.keepalive[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].keepalive`</p> |
 |Nginx |Nginx: HTTP upstream [{#NAME}]: Zombies |<p>The current number of servers removed from the group but still processing active client requests.</p> |DEPENDENT |nginx.http.upstreams.zombies[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].zombies`</p> |
-|Nginx |Nginx: HTTP upstream [{#NAME}]: Zone |<p>The name of the shared memory zone that keeps the group’s configuration and run-time state.</p> |DEPENDENT |nginx.http.upstreams.zone[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].zone`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p> |
+|Nginx |Nginx: HTTP upstream [{#NAME}]: Zone |<p>The name of the shared memory zone that keeps the group's configuration and run-time state.</p> |DEPENDENT |nginx.http.upstreams.zone[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].zone`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p> |
 |Nginx |Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]: State |<p>Current state, which may be one of “up”, “draining”, “down”, “unavail”, “checking”, and “unhealthy”.</p> |DEPENDENT |nginx.http.upstream.peer.state[{#UPSTREAM},{#PEER}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#UPSTREAM}'].peers[?(@.server == '{#PEER}')].state.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p> |
 |Nginx |Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]: Active |<p>The current number of active connections.</p> |DEPENDENT |nginx.http.upstream.peer.active[{#UPSTREAM},{#PEER}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#UPSTREAM}'].peers[?(@.server == '{#PEER}')].active.first()`</p> |
 |Nginx |Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]: Requests, rate |<p>The total number of client requests forwarded to this server per second.</p> |DEPENDENT |nginx.http.upstream.peer.requests.rate[{#UPSTREAM},{#PEER}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#UPSTREAM}'].peers[?(@.server == '{#PEER}')].requests.first()`</p><p>- CHANGE_PER_SECOND</p> |
@@ -178,16 +178,16 @@ There are no template links in this template.
 |Nginx |Nginx: Resolver [{#NAME}]: Responses refused, rate |<p>The total number of REFUSED (Operation refused) responses per second.</p> |DEPENDENT |nginx.resolvers.responses.refused.rate[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].responses.refused`</p><p>- CHANGE_PER_SECOND</p> |
 |Nginx |Nginx: Resolver [{#NAME}]: Responses timedout, rate |<p>The total number of timed out requests per second.</p> |DEPENDENT |nginx.resolvers.responses.timedout.rate[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].responses.timedout`</p><p>- CHANGE_PER_SECOND</p> |
 |Nginx |Nginx: Resolver [{#NAME}]: Responses unknown, rate |<p>The total number of requests completed with an unknown error per second.</p> |DEPENDENT |nginx.resolvers.responses.unknown.rate[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#NAME}'].responses.unknown`</p><p>- CHANGE_PER_SECOND</p> |
-|Zabbix_raw_items |Nginx: Get info |<p>Return status of nginx running instance.</p> |HTTP_AGENT |nginx.info |
-|Zabbix_raw_items |Nginx: Get connections |<p>Returns statistics of client connections.</p> |HTTP_AGENT |nginx.connections |
-|Zabbix_raw_items |Nginx: Get SSL |<p>Returns SSL statistics.</p> |HTTP_AGENT |nginx.ssl |
-|Zabbix_raw_items |Nginx: Get requests |<p>Returns status of client HTTP requests.</p> |HTTP_AGENT |nginx.requests |
-|Zabbix_raw_items |Nginx: Get HTTP zones |<p>Returns status information for each HTTP server zone.</p> |HTTP_AGENT |nginx.http.server_zones |
-|Zabbix_raw_items |Nginx: Get HTTP location zones |<p>Returns status information for each HTTP location zone.</p> |HTTP_AGENT |nginx.http.location_zones |
-|Zabbix_raw_items |Nginx: Get HTTP upstreams |<p>Returns status of each HTTP upstream server group and its servers.</p> |HTTP_AGENT |nginx.http.upstreams |
-|Zabbix_raw_items |Nginx: Get Stream server zones |<p>Returns status information for each stream server zone.</p> |HTTP_AGENT |nginx.stream.server_zones |
-|Zabbix_raw_items |Nginx: Get Stream upstreams |<p>Returns status of each stream upstream server group and its servers.</p> |HTTP_AGENT |nginx.stream.upstreams |
-|Zabbix_raw_items |Nginx: Get resolvers |<p>Returns status information for each resolver zone.</p> |HTTP_AGENT |nginx.resolvers |
+|Zabbix raw items |Nginx: Get info |<p>Return status of nginx running instance.</p> |HTTP_AGENT |nginx.info |
+|Zabbix raw items |Nginx: Get connections |<p>Returns statistics of client connections.</p> |HTTP_AGENT |nginx.connections |
+|Zabbix raw items |Nginx: Get SSL |<p>Returns SSL statistics.</p> |HTTP_AGENT |nginx.ssl |
+|Zabbix raw items |Nginx: Get requests |<p>Returns status of client HTTP requests.</p> |HTTP_AGENT |nginx.requests |
+|Zabbix raw items |Nginx: Get HTTP zones |<p>Returns status information for each HTTP server zone.</p> |HTTP_AGENT |nginx.http.server_zones |
+|Zabbix raw items |Nginx: Get HTTP location zones |<p>Returns status information for each HTTP location zone.</p> |HTTP_AGENT |nginx.http.location_zones |
+|Zabbix raw items |Nginx: Get HTTP upstreams |<p>Returns status of each HTTP upstream server group and its servers.</p> |HTTP_AGENT |nginx.http.upstreams |
+|Zabbix raw items |Nginx: Get Stream server zones |<p>Returns status information for each stream server zone.</p> |HTTP_AGENT |nginx.stream.server_zones |
+|Zabbix raw items |Nginx: Get Stream upstreams |<p>Returns status of each stream upstream server group and its servers.</p> |HTTP_AGENT |nginx.stream.upstreams |
+|Zabbix raw items |Nginx: Get resolvers |<p>Returns status information for each resolver zone.</p> |HTTP_AGENT |nginx.resolvers |
 
 ## Triggers
 
@@ -207,5 +207,5 @@ There are no template links in this template.
 
 Please report any issues with the template at https://support.zabbix.com
 
-You can also provide a feedback, discuss the template or ask for help with it at [ZABBIX forums](https://www.zabbix.com/forum/zabbix-suggestions-and-feedback).
+You can also provide feedback, discuss the template or ask for help with it at [ZABBIX forums](https://www.zabbix.com/forum/zabbix-suggestions-and-feedback).
 
diff --git a/templates/app/nginx_plus_http/template_app_nginx_plus_http.yaml b/templates/app/nginx_plus_http/template_app_nginx_plus_http.yaml
index f04ae215390..40169a7c2e7 100644
--- a/templates/app/nginx_plus_http/template_app_nginx_plus_http.yaml
+++ b/templates/app/nginx_plus_http/template_app_nginx_plus_http.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-15T06:57:50Z'
+  date: '2022-01-26T10:51:08Z'
   groups:
     -
       uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
@@ -17,7 +17,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Applications
@@ -35,8 +35,11 @@ zabbix_export:
           status_codes: '200,404'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: connections
+            -
+              tag: component
+              value: raw
         -
           uuid: 1734b26ca856405e8c08f222944cadc3
           name: 'Nginx: Connections accepted, rate'
@@ -58,8 +61,8 @@ zabbix_export:
             key: nginx.connections
           tags:
             -
-              tag: Application
-              value: Nginx
+              tag: component
+              value: connections
         -
           uuid: a0fd403c29e4452a9be0aecb650ab063
           name: 'Nginx: Connections active'
@@ -77,8 +80,8 @@ zabbix_export:
             key: nginx.connections
           tags:
             -
-              tag: Application
-              value: Nginx
+              tag: component
+              value: connections
         -
           uuid: 06395827019542b7bd381d42beb76b10
           name: 'Nginx: Connections dropped'
@@ -96,8 +99,8 @@ zabbix_export:
             key: nginx.connections
           tags:
             -
-              tag: Application
-              value: Nginx
+              tag: component
+              value: connections
           triggers:
             -
               uuid: 91c9dab8147a4d0086019119e4e55b5e
@@ -105,6 +108,10 @@ zabbix_export:
               name: 'Nginx: High connections drop rate (more than {$NGINX.DROP_RATE.MAX.WARN} for 5m)'
               priority: WARNING
               description: 'The dropping rate connections is greater than {$NGINX.DROP_RATE.MAX.WARN} for the last 5 minutes.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 0c0e5a2ba5f643e09d07e34d724aff9a
           name: 'Nginx: Connections idle'
@@ -122,8 +129,8 @@ zabbix_export:
             key: nginx.connections
           tags:
             -
-              tag: Application
-              value: Nginx
+              tag: component
+              value: connections
         -
           uuid: 51c50d69acdb451395736902733673fe
           name: 'Nginx: Get HTTP location zones'
@@ -137,8 +144,11 @@ zabbix_export:
           status_codes: '200,404'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: location_zones
+            -
+              tag: component
+              value: raw
         -
           uuid: 5b337c675bc14d9ab3ac6d2cf5b82dce
           name: 'Nginx: Get HTTP zones'
@@ -152,8 +162,11 @@ zabbix_export:
           status_codes: '200,404'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
+            -
+              tag: component
+              value: server_zones
         -
           uuid: 4ec5e9b1d17141f49db5d9bf29134a49
           name: 'Nginx: Get HTTP upstreams'
@@ -167,8 +180,11 @@ zabbix_export:
           status_codes: '200,404'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
+            -
+              tag: component
+              value: upstreams
         -
           uuid: d6c37400f8e64d89a698896afa6589de
           name: 'Nginx: Get info'
@@ -182,8 +198,11 @@ zabbix_export:
           status_codes: '200,404'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: info
+            -
+              tag: component
+              value: raw
         -
           uuid: 178f9f0c2ae74a6bbf1ae6965021ccde
           name: 'Nginx: Address'
@@ -207,8 +226,8 @@ zabbix_export:
             key: nginx.info
           tags:
             -
-              tag: Application
-              value: Nginx
+              tag: component
+              value: info
         -
           uuid: 14c417b374ef4674bb374979135f8617
           name: 'Nginx: Get info error'
@@ -233,14 +252,21 @@ zabbix_export:
             key: nginx.info
           tags:
             -
-              tag: Application
-              value: Nginx
+              tag: component
+              value: health
+            -
+              tag: component
+              value: info
           triggers:
             -
               uuid: e444c708371748bd831bba6c8d9a92e0
               expression: 'length(last(/Nginx Plus by HTTP/nginx.info.error))>0'
               name: 'Nginx: Server response error (text: {ITEM.VALUE})'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 9baff3e318d84cd78c6a8ec6ae294de5
           name: 'Nginx: Generation'
@@ -262,8 +288,8 @@ zabbix_export:
             key: nginx.info
           tags:
             -
-              tag: Application
-              value: Nginx
+              tag: component
+              value: info
         -
           uuid: 1baceaa7af4d45e487a448670e213c94
           name: 'Nginx: Uptime'
@@ -287,8 +313,8 @@ zabbix_export:
             key: nginx.info
           tags:
             -
-              tag: Application
-              value: Nginx
+              tag: component
+              value: info
           triggers:
             -
               uuid: 396fb4be618e45578566971d5399d611
@@ -297,6 +323,10 @@ zabbix_export:
               priority: WARNING
               description: 'Zabbix has not received data for metrics for the last 30 minutes'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
             -
               uuid: 95622a29bd58444b9f0bd985db99f922
               expression: 'last(/Nginx Plus by HTTP/nginx.info.uptime)<10m'
@@ -304,6 +334,10 @@ zabbix_export:
               priority: INFO
               description: 'Uptime is less than 10 minutes'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 89059effd28641e08e2002c807784bcb
           name: 'Nginx: Version'
@@ -327,8 +361,8 @@ zabbix_export:
             key: nginx.info
           tags:
             -
-              tag: Application
-              value: Nginx
+              tag: component
+              value: info
           triggers:
             -
               uuid: a91ff018fe4f4a1495b08adeb2b0005f
@@ -337,6 +371,10 @@ zabbix_export:
               priority: INFO
               description: 'Nginx version has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 65377fc7308340348199c4c63720a7e1
           name: 'Nginx: Get requests'
@@ -350,8 +388,11 @@ zabbix_export:
           status_codes: '200,404'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
+            -
+              tag: component
+              value: requests
         -
           uuid: 630c4f81f9f44397a156e2d4e5d21af8
           name: 'Nginx: Requests current'
@@ -369,8 +410,8 @@ zabbix_export:
             key: nginx.requests
           tags:
             -
-              tag: Application
-              value: Nginx
+              tag: component
+              value: requests
         -
           uuid: 8130bfb659a94641b97a1abcdb9a4f66
           name: 'Nginx: Requests total, rate'
@@ -392,8 +433,8 @@ zabbix_export:
             key: nginx.requests
           tags:
             -
-              tag: Application
-              value: Nginx
+              tag: component
+              value: requests
         -
           uuid: 9ea35f4f2ca24187896b7f44fb410d24
           name: 'Nginx: Get resolvers'
@@ -407,8 +448,11 @@ zabbix_export:
           status_codes: '200,404'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
+            -
+              tag: component
+              value: resolvers
         -
           uuid: e0798bb2d16c418781e19880fd78832c
           name: 'Nginx: Get SSL'
@@ -422,8 +466,11 @@ zabbix_export:
           status_codes: '200,404'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
+            -
+              tag: component
+              value: ssl
         -
           uuid: 09c7ab8555d046a69a96889185650dfe
           name: 'Nginx: SSL handshakes, rate'
@@ -445,8 +492,8 @@ zabbix_export:
             key: nginx.ssl
           tags:
             -
-              tag: Application
-              value: Nginx
+              tag: component
+              value: ssl
         -
           uuid: 77fcc55ced2045e099b37580f7ef6d5b
           name: 'Nginx: SSL handshakes failed, rate'
@@ -468,8 +515,8 @@ zabbix_export:
             key: nginx.ssl
           tags:
             -
-              tag: Application
-              value: Nginx
+              tag: component
+              value: ssl
         -
           uuid: 98ec8bec834a42caba8d260d939beb0e
           name: 'Nginx: SSL session reuses, rate'
@@ -491,8 +538,8 @@ zabbix_export:
             key: nginx.ssl
           tags:
             -
-              tag: Application
-              value: Nginx
+              tag: component
+              value: ssl
         -
           uuid: 148a8612964b445ba37e340c9341f49d
           name: 'Nginx: Get Stream server zones'
@@ -506,8 +553,11 @@ zabbix_export:
           status_codes: '200,404'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
+            -
+              tag: component
+              value: server_zones
         -
           uuid: c48ca144a8414b2db1c35d518ca5a24f
           name: 'Nginx: Get Stream upstreams'
@@ -521,8 +571,11 @@ zabbix_export:
           status_codes: '200,404'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
+            -
+              tag: component
+              value: upstreams
       discovery_rules:
         -
           uuid: 33fdb45a55544c628c0106ed193ebc0b
@@ -564,8 +617,11 @@ zabbix_export:
                 key: nginx.http.location_zones
               tags:
                 -
-                  tag: Application
-                  value: 'Nginx: HTTP location zone [{#NAME}]'
+                  tag: component
+                  value: location_zones
+                -
+                  tag: zone
+                  value: '{#NAME}'
             -
               uuid: 17e01c9171bd493f98b37811dcf49802
               name: 'Nginx: HTTP location zone [{#NAME}]: Received, rate'
@@ -587,8 +643,11 @@ zabbix_export:
                 key: nginx.http.location_zones
               tags:
                 -
-                  tag: Application
-                  value: 'Nginx: HTTP location zone [{#NAME}]'
+                  tag: component
+                  value: location_zones
+                -
+                  tag: zone
+                  value: '{#NAME}'
             -
               uuid: c646c18580ef4b8695cbc03ce0d5122d
               name: 'Nginx: HTTP location zone [{#NAME}]: Requests, rate'
@@ -610,8 +669,11 @@ zabbix_export:
                 key: nginx.http.location_zones
               tags:
                 -
-                  tag: Application
-                  value: 'Nginx: HTTP location zone [{#NAME}]'
+                  tag: component
+                  value: location_zones
+                -
+                  tag: zone
+                  value: '{#NAME}'
             -
               uuid: 82c9f68d10ec47f1a701eee692e3b9ae
               name: 'Nginx: HTTP location zone [{#NAME}]: Responses 1xx, rate'
@@ -633,8 +695,11 @@ zabbix_export:
                 key: nginx.http.location_zones
               tags:
                 -
-                  tag: Application
-                  value: 'Nginx: HTTP location zone [{#NAME}]'
+                  tag: component
+                  value: location_zones
+                -
+                  tag: zone
+                  value: '{#NAME}'
             -
               uuid: 0cedd14450ba44f0b4c026afabb522a9
               name: 'Nginx: HTTP location zone [{#NAME}]: Responses 2xx, rate'
@@ -656,8 +721,11 @@ zabbix_export:
                 key: nginx.http.location_zones
               tags:
                 -
-                  tag: Application
-                  value: 'Nginx: HTTP location zone [{#NAME}]'
+                  tag: component
+                  value: location_zones
+                -
+                  tag: zone
+                  value: '{#NAME}'
             -
               uuid: 046a2a3b9a644dc1b4a0078b6722c867
               name: 'Nginx: HTTP location zone [{#NAME}]: Responses 3xx, rate'
@@ -679,8 +747,11 @@ zabbix_export:
                 key: nginx.http.location_zones
               tags:
                 -
-                  tag: Application
-                  value: 'Nginx: HTTP location zone [{#NAME}]'
+                  tag: component
+                  value: location_zones
+                -
+                  tag: zone
+                  value: '{#NAME}'
             -
               uuid: 32eb7cb8f04044d6a00ead678ff44a00
               name: 'Nginx: HTTP location zone [{#NAME}]: Responses 4xx, rate'
@@ -702,8 +773,11 @@ zabbix_export:
                 key: nginx.http.location_zones
               tags:
                 -
-                  tag: Application
-                  value: 'Nginx: HTTP location zone [{#NAME}]'
+                  tag: component
+                  value: location_zones
+                -
+                  tag: zone
+                  value: '{#NAME}'
             -
               uuid: dd5a27eb32da42d7998f89a96e29304f
               name: 'Nginx: HTTP location zone [{#NAME}]: Responses 5xx, rate'
@@ -725,8 +799,11 @@ zabbix_export:
                 key: nginx.http.location_zones
               tags:
                 -
-                  tag: Application
-                  value: 'Nginx: HTTP location zone [{#NAME}]'
+                  tag: component
+                  value: location_zones
+                -
+                  tag: zone
+                  value: '{#NAME}'
             -
               uuid: b6e3c7f074b54531aa57dce55169aedd
               name: 'Nginx: HTTP location zone [{#NAME}]: Responses total, rate'
@@ -748,8 +825,11 @@ zabbix_export:
                 key: nginx.http.location_zones
               tags:
                 -
-                  tag: Application
-                  value: 'Nginx: HTTP location zone [{#NAME}]'
+                  tag: component
+                  value: location_zones
+                -
+                  tag: zone
+                  value: '{#NAME}'
             -
               uuid: 0af45d37b3a24d5491054aa3cf319315
               name: 'Nginx: HTTP location zone [{#NAME}]: Sent, rate'
@@ -771,8 +851,11 @@ zabbix_export:
                 key: nginx.http.location_zones
               tags:
                 -
-                  tag: Application
-                  value: 'Nginx: HTTP location zone [{#NAME}]'
+                  tag: component
+                  value: location_zones
+                -
+                  tag: zone
+                  value: '{#NAME}'
           graph_prototypes:
             -
               uuid: 85880c097a1c47bfafa35de05304abbc
@@ -880,8 +963,11 @@ zabbix_export:
                 key: nginx.http.server_zones
               tags:
                 -
-                  tag: Application
-                  value: 'Nginx: HTTP zone [{#NAME}]'
+                  tag: component
+                  value: server_zones
+                -
+                  tag: zone
+                  value: '{#NAME}'
             -
               uuid: e8dd5302fced4d23ba93656f383222d9
               name: 'Nginx: HTTP server zone [{#NAME}]: Processing'
@@ -899,8 +985,11 @@ zabbix_export:
                 key: nginx.http.server_zones
               tags:
                 -
-                  tag: Application
-                  value: 'Nginx: HTTP zone [{#NAME}]'
+                  tag: component
+                  value: server_zones
+                -
+                  tag: zone
+                  value: '{#NAME}'
             -
               uuid: edc834403218460b8c7b8b3ca0709a76
               name: 'Nginx: HTTP server zone [{#NAME}]: Received, rate'
@@ -922,8 +1011,11 @@ zabbix_export:
                 key: nginx.http.server_zones
               tags:
                 -
-                  tag: Application
-                  value: 'Nginx: HTTP zone [{#NAME}]'
+                  tag: component
+                  value: server_zones
+                -
+                  tag: zone
+                  value: '{#NAME}'
             -
               uuid: e33079d5cc684a5687bd7cd10eaec541
               name: 'Nginx: HTTP server zone [{#NAME}]: Requests, rate'
@@ -945,8 +1037,11 @@ zabbix_export:
                 key: nginx.http.server_zones
               tags:
                 -
-                  tag: Application
-                  value: 'Nginx: HTTP zone [{#NAME}]'
+                  tag: component
+                  value: server_zones
+                -
+                  tag: zone
+                  value: '{#NAME}'
             -
               uuid: 2b37ee1a3c1243c38534f70acf7a32d9
               name: 'Nginx: HTTP server zone [{#NAME}]: Responses 1xx, rate'
@@ -968,8 +1063,11 @@ zabbix_export:
                 key: nginx.http.server_zones
               tags:
                 -
-                  tag: Application
-                  value: 'Nginx: HTTP zone [{#NAME}]'
+                  tag: component
+                  value: server_zones
+                -
+                  tag: zone
+                  value: '{#NAME}'
             -
               uuid: 4e127d8bfac940f1b3703053ada05fbd
               name: 'Nginx: HTTP server zone [{#NAME}]: Responses 2xx, rate'
@@ -991,8 +1089,11 @@ zabbix_export:
                 key: nginx.http.server_zones
               tags:
                 -
-                  tag: Application
-                  value: 'Nginx: HTTP zone [{#NAME}]'
+                  tag: component
+                  value: server_zones
+                -
+                  tag: zone
+                  value: '{#NAME}'
             -
               uuid: 6add98c2b5334160a0e4cc363f53cb7e
               name: 'Nginx: HTTP server zone [{#NAME}]: Responses 3xx, rate'
@@ -1014,8 +1115,11 @@ zabbix_export:
                 key: nginx.http.server_zones
               tags:
                 -
-                  tag: Application
-                  value: 'Nginx: HTTP zone [{#NAME}]'
+                  tag: component
+                  value: server_zones
+                -
+                  tag: zone
+                  value: '{#NAME}'
             -
               uuid: 1f2cd6dcddf948a9bf17f05c68502f46
               name: 'Nginx: HTTP server zone [{#NAME}]: Responses 4xx, rate'
@@ -1037,8 +1141,11 @@ zabbix_export:
                 key: nginx.http.server_zones
               tags:
                 -
-                  tag: Application
-                  value: 'Nginx: HTTP zone [{#NAME}]'
+                  tag: component
+                  value: server_zones
+                -
+                  tag: zone
+                  value: '{#NAME}'
             -
               uuid: fc6654f2627e47cbbe1a7628c073520a
               name: 'Nginx: HTTP server zone [{#NAME}]: Responses 5xx, rate'
@@ -1060,8 +1167,11 @@ zabbix_export:
                 key: nginx.http.server_zones
               tags:
                 -
-                  tag: Application
-                  value: 'Nginx: HTTP zone [{#NAME}]'
+                  tag: component
+                  value: server_zones
+                -
+                  tag: zone
+                  value: '{#NAME}'
             -
               uuid: fd81275f0c994a62a9412d595d7d2e8b
               name: 'Nginx: HTTP server zone [{#NAME}]: Responses total, rate'
@@ -1083,8 +1193,11 @@ zabbix_export:
                 key: nginx.http.server_zones
               tags:
                 -
-                  tag: Application
-                  value: 'Nginx: HTTP zone [{#NAME}]'
+                  tag: component
+                  value: server_zones
+                -
+                  tag: zone
+                  value: '{#NAME}'
             -
               uuid: 91acfc8de0e64d52820d509ced251e5b
               name: 'Nginx: HTTP server zone [{#NAME}]: Sent, rate'
@@ -1106,8 +1219,11 @@ zabbix_export:
                 key: nginx.http.server_zones
               tags:
                 -
-                  tag: Application
-                  value: 'Nginx: HTTP zone [{#NAME}]'
+                  tag: component
+                  value: server_zones
+                -
+                  tag: zone
+                  value: '{#NAME}'
           graph_prototypes:
             -
               uuid: ba4bc0201f0741078e1512fd79bddf59
@@ -1211,8 +1327,14 @@ zabbix_export:
                 key: nginx.http.upstreams
               tags:
                 -
-                  tag: Application
-                  value: 'Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]'
+                  tag: component
+                  value: upstream
+                -
+                  tag: peer
+                  value: '{#PEER}'
+                -
+                  tag: upstream
+                  value: '{#NAME}'
             -
               uuid: cd7455016ac549598df2551a716545ef
               name: 'Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]: Fails, rate'
@@ -1234,8 +1356,14 @@ zabbix_export:
                 key: nginx.http.upstreams
               tags:
                 -
-                  tag: Application
-                  value: 'Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]'
+                  tag: component
+                  value: upstream
+                -
+                  tag: peer
+                  value: '{#PEER}'
+                -
+                  tag: upstream
+                  value: '{#NAME}'
             -
               uuid: b0607f003d7a4713a28f0d75b7933087
               name: 'Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]: Header time'
@@ -1255,8 +1383,14 @@ zabbix_export:
                 key: nginx.http.upstreams
               tags:
                 -
-                  tag: Application
-                  value: 'Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]'
+                  tag: component
+                  value: upstream
+                -
+                  tag: peer
+                  value: '{#PEER}'
+                -
+                  tag: upstream
+                  value: '{#NAME}'
             -
               uuid: 89f89850409a4aff8447b9f7c2839f01
               name: 'Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]: Health checks, check'
@@ -1274,8 +1408,14 @@ zabbix_export:
                 key: nginx.http.upstreams
               tags:
                 -
-                  tag: Application
-                  value: 'Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]'
+                  tag: component
+                  value: upstream
+                -
+                  tag: peer
+                  value: '{#PEER}'
+                -
+                  tag: upstream
+                  value: '{#NAME}'
             -
               uuid: 31292e9dbc8c45dd936ed1e77d44940b
               name: 'Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]: Health checks, fails'
@@ -1293,8 +1433,14 @@ zabbix_export:
                 key: nginx.http.upstreams
               tags:
                 -
-                  tag: Application
-                  value: 'Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]'
+                  tag: component
+                  value: upstream
+                -
+                  tag: peer
+                  value: '{#PEER}'
+                -
+                  tag: upstream
+                  value: '{#NAME}'
             -
               uuid: 89c57fb94cab4635b14532961560a8bf
               name: 'Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]: Health checks, unhealthy'
@@ -1312,8 +1458,14 @@ zabbix_export:
                 key: nginx.http.upstreams
               tags:
                 -
-                  tag: Application
-                  value: 'Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]'
+                  tag: component
+                  value: upstream
+                -
+                  tag: peer
+                  value: '{#PEER}'
+                -
+                  tag: upstream
+                  value: '{#NAME}'
             -
               uuid: 8731deb89d1c4fc2bab90aca5802c721
               name: 'Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]: Received, rate'
@@ -1335,8 +1487,14 @@ zabbix_export:
                 key: nginx.http.upstreams
               tags:
                 -
-                  tag: Application
-                  value: 'Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]'
+                  tag: component
+                  value: upstream
+                -
+                  tag: peer
+                  value: '{#PEER}'
+                -
+                  tag: upstream
+                  value: '{#NAME}'
             -
               uuid: 3ff18cfb4028421e9af0460aeaa2d6a4
               name: 'Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]: Requests, rate'
@@ -1358,8 +1516,14 @@ zabbix_export:
                 key: nginx.http.upstreams
               tags:
                 -
-                  tag: Application
-                  value: 'Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]'
+                  tag: component
+                  value: upstream
+                -
+                  tag: peer
+                  value: '{#PEER}'
+                -
+                  tag: upstream
+                  value: '{#NAME}'
             -
               uuid: 6ca38995050e44488df4fde7dc543541
               name: 'Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]: Responses 1xx, rate'
@@ -1381,8 +1545,14 @@ zabbix_export:
                 key: nginx.http.upstreams
               tags:
                 -
-                  tag: Application
-                  value: 'Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]'
+                  tag: component
+                  value: upstream
+                -
+                  tag: peer
+                  value: '{#PEER}'
+                -
+                  tag: upstream
+                  value: '{#NAME}'
             -
               uuid: e526b61c48eb45568ef92434eee3a2cb
               name: 'Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]: Responses 2xx, rate'
@@ -1404,8 +1574,14 @@ zabbix_export:
                 key: nginx.http.upstreams
               tags:
                 -
-                  tag: Application
-                  value: 'Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]'
+                  tag: component
+                  value: upstream
+                -
+                  tag: peer
+                  value: '{#PEER}'
+                -
+                  tag: upstream
+                  value: '{#NAME}'
             -
               uuid: 7b2851137d77418a8548e92332c66c86
               name: 'Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]: Responses 3xx, rate'
@@ -1427,8 +1603,14 @@ zabbix_export:
                 key: nginx.http.upstreams
               tags:
                 -
-                  tag: Application
-                  value: 'Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]'
+                  tag: component
+                  value: upstream
+                -
+                  tag: peer
+                  value: '{#PEER}'
+                -
+                  tag: upstream
+                  value: '{#NAME}'
             -
               uuid: cb81f113d289409ca26af48aeb68f8cc
               name: 'Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]: Responses 4xx, rate'
@@ -1450,8 +1632,14 @@ zabbix_export:
                 key: nginx.http.upstreams
               tags:
                 -
-                  tag: Application
-                  value: 'Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]'
+                  tag: component
+                  value: upstream
+                -
+                  tag: peer
+                  value: '{#PEER}'
+                -
+                  tag: upstream
+                  value: '{#NAME}'
             -
               uuid: 172cb81d02f04fd48c7b82d8ae7dac69
               name: 'Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]: Responses 5xx, rate'
@@ -1473,8 +1661,14 @@ zabbix_export:
                 key: nginx.http.upstreams
               tags:
                 -
-                  tag: Application
-                  value: 'Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]'
+                  tag: component
+                  value: upstream
+                -
+                  tag: peer
+                  value: '{#PEER}'
+                -
+                  tag: upstream
+                  value: '{#NAME}'
             -
               uuid: d587254989c743b4aa9c8043bf18baa5
               name: 'Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]: Responses total, rate'
@@ -1496,8 +1690,14 @@ zabbix_export:
                 key: nginx.http.upstreams
               tags:
                 -
-                  tag: Application
-                  value: 'Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]'
+                  tag: component
+                  value: upstream
+                -
+                  tag: peer
+                  value: '{#PEER}'
+                -
+                  tag: upstream
+                  value: '{#NAME}'
             -
               uuid: 868562df5ab44d3cadeb6fa294b33559
               name: 'Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]: Response time'
@@ -1517,8 +1717,14 @@ zabbix_export:
                 key: nginx.http.upstreams
               tags:
                 -
-                  tag: Application
-                  value: 'Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]'
+                  tag: component
+                  value: upstream
+                -
+                  tag: peer
+                  value: '{#PEER}'
+                -
+                  tag: upstream
+                  value: '{#NAME}'
             -
               uuid: 2a0a36d22acf453e80d79820990db9b8
               name: 'Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]: Sent, rate'
@@ -1540,8 +1746,14 @@ zabbix_export:
                 key: nginx.http.upstreams
               tags:
                 -
-                  tag: Application
-                  value: 'Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]'
+                  tag: component
+                  value: upstream
+                -
+                  tag: peer
+                  value: '{#PEER}'
+                -
+                  tag: upstream
+                  value: '{#NAME}'
             -
               uuid: 33eacaa48f974c348e37475341a6c8af
               name: 'Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]: State'
@@ -1565,8 +1777,14 @@ zabbix_export:
                 key: nginx.http.upstreams
               tags:
                 -
-                  tag: Application
-                  value: 'Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]'
+                  tag: component
+                  value: upstream
+                -
+                  tag: peer
+                  value: '{#PEER}'
+                -
+                  tag: upstream
+                  value: '{#NAME}'
               trigger_prototypes:
                 -
                   uuid: fc6586fe2eef457bac1d71ce0313f95d
@@ -1574,6 +1792,10 @@ zabbix_export:
                   name: 'Nginx: HTTP upstream server is not in UP or DOWN state.'
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: e89e6c141217465794febd9131ccafae
               name: 'Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]: Unavail'
@@ -1591,19 +1813,33 @@ zabbix_export:
                 key: nginx.http.upstreams
               tags:
                 -
-                  tag: Application
-                  value: 'Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]'
+                  tag: component
+                  value: upstream
+                -
+                  tag: peer
+                  value: '{#PEER}'
+                -
+                  tag: upstream
+                  value: '{#NAME}'
           trigger_prototypes:
             -
               uuid: e7b4782a796b4710b50a96f3d24c8208
               expression: 'sum(/Nginx Plus by HTTP/nginx.http.upstream.peer.responses.4xx.rate[{#UPSTREAM},{#PEER}],5m) > (sum(/Nginx Plus by HTTP/nginx.http.upstream.peer.responses.total.rate[{#UPSTREAM},{#PEER}],5m)*({$NGINX.HTTP.UPSTREAM.4XX.MAX.WARN}/100))'
               name: 'Nginx: Too many HTTP requests with code 4xx (over {$NGINX.HTTP.UPSTREAM.4XX.MAX.WARN}% for 5m)'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: f542573d149547d3844f635bf2a87120
               expression: 'sum(/Nginx Plus by HTTP/nginx.http.upstream.peer.responses.5xx.rate[{#UPSTREAM},{#PEER}],5m) > (sum(/Nginx Plus by HTTP/nginx.http.upstream.peer.responses.total.rate[{#UPSTREAM},{#PEER}],5m)*({$NGINX.HTTP.UPSTREAM.5XX.MAX.WARN}/100))'
               name: 'Nginx: Too many HTTP requests with code 5xx (over {$NGINX.HTTP.UPSTREAM.5XX.MAX.WARN}% for 5m)'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: 63582bcbe4c741e88cd64a43ff1b7d9d
@@ -1724,8 +1960,11 @@ zabbix_export:
                 key: nginx.http.upstreams
               tags:
                 -
-                  tag: Application
-                  value: 'Nginx: HTTP upstream [{#NAME}]'
+                  tag: component
+                  value: upstreams
+                -
+                  tag: upstream
+                  value: '{#NAME}'
             -
               uuid: 1a426d42dada4eb082aa4e912ae1256c
               name: 'Nginx: HTTP upstream [{#NAME}]: Zombies'
@@ -1743,8 +1982,11 @@ zabbix_export:
                 key: nginx.http.upstreams
               tags:
                 -
-                  tag: Application
-                  value: 'Nginx: HTTP upstream [{#NAME}]'
+                  tag: component
+                  value: upstreams
+                -
+                  tag: upstream
+                  value: '{#NAME}'
             -
               uuid: 8aa415f2a55a4e8fb28ea87a8d307bd4
               name: 'Nginx: HTTP upstream [{#NAME}]: Zone'
@@ -1754,7 +1996,7 @@ zabbix_export:
               history: 7d
               trends: '0'
               value_type: CHAR
-              description: 'The name of the shared memory zone that keeps the group’s configuration and run-time state.'
+              description: 'The name of the shared memory zone that keeps the group''s configuration and run-time state.'
               preprocessing:
                 -
                   type: JSONPATH
@@ -1768,8 +2010,11 @@ zabbix_export:
                 key: nginx.http.upstreams
               tags:
                 -
-                  tag: Application
-                  value: 'Nginx: HTTP upstream [{#NAME}]'
+                  tag: component
+                  value: upstreams
+                -
+                  tag: upstream
+                  value: '{#NAME}'
           master_item:
             key: nginx.http.upstreams
           preprocessing:
@@ -1828,8 +2073,11 @@ zabbix_export:
                 key: nginx.resolvers
               tags:
                 -
-                  tag: Application
-                  value: 'Nginx: Resolver [{#NAME}]'
+                  tag: component
+                  value: resolver
+                -
+                  tag: resolver
+                  value: '{#NAME}'
             -
               uuid: fb149324f11a4edc9971e9e2572282a6
               name: 'Nginx: Resolver [{#NAME}]: Requests name, rate'
@@ -1851,8 +2099,11 @@ zabbix_export:
                 key: nginx.resolvers
               tags:
                 -
-                  tag: Application
-                  value: 'Nginx: Resolver [{#NAME}]'
+                  tag: component
+                  value: resolver
+                -
+                  tag: resolver
+                  value: '{#NAME}'
             -
               uuid: 9ebd08e8b6a3416c940b16a03158bafe
               name: 'Nginx: Resolver [{#NAME}]: Requests srv, rate'
@@ -1874,8 +2125,11 @@ zabbix_export:
                 key: nginx.resolvers
               tags:
                 -
-                  tag: Application
-                  value: 'Nginx: Resolver [{#NAME}]'
+                  tag: component
+                  value: resolver
+                -
+                  tag: resolver
+                  value: '{#NAME}'
             -
               uuid: 8a7db7d9c24f4f88b9ad9dde32b2b2e0
               name: 'Nginx: Resolver [{#NAME}]: Responses formerr, rate'
@@ -1897,8 +2151,11 @@ zabbix_export:
                 key: nginx.resolvers
               tags:
                 -
-                  tag: Application
-                  value: 'Nginx: Resolver [{#NAME}]'
+                  tag: component
+                  value: resolver
+                -
+                  tag: resolver
+                  value: '{#NAME}'
             -
               uuid: bf5a55d771724cfeaec90950f653b181
               name: 'Nginx: Resolver [{#NAME}]: Responses noerror, rate'
@@ -1920,8 +2177,11 @@ zabbix_export:
                 key: nginx.resolvers
               tags:
                 -
-                  tag: Application
-                  value: 'Nginx: Resolver [{#NAME}]'
+                  tag: component
+                  value: resolver
+                -
+                  tag: resolver
+                  value: '{#NAME}'
             -
               uuid: 46cd31140a3342568c7d7ae0cdae6270
               name: 'Nginx: Resolver [{#NAME}]: Responses notimp, rate'
@@ -1943,8 +2203,11 @@ zabbix_export:
                 key: nginx.resolvers
               tags:
                 -
-                  tag: Application
-                  value: 'Nginx: Resolver [{#NAME}]'
+                  tag: component
+                  value: resolver
+                -
+                  tag: resolver
+                  value: '{#NAME}'
             -
               uuid: b4e002955de844a69a755076993b0577
               name: 'Nginx: Resolver [{#NAME}]: Responses nxdomain, rate'
@@ -1966,8 +2229,11 @@ zabbix_export:
                 key: nginx.resolvers
               tags:
                 -
-                  tag: Application
-                  value: 'Nginx: Resolver [{#NAME}]'
+                  tag: component
+                  value: resolver
+                -
+                  tag: resolver
+                  value: '{#NAME}'
             -
               uuid: 114f260fc9754e80927494dce51f9e46
               name: 'Nginx: Resolver [{#NAME}]: Responses refused, rate'
@@ -1989,8 +2255,11 @@ zabbix_export:
                 key: nginx.resolvers
               tags:
                 -
-                  tag: Application
-                  value: 'Nginx: Resolver [{#NAME}]'
+                  tag: component
+                  value: resolver
+                -
+                  tag: resolver
+                  value: '{#NAME}'
             -
               uuid: 7b4f4f609807407e849525f9f99c0fcc
               name: 'Nginx: Resolver [{#NAME}]: Responses servfail, rate'
@@ -2012,8 +2281,11 @@ zabbix_export:
                 key: nginx.resolvers
               tags:
                 -
-                  tag: Application
-                  value: 'Nginx: Resolver [{#NAME}]'
+                  tag: component
+                  value: resolver
+                -
+                  tag: resolver
+                  value: '{#NAME}'
             -
               uuid: 28b11b8bfd6143ada94b041390281a2f
               name: 'Nginx: Resolver [{#NAME}]: Responses timedout, rate'
@@ -2035,8 +2307,11 @@ zabbix_export:
                 key: nginx.resolvers
               tags:
                 -
-                  tag: Application
-                  value: 'Nginx: Resolver [{#NAME}]'
+                  tag: component
+                  value: resolver
+                -
+                  tag: resolver
+                  value: '{#NAME}'
             -
               uuid: b68f19ad119941b58da491d2cd827277
               name: 'Nginx: Resolver [{#NAME}]: Responses unknown, rate'
@@ -2058,8 +2333,11 @@ zabbix_export:
                 key: nginx.resolvers
               tags:
                 -
-                  tag: Application
-                  value: 'Nginx: Resolver [{#NAME}]'
+                  tag: component
+                  value: resolver
+                -
+                  tag: resolver
+                  value: '{#NAME}'
           graph_prototypes:
             -
               uuid: 7c91ca5b8477468fa19c56b621e0c32a
@@ -2202,8 +2480,11 @@ zabbix_export:
                 key: nginx.stream.server_zones
               tags:
                 -
-                  tag: Application
-                  value: 'Nginx: Stream zone [{#NAME}]'
+                  tag: component
+                  value: server_zones
+                -
+                  tag: zone
+                  value: '{#NAME}'
             -
               uuid: c9e9d883123842d291c922d5bbcca8f3
               name: 'Nginx: Stream server zone [{#NAME}]: Discarded, rate'
@@ -2225,8 +2506,11 @@ zabbix_export:
                 key: nginx.stream.server_zones
               tags:
                 -
-                  tag: Application
-                  value: 'Nginx: Stream zone [{#NAME}]'
+                  tag: component
+                  value: server_zones
+                -
+                  tag: zone
+                  value: '{#NAME}'
             -
               uuid: f8d16f41fe9e4be685c28bb4acd2187f
               name: 'Nginx: Stream server zone [{#NAME}]: Processing'
@@ -2244,8 +2528,11 @@ zabbix_export:
                 key: nginx.stream.server_zones
               tags:
                 -
-                  tag: Application
-                  value: 'Nginx: Stream zone [{#NAME}]'
+                  tag: component
+                  value: server_zones
+                -
+                  tag: zone
+                  value: '{#NAME}'
             -
               uuid: 47a9959627e3423e9739b55dac23edd2
               name: 'Nginx: Stream server zone [{#NAME}]: Received, rate'
@@ -2267,8 +2554,11 @@ zabbix_export:
                 key: nginx.stream.server_zones
               tags:
                 -
-                  tag: Application
-                  value: 'Nginx: Stream zone [{#NAME}]'
+                  tag: component
+                  value: server_zones
+                -
+                  tag: zone
+                  value: '{#NAME}'
             -
               uuid: 2aafb1ae6ce24f14a3494826d63cfce2
               name: 'Nginx: Stream server zone [{#NAME}]: Sent, rate'
@@ -2290,8 +2580,11 @@ zabbix_export:
                 key: nginx.stream.server_zones
               tags:
                 -
-                  tag: Application
-                  value: 'Nginx: Stream zone [{#NAME}]'
+                  tag: component
+                  value: server_zones
+                -
+                  tag: zone
+                  value: '{#NAME}'
             -
               uuid: 7399335b883040c495b5cbfade3e182e
               name: 'Nginx: Stream server zone [{#NAME}]: Sessions 2xx, rate'
@@ -2313,8 +2606,11 @@ zabbix_export:
                 key: nginx.stream.server_zones
               tags:
                 -
-                  tag: Application
-                  value: 'Nginx: Stream zone [{#NAME}]'
+                  tag: component
+                  value: server_zones
+                -
+                  tag: zone
+                  value: '{#NAME}'
             -
               uuid: 5e654682849748bea849db9ab73f7075
               name: 'Nginx: Stream server zone [{#NAME}]: Sessions 4xx, rate'
@@ -2336,8 +2632,11 @@ zabbix_export:
                 key: nginx.stream.server_zones
               tags:
                 -
-                  tag: Application
-                  value: 'Nginx: Stream zone [{#NAME}]'
+                  tag: component
+                  value: server_zones
+                -
+                  tag: zone
+                  value: '{#NAME}'
             -
               uuid: 0cdc4545f6dc4a1e8f247291302824a4
               name: 'Nginx: Stream server zone [{#NAME}]: Sessions 5xx, rate'
@@ -2359,8 +2658,11 @@ zabbix_export:
                 key: nginx.stream.server_zones
               tags:
                 -
-                  tag: Application
-                  value: 'Nginx: Stream zone [{#NAME}]'
+                  tag: component
+                  value: server_zones
+                -
+                  tag: zone
+                  value: '{#NAME}'
             -
               uuid: 30313c91655042b8948422c13fbdfca3
               name: 'Nginx: Stream server zone [{#NAME}]: Sessions total, rate'
@@ -2382,8 +2684,11 @@ zabbix_export:
                 key: nginx.stream.server_zones
               tags:
                 -
-                  tag: Application
-                  value: 'Nginx: Stream zone [{#NAME}]'
+                  tag: component
+                  value: server_zones
+                -
+                  tag: zone
+                  value: '{#NAME}'
           graph_prototypes:
             -
               uuid: f833112506e941d791057925c58bd1d9
@@ -2463,8 +2768,14 @@ zabbix_export:
                 key: nginx.stream.upstreams
               tags:
                 -
-                  tag: Application
-                  value: 'Nginx: Stream upstream [{#UPSTREAM}] peer [{#PEER}]'
+                  tag: component
+                  value: upstream
+                -
+                  tag: peer
+                  value: '{#PEER}'
+                -
+                  tag: upstream
+                  value: '{#UPSTREAM}'
             -
               uuid: 2ae319abd31b40b7a765c300e5dfa954
               name: 'Nginx: Stream upstream [{#UPSTREAM}] peer [{#PEER}]: Connections'
@@ -2482,8 +2793,14 @@ zabbix_export:
                 key: nginx.stream.upstreams
               tags:
                 -
-                  tag: Application
-                  value: 'Nginx: Stream upstream [{#UPSTREAM}] peer [{#PEER}]'
+                  tag: component
+                  value: upstream
+                -
+                  tag: peer
+                  value: '{#PEER}'
+                -
+                  tag: upstream
+                  value: '{#UPSTREAM}'
             -
               uuid: f98409ef166b47f3a70d46dffe233166
               name: 'Nginx: Stream upstream [{#UPSTREAM}] peer [{#PEER}]: Connect time'
@@ -2503,8 +2820,14 @@ zabbix_export:
                 key: nginx.stream.upstreams
               tags:
                 -
-                  tag: Application
-                  value: 'Nginx: Stream upstream [{#UPSTREAM}] peer [{#PEER}]'
+                  tag: component
+                  value: upstream
+                -
+                  tag: peer
+                  value: '{#PEER}'
+                -
+                  tag: upstream
+                  value: '{#UPSTREAM}'
             -
               uuid: 0b1000ddc883422cb9fb3382a839c10a
               name: 'Nginx: Stream upstream [{#UPSTREAM}] peer [{#PEER}]: Fails, rate'
@@ -2526,8 +2849,14 @@ zabbix_export:
                 key: nginx.stream.upstreams
               tags:
                 -
-                  tag: Application
-                  value: 'Nginx: Stream upstream [{#UPSTREAM}] peer [{#PEER}]'
+                  tag: component
+                  value: upstream
+                -
+                  tag: peer
+                  value: '{#PEER}'
+                -
+                  tag: upstream
+                  value: '{#UPSTREAM}'
             -
               uuid: 23a02d1c0a63483fb1eb4914a7e48ecf
               name: 'Nginx: Stream upstream [{#UPSTREAM}] peer [{#PEER}]: First byte time'
@@ -2547,8 +2876,14 @@ zabbix_export:
                 key: nginx.stream.upstreams
               tags:
                 -
-                  tag: Application
-                  value: 'Nginx: Stream upstream [{#UPSTREAM}] peer [{#PEER}]'
+                  tag: component
+                  value: upstream
+                -
+                  tag: peer
+                  value: '{#PEER}'
+                -
+                  tag: upstream
+                  value: '{#UPSTREAM}'
             -
               uuid: dac0196daad74fc385a336c7dbddbcfd
               name: 'Nginx: Stream upstream [{#UPSTREAM}] peer [{#PEER}]: Health checks, check'
@@ -2566,8 +2901,14 @@ zabbix_export:
                 key: nginx.stream.upstreams
               tags:
                 -
-                  tag: Application
-                  value: 'Nginx: Stream upstream [{#UPSTREAM}] peer [{#PEER}]'
+                  tag: component
+                  value: upstream
+                -
+                  tag: peer
+                  value: '{#PEER}'
+                -
+                  tag: upstream
+                  value: '{#UPSTREAM}'
             -
               uuid: af2a6991b432439cb4afb071974a05e7
               name: 'Nginx: Stream upstream [{#UPSTREAM}] peer [{#PEER}]: Health checks, fails'
@@ -2585,8 +2926,14 @@ zabbix_export:
                 key: nginx.stream.upstreams
               tags:
                 -
-                  tag: Application
-                  value: 'Nginx: Stream upstream [{#UPSTREAM}] peer [{#PEER}]'
+                  tag: component
+                  value: upstream
+                -
+                  tag: peer
+                  value: '{#PEER}'
+                -
+                  tag: upstream
+                  value: '{#UPSTREAM}'
             -
               uuid: 089bbb9c602a4654a3d2c582c643745f
               name: 'Nginx: Stream upstream [{#UPSTREAM}] peer [{#PEER}]: Health checks, unhealthy'
@@ -2604,8 +2951,14 @@ zabbix_export:
                 key: nginx.stream.upstreams
               tags:
                 -
-                  tag: Application
-                  value: 'Nginx: Stream upstream [{#UPSTREAM}] peer [{#PEER}]'
+                  tag: component
+                  value: upstream
+                -
+                  tag: peer
+                  value: '{#PEER}'
+                -
+                  tag: upstream
+                  value: '{#UPSTREAM}'
             -
               uuid: 12193b1723eb419a9bbcb235c7b45308
               name: 'Nginx: Stream upstream [{#UPSTREAM}] peer [{#PEER}]: Received, rate'
@@ -2627,8 +2980,14 @@ zabbix_export:
                 key: nginx.stream.upstreams
               tags:
                 -
-                  tag: Application
-                  value: 'Nginx: Stream upstream [{#UPSTREAM}] peer [{#PEER}]'
+                  tag: component
+                  value: upstream
+                -
+                  tag: peer
+                  value: '{#PEER}'
+                -
+                  tag: upstream
+                  value: '{#UPSTREAM}'
             -
               uuid: bda851b725454395b59988f03c534b3b
               name: 'Nginx: Stream upstream [{#UPSTREAM}] peer [{#PEER}]: Response time'
@@ -2648,8 +3007,14 @@ zabbix_export:
                 key: nginx.stream.upstreams
               tags:
                 -
-                  tag: Application
-                  value: 'Nginx: Stream upstream [{#UPSTREAM}] peer [{#PEER}]'
+                  tag: component
+                  value: upstream
+                -
+                  tag: peer
+                  value: '{#PEER}'
+                -
+                  tag: upstream
+                  value: '{#UPSTREAM}'
             -
               uuid: 6ae8685716cf487fa72534a76e4b286a
               name: 'Nginx: Stream upstream [{#UPSTREAM}] peer [{#PEER}]: Sent, rate'
@@ -2671,8 +3036,14 @@ zabbix_export:
                 key: nginx.stream.upstreams
               tags:
                 -
-                  tag: Application
-                  value: 'Nginx: Stream upstream [{#UPSTREAM}] peer [{#PEER}]'
+                  tag: component
+                  value: upstream
+                -
+                  tag: peer
+                  value: '{#PEER}'
+                -
+                  tag: upstream
+                  value: '{#UPSTREAM}'
             -
               uuid: ae7b6564244845518816fffc38bbf9aa
               name: 'Nginx: Stream upstream [{#UPSTREAM}] peer [{#PEER}]: State'
@@ -2696,8 +3067,14 @@ zabbix_export:
                 key: nginx.stream.upstreams
               tags:
                 -
-                  tag: Application
-                  value: 'Nginx: Stream upstream [{#UPSTREAM}] peer [{#PEER}]'
+                  tag: component
+                  value: upstream
+                -
+                  tag: peer
+                  value: '{#PEER}'
+                -
+                  tag: upstream
+                  value: '{#UPSTREAM}'
               trigger_prototypes:
                 -
                   uuid: 20ef9b9e953246ef856dd46033595e52
@@ -2705,6 +3082,10 @@ zabbix_export:
                   name: 'Nginx: Stream upstream server is not in UP or DOWN state.'
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 732f0ea262454ab3a4cfeb09aea66b9b
               name: 'Nginx: Stream upstream [{#UPSTREAM}] peer [{#PEER}]: Unavail'
@@ -2722,8 +3103,14 @@ zabbix_export:
                 key: nginx.stream.upstreams
               tags:
                 -
-                  tag: Application
-                  value: 'Nginx: Stream upstream [{#UPSTREAM}] peer [{#PEER}]'
+                  tag: component
+                  value: upstream
+                -
+                  tag: peer
+                  value: '{#PEER}'
+                -
+                  tag: upstream
+                  value: '{#UPSTREAM}'
           graph_prototypes:
             -
               uuid: abb23d681d0a461db00648b412b176c8
@@ -2805,8 +3192,11 @@ zabbix_export:
                 key: nginx.stream.upstreams
               tags:
                 -
-                  tag: Application
-                  value: 'Nginx: Stream upstream [{#NAME}]'
+                  tag: component
+                  value: upstreams
+                -
+                  tag: upstream
+                  value: '{#NAME}'
             -
               uuid: 8c273c10ece545a58e4d34f6d3812fe0
               name: 'Nginx: Stream upstream [{#NAME}]: Zone'
@@ -2829,8 +3219,11 @@ zabbix_export:
                 key: nginx.stream.upstreams
               tags:
                 -
-                  tag: Application
-                  value: 'Nginx: Stream upstream [{#NAME}]'
+                  tag: component
+                  value: upstreams
+                -
+                  tag: upstream
+                  value: '{#NAME}'
           master_item:
             key: nginx.stream.upstreams
           preprocessing:
@@ -2849,6 +3242,13 @@ zabbix_export:
               type: DISCARD_UNCHANGED_HEARTBEAT
               parameters:
                 - 30m
+      tags:
+        -
+          tag: class
+          value: software
+        -
+          tag: target
+          value: nginx
       macros:
         -
           macro: '{$NGINX.API.ENDPOINT}'
diff --git a/templates/app/nntp_service/README.md b/templates/app/nntp_service/README.md
new file mode 100644
index 00000000000..a1715c75011
--- /dev/null
+++ b/templates/app/nntp_service/README.md
@@ -0,0 +1,39 @@
+
+# NNTP Service
+
+## Overview
+
+For Zabbix version: 6.0 and higher  
+
+## Setup
+
+Refer to the vendor documentation.
+
+## Zabbix configuration
+
+No specific Zabbix configuration is required.
+
+
+## Template links
+
+There are no template links in this template.
+
+## Discovery rules
+
+
+## Items collected
+
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|Services |NNTP service is running |<p>-</p> |SIMPLE |net.tcp.service[nntp] |
+
+## Triggers
+
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|NNTP service is down on {HOST.NAME} |<p>-</p> |`max(/NNTP Service/net.tcp.service[nntp],#3)=0` |AVERAGE | |
+
+## Feedback
+
+Please report any issues with the template at https://support.zabbix.com
+
diff --git a/templates/classic/template_app_nntp_service.yaml b/templates/app/nntp_service/template_app_nntp_service.yaml
index 7006c2c4c82..b82bc546bad 100644
--- a/templates/classic/template_app_nntp_service.yaml
+++ b/templates/app/nntp_service/template_app_nntp_service.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:32Z'
+  version: '6.0'
+  date: '2022-01-26T10:50:56Z'
   groups:
     -
       uuid: 57b7ae836ca64446ba2c296389c009b7
@@ -10,6 +10,10 @@ zabbix_export:
       uuid: 22c53db48be0472cb97209c74418cf16
       template: 'NNTP Service'
       name: 'NNTP Service'
+      description: |
+        Template module for monitoring NNTP service
+        
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Modules
@@ -24,14 +28,25 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: 'NNTP service'
+              tag: component
+              value: network
           triggers:
             -
               uuid: f549234088cb4d1981c72eae82665f56
               expression: 'max(/NNTP Service/net.tcp.service[nntp],#3)=0'
               name: 'NNTP service is down on {HOST.NAME}'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: availability
+      tags:
+        -
+          tag: class
+          value: service
+        -
+          tag: target
+          value: nntp
       valuemaps:
         -
           uuid: e0acc1611fcf43e38d6d1de761c48409
diff --git a/templates/app/ntp_service/README.md b/templates/app/ntp_service/README.md
new file mode 100644
index 00000000000..c93f796d847
--- /dev/null
+++ b/templates/app/ntp_service/README.md
@@ -0,0 +1,39 @@
+
+# NTP Service
+
+## Overview
+
+For Zabbix version: 6.0 and higher  
+
+## Setup
+
+Refer to the vendor documentation.
+
+## Zabbix configuration
+
+No specific Zabbix configuration is required.
+
+
+## Template links
+
+There are no template links in this template.
+
+## Discovery rules
+
+
+## Items collected
+
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|Services |NTP service is running |<p>-</p> |SIMPLE |net.tcp.service[ntp] |
+
+## Triggers
+
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|NTP service is down on {HOST.NAME} |<p>-</p> |`max(/NTP Service/net.tcp.service[ntp],#3)=0` |AVERAGE | |
+
+## Feedback
+
+Please report any issues with the template at https://support.zabbix.com
+
diff --git a/templates/classic/template_app_ntp_service.yaml b/templates/app/ntp_service/template_app_ntp_service.yaml
index caf4df771e6..d1bb6720f9a 100644
--- a/templates/classic/template_app_ntp_service.yaml
+++ b/templates/app/ntp_service/template_app_ntp_service.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:32Z'
+  version: '6.0'
+  date: '2022-01-26T10:50:46Z'
   groups:
     -
       uuid: 57b7ae836ca64446ba2c296389c009b7
@@ -10,6 +10,10 @@ zabbix_export:
       uuid: b28c13fdd0194ddcb5f6b18723a575ae
       template: 'NTP Service'
       name: 'NTP Service'
+      description: |
+        Template module for monitoring NTP service
+        
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Modules
@@ -18,20 +22,31 @@ zabbix_export:
           uuid: e6101cf9015e436e82d9203f638f1840
           name: 'NTP service is running'
           type: SIMPLE
-          key: 'net.udp.service[ntp]'
+          key: 'net.tcp.service[ntp]'
           history: 1w
           valuemap:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: 'NTP service'
+              tag: component
+              value: network
           triggers:
             -
               uuid: 6c7f4d7e2719401d8fd8f99ae8fc2d34
-              expression: 'max(/NTP Service/net.udp.service[ntp],#3)=0'
+              expression: 'max(/NTP Service/net.tcp.service[ntp],#3)=0'
               name: 'NTP service is down on {HOST.NAME}'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: availability
+      tags:
+        -
+          tag: class
+          value: service
+        -
+          tag: target
+          value: ntp
       valuemaps:
         -
           uuid: 1fb344806bc84930a4c45b84fd375cc8
diff --git a/templates/app/pfsense_snmp/template_app_pfsense_snmp.yaml b/templates/app/pfsense_snmp/template_app_pfsense_snmp.yaml
index eea3400cf15..93029b20145 100644
--- a/templates/app/pfsense_snmp/template_app_pfsense_snmp.yaml
+++ b/templates/app/pfsense_snmp/template_app_pfsense_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-20T18:07:07Z'
+  date: '2022-01-26T10:02:24Z'
   groups:
     -
       uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
@@ -26,7 +26,7 @@ zabbix_export:
         UCD-DISKIO-MIB
         UCD-SNMP-MIB
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Applications
@@ -45,17 +45,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: resource
-              value: network
-            -
-              tag: target
-              value: pfsense
-            -
-              tag: transport
-              value: icmp
+              tag: component
+              value: health
             -
-              tag: type
-              value: state
+              tag: component
+              value: network
           triggers:
             -
               uuid: 8bf17f0b4f0642d48d76ea3add39ae23
@@ -63,6 +57,10 @@ zabbix_export:
               name: 'PFSense: Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: b70284fd74b246da83e262ed66449612
           name: 'PFSense: ICMP loss'
@@ -74,17 +72,11 @@ zabbix_export:
           description: 'Percentage of lost packets.'
           tags:
             -
-              tag: resource
-              value: network
-            -
-              tag: target
-              value: pfsense
-            -
-              tag: transport
-              value: icmp
+              tag: component
+              value: health
             -
-              tag: type
-              value: gauge
+              tag: component
+              value: network
           triggers:
             -
               uuid: e02cf70bf2744d61abf8d770cc568867
@@ -97,6 +89,13 @@ zabbix_export:
                 -
                   name: 'PFSense: Unavailable by ICMP ping'
                   expression: 'max(/PFSense SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: d1493a3c5a634ffb99aa031d134d07ad
           name: 'PFSense: ICMP response time'
@@ -108,17 +107,11 @@ zabbix_export:
           description: 'ICMP ping response time (in seconds).'
           tags:
             -
-              tag: resource
-              value: network
-            -
-              tag: target
-              value: pfsense
-            -
-              tag: transport
-              value: icmp
+              tag: component
+              value: health
             -
-              tag: type
-              value: gauge
+              tag: component
+              value: network
           triggers:
             -
               uuid: 364ec24b0c88416fb2575a6b06340ec7
@@ -131,6 +124,13 @@ zabbix_export:
                 -
                   name: 'PFSense: Unavailable by ICMP ping'
                   expression: 'max(/PFSense SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: a2a331bc385344a1877a45f3887b7d91
           name: 'PFSense: DHCP server status'
@@ -152,17 +152,8 @@ zabbix_export:
               error_handler_params: '0'
           tags:
             -
-              tag: resource
-              value: services
-            -
-              tag: target
-              value: pfsense
-            -
-              tag: transport
-              value: snmp
-            -
-              tag: type
-              value: gauge
+              tag: component
+              value: application
           triggers:
             -
               uuid: 80fc3672290d45d49c250ccc120f3606
@@ -171,6 +162,10 @@ zabbix_export:
               opdata: 'Current state: {ITEM.LASTVALUE1}'
               priority: AVERAGE
               description: 'Please check DHCP server settings https://docs.netgate.com/pfsense/en/latest/services/dhcp/index.html'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 6a03330a20354f76b8496b9a8eac0c0a
           name: 'PFSense: DNS server status'
@@ -192,17 +187,8 @@ zabbix_export:
               error_handler_params: '0'
           tags:
             -
-              tag: resource
-              value: services
-            -
-              tag: target
-              value: pfsense
-            -
-              tag: transport
-              value: snmp
-            -
-              tag: type
-              value: gauge
+              tag: component
+              value: application
           triggers:
             -
               uuid: 67b862f6aa3a4833af44d513aad517b5
@@ -211,6 +197,10 @@ zabbix_export:
               opdata: 'Current state: {ITEM.LASTVALUE1}'
               priority: AVERAGE
               description: 'Please check DNS server settings https://docs.netgate.com/pfsense/en/latest/services/dns/index.html'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 18a8140ca46a47e0b4a3612be5338ada
           name: 'PFSense: State of nginx process'
@@ -232,17 +222,8 @@ zabbix_export:
               error_handler_params: '0'
           tags:
             -
-              tag: resource
-              value: services
-            -
-              tag: target
-              value: pfsense
-            -
-              tag: transport
-              value: snmp
-            -
-              tag: type
-              value: gauge
+              tag: component
+              value: application
           triggers:
             -
               uuid: 9f7a47055ee64edcbb70b047a35f7774
@@ -251,6 +232,10 @@ zabbix_export:
               opdata: 'Current state: {ITEM.LASTVALUE1}'
               priority: AVERAGE
               description: 'Please check nginx service status'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 3739cb57166343e3955d00fa31d55bd3
           name: 'PFSense: Packets with bad offset'
@@ -270,17 +255,8 @@ zabbix_export:
                 - ''
           tags:
             -
-              tag: resource
+              tag: component
               value: network
-            -
-              tag: target
-              value: pfsense
-            -
-              tag: transport
-              value: snmp
-            -
-              tag: type
-              value: rate
         -
           uuid: 519dbf4fa71b48e8b70c1260caffea14
           name: 'PFSense: Fragmented packets'
@@ -300,17 +276,8 @@ zabbix_export:
                 - ''
           tags:
             -
-              tag: resource
+              tag: component
               value: network
-            -
-              tag: target
-              value: pfsense
-            -
-              tag: transport
-              value: snmp
-            -
-              tag: type
-              value: rate
         -
           uuid: d4a0686adfa7421ea472e64d94bee70b
           name: 'PFSense: Packets matched a filter rule'
@@ -330,17 +297,8 @@ zabbix_export:
                 - ''
           tags:
             -
-              tag: resource
+              tag: component
               value: network
-            -
-              tag: target
-              value: pfsense
-            -
-              tag: transport
-              value: snmp
-            -
-              tag: type
-              value: rate
         -
           uuid: ca30df62467645b6a04f791bf22d7b91
           name: 'PFSense: Packets dropped due to memory limitation'
@@ -360,17 +318,8 @@ zabbix_export:
                 - ''
           tags:
             -
-              tag: resource
+              tag: component
               value: network
-            -
-              tag: target
-              value: pfsense
-            -
-              tag: transport
-              value: snmp
-            -
-              tag: type
-              value: rate
         -
           uuid: 82360caa98ca4f209499db3c55b0c330
           name: 'PFSense: Normalized packets'
@@ -390,17 +339,8 @@ zabbix_export:
                 - ''
           tags:
             -
-              tag: resource
+              tag: component
               value: network
-            -
-              tag: target
-              value: pfsense
-            -
-              tag: transport
-              value: snmp
-            -
-              tag: type
-              value: rate
         -
           uuid: cf4fbeeb1a6a4d9dbb69adf90b54de3a
           name: 'PFSense: Short packets'
@@ -420,17 +360,8 @@ zabbix_export:
                 - ''
           tags:
             -
-              tag: resource
+              tag: component
               value: network
-            -
-              tag: target
-              value: pfsense
-            -
-              tag: transport
-              value: snmp
-            -
-              tag: type
-              value: rate
         -
           uuid: 600896282920468baf2e47ab75ee9b31
           name: 'PFSense: Packet filter running status'
@@ -445,17 +376,11 @@ zabbix_export:
             name: 'SNMPv2-TC::TruthValue'
           tags:
             -
-              tag: resource
-              value: firewall
-            -
-              tag: target
-              value: pfsense
-            -
-              tag: transport
-              value: snmp
+              tag: component
+              value: application
             -
-              tag: type
-              value: state
+              tag: component
+              value: health
           triggers:
             -
               uuid: 4a7ff4c437054ce88c6c069ffcb6434f
@@ -464,6 +389,10 @@ zabbix_export:
               opdata: 'Current running state: {ITEM.LASTVALUE1}'
               priority: HIGH
               description: 'Please check PF status'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 6d0cf4a1a284453991e12daf921fed9a
           name: 'PFSense: Firewall rules count'
@@ -476,17 +405,8 @@ zabbix_export:
             The number of labeled filter rules on this system.
           tags:
             -
-              tag: resource
-              value: services
-            -
-              tag: target
-              value: pfsense
-            -
-              tag: transport
-              value: snmp
-            -
-              tag: type
-              value: gauge
+              tag: component
+              value: firewall
         -
           uuid: c13b50c508e04851baf09c1c865241fc
           name: 'PFSense: Source tracking table current'
@@ -499,20 +419,8 @@ zabbix_export:
             Number of entries in the source tracking table.
           tags:
             -
-              tag: data
-              value: raw
-            -
-              tag: resource
+              tag: component
               value: network
-            -
-              tag: target
-              value: pfsense
-            -
-              tag: transport
-              value: snmp
-            -
-              tag: type
-              value: gauge
         -
           uuid: 58e12f73fd4243a89d62bbdc7e307cf9
           name: 'PFSense: Source tracking table limit'
@@ -525,20 +433,8 @@ zabbix_export:
             Maximum number of 'sticky-address' or 'source-track' rules in the ruleset.
           tags:
             -
-              tag: data
-              value: raw
-            -
-              tag: resource
+              tag: component
               value: network
-            -
-              tag: target
-              value: pfsense
-            -
-              tag: transport
-              value: snmp
-            -
-              tag: type
-              value: gauge
         -
           uuid: 8fb3a344b39241bbb3bf78092fa17ec8
           name: 'PFSense: Source tracking table utilization in %'
@@ -551,17 +447,8 @@ zabbix_export:
           description: 'Utilization of source tracking table in %.'
           tags:
             -
-              tag: resource
+              tag: component
               value: network
-            -
-              tag: target
-              value: pfsense
-            -
-              tag: transport
-              value: calculated
-            -
-              tag: type
-              value: gauge
           triggers:
             -
               uuid: 7983ee28646d4327ae0814c88c7b213f
@@ -570,6 +457,10 @@ zabbix_export:
               opdata: 'Current utilization: {ITEM.LASTVALUE1}'
               priority: WARNING
               description: 'Please check the number of sticky connections https://docs.netgate.com/pfsense/en/latest/monitoring/status/firewall-states-sources.html'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
         -
           uuid: f0eab94d244b46c29363b630850ed709
           name: 'PFSense: States table current'
@@ -582,20 +473,8 @@ zabbix_export:
             Number of entries in the state table.
           tags:
             -
-              tag: data
-              value: raw
-            -
-              tag: resource
+              tag: component
               value: network
-            -
-              tag: target
-              value: pfsense
-            -
-              tag: transport
-              value: snmp
-            -
-              tag: type
-              value: gauge
         -
           uuid: 8500a1db240b48d7bca514371a89c641
           name: 'PFSense: States table limit'
@@ -608,20 +487,8 @@ zabbix_export:
             Maximum number of 'keep state' rules in the ruleset.
           tags:
             -
-              tag: data
-              value: raw
-            -
-              tag: resource
+              tag: component
               value: network
-            -
-              tag: target
-              value: pfsense
-            -
-              tag: transport
-              value: snmp
-            -
-              tag: type
-              value: gauge
         -
           uuid: 5e96cadaafca4e51ad62dba4fec5220a
           name: 'PFSense: States table utilization in %'
@@ -634,17 +501,8 @@ zabbix_export:
           description: 'Utilization of state table in %.'
           tags:
             -
-              tag: resource
+              tag: component
               value: network
-            -
-              tag: target
-              value: pfsense
-            -
-              tag: transport
-              value: calculated
-            -
-              tag: type
-              value: gauge
           triggers:
             -
               uuid: ce0e7dec597e4148abd9b699c787decd
@@ -653,6 +511,10 @@ zabbix_export:
               opdata: 'Current utilization: {ITEM.LASTVALUE1}'
               priority: WARNING
               description: 'Please check the number of connections https://docs.netgate.com/pfsense/en/latest/config/advanced-firewall-nat.html#config-advanced-firewall-maxstates'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
         -
           uuid: ef15deb6c36945b281a152e2af39dd1d
           name: 'PFSense: System contact details'
@@ -674,17 +536,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: resource
-              value: inventory
-            -
-              tag: target
-              value: pfsense
-            -
-              tag: transport
-              value: snmp
-            -
-              tag: type
-              value: string
+              tag: component
+              value: system
         -
           uuid: 44da130c834d476b884a5cfec2ef53cd
           name: 'PFSense: Interrupts per second'
@@ -703,17 +556,8 @@ zabbix_export:
                 - ''
           tags:
             -
-              tag: resource
+              tag: component
               value: cpu
-            -
-              tag: target
-              value: pfsense
-            -
-              tag: transport
-              value: snmp
-            -
-              tag: type
-              value: rate
         -
           uuid: 2d426f9553de4c01bf3e92b72a0ef8d5
           name: 'PFSense: Load average (1m avg)'
@@ -727,17 +571,8 @@ zabbix_export:
             The 1 minute load averages.
           tags:
             -
-              tag: resource
+              tag: component
               value: cpu
-            -
-              tag: target
-              value: pfsense
-            -
-              tag: transport
-              value: snmp
-            -
-              tag: type
-              value: gauge
         -
           uuid: 371cfe5f4cc64582a7d9dacba183c0ea
           name: 'PFSense: Load average (5m avg)'
@@ -751,17 +586,8 @@ zabbix_export:
             The 5 minutes load averages.
           tags:
             -
-              tag: resource
+              tag: component
               value: cpu
-            -
-              tag: target
-              value: pfsense
-            -
-              tag: transport
-              value: snmp
-            -
-              tag: type
-              value: gauge
         -
           uuid: e160d773f3814cba89c8729f2b0354f8
           name: 'PFSense: Load average (15m avg)'
@@ -775,17 +601,8 @@ zabbix_export:
             The 15 minutes load averages.
           tags:
             -
-              tag: resource
+              tag: component
               value: cpu
-            -
-              tag: target
-              value: pfsense
-            -
-              tag: transport
-              value: snmp
-            -
-              tag: type
-              value: gauge
         -
           uuid: 8b9cc8b5ab164399a56169ed0603a804
           name: 'PFSense: Number of CPUs'
@@ -805,20 +622,8 @@ zabbix_export:
                   return JSON.parse(value).length;
           tags:
             -
-              tag: data
-              value: raw
-            -
-              tag: resource
+              tag: component
               value: cpu
-            -
-              tag: target
-              value: pfsense
-            -
-              tag: transport
-              value: snmp
-            -
-              tag: type
-              value: gauge
         -
           uuid: c476e9b090284cb6aaee6cd3fdcd1b88
           name: 'PFSense: Context switches per second'
@@ -837,17 +642,8 @@ zabbix_export:
                 - ''
           tags:
             -
-              tag: resource
+              tag: component
               value: cpu
-            -
-              tag: target
-              value: pfsense
-            -
-              tag: transport
-              value: snmp
-            -
-              tag: type
-              value: rate
         -
           uuid: e7038a49caec4d5293ceb2a18c1d839e
           name: 'PFSense: System description'
@@ -868,17 +664,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: resource
-              value: inventory
-            -
-              tag: target
-              value: pfsense
-            -
-              tag: transport
-              value: snmp
-            -
-              tag: type
-              value: string
+              tag: component
+              value: system
         -
           uuid: cec39a0105434fbeb30529763a7298bb
           name: 'PFSense: System location'
@@ -900,17 +687,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: resource
-              value: inventory
-            -
-              tag: target
-              value: pfsense
-            -
-              tag: transport
-              value: snmp
-            -
-              tag: type
-              value: string
+              tag: component
+              value: system
         -
           uuid: 8c3afc62530e457da1e2d057c96fc442
           name: 'PFSense: System name'
@@ -932,17 +710,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: resource
-              value: inventory
-            -
-              tag: target
-              value: pfsense
-            -
-              tag: transport
-              value: snmp
-            -
-              tag: type
-              value: string
+              tag: component
+              value: system
           triggers:
             -
               uuid: d00224077a90496099c2622e3c662624
@@ -951,6 +720,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: 6f1d5a86066d4f669a8c11f77fbc078d
           name: 'PFSense: System object ID'
@@ -971,17 +747,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: resource
-              value: inventory
-            -
-              tag: target
-              value: pfsense
-            -
-              tag: transport
-              value: snmp
-            -
-              tag: type
-              value: string
+              tag: component
+              value: system
         -
           uuid: 163e057ff21a40cba86fe7ac023d83b1
           name: 'PFSense: Free swap space'
@@ -1000,20 +767,11 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: data
-              value: raw
-            -
-              tag: resource
-              value: swap
-            -
-              tag: target
-              value: pfsense
-            -
-              tag: transport
-              value: snmp
+              tag: component
+              value: memory
             -
-              tag: type
-              value: gauge
+              tag: component
+              value: storage
         -
           uuid: db5dabf90df84ea19e1e164204eeefdc
           name: 'PFSense: Free swap space in %'
@@ -1026,17 +784,11 @@ zabbix_export:
           description: 'The free space of swap volume/file in percent.'
           tags:
             -
-              tag: resource
-              value: swap
-            -
-              tag: target
-              value: pfsense
-            -
-              tag: transport
-              value: calculated
+              tag: component
+              value: memory
             -
-              tag: type
-              value: gauge
+              tag: component
+              value: storage
         -
           uuid: 3a7282d75aea46a38def8dbb5e5018eb
           name: 'PFSense: Total swap space'
@@ -1055,20 +807,11 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: data
-              value: raw
-            -
-              tag: resource
-              value: swap
-            -
-              tag: target
-              value: pfsense
-            -
-              tag: transport
-              value: snmp
+              tag: component
+              value: memory
             -
-              tag: type
-              value: gauge
+              tag: component
+              value: storage
         -
           uuid: 0979a3c35bf347a38b2c5a9dbc423325
           name: 'PFSense: Uptime'
@@ -1089,17 +832,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: resource
-              value: uptime
-            -
-              tag: target
-              value: pfsense
-            -
-              tag: transport
-              value: snmp
-            -
-              tag: type
-              value: counter
+              tag: component
+              value: system
           triggers:
             -
               uuid: 9da88806fff147f8aa7a79e526f0f7d1
@@ -1108,6 +842,10 @@ zabbix_export:
               priority: INFO
               description: 'Uptime is less than 10 minutes'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 1cc1e018e6364da1bc7264501e668ce8
           name: 'PFSense: Available memory'
@@ -1119,17 +857,8 @@ zabbix_export:
           description: 'Please note that memory utilization is a rough estimate, since memory available is calculated as free+buffers+cached, which is not 100% accurate, but the best we can get using SNMP.'
           tags:
             -
-              tag: resource
+              tag: component
               value: memory
-            -
-              tag: target
-              value: pfsense
-            -
-              tag: transport
-              value: calculated
-            -
-              tag: type
-              value: gauge
         -
           uuid: 8d421b71ea5f453d9079596617b64d1f
           name: 'PFSense: Memory (buffers)'
@@ -1148,20 +877,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: data
-              value: raw
-            -
-              tag: resource
+              tag: component
               value: memory
-            -
-              tag: target
-              value: pfsense
-            -
-              tag: transport
-              value: snmp
-            -
-              tag: type
-              value: gauge
         -
           uuid: 83ae273de74b4779a66553e976d5fa6e
           name: 'PFSense: Memory (cached)'
@@ -1180,20 +897,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: data
-              value: raw
-            -
-              tag: resource
+              tag: component
               value: memory
-            -
-              tag: target
-              value: pfsense
-            -
-              tag: transport
-              value: snmp
-            -
-              tag: type
-              value: gauge
         -
           uuid: 4efc067cae354030a8cbd1054671bdf7
           name: 'PFSense: Free memory'
@@ -1212,20 +917,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: data
-              value: raw
-            -
-              tag: resource
+              tag: component
               value: memory
-            -
-              tag: target
-              value: pfsense
-            -
-              tag: transport
-              value: snmp
-            -
-              tag: type
-              value: gauge
         -
           uuid: 84705a5340d149cf8a0792a1eb997c8e
           name: 'PFSense: Total memory'
@@ -1244,20 +937,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: data
-              value: raw
-            -
-              tag: resource
+              tag: component
               value: memory
-            -
-              tag: target
-              value: pfsense
-            -
-              tag: transport
-              value: snmp
-            -
-              tag: type
-              value: gauge
         -
           uuid: d0da8070297d49c3a44aeec984abd085
           name: 'PFSense: Memory utilization'
@@ -1270,17 +951,8 @@ zabbix_export:
           description: 'Please note that memory utilization is a rough estimate, since memory available is calculated as free+buffers+cached, which is not 100% accurate, but the best we can get using SNMP.'
           tags:
             -
-              tag: resource
+              tag: component
               value: memory
-            -
-              tag: target
-              value: pfsense
-            -
-              tag: transport
-              value: calculated
-            -
-              tag: type
-              value: gauge
           triggers:
             -
               uuid: 786ef350e20f4dfc9371a54e4ffeda63
@@ -1292,6 +964,13 @@ zabbix_export:
                 -
                   name: 'PFSense: Lack of available memory (<{$MEMORY.AVAILABLE.MIN} of {ITEM.VALUE2})'
                   expression: 'min(/PFSense SNMP/vm.memory.available,5m)<{$MEMORY.AVAILABLE.MIN} and last(/PFSense SNMP/vm.memory.total)>0'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 585c88310a704e119aa5fc7f7f9c3804
           name: 'PFSense: SNMP agent availability'
@@ -1308,17 +987,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: resource
-              value: network
-            -
-              tag: target
-              value: pfsense
-            -
-              tag: transport
-              value: internal
+              tag: component
+              value: health
             -
-              tag: type
-              value: state
+              tag: component
+              value: network
           triggers:
             -
               uuid: d06bdb79a48c438798286a89680eb3e1
@@ -1331,6 +1004,10 @@ zabbix_export:
                 -
                   name: 'PFSense: Unavailable by ICMP ping'
                   expression: 'max(/PFSense SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: 47e148e6760145cc9288fa6b4e8d0013
@@ -1354,20 +1031,8 @@ zabbix_export:
                 The time the CPU has spent doing nothing.
               tags:
                 -
-                  tag: data
-                  value: raw
-                -
-                  tag: resource
+                  tag: component
                   value: cpu
-                -
-                  tag: target
-                  value: pfsense
-                -
-                  tag: transport
-                  value: snmp
-                -
-                  tag: type
-                  value: gauge
             -
               uuid: 57a73880d8ff4779a2bbe9d774ad3fc8
               name: 'PFSense: CPU interrupt time'
@@ -1393,17 +1058,8 @@ zabbix_export:
                       return value/{#CPU.COUNT}
               tags:
                 -
-                  tag: resource
+                  tag: component
                   value: cpu
-                -
-                  tag: target
-                  value: pfsense
-                -
-                  tag: transport
-                  value: snmp
-                -
-                  tag: type
-                  value: gauge
             -
               uuid: 01e84522bcfd4cc2834c6c196e887563
               name: 'PFSense: CPU iowait time'
@@ -1429,17 +1085,8 @@ zabbix_export:
                       return value/{#CPU.COUNT}
               tags:
                 -
-                  tag: resource
+                  tag: component
                   value: cpu
-                -
-                  tag: target
-                  value: pfsense
-                -
-                  tag: transport
-                  value: snmp
-                -
-                  tag: type
-                  value: gauge
             -
               uuid: 4eb44b0d8aa2440480c92b880196ba72
               name: 'PFSense: CPU nice time'
@@ -1465,17 +1112,8 @@ zabbix_export:
                       return value/{#CPU.COUNT}
               tags:
                 -
-                  tag: resource
+                  tag: component
                   value: cpu
-                -
-                  tag: target
-                  value: pfsense
-                -
-                  tag: transport
-                  value: snmp
-                -
-                  tag: type
-                  value: gauge
             -
               uuid: 4b412b3f128746c69364590965c02eea
               name: 'PFSense: CPU system time'
@@ -1501,17 +1139,8 @@ zabbix_export:
                       return value/{#CPU.COUNT}
               tags:
                 -
-                  tag: resource
+                  tag: component
                   value: cpu
-                -
-                  tag: target
-                  value: pfsense
-                -
-                  tag: transport
-                  value: snmp
-                -
-                  tag: type
-                  value: gauge
             -
               uuid: 922ad22eed7f427e8560942941a427ba
               name: 'PFSense: CPU user time'
@@ -1537,17 +1166,8 @@ zabbix_export:
                       return value/{#CPU.COUNT}
               tags:
                 -
-                  tag: resource
+                  tag: component
                   value: cpu
-                -
-                  tag: target
-                  value: pfsense
-                -
-                  tag: transport
-                  value: snmp
-                -
-                  tag: type
-                  value: gauge
             -
               uuid: cae6db6f7aae4ecdaac3e451eee5eacb
               name: 'PFSense: CPU utilization'
@@ -1569,17 +1189,8 @@ zabbix_export:
                 key: 'system.cpu.idle[{#SNMPINDEX}]'
               tags:
                 -
-                  tag: resource
+                  tag: component
                   value: cpu
-                -
-                  tag: target
-                  value: pfsense
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: gauge
               trigger_prototypes:
                 -
                   uuid: 76857a00f1fe4d639dbb5cfe775f36d6
@@ -1595,6 +1206,10 @@ zabbix_export:
                         min(/PFSense SNMP/system.cpu.load.avg1,5m)/last(/PFSense SNMP/system.cpu.num)>{$LOAD_AVG_PER_CPU.MAX.WARN}
                         and last(/PFSense SNMP/system.cpu.load.avg5)>0
                         and last(/PFSense SNMP/system.cpu.load.avg15)>0
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 2b2dd0814a1e479fb9faa178b10ce83e
@@ -1741,20 +1356,17 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: interface
-                  value: '{#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: firewall
                 -
-                  tag: resource
+                  tag: component
                   value: network
                 -
-                  tag: target
-                  value: pfsense
+                  tag: description
+                  value: '{#IFALIAS}'
                 -
-                  tag: transport
-                  value: snmp
-                -
-                  tag: type
-                  value: rate
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: 850a471b36de4bcebf9d8831f52953de
               name: 'PFSense: Interface [{#IFNAME}({#IFALIAS})]: Inbound IPv4 packets blocked'
@@ -1773,20 +1385,17 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: interface
-                  value: '{#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: firewall
                 -
-                  tag: resource
+                  tag: component
                   value: network
                 -
-                  tag: target
-                  value: pfsense
+                  tag: description
+                  value: '{#IFALIAS}'
                 -
-                  tag: transport
-                  value: snmp
-                -
-                  tag: type
-                  value: rate
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: 96de779174c8486d97269a43f0d4a8f4
               name: 'PFSense: Interface [{#IFNAME}({#IFALIAS})]: Inbound IPv6 traffic blocked'
@@ -1809,20 +1418,17 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: interface
-                  value: '{#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: firewall
                 -
-                  tag: resource
+                  tag: component
                   value: network
                 -
-                  tag: target
-                  value: pfsense
+                  tag: description
+                  value: '{#IFALIAS}'
                 -
-                  tag: transport
-                  value: snmp
-                -
-                  tag: type
-                  value: rate
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: 2582b09afee14e658c9c9c8b845818b9
               name: 'PFSense: Interface [{#IFNAME}({#IFALIAS})]: Inbound IPv6 packets blocked'
@@ -1841,20 +1447,17 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: interface
-                  value: '{#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: firewall
                 -
-                  tag: resource
+                  tag: component
                   value: network
                 -
-                  tag: target
-                  value: pfsense
-                -
-                  tag: transport
-                  value: snmp
+                  tag: description
+                  value: '{#IFALIAS}'
                 -
-                  tag: type
-                  value: rate
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: eea8bd3342824bed8b4e3768c069e8b3
               name: 'PFSense: Interface [{#IFNAME}({#IFALIAS})]: Inbound packets discarded'
@@ -1876,20 +1479,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: interface
-                  value: '{#IFNAME}({#IFALIAS})'
-                -
-                  tag: resource
+                  tag: component
                   value: network
                 -
-                  tag: target
-                  value: pfsense
+                  tag: description
+                  value: '{#IFALIAS}'
                 -
-                  tag: transport
-                  value: snmp
-                -
-                  tag: type
-                  value: rate
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: 4915f853f848404988ce7ae3a22e7991
               name: 'PFSense: Interface [{#IFNAME}({#IFALIAS})]: Inbound packets with errors'
@@ -1907,20 +1504,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: interface
-                  value: '{#IFNAME}({#IFALIAS})'
-                -
-                  tag: resource
+                  tag: component
                   value: network
                 -
-                  tag: target
-                  value: pfsense
-                -
-                  tag: transport
-                  value: snmp
+                  tag: description
+                  value: '{#IFALIAS}'
                 -
-                  tag: type
-                  value: rate
+                  tag: interface
+                  value: '{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: f5cbc2b7d91f4fa5aab8eb96d8a0550f
@@ -1935,6 +1526,10 @@ zabbix_export:
                     -
                       name: 'PFSense: Link down'
                       expression: '{$IFCONTROL:"{#IFNAME}"}=1 and (last(/PFSense SNMP/net.if.status[{#SNMPINDEX}])=2)'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: fcda9fb8fff14106940543836177e3e3
               name: 'PFSense: Interface [{#IFNAME}({#IFALIAS})]: Inbound IPv4 traffic passed'
@@ -1957,20 +1552,17 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: interface
-                  value: '{#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: firewall
                 -
-                  tag: resource
+                  tag: component
                   value: network
                 -
-                  tag: target
-                  value: pfsense
+                  tag: description
+                  value: '{#IFALIAS}'
                 -
-                  tag: transport
-                  value: snmp
-                -
-                  tag: type
-                  value: rate
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: a895016cc42341729beb3ec41e30e1dc
               name: 'PFSense: Interface [{#IFNAME}({#IFALIAS})]: Inbound IPv4 packets passed'
@@ -1989,20 +1581,17 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: interface
-                  value: '{#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: firewall
                 -
-                  tag: resource
+                  tag: component
                   value: network
                 -
-                  tag: target
-                  value: pfsense
+                  tag: description
+                  value: '{#IFALIAS}'
                 -
-                  tag: transport
-                  value: snmp
-                -
-                  tag: type
-                  value: rate
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: 1ed0a16478074997a3254fd1025a438d
               name: 'PFSense: Interface [{#IFNAME}({#IFALIAS})]: Inbound IPv6 traffic passed'
@@ -2025,20 +1614,17 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: interface
-                  value: '{#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: firewall
                 -
-                  tag: resource
+                  tag: component
                   value: network
                 -
-                  tag: target
-                  value: pfsense
+                  tag: description
+                  value: '{#IFALIAS}'
                 -
-                  tag: transport
-                  value: snmp
-                -
-                  tag: type
-                  value: rate
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: 5eb85cf165424dde93e028468c310593
               name: 'PFSense: Interface [{#IFNAME}({#IFALIAS})]: Inbound IPv6 packets passed'
@@ -2057,20 +1643,17 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: interface
-                  value: '{#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: firewall
                 -
-                  tag: resource
+                  tag: component
                   value: network
                 -
-                  tag: target
-                  value: pfsense
-                -
-                  tag: transport
-                  value: snmp
+                  tag: description
+                  value: '{#IFALIAS}'
                 -
-                  tag: type
-                  value: rate
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: 4fefa40765144566a5c507ef19f884d6
               name: 'PFSense: Interface [{#IFNAME}({#IFALIAS})]: Bits received'
@@ -2093,20 +1676,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: interface
-                  value: '{#IFNAME}({#IFALIAS})'
-                -
-                  tag: resource
+                  tag: component
                   value: network
                 -
-                  tag: target
-                  value: pfsense
+                  tag: description
+                  value: '{#IFALIAS}'
                 -
-                  tag: transport
-                  value: snmp
-                -
-                  tag: type
-                  value: rate
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: b9c94af7fae9462a9659261366c03e4f
               name: 'PFSense: Interface [{#IFNAME}({#IFALIAS})]: Outbound IPv4 traffic blocked'
@@ -2129,20 +1706,17 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: interface
-                  value: '{#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: firewall
                 -
-                  tag: resource
+                  tag: component
                   value: network
                 -
-                  tag: target
-                  value: pfsense
+                  tag: description
+                  value: '{#IFALIAS}'
                 -
-                  tag: transport
-                  value: snmp
-                -
-                  tag: type
-                  value: rate
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: 03c616505a6746ffa8027efd95aad00d
               name: 'PFSense: Interface [{#IFNAME}({#IFALIAS})]: Outbound IPv4 packets blocked'
@@ -2161,20 +1735,17 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: interface
-                  value: '{#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: firewall
                 -
-                  tag: resource
+                  tag: component
                   value: network
                 -
-                  tag: target
-                  value: pfsense
-                -
-                  tag: transport
-                  value: snmp
+                  tag: description
+                  value: '{#IFALIAS}'
                 -
-                  tag: type
-                  value: rate
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: c81392868fe04ba5bd82dcffa3065e73
               name: 'PFSense: Interface [{#IFNAME}({#IFALIAS})]: Outbound IPv6 traffic blocked'
@@ -2197,20 +1768,17 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: interface
-                  value: '{#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: firewall
                 -
-                  tag: resource
+                  tag: component
                   value: network
                 -
-                  tag: target
-                  value: pfsense
-                -
-                  tag: transport
-                  value: snmp
+                  tag: description
+                  value: '{#IFALIAS}'
                 -
-                  tag: type
-                  value: rate
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: 41a658c922614223b5473eb4e01a3336
               name: 'PFSense: Interface [{#IFNAME}({#IFALIAS})]: Outbound IPv6 packets blocked'
@@ -2229,20 +1797,17 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: interface
-                  value: '{#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: firewall
                 -
-                  tag: resource
+                  tag: component
                   value: network
                 -
-                  tag: target
-                  value: pfsense
-                -
-                  tag: transport
-                  value: snmp
+                  tag: description
+                  value: '{#IFALIAS}'
                 -
-                  tag: type
-                  value: rate
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: feb327e6f99e41c3a0194d1578a46e50
               name: 'PFSense: Interface [{#IFNAME}({#IFALIAS})]: Outbound packets discarded'
@@ -2264,20 +1829,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: interface
-                  value: '{#IFNAME}({#IFALIAS})'
-                -
-                  tag: resource
+                  tag: component
                   value: network
                 -
-                  tag: target
-                  value: pfsense
+                  tag: description
+                  value: '{#IFALIAS}'
                 -
-                  tag: transport
-                  value: snmp
-                -
-                  tag: type
-                  value: rate
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: 72d053e5bf3b4330a99382b8a2efcdf7
               name: 'PFSense: Interface [{#IFNAME}({#IFALIAS})]: Outbound packets with errors'
@@ -2295,20 +1854,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: interface
-                  value: '{#IFNAME}({#IFALIAS})'
-                -
-                  tag: resource
+                  tag: component
                   value: network
                 -
-                  tag: target
-                  value: pfsense
-                -
-                  tag: transport
-                  value: snmp
+                  tag: description
+                  value: '{#IFALIAS}'
                 -
-                  tag: type
-                  value: rate
+                  tag: interface
+                  value: '{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 5fb5f37490d04dbc8e0553c6aa881547
@@ -2323,6 +1876,10 @@ zabbix_export:
                     -
                       name: 'PFSense: Link down'
                       expression: '{$IFCONTROL:"{#IFNAME}"}=1 and (last(/PFSense SNMP/net.if.status[{#SNMPINDEX}])=2)'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 29e2a5d7299b4419bbb29a98c068d46f
               name: 'PFSense: Interface [{#IFNAME}({#IFALIAS})]: Outbound IPv4 traffic passed'
@@ -2345,20 +1902,17 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: interface
-                  value: '{#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: firewall
                 -
-                  tag: resource
+                  tag: component
                   value: network
                 -
-                  tag: target
-                  value: pfsense
+                  tag: description
+                  value: '{#IFALIAS}'
                 -
-                  tag: transport
-                  value: snmp
-                -
-                  tag: type
-                  value: rate
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: e073f3fd38ed4aeaba85dfa5b74cc066
               name: 'PFSense: Interface [{#IFNAME}({#IFALIAS})]: Outbound IPv4 packets passed'
@@ -2377,20 +1931,17 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: interface
-                  value: '{#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: firewall
                 -
-                  tag: resource
+                  tag: component
                   value: network
                 -
-                  tag: target
-                  value: pfsense
-                -
-                  tag: transport
-                  value: snmp
+                  tag: description
+                  value: '{#IFALIAS}'
                 -
-                  tag: type
-                  value: rate
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: 3b472db1999640c3a0ef0c75ddae7940
               name: 'PFSense: Interface [{#IFNAME}({#IFALIAS})]: Outbound IPv6 traffic passed'
@@ -2413,20 +1964,17 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: interface
-                  value: '{#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: firewall
                 -
-                  tag: resource
+                  tag: component
                   value: network
                 -
-                  tag: target
-                  value: pfsense
-                -
-                  tag: transport
-                  value: snmp
+                  tag: description
+                  value: '{#IFALIAS}'
                 -
-                  tag: type
-                  value: rate
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: a5ba6a1a6dbf4788b77eee825f85eed1
               name: 'PFSense: Interface [{#IFNAME}({#IFALIAS})]: Outbound IPv6 packets passed'
@@ -2445,20 +1993,17 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: interface
-                  value: '{#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: firewall
                 -
-                  tag: resource
+                  tag: component
                   value: network
                 -
-                  tag: target
-                  value: pfsense
-                -
-                  tag: transport
-                  value: snmp
+                  tag: description
+                  value: '{#IFALIAS}'
                 -
-                  tag: type
-                  value: rate
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: afd513d29ecc4360ab0baf0a7ae3bb53
               name: 'PFSense: Interface [{#IFNAME}({#IFALIAS})]: Bits sent'
@@ -2481,20 +2026,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: interface
-                  value: '{#IFNAME}({#IFALIAS})'
-                -
-                  tag: resource
+                  tag: component
                   value: network
                 -
-                  tag: target
-                  value: pfsense
+                  tag: description
+                  value: '{#IFALIAS}'
                 -
-                  tag: transport
-                  value: snmp
-                -
-                  tag: type
-                  value: rate
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: ecde40c612da452599e2e7b2f1979e83
               name: 'PFSense: Interface [{#IFNAME}({#IFALIAS})]: Rules references count'
@@ -2507,20 +2046,17 @@ zabbix_export:
                 The number of rules referencing this interface.
               tags:
                 -
-                  tag: interface
-                  value: '{#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: firewall
                 -
-                  tag: resource
+                  tag: component
                   value: network
                 -
-                  tag: target
-                  value: pfsense
+                  tag: description
+                  value: '{#IFALIAS}'
                 -
-                  tag: transport
-                  value: snmp
-                -
-                  tag: type
-                  value: gauge
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: eb2f06d673094e10bab8e1d774b26997
               name: 'PFSense: Interface [{#IFNAME}({#IFALIAS})]: Speed'
@@ -2543,20 +2079,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: interface
-                  value: '{#IFNAME}({#IFALIAS})'
-                -
-                  tag: resource
+                  tag: component
                   value: network
                 -
-                  tag: target
-                  value: pfsense
-                -
-                  tag: transport
-                  value: snmp
+                  tag: description
+                  value: '{#IFALIAS}'
                 -
-                  tag: type
-                  value: gauge
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: 2af41422c46141fba0432818b076bca3
               name: 'PFSense: Interface [{#IFNAME}({#IFALIAS})]: Operational status'
@@ -2582,20 +2112,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: interface
-                  value: '{#IFNAME}({#IFALIAS})'
-                -
-                  tag: resource
+                  tag: component
                   value: network
                 -
-                  tag: target
-                  value: pfsense
+                  tag: description
+                  value: '{#IFALIAS}'
                 -
-                  tag: transport
-                  value: snmp
-                -
-                  tag: type
-                  value: state
+                  tag: interface
+                  value: '{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: d4392162d62541aeb148718ddd7f5d57
@@ -2607,6 +2131,10 @@ zabbix_export:
                     This trigger expression works as follows:
                     1. Can be triggered if operations status is down.
                     2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 86f6e925d8a64e31a44b5338c92b31ec
               name: 'PFSense: Interface [{#IFNAME}({#IFALIAS})]: Interface type'
@@ -2628,20 +2156,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: interface
-                  value: '{#IFNAME}({#IFALIAS})'
-                -
-                  tag: resource
+                  tag: component
                   value: network
                 -
-                  tag: target
-                  value: pfsense
-                -
-                  tag: transport
-                  value: snmp
+                  tag: description
+                  value: '{#IFALIAS}'
                 -
-                  tag: type
-                  value: string
+                  tag: interface
+                  value: '{#IFNAME}'
           trigger_prototypes:
             -
               uuid: eb3090605ba14407a91736ac9768d65a
@@ -2669,6 +2191,10 @@ zabbix_export:
                 -
                   name: 'PFSense: Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and (last(/PFSense SNMP/net.if.status[{#SNMPINDEX}])=2)'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
             -
               uuid: 90c99a9c4ce44b3ca929c4b3200286fb
               expression: |
@@ -2684,6 +2210,10 @@ zabbix_export:
                 -
                   name: 'PFSense: Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and (last(/PFSense SNMP/net.if.status[{#SNMPINDEX}])=2)'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 6be52ce31bab4250b421de1bfe84263c
               expression: |
@@ -2699,6 +2229,10 @@ zabbix_export:
                 -
                   name: 'PFSense: Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and (last(/PFSense SNMP/net.if.status[{#SNMPINDEX}])=2)'
+              tags:
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: 4679de2da218418e9564f0cc5a13e31a
@@ -2895,20 +2429,11 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: device
-                  value: '{#DEVNAME}'
-                -
-                  tag: resource
-                  value: disk
-                -
-                  tag: target
-                  value: pfsense
+                  tag: component
+                  value: storage
                 -
-                  tag: transport
-                  value: snmp
-                -
-                  tag: type
-                  value: rate
+                  tag: disk
+                  value: '{#DEVNAME}'
             -
               uuid: 180555ff64304d15bd17b9d58cfc91ed
               name: 'PFSense: [{#DEVNAME}]: Disk utilization'
@@ -2923,20 +2448,11 @@ zabbix_export:
                 The 1 minute average load of disk (%)
               tags:
                 -
-                  tag: device
-                  value: '{#DEVNAME}'
-                -
-                  tag: resource
-                  value: disk
-                -
-                  tag: target
-                  value: pfsense
+                  tag: component
+                  value: storage
                 -
-                  tag: transport
-                  value: snmp
-                -
-                  tag: type
-                  value: gauge
+                  tag: disk
+                  value: '{#DEVNAME}'
             -
               uuid: 35777597864a4db0ad063c609c3dbee3
               name: 'PFSense: [{#DEVNAME}]: Disk write rate'
@@ -2956,20 +2472,11 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: device
-                  value: '{#DEVNAME}'
-                -
-                  tag: resource
-                  value: disk
-                -
-                  tag: target
-                  value: pfsense
-                -
-                  tag: transport
-                  value: snmp
+                  tag: component
+                  value: storage
                 -
-                  tag: type
-                  value: rate
+                  tag: disk
+                  value: '{#DEVNAME}'
           graph_prototypes:
             -
               uuid: 68683d3f206245639c89bda5da17e0d3
@@ -3036,20 +2543,11 @@ zabbix_export:
                     - 'return (100-value);'
               tags:
                 -
+                  tag: component
+                  value: storage
+                -
                   tag: filesystem
                   value: '{#FSNAME}'
-                -
-                  tag: resource
-                  value: filesystem
-                -
-                  tag: target
-                  value: pfsense
-                -
-                  tag: transport
-                  value: snmp
-                -
-                  tag: type
-                  value: gauge
               trigger_prototypes:
                 -
                   uuid: 55324e1072f34c5fbc67a7f0566f64d6
@@ -3060,6 +2558,10 @@ zabbix_export:
                   description: |
                     It may become impossible to write to disk if there are no index nodes left.
                     As symptoms, 'No space left on device' or 'Disk is full' errors may be seen even though free space is available.
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
                 -
                   uuid: 48917b7fd7cd4e16a7746ce9cf88a7b6
                   expression: 'min(/PFSense SNMP/vfs.fs.inode.pfree[{#SNMPINDEX}],5m)<{$VFS.FS.INODE.PFREE.MIN.WARN:"{#FSNAME}"}'
@@ -3073,6 +2575,10 @@ zabbix_export:
                     -
                       name: 'PFSense: {#FSNAME}: Running out of free inodes (free < {$VFS.FS.INODE.PFREE.MIN.CRIT:"{#FSNAME}"}%)'
                       expression: 'min(/PFSense SNMP/vfs.fs.inode.pfree[{#SNMPINDEX}],5m)<{$VFS.FS.INODE.PFREE.MIN.CRIT:"{#FSNAME}"}'
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
             -
               uuid: 51fa616aa3ee4d3ca1371d0d455244eb
               name: 'PFSense: [{#FSNAME}]: Space utilization'
@@ -3087,20 +2593,11 @@ zabbix_export:
                 If having problems collecting this item make sure access to UCD-SNMP-MIB is allowed.
               tags:
                 -
+                  tag: component
+                  value: storage
+                -
                   tag: filesystem
                   value: '{#FSNAME}'
-                -
-                  tag: resource
-                  value: filesystem
-                -
-                  tag: target
-                  value: pfsense
-                -
-                  tag: transport
-                  value: snmp
-                -
-                  tag: type
-                  value: gauge
             -
               uuid: f5f253e700f742579a4f91d3061a816e
               name: 'PFSense: [{#FSNAME}]: Total space'
@@ -3119,20 +2616,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
+                  tag: component
+                  value: storage
+                -
                   tag: filesystem
                   value: '{#FSNAME}'
-                -
-                  tag: resource
-                  value: filesystem
-                -
-                  tag: target
-                  value: pfsense
-                -
-                  tag: transport
-                  value: snmp
-                -
-                  tag: type
-                  value: gauge
             -
               uuid: eaf1ed2e94cc41f69fda97778f27628c
               name: 'PFSense: [{#FSNAME}]: Used space'
@@ -3151,20 +2639,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
+                  tag: component
+                  value: storage
+                -
                   tag: filesystem
                   value: '{#FSNAME}'
-                -
-                  tag: resource
-                  value: filesystem
-                -
-                  tag: target
-                  value: pfsense
-                -
-                  tag: transport
-                  value: snmp
-                -
-                  tag: type
-                  value: gauge
           trigger_prototypes:
             -
               uuid: 711e2c5b136e4a51a2fb745d847a9fc5
@@ -3180,6 +2659,13 @@ zabbix_export:
                  - The disk free space is less than 5G.
                  - The disk will be full in less than 24 hours.
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
             -
               uuid: ef0273e1092a40ff888e0ea87c859abb
               expression: |
@@ -3200,6 +2686,13 @@ zabbix_export:
                   expression: |
                     last(/PFSense SNMP/vfs.fs.pused[{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"{#FSNAME}"} and
                     ((last(/PFSense SNMP/vfs.fs.total[{#SNMPINDEX}])-last(/PFSense SNMP/vfs.fs.used[{#SNMPINDEX}]))<5G or timeleft(/PFSense SNMP/vfs.fs.pused[{#SNMPINDEX}],1h,100)<1d)
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
           graph_prototypes:
             -
               uuid: af57ea943b0f45f6b03028ef48c07605
@@ -3223,6 +2716,13 @@ zabbix_export:
                   item:
                     host: 'PFSense SNMP'
                     key: 'vfs.fs.used[{#SNMPINDEX}]'
+      tags:
+        -
+          tag: class
+          value: software
+        -
+          tag: target
+          value: pfsense
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
@@ -4310,6 +3810,13 @@ zabbix_export:
         -
           name: 'PFSense: Lack of available memory (<{$MEMORY.AVAILABLE.MIN} of {ITEM.VALUE2})'
           expression: 'min(/PFSense SNMP/vm.memory.available,5m)<{$MEMORY.AVAILABLE.MIN} and last(/PFSense SNMP/vm.memory.total)>0'
+      tags:
+        -
+          tag: scope
+          value: capacity
+        -
+          tag: scope
+          value: performance
     -
       uuid: d890efaff23f49e8ba05d22390f9e21b
       expression: 'min(/PFSense SNMP/vm.memory.available,5m)<{$MEMORY.AVAILABLE.MIN} and last(/PFSense SNMP/vm.memory.total)>0'
@@ -4317,6 +3824,13 @@ zabbix_export:
       opdata: 'Available: {ITEM.LASTVALUE1}, total: {ITEM.LASTVALUE2}'
       priority: AVERAGE
       description: 'The system is running out of memory'
+      tags:
+        -
+          tag: scope
+          value: capacity
+        -
+          tag: scope
+          value: performance
     -
       uuid: ffbe648f887744de91a6e1206518fc74
       expression: |
@@ -4327,6 +3841,10 @@ zabbix_export:
       opdata: 'Load averages(1m 5m 15m): ({ITEM.LASTVALUE1} {ITEM.LASTVALUE3} {ITEM.LASTVALUE4}), # of CPUs: {ITEM.LASTVALUE2}'
       priority: AVERAGE
       description: 'Per CPU load average is too high. Your system may be slow to respond.'
+      tags:
+        -
+          tag: scope
+          value: performance
   graphs:
     -
       uuid: 7fdf3de55e6b48abb9c6fbbf4a0f4ceb
diff --git a/templates/app/php-fpm_agent/template_app_php-fpm_agent.yaml b/templates/app/php-fpm_agent/template_app_php-fpm_agent.yaml
index 6bf11048625..0af3c3113b9 100644
--- a/templates/app/php-fpm_agent/template_app_php-fpm_agent.yaml
+++ b/templates/app/php-fpm_agent/template_app_php-fpm_agent.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-15T06:57:53Z'
+  date: '2022-01-26T10:50:35Z'
   groups:
     -
       uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
@@ -13,7 +13,7 @@ zabbix_export:
       description: |
         Get PHP-FPM metrics using Zabbix agent running on Linux.
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Applications
@@ -40,8 +40,8 @@ zabbix_export:
             key: 'web.page.get["{$PHP_FPM.HOST}","{$PHP_FPM.STATUS.PAGE}?json","{$PHP_FPM.PORT}"]'
           tags:
             -
-              tag: Application
-              value: PHP-FPM
+              tag: component
+              value: connections
         -
           uuid: edc6b68194fe499facfb6b22425ff0d4
           name: 'PHP-FPM: Listen queue'
@@ -59,8 +59,8 @@ zabbix_export:
             key: 'web.page.get["{$PHP_FPM.HOST}","{$PHP_FPM.STATUS.PAGE}?json","{$PHP_FPM.PORT}"]'
           tags:
             -
-              tag: Application
-              value: PHP-FPM
+              tag: component
+              value: listen-queue
         -
           uuid: aff9f072b06a4b56afb0e0f44b2c83a4
           name: 'PHP-FPM: Listen queue, len'
@@ -78,8 +78,8 @@ zabbix_export:
             key: 'web.page.get["{$PHP_FPM.HOST}","{$PHP_FPM.STATUS.PAGE}?json","{$PHP_FPM.PORT}"]'
           tags:
             -
-              tag: Application
-              value: PHP-FPM
+              tag: component
+              value: listen-queue
         -
           uuid: de0a543bee5a46c88085b2aba2f4976f
           name: 'PHP-FPM: Listen queue, max'
@@ -97,8 +97,8 @@ zabbix_export:
             key: 'web.page.get["{$PHP_FPM.HOST}","{$PHP_FPM.STATUS.PAGE}?json","{$PHP_FPM.PORT}"]'
           tags:
             -
-              tag: Application
-              value: PHP-FPM
+              tag: component
+              value: listen-queue
         -
           uuid: dfabcd55c13449c29a48b70fdce77674
           name: 'PHP-FPM: Queue usage'
@@ -111,8 +111,8 @@ zabbix_export:
           description: 'Queue utilization'
           tags:
             -
-              tag: Application
-              value: PHP-FPM
+              tag: component
+              value: application
           triggers:
             -
               uuid: a11264f0e1174b7fb81b457dad1a745f
@@ -120,6 +120,10 @@ zabbix_export:
               name: 'PHP-FPM: Queue utilization is high (over {$PHP_FPM.QUEUE.WARN.MAX}% for 15m)'
               priority: WARNING
               description: 'The queue for this pool reached {$PHP_FPM.QUEUE.WARN.MAX}% of its maximum capacity. Items in queue represent the current number of connections that have been initiated on this pool, but not yet accepted.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
         -
           uuid: e9d49669cf58492a9d5ef7ff997e1a40
           name: 'PHP-FPM: Max children reached'
@@ -141,8 +145,8 @@ zabbix_export:
             key: 'web.page.get["{$PHP_FPM.HOST}","{$PHP_FPM.STATUS.PAGE}?json","{$PHP_FPM.PORT}"]'
           tags:
             -
-              tag: Application
-              value: PHP-FPM
+              tag: component
+              value: application
         -
           uuid: 830e04be30f04e50ac0fa4783ecdc677
           name: 'PHP-FPM: Pool name'
@@ -166,8 +170,8 @@ zabbix_export:
             key: 'web.page.get["{$PHP_FPM.HOST}","{$PHP_FPM.STATUS.PAGE}?json","{$PHP_FPM.PORT}"]'
           tags:
             -
-              tag: Application
-              value: PHP-FPM
+              tag: component
+              value: application
         -
           uuid: 250f346008984a95829dba08d0f95838
           name: 'PHP-FPM: Ping'
@@ -189,8 +193,8 @@ zabbix_export:
             key: 'web.page.get["{$PHP_FPM.HOST}","{$PHP_FPM.PING.PAGE}","{$PHP_FPM.PORT}"]'
           tags:
             -
-              tag: Application
-              value: PHP-FPM
+              tag: component
+              value: health
           triggers:
             -
               uuid: 10d92102d7a24327ada7869a41119fee
@@ -202,6 +206,10 @@ zabbix_export:
                 -
                   name: 'PHP-FPM: Process is not running'
                   expression: 'last(/PHP-FPM by Zabbix agent/proc.num["{$PHP_FPM.PROCESS_NAME}"])=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 8ebee5fc8c854a96b34ed743e3dd0154
           name: 'PHP-FPM: Processes, active'
@@ -219,8 +227,8 @@ zabbix_export:
             key: 'web.page.get["{$PHP_FPM.HOST}","{$PHP_FPM.STATUS.PAGE}?json","{$PHP_FPM.PORT}"]'
           tags:
             -
-              tag: Application
-              value: PHP-FPM
+              tag: component
+              value: system
         -
           uuid: 11cfd028325242a58d61d9e83aee640b
           name: 'PHP-FPM: Processes, idle'
@@ -238,8 +246,8 @@ zabbix_export:
             key: 'web.page.get["{$PHP_FPM.HOST}","{$PHP_FPM.STATUS.PAGE}?json","{$PHP_FPM.PORT}"]'
           tags:
             -
-              tag: Application
-              value: PHP-FPM
+              tag: component
+              value: system
         -
           uuid: 3858218f90684bb19cbe27fc9aedf404
           name: 'PHP-FPM: Processes, max active'
@@ -257,8 +265,8 @@ zabbix_export:
             key: 'web.page.get["{$PHP_FPM.HOST}","{$PHP_FPM.STATUS.PAGE}?json","{$PHP_FPM.PORT}"]'
           tags:
             -
-              tag: Application
-              value: PHP-FPM
+              tag: component
+              value: application
         -
           uuid: a79af6cf38ec45518055c64aa7f1f5a2
           name: 'PHP-FPM: Processes, total'
@@ -276,8 +284,8 @@ zabbix_export:
             key: 'web.page.get["{$PHP_FPM.HOST}","{$PHP_FPM.STATUS.PAGE}?json","{$PHP_FPM.PORT}"]'
           tags:
             -
-              tag: Application
-              value: PHP-FPM
+              tag: component
+              value: system
         -
           uuid: 5ab12fc9f4ef49e5bbf7b2c6a840879e
           name: 'PHP-FPM: Process manager'
@@ -301,8 +309,8 @@ zabbix_export:
             key: 'web.page.get["{$PHP_FPM.HOST}","{$PHP_FPM.STATUS.PAGE}?json","{$PHP_FPM.PORT}"]'
           tags:
             -
-              tag: Application
-              value: PHP-FPM
+              tag: component
+              value: application
           triggers:
             -
               uuid: 231e0fbfb6e94f34b790576766244602
@@ -311,6 +319,10 @@ zabbix_export:
               priority: INFO
               description: 'PHP-FPM manager changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 4d17b6d89ac94d0880eac6962ebf7347
           name: 'PHP-FPM: Slow requests'
@@ -332,8 +344,8 @@ zabbix_export:
             key: 'web.page.get["{$PHP_FPM.HOST}","{$PHP_FPM.STATUS.PAGE}?json","{$PHP_FPM.PORT}"]'
           tags:
             -
-              tag: Application
-              value: PHP-FPM
+              tag: component
+              value: application
           triggers:
             -
               uuid: f30147d8e92f48aa8fedc2d28b8d7c70
@@ -341,6 +353,10 @@ zabbix_export:
               name: 'PHP-FPM: Detected slow requests'
               priority: WARNING
               description: 'PHP-FPM detected slow request. A slow request means that it took more time to execute than expected (defined in the configuration of your pool).'
+              tags:
+                -
+                  tag: scope
+                  value: perfomance
         -
           uuid: 4e4d6eda8fbb4dd2ba7f48fba5723473
           name: 'PHP-FPM: Start time'
@@ -359,8 +375,8 @@ zabbix_export:
             key: 'web.page.get["{$PHP_FPM.HOST}","{$PHP_FPM.STATUS.PAGE}?json","{$PHP_FPM.PORT}"]'
           tags:
             -
-              tag: Application
-              value: PHP-FPM
+              tag: component
+              value: application
         -
           uuid: 2a19b306712a47999e70d3ec30e39b05
           name: 'PHP-FPM: Uptime'
@@ -379,8 +395,8 @@ zabbix_export:
             key: 'web.page.get["{$PHP_FPM.HOST}","{$PHP_FPM.STATUS.PAGE}?json","{$PHP_FPM.PORT}"]'
           tags:
             -
-              tag: Application
-              value: PHP-FPM
+              tag: component
+              value: application
           triggers:
             -
               uuid: bdf9962aee2049a8aec000b037b94d60
@@ -393,6 +409,10 @@ zabbix_export:
                 -
                   name: 'PHP-FPM: Process is not running'
                   expression: 'last(/PHP-FPM by Zabbix agent/proc.num["{$PHP_FPM.PROCESS_NAME}"])=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: c6966a6c3ff0452ab4fd112c9299e624
               expression: 'last(/PHP-FPM by Zabbix agent/php-fpm.uptime)<10m'
@@ -400,6 +420,10 @@ zabbix_export:
               priority: INFO
               description: 'Uptime is less than 10 minutes'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: b53e2e356317468f9d6d3272eb755650
           name: 'PHP-FPM: Version'
@@ -425,8 +449,8 @@ zabbix_export:
             key: 'web.page.get["{$PHP_FPM.HOST}","{$PHP_FPM.PING.PAGE}","{$PHP_FPM.PORT}"]'
           tags:
             -
-              tag: Application
-              value: PHP-FPM
+              tag: component
+              value: application
           triggers:
             -
               uuid: fb110a37f0fc4a62b51df72e33bc3448
@@ -435,6 +459,10 @@ zabbix_export:
               priority: INFO
               description: 'PHP-FPM version has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: a709eaae52ad4128a129c618db6525d2
           name: 'PHP-FPM: CPU utilization'
@@ -445,8 +473,8 @@ zabbix_export:
           description: 'Process CPU utilization percentage.'
           tags:
             -
-              tag: Application
-              value: PHP-FPM
+              tag: component
+              value: cpu
         -
           uuid: ef771994ec9e482babf872d9f867d500
           name: 'PHP-FPM: Memory usage, %'
@@ -457,8 +485,8 @@ zabbix_export:
           description: 'Memory used percentage relative to total memory available.'
           tags:
             -
-              tag: Application
-              value: PHP-FPM
+              tag: component
+              value: memory
         -
           uuid: f55a5ef29f864d0a8c1af25df2372f7c
           name: 'PHP-FPM: Memory usage (rss)'
@@ -468,8 +496,8 @@ zabbix_export:
           description: 'Resident set size memory used by process in bytes.'
           tags:
             -
-              tag: Application
-              value: PHP-FPM
+              tag: component
+              value: memory
         -
           uuid: ab8dc0d1ce344fe8ae6a22716a168fbd
           name: 'PHP-FPM: Number of processes running'
@@ -477,14 +505,18 @@ zabbix_export:
           history: 7d
           tags:
             -
-              tag: Application
-              value: PHP-FPM
+              tag: component
+              value: system
           triggers:
             -
               uuid: 21a03d0ada634602ae9089a2cf3b4d70
               expression: 'last(/PHP-FPM by Zabbix agent/proc.num["{$PHP_FPM.PROCESS_NAME}"])=0'
               name: 'PHP-FPM: Process is not running'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: c0c438492c63453496e83938745ffffc
           name: 'PHP-FPM: php-fpm_ping'
@@ -494,8 +526,8 @@ zabbix_export:
           value_type: TEXT
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: health
         -
           uuid: 09ec73291f21417ab8f19f56fda3331f
           name: 'PHP-FPM: Get status page'
@@ -511,8 +543,15 @@ zabbix_export:
                 - \1
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
+      tags:
+        -
+          tag: class
+          value: application
+        -
+          tag: target
+          value: php-fpm
       macros:
         -
           macro: '{$PHP_FPM.HOST}'
diff --git a/templates/app/php-fpm_http/template_app_php-fpm_http.yaml b/templates/app/php-fpm_http/template_app_php-fpm_http.yaml
index cf608fb6d59..eedddb9c80c 100644
--- a/templates/app/php-fpm_http/template_app_php-fpm_http.yaml
+++ b/templates/app/php-fpm_http/template_app_php-fpm_http.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-15T06:57:57Z'
+  date: '2022-01-26T10:50:04Z'
   groups:
     -
       uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
@@ -13,7 +13,7 @@ zabbix_export:
       description: |
         Get PHP-FPM metrics using the Zabbix HTTP agent.
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Applications
@@ -40,8 +40,8 @@ zabbix_export:
             key: php-fpm.get_status
           tags:
             -
-              tag: Application
-              value: PHP-FPM
+              tag: component
+              value: connections
         -
           uuid: a9ae24915703483ea95a346c625ed70e
           name: 'PHP-FPM: Get ping page'
@@ -54,8 +54,8 @@ zabbix_export:
           retrieve_mode: BOTH
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: health
         -
           uuid: b91063d42d4b454089b58e29ee3bdb38
           name: 'PHP-FPM: Get status page'
@@ -67,8 +67,8 @@ zabbix_export:
           url: '{$PHP_FPM.SCHEME}://{$PHP_FPM.HOST}:{$PHP_FPM.PORT}/{$PHP_FPM.STATUS.PAGE}?json'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
         -
           uuid: cf2fe31db5084bc5b363ef7d0d691c25
           name: 'PHP-FPM: Listen queue'
@@ -86,8 +86,8 @@ zabbix_export:
             key: php-fpm.get_status
           tags:
             -
-              tag: Application
-              value: PHP-FPM
+              tag: component
+              value: listen-queue
         -
           uuid: 56876a76bd3a4c6c90b033c19a59f6d1
           name: 'PHP-FPM: Listen queue, len'
@@ -105,8 +105,8 @@ zabbix_export:
             key: php-fpm.get_status
           tags:
             -
-              tag: Application
-              value: PHP-FPM
+              tag: component
+              value: listen-queue
         -
           uuid: a8829ff906e847c2b97a32b1ded60523
           name: 'PHP-FPM: Listen queue, max'
@@ -124,8 +124,8 @@ zabbix_export:
             key: php-fpm.get_status
           tags:
             -
-              tag: Application
-              value: PHP-FPM
+              tag: component
+              value: listen-queue
         -
           uuid: 314c3f19311f47acb93b046ab2625c75
           name: 'PHP-FPM: Queue usage'
@@ -138,8 +138,8 @@ zabbix_export:
           description: 'Queue utilization'
           tags:
             -
-              tag: Application
-              value: PHP-FPM
+              tag: component
+              value: listen-queue
           triggers:
             -
               uuid: 1ad5018fb19d4a9cb9e627f964bfd627
@@ -147,6 +147,10 @@ zabbix_export:
               name: 'PHP-FPM: Queue utilization is high (over {$PHP_FPM.QUEUE.WARN.MAX}% for 15m)'
               priority: WARNING
               description: 'The queue for this pool reached {$PHP_FPM.QUEUE.WARN.MAX}% of its maximum capacity. Items in queue represent the current number of connections that have been initiated on this pool, but not yet accepted.'
+              tags:
+                -
+                  tag: scope
+                  value: perfomance
         -
           uuid: dcb11355c5ae4c6ab5f1326aa1c7bbd6
           name: 'PHP-FPM: Max children reached'
@@ -168,8 +172,8 @@ zabbix_export:
             key: php-fpm.get_status
           tags:
             -
-              tag: Application
-              value: PHP-FPM
+              tag: component
+              value: application
         -
           uuid: 226939bd485a4381a5c0a6d4511acbc3
           name: 'PHP-FPM: Pool name'
@@ -193,8 +197,8 @@ zabbix_export:
             key: php-fpm.get_status
           tags:
             -
-              tag: Application
-              value: PHP-FPM
+              tag: component
+              value: application
         -
           uuid: 6a090c078ace46bd958b42225c63f5ca
           name: 'PHP-FPM: Ping'
@@ -216,8 +220,8 @@ zabbix_export:
             key: php-fpm.get_ping
           tags:
             -
-              tag: Application
-              value: PHP-FPM
+              tag: component
+              value: health
           triggers:
             -
               uuid: 5dcc607026d24e63b2f099540a5d8e9b
@@ -225,6 +229,10 @@ zabbix_export:
               name: 'PHP-FPM: Service is down'
               priority: HIGH
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 923243cbb4b647389a38b4788aad3141
           name: 'PHP-FPM: Processes, active'
@@ -242,8 +250,8 @@ zabbix_export:
             key: php-fpm.get_status
           tags:
             -
-              tag: Application
-              value: PHP-FPM
+              tag: component
+              value: memory
         -
           uuid: 79402b0cac4d4a409b39db4bf71557d2
           name: 'PHP-FPM: Processes, idle'
@@ -261,8 +269,8 @@ zabbix_export:
             key: php-fpm.get_status
           tags:
             -
-              tag: Application
-              value: PHP-FPM
+              tag: component
+              value: system
         -
           uuid: 9632f44f9b2648f299e9f61a39daf92f
           name: 'PHP-FPM: Processes, max active'
@@ -280,8 +288,8 @@ zabbix_export:
             key: php-fpm.get_status
           tags:
             -
-              tag: Application
-              value: PHP-FPM
+              tag: component
+              value: application
         -
           uuid: e69faadd7a9d457e8f56d283871b946a
           name: 'PHP-FPM: Processes, total'
@@ -299,8 +307,8 @@ zabbix_export:
             key: php-fpm.get_status
           tags:
             -
-              tag: Application
-              value: PHP-FPM
+              tag: component
+              value: system
         -
           uuid: 084848b2d6bd4b8a88424b1ec9055b0f
           name: 'PHP-FPM: Process manager'
@@ -324,8 +332,8 @@ zabbix_export:
             key: php-fpm.get_status
           tags:
             -
-              tag: Application
-              value: PHP-FPM
+              tag: component
+              value: application
           triggers:
             -
               uuid: 8cfa50bcea744075954d0a9c8a132330
@@ -334,6 +342,10 @@ zabbix_export:
               priority: INFO
               description: 'PHP-FPM manager changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 0dd9e388e2584e0090ed65bab39183f9
           name: 'PHP-FPM: Slow requests'
@@ -355,8 +367,8 @@ zabbix_export:
             key: php-fpm.get_status
           tags:
             -
-              tag: Application
-              value: PHP-FPM
+              tag: component
+              value: application
           triggers:
             -
               uuid: 63bd00ee25af4b42a37dad1d742c66c0
@@ -364,6 +376,10 @@ zabbix_export:
               name: 'PHP-FPM: Detected slow requests'
               priority: WARNING
               description: 'PHP-FPM detected slow request. A slow request means that it took more time to execute than expected (defined in the configuration of your pool).'
+              tags:
+                -
+                  tag: scope
+                  value: perfomance
         -
           uuid: 9a625629fc0a4222acfefa0409ec1c72
           name: 'PHP-FPM: Start time'
@@ -382,8 +398,8 @@ zabbix_export:
             key: php-fpm.get_status
           tags:
             -
-              tag: Application
-              value: PHP-FPM
+              tag: component
+              value: application
         -
           uuid: 093024c740b946a0bd6637ba9e3e0dad
           name: 'PHP-FPM: Uptime'
@@ -402,8 +418,8 @@ zabbix_export:
             key: php-fpm.get_status
           tags:
             -
-              tag: Application
-              value: PHP-FPM
+              tag: component
+              value: application
           triggers:
             -
               uuid: b44815446b3b464f883f4d0e799b020e
@@ -416,6 +432,10 @@ zabbix_export:
                 -
                   name: 'PHP-FPM: Service is down'
                   expression: 'last(/PHP-FPM by HTTP/php-fpm.ping)=0 or nodata(/PHP-FPM by HTTP/php-fpm.ping,3m)=1'
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 9ed4047bdcd74e649814c5d004ba78c7
               expression: 'last(/PHP-FPM by HTTP/php-fpm.uptime)<10m'
@@ -423,6 +443,10 @@ zabbix_export:
               priority: INFO
               description: 'Uptime is less than 10 minutes'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: d49adb58e8bb4453911270e5dce1e03e
           name: 'PHP-FPM: Version'
@@ -448,8 +472,8 @@ zabbix_export:
             key: php-fpm.get_ping
           tags:
             -
-              tag: Application
-              value: PHP-FPM
+              tag: component
+              value: application
           triggers:
             -
               uuid: d6c891de92c34bdba80a2ba88f975271
@@ -458,6 +482,17 @@ zabbix_export:
               priority: INFO
               description: 'PHP-FPM version has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+      tags:
+        -
+          tag: class
+          value: application
+        -
+          tag: target
+          value: php-fpm
       macros:
         -
           macro: '{$PHP_FPM.HOST}'
diff --git a/templates/app/pop_service/README.md b/templates/app/pop_service/README.md
new file mode 100644
index 00000000000..190abe8daea
--- /dev/null
+++ b/templates/app/pop_service/README.md
@@ -0,0 +1,39 @@
+
+# POP Service
+
+## Overview
+
+For Zabbix version: 6.0 and higher  
+
+## Setup
+
+Refer to the vendor documentation.
+
+## Zabbix configuration
+
+No specific Zabbix configuration is required.
+
+
+## Template links
+
+There are no template links in this template.
+
+## Discovery rules
+
+
+## Items collected
+
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|Services |POP service is running |<p>-</p> |SIMPLE |net.tcp.service[pop] |
+
+## Triggers
+
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|POP service is down on {HOST.NAME} |<p>-</p> |`max(/POP Service/net.tcp.service[pop],#3)=0` |AVERAGE | |
+
+## Feedback
+
+Please report any issues with the template at https://support.zabbix.com
+
diff --git a/templates/classic/template_app_pop_service.yaml b/templates/app/pop_service/template_app_pop_service.yaml
index 062caeee78a..231fb5f51be 100644
--- a/templates/classic/template_app_pop_service.yaml
+++ b/templates/app/pop_service/template_app_pop_service.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:29Z'
+  version: '6.0'
+  date: '2022-01-26T09:59:42Z'
   groups:
     -
       uuid: 57b7ae836ca64446ba2c296389c009b7
@@ -10,6 +10,10 @@ zabbix_export:
       uuid: e042c0e455f74e7eb2384c203edcb26e
       template: 'POP Service'
       name: 'POP Service'
+      description: |
+        Template module for monitoring POP service
+        
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Modules
@@ -24,14 +28,25 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: 'POP service'
+              tag: component
+              value: network
           triggers:
             -
               uuid: 72ad7fa260144095bdc41eddf09bbb08
               expression: 'max(/POP Service/net.tcp.service[pop],#3)=0'
               name: 'POP service is down on {HOST.NAME}'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: availability
+      tags:
+        -
+          tag: class
+          value: service
+        -
+          tag: target
+          value: pop
       valuemaps:
         -
           uuid: 603906e741e94b349db9e5116aa2c81b
diff --git a/templates/app/rabbitmq_agent/template_app_rabbitmq_agent.yaml b/templates/app/rabbitmq_agent/template_app_rabbitmq_agent.yaml
index 0f683787db5..5d14da38dc3 100644
--- a/templates/app/rabbitmq_agent/template_app_rabbitmq_agent.yaml
+++ b/templates/app/rabbitmq_agent/template_app_rabbitmq_agent.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-10T07:40:00Z'
+  date: '2022-01-26T10:47:03Z'
   groups:
     -
       uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
@@ -15,7 +15,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/387226-discussion-thread-for-official-zabbix-template-rabbitmq
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Applications
@@ -39,8 +39,8 @@ zabbix_export:
             key: 'web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.CLUSTER_HOST}:{$RABBITMQ.API.PORT}/api/overview"]'
           tags:
             -
-              tag: Application
-              value: RabbitMQ
+              tag: component
+              value: messages
         -
           uuid: f78fabbd7e3f44dc81b1cf9c90b26f2e
           name: 'RabbitMQ: Messages acknowledged per second'
@@ -61,8 +61,8 @@ zabbix_export:
             key: 'web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.CLUSTER_HOST}:{$RABBITMQ.API.PORT}/api/overview"]'
           tags:
             -
-              tag: Application
-              value: RabbitMQ
+              tag: component
+              value: messages
         -
           uuid: 45cf9b5cf5cd4b13b0e140383233799f
           name: 'RabbitMQ: Messages confirmed'
@@ -82,8 +82,8 @@ zabbix_export:
             key: 'web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.CLUSTER_HOST}:{$RABBITMQ.API.PORT}/api/overview"]'
           tags:
             -
-              tag: Application
-              value: RabbitMQ
+              tag: component
+              value: messages
         -
           uuid: bc85a070e1e9451b953d85bb519ed63d
           name: 'RabbitMQ: Messages confirmed per second'
@@ -104,8 +104,8 @@ zabbix_export:
             key: 'web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.CLUSTER_HOST}:{$RABBITMQ.API.PORT}/api/overview"]'
           tags:
             -
-              tag: Application
-              value: RabbitMQ
+              tag: component
+              value: messages
         -
           uuid: 004da545af4a4f61bd2167281bb9a02b
           name: 'RabbitMQ: Messages delivered'
@@ -125,8 +125,8 @@ zabbix_export:
             key: 'web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.CLUSTER_HOST}:{$RABBITMQ.API.PORT}/api/overview"]'
           tags:
             -
-              tag: Application
-              value: RabbitMQ
+              tag: component
+              value: messages
         -
           uuid: c00a84c8676544dcbdd74fec13881063
           name: 'RabbitMQ: Messages delivered per second'
@@ -147,8 +147,8 @@ zabbix_export:
             key: 'web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.CLUSTER_HOST}:{$RABBITMQ.API.PORT}/api/overview"]'
           tags:
             -
-              tag: Application
-              value: RabbitMQ
+              tag: component
+              value: messages
         -
           uuid: 4215bdf87f0e426f85bd79434a0fb0bb
           name: 'RabbitMQ: Messages published'
@@ -168,8 +168,8 @@ zabbix_export:
             key: 'web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.CLUSTER_HOST}:{$RABBITMQ.API.PORT}/api/overview"]'
           tags:
             -
-              tag: Application
-              value: RabbitMQ
+              tag: component
+              value: messages
         -
           uuid: cfadadb681474c7eb0512d1f4d223ff6
           name: 'RabbitMQ: Messages published per second'
@@ -190,8 +190,8 @@ zabbix_export:
             key: 'web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.CLUSTER_HOST}:{$RABBITMQ.API.PORT}/api/overview"]'
           tags:
             -
-              tag: Application
-              value: RabbitMQ
+              tag: component
+              value: messages
         -
           uuid: bb068ac7c6094fb8a59cd1a003e88c39
           name: 'RabbitMQ: Messages publish_in'
@@ -211,8 +211,8 @@ zabbix_export:
             key: 'web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.CLUSTER_HOST}:{$RABBITMQ.API.PORT}/api/overview"]'
           tags:
             -
-              tag: Application
-              value: RabbitMQ
+              tag: component
+              value: messages
         -
           uuid: db511bf1cd6c465f8fe1ae6b5fa08660
           name: 'RabbitMQ: Messages publish_in per second'
@@ -233,8 +233,8 @@ zabbix_export:
             key: 'web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.CLUSTER_HOST}:{$RABBITMQ.API.PORT}/api/overview"]'
           tags:
             -
-              tag: Application
-              value: RabbitMQ
+              tag: component
+              value: messages
         -
           uuid: 23dcb85dd9bc4fefb1a9682956181c2e
           name: 'RabbitMQ: Messages publish_out'
@@ -254,8 +254,8 @@ zabbix_export:
             key: 'web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.CLUSTER_HOST}:{$RABBITMQ.API.PORT}/api/overview"]'
           tags:
             -
-              tag: Application
-              value: RabbitMQ
+              tag: component
+              value: messages
         -
           uuid: 05e4c745be95412995749c352ec0f925
           name: 'RabbitMQ: Messages publish_out per second'
@@ -276,8 +276,8 @@ zabbix_export:
             key: 'web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.CLUSTER_HOST}:{$RABBITMQ.API.PORT}/api/overview"]'
           tags:
             -
-              tag: Application
-              value: RabbitMQ
+              tag: component
+              value: messages
         -
           uuid: 650d6a94e381477299c62cfb2a2252cf
           name: 'RabbitMQ: Messages returned redeliver'
@@ -297,8 +297,8 @@ zabbix_export:
             key: 'web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.CLUSTER_HOST}:{$RABBITMQ.API.PORT}/api/overview"]'
           tags:
             -
-              tag: Application
-              value: RabbitMQ
+              tag: component
+              value: messages
         -
           uuid: 6d7eb8880bca4c6e92f65f8a32911599
           name: 'RabbitMQ: Messages returned redeliver per second'
@@ -319,8 +319,8 @@ zabbix_export:
             key: 'web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.CLUSTER_HOST}:{$RABBITMQ.API.PORT}/api/overview"]'
           tags:
             -
-              tag: Application
-              value: RabbitMQ
+              tag: component
+              value: messages
         -
           uuid: e3faec09ae0a4d7aa8aab50d71de7bb3
           name: 'RabbitMQ: Messages returned unroutable'
@@ -340,8 +340,8 @@ zabbix_export:
             key: 'web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.CLUSTER_HOST}:{$RABBITMQ.API.PORT}/api/overview"]'
           tags:
             -
-              tag: Application
-              value: RabbitMQ
+              tag: component
+              value: messages
         -
           uuid: 72267cce69cf490ea626ff3ae17b6362
           name: 'RabbitMQ: Messages returned unroutable per second'
@@ -362,8 +362,8 @@ zabbix_export:
             key: 'web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.CLUSTER_HOST}:{$RABBITMQ.API.PORT}/api/overview"]'
           tags:
             -
-              tag: Application
-              value: RabbitMQ
+              tag: component
+              value: messages
         -
           uuid: 2b03117e863348ee84d94acfe877ef7f
           name: 'RabbitMQ: Channels total'
@@ -381,8 +381,8 @@ zabbix_export:
             key: 'web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.CLUSTER_HOST}:{$RABBITMQ.API.PORT}/api/overview"]'
           tags:
             -
-              tag: Application
-              value: RabbitMQ
+              tag: component
+              value: channels
         -
           uuid: b3cdd6739a964447b524df4fdd726434
           name: 'RabbitMQ: Connections total'
@@ -400,8 +400,8 @@ zabbix_export:
             key: 'web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.CLUSTER_HOST}:{$RABBITMQ.API.PORT}/api/overview"]'
           tags:
             -
-              tag: Application
-              value: RabbitMQ
+              tag: component
+              value: connections
         -
           uuid: c39007dbd4374bee943d61b7e90c0f01
           name: 'RabbitMQ: Consumers total'
@@ -419,8 +419,8 @@ zabbix_export:
             key: 'web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.CLUSTER_HOST}:{$RABBITMQ.API.PORT}/api/overview"]'
           tags:
             -
-              tag: Application
-              value: RabbitMQ
+              tag: component
+              value: consumers
         -
           uuid: be0b952e5d08409aa2c65fe143a9193c
           name: 'RabbitMQ: Exchanges total'
@@ -438,8 +438,8 @@ zabbix_export:
             key: 'web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.CLUSTER_HOST}:{$RABBITMQ.API.PORT}/api/overview"]'
           tags:
             -
-              tag: Application
-              value: RabbitMQ
+              tag: component
+              value: exchanges
         -
           uuid: d7c86b4921f54924af1b72cd2493da1c
           name: 'RabbitMQ: Queues total'
@@ -457,8 +457,8 @@ zabbix_export:
             key: 'web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.CLUSTER_HOST}:{$RABBITMQ.API.PORT}/api/overview"]'
           tags:
             -
-              tag: Application
-              value: RabbitMQ
+              tag: component
+              value: queues
         -
           uuid: c98b2b3dd2bd4fec9e7c571bc631167b
           name: 'RabbitMQ: Messages total'
@@ -476,8 +476,8 @@ zabbix_export:
             key: 'web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.CLUSTER_HOST}:{$RABBITMQ.API.PORT}/api/overview"]'
           tags:
             -
-              tag: Application
-              value: RabbitMQ
+              tag: component
+              value: messages
         -
           uuid: efaabe175e5f4fffa8a810ea35753475
           name: 'RabbitMQ: Messages ready for delivery'
@@ -495,8 +495,8 @@ zabbix_export:
             key: 'web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.CLUSTER_HOST}:{$RABBITMQ.API.PORT}/api/overview"]'
           tags:
             -
-              tag: Application
-              value: RabbitMQ
+              tag: component
+              value: messages
         -
           uuid: 6cf09ed9d244464288c8050b10622e3a
           name: 'RabbitMQ: Messages unacknowledged'
@@ -514,8 +514,8 @@ zabbix_export:
             key: 'web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.CLUSTER_HOST}:{$RABBITMQ.API.PORT}/api/overview"]'
           tags:
             -
-              tag: Application
-              value: RabbitMQ
+              tag: component
+              value: messages
         -
           uuid: f015f991bcea4c4dbf83dfb013300010
           name: 'RabbitMQ: Get exchanges'
@@ -532,8 +532,8 @@ zabbix_export:
                 - \1
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
         -
           uuid: 943eabfb44164908b9135aa4d6478bea
           name: 'RabbitMQ: Get overview'
@@ -550,8 +550,8 @@ zabbix_export:
                 - \1
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
           triggers:
             -
               uuid: 000d3e773f6e4ebf89f16daa2ce8c168
@@ -560,6 +560,10 @@ zabbix_export:
               priority: WARNING
               description: 'Zabbix has not received data for items for the last 30 minutes'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: e28b4491721d4dbf8eded86a5caeabc2
@@ -601,8 +605,17 @@ zabbix_export:
                 key: 'web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.CLUSTER_HOST}:{$RABBITMQ.API.PORT}/api/exchanges"]'
               tags:
                 -
-                  tag: Application
-                  value: 'RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"'
+                  tag: component
+                  value: messages
+                -
+                  tag: exchange
+                  value: '{#EXCHANGE}'
+                -
+                  tag: type
+                  value: '{#TYPE}'
+                -
+                  tag: vhost
+                  value: '{#VHOST}'
             -
               uuid: fcf7807f096d4cddb8fa2b3671814dfa
               name: 'RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages acknowledged'
@@ -622,8 +635,17 @@ zabbix_export:
                 key: 'web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.CLUSTER_HOST}:{$RABBITMQ.API.PORT}/api/exchanges"]'
               tags:
                 -
-                  tag: Application
-                  value: 'RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"'
+                  tag: component
+                  value: messages
+                -
+                  tag: exchange
+                  value: '{#EXCHANGE}'
+                -
+                  tag: type
+                  value: '{#TYPE}'
+                -
+                  tag: vhost
+                  value: '{#VHOST}'
             -
               uuid: 858f8ce62fa04a31902569a712e58234
               name: 'RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages confirmed per second'
@@ -644,8 +666,17 @@ zabbix_export:
                 key: 'web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.CLUSTER_HOST}:{$RABBITMQ.API.PORT}/api/exchanges"]'
               tags:
                 -
-                  tag: Application
-                  value: 'RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"'
+                  tag: component
+                  value: messages
+                -
+                  tag: exchange
+                  value: '{#EXCHANGE}'
+                -
+                  tag: type
+                  value: '{#TYPE}'
+                -
+                  tag: vhost
+                  value: '{#VHOST}'
             -
               uuid: 38d41b5d815a40ff816f6fad2395b61a
               name: 'RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages confirmed'
@@ -665,8 +696,17 @@ zabbix_export:
                 key: 'web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.CLUSTER_HOST}:{$RABBITMQ.API.PORT}/api/exchanges"]'
               tags:
                 -
-                  tag: Application
-                  value: 'RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"'
+                  tag: component
+                  value: messages
+                -
+                  tag: exchange
+                  value: '{#EXCHANGE}'
+                -
+                  tag: type
+                  value: '{#TYPE}'
+                -
+                  tag: vhost
+                  value: '{#VHOST}'
             -
               uuid: ab53a6957ea641fe8b2a7f26c4bcc743
               name: 'RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages delivered per second'
@@ -687,8 +727,17 @@ zabbix_export:
                 key: 'web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.CLUSTER_HOST}:{$RABBITMQ.API.PORT}/api/exchanges"]'
               tags:
                 -
-                  tag: Application
-                  value: 'RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"'
+                  tag: component
+                  value: messages
+                -
+                  tag: exchange
+                  value: '{#EXCHANGE}'
+                -
+                  tag: type
+                  value: '{#TYPE}'
+                -
+                  tag: vhost
+                  value: '{#VHOST}'
             -
               uuid: 412e5003ad2d4e80832ee0551a596791
               name: 'RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages delivered'
@@ -708,8 +757,17 @@ zabbix_export:
                 key: 'web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.CLUSTER_HOST}:{$RABBITMQ.API.PORT}/api/exchanges"]'
               tags:
                 -
-                  tag: Application
-                  value: 'RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"'
+                  tag: component
+                  value: messages
+                -
+                  tag: exchange
+                  value: '{#EXCHANGE}'
+                -
+                  tag: type
+                  value: '{#TYPE}'
+                -
+                  tag: vhost
+                  value: '{#VHOST}'
             -
               uuid: 32a0c7af8b9940a482a3a1d63ee90940
               name: 'RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages published per second'
@@ -730,8 +788,17 @@ zabbix_export:
                 key: 'web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.CLUSTER_HOST}:{$RABBITMQ.API.PORT}/api/exchanges"]'
               tags:
                 -
-                  tag: Application
-                  value: 'RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"'
+                  tag: component
+                  value: messages
+                -
+                  tag: exchange
+                  value: '{#EXCHANGE}'
+                -
+                  tag: type
+                  value: '{#TYPE}'
+                -
+                  tag: vhost
+                  value: '{#VHOST}'
             -
               uuid: 1eccbe4450d74d5f9c5b8f7e6279b214
               name: 'RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages published'
@@ -751,8 +818,17 @@ zabbix_export:
                 key: 'web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.CLUSTER_HOST}:{$RABBITMQ.API.PORT}/api/exchanges"]'
               tags:
                 -
-                  tag: Application
-                  value: 'RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"'
+                  tag: component
+                  value: messages
+                -
+                  tag: exchange
+                  value: '{#EXCHANGE}'
+                -
+                  tag: type
+                  value: '{#TYPE}'
+                -
+                  tag: vhost
+                  value: '{#VHOST}'
             -
               uuid: 3520a523abd1413f88c1c19978e6d562
               name: 'RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages publish_in per second'
@@ -773,8 +849,17 @@ zabbix_export:
                 key: 'web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.CLUSTER_HOST}:{$RABBITMQ.API.PORT}/api/exchanges"]'
               tags:
                 -
-                  tag: Application
-                  value: 'RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"'
+                  tag: component
+                  value: messages
+                -
+                  tag: exchange
+                  value: '{#EXCHANGE}'
+                -
+                  tag: type
+                  value: '{#TYPE}'
+                -
+                  tag: vhost
+                  value: '{#VHOST}'
             -
               uuid: 520d8301e48540679472bf508a6e293b
               name: 'RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages publish_in'
@@ -794,8 +879,17 @@ zabbix_export:
                 key: 'web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.CLUSTER_HOST}:{$RABBITMQ.API.PORT}/api/exchanges"]'
               tags:
                 -
-                  tag: Application
-                  value: 'RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"'
+                  tag: component
+                  value: messages
+                -
+                  tag: exchange
+                  value: '{#EXCHANGE}'
+                -
+                  tag: type
+                  value: '{#TYPE}'
+                -
+                  tag: vhost
+                  value: '{#VHOST}'
             -
               uuid: 6beb5e40cb8b416a8722ea77abb7355d
               name: 'RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages publish_out per second'
@@ -816,8 +910,17 @@ zabbix_export:
                 key: 'web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.CLUSTER_HOST}:{$RABBITMQ.API.PORT}/api/exchanges"]'
               tags:
                 -
-                  tag: Application
-                  value: 'RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"'
+                  tag: component
+                  value: messages
+                -
+                  tag: exchange
+                  value: '{#EXCHANGE}'
+                -
+                  tag: type
+                  value: '{#TYPE}'
+                -
+                  tag: vhost
+                  value: '{#VHOST}'
             -
               uuid: beb929ee395e4caba73f3063c24a1d60
               name: 'RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages publish_out'
@@ -837,8 +940,17 @@ zabbix_export:
                 key: 'web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.CLUSTER_HOST}:{$RABBITMQ.API.PORT}/api/exchanges"]'
               tags:
                 -
-                  tag: Application
-                  value: 'RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"'
+                  tag: component
+                  value: messages
+                -
+                  tag: exchange
+                  value: '{#EXCHANGE}'
+                -
+                  tag: type
+                  value: '{#TYPE}'
+                -
+                  tag: vhost
+                  value: '{#VHOST}'
             -
               uuid: 7485d5a12fb04a13810ea54b9cc598e1
               name: 'RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages redelivered per second'
@@ -859,8 +971,17 @@ zabbix_export:
                 key: 'web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.CLUSTER_HOST}:{$RABBITMQ.API.PORT}/api/exchanges"]'
               tags:
                 -
-                  tag: Application
-                  value: 'RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"'
+                  tag: component
+                  value: messages
+                -
+                  tag: exchange
+                  value: '{#EXCHANGE}'
+                -
+                  tag: type
+                  value: '{#TYPE}'
+                -
+                  tag: vhost
+                  value: '{#VHOST}'
             -
               uuid: 58a06005659943429122d451acb521e0
               name: 'RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages redelivered'
@@ -880,8 +1001,17 @@ zabbix_export:
                 key: 'web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.CLUSTER_HOST}:{$RABBITMQ.API.PORT}/api/exchanges"]'
               tags:
                 -
-                  tag: Application
-                  value: 'RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"'
+                  tag: component
+                  value: messages
+                -
+                  tag: exchange
+                  value: '{#EXCHANGE}'
+                -
+                  tag: type
+                  value: '{#TYPE}'
+                -
+                  tag: vhost
+                  value: '{#VHOST}'
             -
               uuid: 295eeb3bd071400d921efe1f5a924a3e
               name: 'RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages returned unroutable per second'
@@ -902,8 +1032,17 @@ zabbix_export:
                 key: 'web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.CLUSTER_HOST}:{$RABBITMQ.API.PORT}/api/exchanges"]'
               tags:
                 -
-                  tag: Application
-                  value: 'RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"'
+                  tag: component
+                  value: messages
+                -
+                  tag: exchange
+                  value: '{#EXCHANGE}'
+                -
+                  tag: type
+                  value: '{#TYPE}'
+                -
+                  tag: vhost
+                  value: '{#VHOST}'
             -
               uuid: 2901eccbd8ef483ba63c5522755155e7
               name: 'RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages returned unroutable'
@@ -923,8 +1062,17 @@ zabbix_export:
                 key: 'web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.CLUSTER_HOST}:{$RABBITMQ.API.PORT}/api/exchanges"]'
               tags:
                 -
-                  tag: Application
-                  value: 'RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"'
+                  tag: component
+                  value: messages
+                -
+                  tag: exchange
+                  value: '{#EXCHANGE}'
+                -
+                  tag: type
+                  value: '{#TYPE}'
+                -
+                  tag: vhost
+                  value: '{#VHOST}'
           master_item:
             key: 'web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.CLUSTER_HOST}:{$RABBITMQ.API.PORT}/api/exchanges"]'
           lld_macro_paths:
@@ -979,8 +1127,11 @@ zabbix_export:
               retrieve_mode: HEADERS
               tags:
                 -
-                  tag: Application
-                  value: RabbitMQ
+                  tag: component
+                  value: health
+                -
+                  tag: component
+                  value: system
               trigger_prototypes:
                 -
                   uuid: 032949c387c64223b3125ba1120ae082
@@ -989,6 +1140,10 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'http://{HOST.CONN}:{$RABBITMQ.API.PORT}/api/index.html'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
           master_item:
             key: 'web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.CLUSTER_HOST}:{$RABBITMQ.API.PORT}/api/overview"]'
           preprocessing:
@@ -1004,6 +1159,13 @@ zabbix_export:
                                        parseInt(value.split('.')[1]) * 100 +
                                        parseInt(value.split('.')[2])
                   return JSON.stringify(rabbit_version >= 30810 ? [{'{#SINGLETON}': ''}] : []);
+      tags:
+        -
+          tag: class
+          value: software
+        -
+          tag: target
+          value: rabbitmq
       macros:
         -
           macro: '{$RABBITMQ.API.CLUSTER_HOST}'
@@ -1137,7 +1299,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/387226-discussion-thread-for-official-zabbix-template-rabbitmq
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Applications
@@ -1151,8 +1313,8 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: RabbitMQ
+              tag: component
+              value: system
           triggers:
             -
               uuid: 5cb80a7552d74e44a83d0825f039f89f
@@ -1167,6 +1329,10 @@ zabbix_export:
                 -
                   name: 'RabbitMQ: Service is down'
                   expression: 'last(/RabbitMQ node by Zabbix agent/net.tcp.service[http,"{$RABBITMQ.API.HOST}","{$RABBITMQ.API.PORT}"])=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 6229b623f5ff40f9a65e9573b3b86e3f
           name: 'RabbitMQ: Service ping'
@@ -1181,8 +1347,11 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: RabbitMQ
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: af5cfb0004e04562a9720b9e1b41fd5b
@@ -1194,6 +1363,10 @@ zabbix_export:
                 -
                   name: 'RabbitMQ: Process is not running'
                   expression: 'last(/RabbitMQ node by Zabbix agent/proc.num["{$RABBITMQ.PROCESS_NAME}"])=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 0b195bf594c44b1f869b4a7671f61453
           name: 'RabbitMQ: CPU utilization'
@@ -1204,8 +1377,8 @@ zabbix_export:
           description: 'Process CPU utilization percentage.'
           tags:
             -
-              tag: Application
-              value: RabbitMQ
+              tag: component
+              value: cpu
         -
           uuid: 6f13f672d8ce4c9592e0f3f5ec3b0ec4
           name: 'RabbitMQ: Memory usage (rss)'
@@ -1215,8 +1388,8 @@ zabbix_export:
           description: 'Resident set size memory used by process in bytes.'
           tags:
             -
-              tag: Application
-              value: RabbitMQ
+              tag: component
+              value: system
         -
           uuid: 4faac75027d14304ab071602df8f2937
           name: 'RabbitMQ: Memory usage (vsize)'
@@ -1226,8 +1399,8 @@ zabbix_export:
           description: 'Virtual memory size used by process in bytes.'
           tags:
             -
-              tag: Application
-              value: RabbitMQ
+              tag: component
+              value: memory
         -
           uuid: 8f1c8d2449c44ab590842184d9deb3a6
           name: 'RabbitMQ: Number of processes running'
@@ -1235,14 +1408,18 @@ zabbix_export:
           history: 7d
           tags:
             -
-              tag: Application
-              value: RabbitMQ
+              tag: component
+              value: system
           triggers:
             -
               uuid: 2979bc7d779b404696f7eac273e99ea7
               expression: 'last(/RabbitMQ node by Zabbix agent/proc.num["{$RABBITMQ.PROCESS_NAME}"])=0'
               name: 'RabbitMQ: Process is not running'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 7dad79be93bd46bba7a2540b38080b06
           name: 'RabbitMQ: Free disk space'
@@ -1261,8 +1438,8 @@ zabbix_export:
             key: 'web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.HOST}:{$RABBITMQ.API.PORT}/api/nodes/{$RABBITMQ.CLUSTER.NAME}@{HOST.NAME}?memory=true"]'
           tags:
             -
-              tag: Application
-              value: RabbitMQ
+              tag: component
+              value: storage
         -
           uuid: d8de1eb13f024ce99388fc4bb68d6ad0
           name: 'RabbitMQ: Disk free alarm'
@@ -1286,8 +1463,8 @@ zabbix_export:
             key: 'web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.HOST}:{$RABBITMQ.API.PORT}/api/nodes/{$RABBITMQ.CLUSTER.NAME}@{HOST.NAME}?memory=true"]'
           tags:
             -
-              tag: Application
-              value: RabbitMQ
+              tag: component
+              value: storage
           triggers:
             -
               uuid: b68cb12ecd4046fd80a717fb557f04e8
@@ -1296,6 +1473,10 @@ zabbix_export:
               opdata: 'Current state: {ITEM.LASTVALUE1}'
               priority: AVERAGE
               description: 'https://www.rabbitmq.com/disk-alarms.html'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 4e62b476bd11497f9190d1f720f22f75
           name: 'RabbitMQ: Disk free limit'
@@ -1314,8 +1495,8 @@ zabbix_export:
             key: 'web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.HOST}:{$RABBITMQ.API.PORT}/api/nodes/{$RABBITMQ.CLUSTER.NAME}@{HOST.NAME}?memory=true"]'
           tags:
             -
-              tag: Application
-              value: RabbitMQ
+              tag: component
+              value: storage
         -
           uuid: 09aeab86c69846eb82d27c2f82f46d2b
           name: 'RabbitMQ: Used file descriptors'
@@ -1333,8 +1514,8 @@ zabbix_export:
             key: 'web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.HOST}:{$RABBITMQ.API.PORT}/api/nodes/{$RABBITMQ.CLUSTER.NAME}@{HOST.NAME}?memory=true"]'
           tags:
             -
-              tag: Application
-              value: RabbitMQ
+              tag: component
+              value: storage
         -
           uuid: e059b278ba384133a72dc723c2b2c40b
           name: 'RabbitMQ: Memory alarm'
@@ -1358,8 +1539,8 @@ zabbix_export:
             key: 'web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.HOST}:{$RABBITMQ.API.PORT}/api/nodes/{$RABBITMQ.CLUSTER.NAME}@{HOST.NAME}?memory=true"]'
           tags:
             -
-              tag: Application
-              value: RabbitMQ
+              tag: component
+              value: memory
           triggers:
             -
               uuid: ec6ae727fe774b0fa56bb4d9ad773e35
@@ -1368,6 +1549,10 @@ zabbix_export:
               opdata: 'Current state: {ITEM.LASTVALUE1}'
               priority: AVERAGE
               description: 'https://www.rabbitmq.com/memory.html'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 54bd4a47d635444e8e2e955325dbb976
           name: 'RabbitMQ: Memory limit'
@@ -1386,8 +1571,8 @@ zabbix_export:
             key: 'web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.HOST}:{$RABBITMQ.API.PORT}/api/nodes/{$RABBITMQ.CLUSTER.NAME}@{HOST.NAME}?memory=true"]'
           tags:
             -
-              tag: Application
-              value: RabbitMQ
+              tag: component
+              value: memory
         -
           uuid: d6a01ec409a6449986c5c0a81ffaf914
           name: 'RabbitMQ: Memory used'
@@ -1406,8 +1591,8 @@ zabbix_export:
             key: 'web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.HOST}:{$RABBITMQ.API.PORT}/api/nodes/{$RABBITMQ.CLUSTER.NAME}@{HOST.NAME}?memory=true"]'
           tags:
             -
-              tag: Application
-              value: RabbitMQ
+              tag: component
+              value: memory
         -
           uuid: db91f84a5ad7412c959fbfe4e3b6df88
           name: 'RabbitMQ: Management plugin version'
@@ -1431,8 +1616,8 @@ zabbix_export:
             key: 'web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.HOST}:{$RABBITMQ.API.PORT}/api/overview"]'
           tags:
             -
-              tag: Application
-              value: RabbitMQ
+              tag: component
+              value: system
         -
           uuid: 52a0be5049ee40748761d301a644315b
           name: 'RabbitMQ: RabbitMQ version'
@@ -1456,8 +1641,8 @@ zabbix_export:
             key: 'web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.HOST}:{$RABBITMQ.API.PORT}/api/overview"]'
           tags:
             -
-              tag: Application
-              value: RabbitMQ
+              tag: component
+              value: system
           triggers:
             -
               uuid: daf98bb4593d4697bc51423b2f65ba41
@@ -1466,6 +1651,10 @@ zabbix_export:
               priority: INFO
               description: 'RabbitMQ version has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 5e8c1ed0b073461eb14477edac3c756a
           name: 'RabbitMQ: Number of network partitions'
@@ -1487,8 +1676,8 @@ zabbix_export:
             key: 'web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.HOST}:{$RABBITMQ.API.PORT}/api/nodes/{$RABBITMQ.CLUSTER.NAME}@{HOST.NAME}?memory=true"]'
           tags:
             -
-              tag: Application
-              value: RabbitMQ
+              tag: component
+              value: network
           triggers:
             -
               uuid: 5bed266725e94000804b0ecc7bce6209
@@ -1497,6 +1686,10 @@ zabbix_export:
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
               description: 'https://www.rabbitmq.com/partitions.html#detecting'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 087fcb3992ef4e35bacd4b6e69ef93d3
           name: 'RabbitMQ: Is running'
@@ -1520,8 +1713,8 @@ zabbix_export:
             key: 'web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.HOST}:{$RABBITMQ.API.PORT}/api/nodes/{$RABBITMQ.CLUSTER.NAME}@{HOST.NAME}?memory=true"]'
           tags:
             -
-              tag: Application
-              value: RabbitMQ
+              tag: component
+              value: system
           triggers:
             -
               uuid: 253acf98446e4790975b330d44dd6b96
@@ -1537,6 +1730,10 @@ zabbix_export:
                 -
                   name: 'RabbitMQ: Service is down'
                   expression: 'last(/RabbitMQ node by Zabbix agent/net.tcp.service[http,"{$RABBITMQ.API.HOST}","{$RABBITMQ.API.PORT}"])=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 1ae6f429e99d4ddaa54aa6adab6b8100
           name: 'RabbitMQ: Runtime run queue'
@@ -1554,8 +1751,8 @@ zabbix_export:
             key: 'web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.HOST}:{$RABBITMQ.API.PORT}/api/nodes/{$RABBITMQ.CLUSTER.NAME}@{HOST.NAME}?memory=true"]'
           tags:
             -
-              tag: Application
-              value: RabbitMQ
+              tag: component
+              value: system
         -
           uuid: 3aa508520f224150a05a7ebb64d22c5e
           name: 'RabbitMQ: Sockets available'
@@ -1573,8 +1770,8 @@ zabbix_export:
             key: 'web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.HOST}:{$RABBITMQ.API.PORT}/api/nodes/{$RABBITMQ.CLUSTER.NAME}@{HOST.NAME}?memory=true"]'
           tags:
             -
-              tag: Application
-              value: RabbitMQ
+              tag: component
+              value: system
         -
           uuid: de2cbe02ff6c47d78b6c7105709f4805
           name: 'RabbitMQ: Sockets used'
@@ -1592,8 +1789,8 @@ zabbix_export:
             key: 'web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.HOST}:{$RABBITMQ.API.PORT}/api/nodes/{$RABBITMQ.CLUSTER.NAME}@{HOST.NAME}?memory=true"]'
           tags:
             -
-              tag: Application
-              value: RabbitMQ
+              tag: component
+              value: system
         -
           uuid: a28b6c8cca5544b79c2d9946c1978c7e
           name: 'RabbitMQ: Uptime'
@@ -1617,8 +1814,8 @@ zabbix_export:
             key: 'web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.HOST}:{$RABBITMQ.API.PORT}/api/nodes/{$RABBITMQ.CLUSTER.NAME}@{HOST.NAME}?memory=true"]'
           tags:
             -
-              tag: Application
-              value: RabbitMQ
+              tag: component
+              value: system
           triggers:
             -
               uuid: 729c448ebabb417bb7ce17b1634c4484
@@ -1627,6 +1824,10 @@ zabbix_export:
               priority: INFO
               description: 'Uptime is less than 10 minutes'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 61730555a0ae4f798ea740effb82764c
           name: 'RabbitMQ: Get nodes'
@@ -1643,8 +1844,8 @@ zabbix_export:
                 - \1
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
           triggers:
             -
               uuid: 4f2a88d09b1b49879d80e0794ec19e0e
@@ -1660,6 +1861,10 @@ zabbix_export:
                 -
                   name: 'RabbitMQ: Service is down'
                   expression: 'last(/RabbitMQ node by Zabbix agent/net.tcp.service[http,"{$RABBITMQ.API.HOST}","{$RABBITMQ.API.PORT}"])=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 1af326f40cdb407a96b34025062b4743
           name: 'RabbitMQ: Get node overview'
@@ -1676,8 +1881,8 @@ zabbix_export:
                 - \1
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
         -
           uuid: 7fb61ad564db42d5a373912491f5c9d3
           name: 'RabbitMQ: Get queues'
@@ -1694,8 +1899,8 @@ zabbix_export:
                 - \1
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
       discovery_rules:
         -
           uuid: 04ef7d13809c45009553815f60ef5ba8
@@ -1731,8 +1936,11 @@ zabbix_export:
                   error_handler_params: '0'
               tags:
                 -
-                  tag: Application
-                  value: RabbitMQ
+                  tag: component
+                  value: health
+                -
+                  tag: component
+                  value: system
               trigger_prototypes:
                 -
                   uuid: bf6bcbda20ed46cbb779d9c1f446dfa8
@@ -1741,6 +1949,10 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'https://www.rabbitmq.com/monitoring.html#health-checks'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
           master_item:
             key: 'web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.HOST}:{$RABBITMQ.API.PORT}/api/overview"]'
           preprocessing:
@@ -1797,8 +2009,11 @@ zabbix_export:
               retrieve_mode: HEADERS
               tags:
                 -
-                  tag: Application
-                  value: RabbitMQ
+                  tag: component
+                  value: certificate
+                -
+                  tag: component
+                  value: health
               trigger_prototypes:
                 -
                   uuid: d180912136c74e5cb246655ecab75f57
@@ -1807,6 +2022,10 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'http://{HOST.CONN}:{$RABBITMQ.API.PORT}/api/index.html'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 701449b128cb42cdb971fc608ba9f29b
               name: 'RabbitMQ: Healthcheck: local alarms in effect on the this node{#SINGLETON}'
@@ -1840,8 +2059,11 @@ zabbix_export:
               retrieve_mode: HEADERS
               tags:
                 -
-                  tag: Application
-                  value: RabbitMQ
+                  tag: component
+                  value: health
+                -
+                  tag: component
+                  value: system
               trigger_prototypes:
                 -
                   uuid: 62962f18baa4480294e097fec2cc5e4c
@@ -1850,6 +2072,10 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'http://{HOST.CONN}:{$RABBITMQ.API.PORT}/api/index.html'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 7a07966d8dde4f2caa9ff95693b86974
               name: 'RabbitMQ: Healthcheck: classic mirrored queues without synchronized mirrors online{#SINGLETON}'
@@ -1883,8 +2109,11 @@ zabbix_export:
               retrieve_mode: HEADERS
               tags:
                 -
-                  tag: Application
-                  value: RabbitMQ
+                  tag: component
+                  value: health
+                -
+                  tag: component
+                  value: queues
               trigger_prototypes:
                 -
                   uuid: 19e392f9e48e4c8287e04751a2a73843
@@ -1893,6 +2122,10 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'http://{HOST.CONN}:{$RABBITMQ.API.PORT}/api/index.html'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: f6ec1bb1cc4741be852136fac2c63333
               name: 'RabbitMQ: Healthcheck: queues with minimum online quorum{#SINGLETON}'
@@ -1926,8 +2159,11 @@ zabbix_export:
               retrieve_mode: HEADERS
               tags:
                 -
-                  tag: Application
-                  value: RabbitMQ
+                  tag: component
+                  value: health
+                -
+                  tag: component
+                  value: queues
               trigger_prototypes:
                 -
                   uuid: e063b6dde6a0484ba1561861d8b1f0c1
@@ -1936,6 +2172,10 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'http://{HOST.CONN}:{$RABBITMQ.API.PORT}/api/index.html'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 0d1ad3daf2bb46dba2c9913c1684a0d4
               name: 'RabbitMQ: Healthcheck: virtual hosts on the this node{#SINGLETON}'
@@ -1969,8 +2209,11 @@ zabbix_export:
               retrieve_mode: HEADERS
               tags:
                 -
-                  tag: Application
-                  value: RabbitMQ
+                  tag: component
+                  value: health
+                -
+                  tag: component
+                  value: system
               trigger_prototypes:
                 -
                   uuid: b61117e5eeff4d41a9a2f1729ec174b2
@@ -1979,6 +2222,10 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'http://{HOST.CONN}:{$RABBITMQ.API.PORT}/api/index.html'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
           master_item:
             key: 'web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.HOST}:{$RABBITMQ.API.PORT}/api/overview"]'
           preprocessing:
@@ -2035,8 +2282,14 @@ zabbix_export:
                 key: 'web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.HOST}:{$RABBITMQ.API.PORT}/api/queues"]'
               tags:
                 -
-                  tag: Application
-                  value: 'RabbitMQ: Queue "{#VHOST}/{#QUEUE}"'
+                  tag: component
+                  value: consumers
+                -
+                  tag: queue
+                  value: '{#QUEUE}'
+                -
+                  tag: vhost
+                  value: '{#VHOST}'
             -
               uuid: 4b4491d5fb2b41eeae044c3d28de1b18
               name: 'RabbitMQ: Queue {#VHOST}/{#QUEUE}: Memory'
@@ -2055,8 +2308,14 @@ zabbix_export:
                 key: 'web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.HOST}:{$RABBITMQ.API.PORT}/api/queues"]'
               tags:
                 -
-                  tag: Application
-                  value: 'RabbitMQ: Queue "{#VHOST}/{#QUEUE}"'
+                  tag: component
+                  value: memory
+                -
+                  tag: queue
+                  value: '{#QUEUE}'
+                -
+                  tag: vhost
+                  value: '{#VHOST}'
             -
               uuid: 223fa7a8372f4e9883d376c9f3e1af2e
               name: 'RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages acknowledged per second'
@@ -2077,8 +2336,14 @@ zabbix_export:
                 key: 'web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.HOST}:{$RABBITMQ.API.PORT}/api/queues"]'
               tags:
                 -
-                  tag: Application
-                  value: 'RabbitMQ: Queue "{#VHOST}/{#QUEUE}"'
+                  tag: component
+                  value: messages
+                -
+                  tag: queue
+                  value: '{#QUEUE}'
+                -
+                  tag: vhost
+                  value: '{#VHOST}'
             -
               uuid: 335513a34e6a4909acfa1be278dd31b3
               name: 'RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages acknowledged'
@@ -2098,8 +2363,14 @@ zabbix_export:
                 key: 'web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.HOST}:{$RABBITMQ.API.PORT}/api/queues"]'
               tags:
                 -
-                  tag: Application
-                  value: 'RabbitMQ: Queue "{#VHOST}/{#QUEUE}"'
+                  tag: component
+                  value: messages
+                -
+                  tag: queue
+                  value: '{#QUEUE}'
+                -
+                  tag: vhost
+                  value: '{#VHOST}'
             -
               uuid: 55b774e5aac249edbb8881373060b15b
               name: 'RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages delivered per second'
@@ -2120,8 +2391,14 @@ zabbix_export:
                 key: 'web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.HOST}:{$RABBITMQ.API.PORT}/api/queues"]'
               tags:
                 -
-                  tag: Application
-                  value: 'RabbitMQ: Queue "{#VHOST}/{#QUEUE}"'
+                  tag: component
+                  value: messages
+                -
+                  tag: queue
+                  value: '{#QUEUE}'
+                -
+                  tag: vhost
+                  value: '{#VHOST}'
             -
               uuid: 2a87988327e1483c84d3f1867bab367f
               name: 'RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages delivered'
@@ -2141,8 +2418,14 @@ zabbix_export:
                 key: 'web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.HOST}:{$RABBITMQ.API.PORT}/api/queues"]'
               tags:
                 -
-                  tag: Application
-                  value: 'RabbitMQ: Queue "{#VHOST}/{#QUEUE}"'
+                  tag: component
+                  value: messages
+                -
+                  tag: queue
+                  value: '{#QUEUE}'
+                -
+                  tag: vhost
+                  value: '{#VHOST}'
             -
               uuid: 3f3024da744349b59c7810dfd10d11a3
               name: 'RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages delivered per second'
@@ -2163,8 +2446,14 @@ zabbix_export:
                 key: 'web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.HOST}:{$RABBITMQ.API.PORT}/api/queues"]'
               tags:
                 -
-                  tag: Application
-                  value: 'RabbitMQ: Queue "{#VHOST}/{#QUEUE}"'
+                  tag: component
+                  value: messages
+                -
+                  tag: queue
+                  value: '{#QUEUE}'
+                -
+                  tag: vhost
+                  value: '{#VHOST}'
             -
               uuid: ad5e9fa0260e4170887fb2dfdc508959
               name: 'RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages delivered'
@@ -2184,8 +2473,14 @@ zabbix_export:
                 key: 'web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.HOST}:{$RABBITMQ.API.PORT}/api/queues"]'
               tags:
                 -
-                  tag: Application
-                  value: 'RabbitMQ: Queue "{#VHOST}/{#QUEUE}"'
+                  tag: component
+                  value: messages
+                -
+                  tag: queue
+                  value: '{#QUEUE}'
+                -
+                  tag: vhost
+                  value: '{#VHOST}'
             -
               uuid: 393306b9cb0148038d02ad9c48cf1fbb
               name: 'RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages published per second'
@@ -2206,8 +2501,14 @@ zabbix_export:
                 key: 'web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.HOST}:{$RABBITMQ.API.PORT}/api/queues"]'
               tags:
                 -
-                  tag: Application
-                  value: 'RabbitMQ: Queue "{#VHOST}/{#QUEUE}"'
+                  tag: component
+                  value: messages
+                -
+                  tag: queue
+                  value: '{#QUEUE}'
+                -
+                  tag: vhost
+                  value: '{#VHOST}'
             -
               uuid: 44814c9f6f154fdcbab66249d0777eae
               name: 'RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages published'
@@ -2227,8 +2528,14 @@ zabbix_export:
                 key: 'web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.HOST}:{$RABBITMQ.API.PORT}/api/queues"]'
               tags:
                 -
-                  tag: Application
-                  value: 'RabbitMQ: Queue "{#VHOST}/{#QUEUE}"'
+                  tag: component
+                  value: messages
+                -
+                  tag: queue
+                  value: '{#QUEUE}'
+                -
+                  tag: vhost
+                  value: '{#VHOST}'
             -
               uuid: 9096e81341374d2fb7dd58e932783afc
               name: 'RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages per second'
@@ -2247,8 +2554,14 @@ zabbix_export:
                 key: 'web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.HOST}:{$RABBITMQ.API.PORT}/api/queues"]'
               tags:
                 -
-                  tag: Application
-                  value: 'RabbitMQ: Queue "{#VHOST}/{#QUEUE}"'
+                  tag: component
+                  value: messages
+                -
+                  tag: queue
+                  value: '{#QUEUE}'
+                -
+                  tag: vhost
+                  value: '{#VHOST}'
             -
               uuid: 8902103fd86746d0851b75a1262e36a9
               name: 'RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages redelivered per second'
@@ -2269,8 +2582,14 @@ zabbix_export:
                 key: 'web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.HOST}:{$RABBITMQ.API.PORT}/api/queues"]'
               tags:
                 -
-                  tag: Application
-                  value: 'RabbitMQ: Queue "{#VHOST}/{#QUEUE}"'
+                  tag: component
+                  value: messages
+                -
+                  tag: queue
+                  value: '{#QUEUE}'
+                -
+                  tag: vhost
+                  value: '{#VHOST}'
             -
               uuid: 3ac1a4b83c9f4d4c8a438d39aca8e82a
               name: 'RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages redelivered'
@@ -2290,8 +2609,14 @@ zabbix_export:
                 key: 'web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.HOST}:{$RABBITMQ.API.PORT}/api/queues"]'
               tags:
                 -
-                  tag: Application
-                  value: 'RabbitMQ: Queue "{#VHOST}/{#QUEUE}"'
+                  tag: component
+                  value: messages
+                -
+                  tag: queue
+                  value: '{#QUEUE}'
+                -
+                  tag: vhost
+                  value: '{#VHOST}'
             -
               uuid: aabd7d6fe6a047d186504386d3a48ae1
               name: 'RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages'
@@ -2309,8 +2634,14 @@ zabbix_export:
                 key: 'web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.HOST}:{$RABBITMQ.API.PORT}/api/queues"]'
               tags:
                 -
-                  tag: Application
-                  value: 'RabbitMQ: Queue "{#VHOST}/{#QUEUE}"'
+                  tag: component
+                  value: messages
+                -
+                  tag: queue
+                  value: '{#QUEUE}'
+                -
+                  tag: vhost
+                  value: '{#VHOST}'
               trigger_prototypes:
                 -
                   uuid: 58986cee2b4846b3b7bd3caf772d7ac6
@@ -2318,6 +2649,10 @@ zabbix_export:
                   name: 'RabbitMQ: Too many messages in queue (over {$RABBITMQ.MESSAGES.MAX.WARN} for 5m)'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: d2e1a2857b314ed3818f92312f5d0043
               name: 'RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages ready per second'
@@ -2336,8 +2671,14 @@ zabbix_export:
                 key: 'web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.HOST}:{$RABBITMQ.API.PORT}/api/queues"]'
               tags:
                 -
-                  tag: Application
-                  value: 'RabbitMQ: Queue "{#VHOST}/{#QUEUE}"'
+                  tag: component
+                  value: messages
+                -
+                  tag: queue
+                  value: '{#QUEUE}'
+                -
+                  tag: vhost
+                  value: '{#VHOST}'
             -
               uuid: 4a75c2d9e0354f47b1c8243bad17bd58
               name: 'RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages ready'
@@ -2355,8 +2696,14 @@ zabbix_export:
                 key: 'web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.HOST}:{$RABBITMQ.API.PORT}/api/queues"]'
               tags:
                 -
-                  tag: Application
-                  value: 'RabbitMQ: Queue "{#VHOST}/{#QUEUE}"'
+                  tag: component
+                  value: messages
+                -
+                  tag: queue
+                  value: '{#QUEUE}'
+                -
+                  tag: vhost
+                  value: '{#VHOST}'
             -
               uuid: d5d88879e3b844d7b03ab956a673daff
               name: 'RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages unacknowledged per second'
@@ -2375,8 +2722,14 @@ zabbix_export:
                 key: 'web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.HOST}:{$RABBITMQ.API.PORT}/api/queues"]'
               tags:
                 -
-                  tag: Application
-                  value: 'RabbitMQ: Queue "{#VHOST}/{#QUEUE}"'
+                  tag: component
+                  value: messages
+                -
+                  tag: queue
+                  value: '{#QUEUE}'
+                -
+                  tag: vhost
+                  value: '{#VHOST}'
             -
               uuid: 252dcf1262014ce599a2eec81f7223eb
               name: 'RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages unacknowledged'
@@ -2394,8 +2747,14 @@ zabbix_export:
                 key: 'web.page.get["http://{$RABBITMQ.API.USER}:{$RABBITMQ.API.PASSWORD}@{$RABBITMQ.API.HOST}:{$RABBITMQ.API.PORT}/api/queues"]'
               tags:
                 -
-                  tag: Application
-                  value: 'RabbitMQ: Queue "{#VHOST}/{#QUEUE}"'
+                  tag: component
+                  value: messages
+                -
+                  tag: queue
+                  value: '{#QUEUE}'
+                -
+                  tag: vhost
+                  value: '{#VHOST}'
           graph_prototypes:
             -
               uuid: a6223df79d334c29ada36ba20729b885
@@ -2511,6 +2870,13 @@ zabbix_export:
             -
               lld_macro: '{#VHOST}'
               path: $.vhost
+      tags:
+        -
+          tag: class
+          value: software
+        -
+          tag: target
+          value: rabbitmq
       macros:
         -
           macro: '{$RABBITMQ.API.HOST}'
diff --git a/templates/app/rabbitmq_http/template_app_rabbitmq_http.yaml b/templates/app/rabbitmq_http/template_app_rabbitmq_http.yaml
index 7d29f2b4b7f..338f5c7368c 100644
--- a/templates/app/rabbitmq_http/template_app_rabbitmq_http.yaml
+++ b/templates/app/rabbitmq_http/template_app_rabbitmq_http.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-10T07:40:06Z'
+  date: '2022-01-26T10:46:31Z'
   groups:
     -
       uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
@@ -15,7 +15,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/387226-discussion-thread-for-official-zabbix-template-rabbitmq
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Applications
@@ -35,8 +35,8 @@ zabbix_export:
           url: '{$RABBITMQ.API.SCHEME}://{HOST.CONN}:{$RABBITMQ.API.PORT}/api/exchanges'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
         -
           uuid: c0d7c1940dea4cd4a01a94b9629db3ce
           name: 'RabbitMQ: Get overview'
@@ -52,8 +52,8 @@ zabbix_export:
           url: '{$RABBITMQ.API.SCHEME}://{HOST.CONN}:{$RABBITMQ.API.PORT}/api/overview'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
           triggers:
             -
               uuid: ae7f1953f9b94c9c907d7bd7627d389d
@@ -62,6 +62,10 @@ zabbix_export:
               priority: WARNING
               description: 'Zabbix has not received data for items for the last 30 minutes'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 94ffc83030e84d93a2bcafc9fc1b307b
           name: 'RabbitMQ: Messages acknowledged'
@@ -81,8 +85,8 @@ zabbix_export:
             key: rabbitmq.get_overview
           tags:
             -
-              tag: Application
-              value: RabbitMQ
+              tag: component
+              value: messages
         -
           uuid: b7c9ca566af64e62bc450752d5cd7777
           name: 'RabbitMQ: Messages acknowledged per second'
@@ -103,8 +107,8 @@ zabbix_export:
             key: rabbitmq.get_overview
           tags:
             -
-              tag: Application
-              value: RabbitMQ
+              tag: component
+              value: messages
         -
           uuid: 5f2ae9a4ca0643c6b3d3e7b1ed36f3e4
           name: 'RabbitMQ: Messages confirmed'
@@ -124,8 +128,8 @@ zabbix_export:
             key: rabbitmq.get_overview
           tags:
             -
-              tag: Application
-              value: RabbitMQ
+              tag: component
+              value: messages
         -
           uuid: 302caaded1ec40a984c13c3eab6f7509
           name: 'RabbitMQ: Messages confirmed per second'
@@ -146,8 +150,8 @@ zabbix_export:
             key: rabbitmq.get_overview
           tags:
             -
-              tag: Application
-              value: RabbitMQ
+              tag: component
+              value: messages
         -
           uuid: fa4dcdd9a76c47fb8b3e0e238077f591
           name: 'RabbitMQ: Messages delivered'
@@ -167,8 +171,8 @@ zabbix_export:
             key: rabbitmq.get_overview
           tags:
             -
-              tag: Application
-              value: RabbitMQ
+              tag: component
+              value: messages
         -
           uuid: 483b3ccd192a4f7a8142da5fc3303d63
           name: 'RabbitMQ: Messages delivered per second'
@@ -189,8 +193,8 @@ zabbix_export:
             key: rabbitmq.get_overview
           tags:
             -
-              tag: Application
-              value: RabbitMQ
+              tag: component
+              value: messages
         -
           uuid: af401642e23241f38b453ce65439a3fb
           name: 'RabbitMQ: Messages published'
@@ -210,8 +214,8 @@ zabbix_export:
             key: rabbitmq.get_overview
           tags:
             -
-              tag: Application
-              value: RabbitMQ
+              tag: component
+              value: messages
         -
           uuid: e386d202d87c442c94ea6151af8f1c45
           name: 'RabbitMQ: Messages published per second'
@@ -232,8 +236,8 @@ zabbix_export:
             key: rabbitmq.get_overview
           tags:
             -
-              tag: Application
-              value: RabbitMQ
+              tag: component
+              value: messages
         -
           uuid: ebe18f0f04fe4c098283cfeab6ebb716
           name: 'RabbitMQ: Messages publish_in'
@@ -253,8 +257,8 @@ zabbix_export:
             key: rabbitmq.get_overview
           tags:
             -
-              tag: Application
-              value: RabbitMQ
+              tag: component
+              value: messages
         -
           uuid: 8078d1269b0f4650b2a2c8d0f7de8bfd
           name: 'RabbitMQ: Messages publish_in per second'
@@ -275,8 +279,8 @@ zabbix_export:
             key: rabbitmq.get_overview
           tags:
             -
-              tag: Application
-              value: RabbitMQ
+              tag: component
+              value: messages
         -
           uuid: 8d5523cd5120462f903af9b67e2abb10
           name: 'RabbitMQ: Messages publish_out'
@@ -296,8 +300,8 @@ zabbix_export:
             key: rabbitmq.get_overview
           tags:
             -
-              tag: Application
-              value: RabbitMQ
+              tag: component
+              value: messages
         -
           uuid: c1a7ca5a475449b4b4d916693acd515b
           name: 'RabbitMQ: Messages publish_out per second'
@@ -318,8 +322,8 @@ zabbix_export:
             key: rabbitmq.get_overview
           tags:
             -
-              tag: Application
-              value: RabbitMQ
+              tag: component
+              value: messages
         -
           uuid: 6c0d428069a84443affba5b1a7f886bc
           name: 'RabbitMQ: Messages returned redeliver'
@@ -339,8 +343,8 @@ zabbix_export:
             key: rabbitmq.get_overview
           tags:
             -
-              tag: Application
-              value: RabbitMQ
+              tag: component
+              value: messages
         -
           uuid: 7d239c3cb6604521b1291bce0dbdf10c
           name: 'RabbitMQ: Messages returned redeliver per second'
@@ -361,8 +365,8 @@ zabbix_export:
             key: rabbitmq.get_overview
           tags:
             -
-              tag: Application
-              value: RabbitMQ
+              tag: component
+              value: messages
         -
           uuid: 70ab0718b7784a8280c99b6af21d909a
           name: 'RabbitMQ: Messages returned unroutable'
@@ -382,8 +386,8 @@ zabbix_export:
             key: rabbitmq.get_overview
           tags:
             -
-              tag: Application
-              value: RabbitMQ
+              tag: component
+              value: messages
         -
           uuid: e2983b5d27294b92b658070e0ef0a2ca
           name: 'RabbitMQ: Messages returned unroutable per second'
@@ -404,8 +408,8 @@ zabbix_export:
             key: rabbitmq.get_overview
           tags:
             -
-              tag: Application
-              value: RabbitMQ
+              tag: component
+              value: messages
         -
           uuid: 787ea966afd741b99bbdce665aebf15a
           name: 'RabbitMQ: Channels total'
@@ -423,8 +427,8 @@ zabbix_export:
             key: rabbitmq.get_overview
           tags:
             -
-              tag: Application
-              value: RabbitMQ
+              tag: component
+              value: channels
         -
           uuid: 3b488cdb79ac4b95abe55ddec9f74dd1
           name: 'RabbitMQ: Connections total'
@@ -442,8 +446,8 @@ zabbix_export:
             key: rabbitmq.get_overview
           tags:
             -
-              tag: Application
-              value: RabbitMQ
+              tag: component
+              value: connections
         -
           uuid: 4b02b27b8091430eb80e6451935848d8
           name: 'RabbitMQ: Consumers total'
@@ -461,8 +465,8 @@ zabbix_export:
             key: rabbitmq.get_overview
           tags:
             -
-              tag: Application
-              value: RabbitMQ
+              tag: component
+              value: consumers
         -
           uuid: 1b98a03a243c4b698faa93228cb9cfb0
           name: 'RabbitMQ: Exchanges total'
@@ -480,8 +484,8 @@ zabbix_export:
             key: rabbitmq.get_overview
           tags:
             -
-              tag: Application
-              value: RabbitMQ
+              tag: component
+              value: exchanges
         -
           uuid: 011491d6f5954cf3bf37ee45a62a4d86
           name: 'RabbitMQ: Queues total'
@@ -499,8 +503,8 @@ zabbix_export:
             key: rabbitmq.get_overview
           tags:
             -
-              tag: Application
-              value: RabbitMQ
+              tag: component
+              value: queues
         -
           uuid: c9bc0b0a61be4412bfc31cb725bbe837
           name: 'RabbitMQ: Messages total'
@@ -518,8 +522,8 @@ zabbix_export:
             key: rabbitmq.get_overview
           tags:
             -
-              tag: Application
-              value: RabbitMQ
+              tag: component
+              value: messages
         -
           uuid: 7c7e5c4111ff464b913a43b59fcb2e9b
           name: 'RabbitMQ: Messages ready for delivery'
@@ -537,8 +541,8 @@ zabbix_export:
             key: rabbitmq.get_overview
           tags:
             -
-              tag: Application
-              value: RabbitMQ
+              tag: component
+              value: messages
         -
           uuid: 3403648d6b964edd8c390e2c175b068a
           name: 'RabbitMQ: Messages unacknowledged'
@@ -556,8 +560,8 @@ zabbix_export:
             key: rabbitmq.get_overview
           tags:
             -
-              tag: Application
-              value: RabbitMQ
+              tag: component
+              value: messages
       discovery_rules:
         -
           uuid: 689cf8096c0c49099e2b56c5b639d3c6
@@ -599,8 +603,17 @@ zabbix_export:
                 key: rabbitmq.get_exchanges
               tags:
                 -
-                  tag: Application
-                  value: 'RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"'
+                  tag: component
+                  value: messages
+                -
+                  tag: exchange
+                  value: '{#EXCHANGE}'
+                -
+                  tag: type
+                  value: '{#TYPE}'
+                -
+                  tag: vhost
+                  value: '{#VHOST}'
             -
               uuid: fd3d7de712d84721a09248670a7504f1
               name: 'RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages acknowledged'
@@ -620,8 +633,17 @@ zabbix_export:
                 key: rabbitmq.get_exchanges
               tags:
                 -
-                  tag: Application
-                  value: 'RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"'
+                  tag: component
+                  value: messages
+                -
+                  tag: exchange
+                  value: '{#EXCHANGE}'
+                -
+                  tag: type
+                  value: '{#TYPE}'
+                -
+                  tag: vhost
+                  value: '{#VHOST}'
             -
               uuid: bc57ae1a1c1d4e9c96a268906d88dbf8
               name: 'RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages confirmed per second'
@@ -642,8 +664,17 @@ zabbix_export:
                 key: rabbitmq.get_exchanges
               tags:
                 -
-                  tag: Application
-                  value: 'RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"'
+                  tag: component
+                  value: messages
+                -
+                  tag: exchange
+                  value: '{#EXCHANGE}'
+                -
+                  tag: type
+                  value: '{#TYPE}'
+                -
+                  tag: vhost
+                  value: '{#VHOST}'
             -
               uuid: 8fac23c225d449b3a01d495b52131f5c
               name: 'RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages confirmed'
@@ -663,8 +694,17 @@ zabbix_export:
                 key: rabbitmq.get_exchanges
               tags:
                 -
-                  tag: Application
-                  value: 'RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"'
+                  tag: component
+                  value: messages
+                -
+                  tag: exchange
+                  value: '{#EXCHANGE}'
+                -
+                  tag: type
+                  value: '{#TYPE}'
+                -
+                  tag: vhost
+                  value: '{#VHOST}'
             -
               uuid: 18916e7d0fce41d698f57f0f1be5dab1
               name: 'RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages delivered per second'
@@ -685,8 +725,17 @@ zabbix_export:
                 key: rabbitmq.get_exchanges
               tags:
                 -
-                  tag: Application
-                  value: 'RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"'
+                  tag: component
+                  value: messages
+                -
+                  tag: exchange
+                  value: '{#EXCHANGE}'
+                -
+                  tag: type
+                  value: '{#TYPE}'
+                -
+                  tag: vhost
+                  value: '{#VHOST}'
             -
               uuid: b86cc017bbb247b79e5b0522cf895d33
               name: 'RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages delivered'
@@ -706,8 +755,17 @@ zabbix_export:
                 key: rabbitmq.get_exchanges
               tags:
                 -
-                  tag: Application
-                  value: 'RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"'
+                  tag: component
+                  value: messages
+                -
+                  tag: exchange
+                  value: '{#EXCHANGE}'
+                -
+                  tag: type
+                  value: '{#TYPE}'
+                -
+                  tag: vhost
+                  value: '{#VHOST}'
             -
               uuid: a4a890d6cbdc40528dee488d8649343d
               name: 'RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages published per second'
@@ -728,8 +786,17 @@ zabbix_export:
                 key: rabbitmq.get_exchanges
               tags:
                 -
-                  tag: Application
-                  value: 'RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"'
+                  tag: component
+                  value: messages
+                -
+                  tag: exchange
+                  value: '{#EXCHANGE}'
+                -
+                  tag: type
+                  value: '{#TYPE}'
+                -
+                  tag: vhost
+                  value: '{#VHOST}'
             -
               uuid: 24515b4712014fbeb857592664624be3
               name: 'RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages published'
@@ -749,8 +816,17 @@ zabbix_export:
                 key: rabbitmq.get_exchanges
               tags:
                 -
-                  tag: Application
-                  value: 'RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"'
+                  tag: component
+                  value: messages
+                -
+                  tag: exchange
+                  value: '{#EXCHANGE}'
+                -
+                  tag: type
+                  value: '{#TYPE}'
+                -
+                  tag: vhost
+                  value: '{#VHOST}'
             -
               uuid: d7ecda9c49ee479481b0b96d92113064
               name: 'RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages publish_in per second'
@@ -771,8 +847,17 @@ zabbix_export:
                 key: rabbitmq.get_exchanges
               tags:
                 -
-                  tag: Application
-                  value: 'RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"'
+                  tag: component
+                  value: messages
+                -
+                  tag: exchange
+                  value: '{#EXCHANGE}'
+                -
+                  tag: type
+                  value: '{#TYPE}'
+                -
+                  tag: vhost
+                  value: '{#VHOST}'
             -
               uuid: 02ebc8dacc0b44cd81bd9a83394359ff
               name: 'RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages publish_in'
@@ -792,8 +877,17 @@ zabbix_export:
                 key: rabbitmq.get_exchanges
               tags:
                 -
-                  tag: Application
-                  value: 'RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"'
+                  tag: component
+                  value: messages
+                -
+                  tag: exchange
+                  value: '{#EXCHANGE}'
+                -
+                  tag: type
+                  value: '{#TYPE}'
+                -
+                  tag: vhost
+                  value: '{#VHOST}'
             -
               uuid: 46a5efc69f2e4928b5744b5ea0cd6ae3
               name: 'RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages publish_out per second'
@@ -814,8 +908,17 @@ zabbix_export:
                 key: rabbitmq.get_exchanges
               tags:
                 -
-                  tag: Application
-                  value: 'RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"'
+                  tag: component
+                  value: messages
+                -
+                  tag: exchange
+                  value: '{#EXCHANGE}'
+                -
+                  tag: type
+                  value: '{#TYPE}'
+                -
+                  tag: vhost
+                  value: '{#VHOST}'
             -
               uuid: c83921ac67074e169e247dc3392213cf
               name: 'RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages publish_out'
@@ -835,8 +938,17 @@ zabbix_export:
                 key: rabbitmq.get_exchanges
               tags:
                 -
-                  tag: Application
-                  value: 'RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"'
+                  tag: component
+                  value: messages
+                -
+                  tag: exchange
+                  value: '{#EXCHANGE}'
+                -
+                  tag: type
+                  value: '{#TYPE}'
+                -
+                  tag: vhost
+                  value: '{#VHOST}'
             -
               uuid: 64bc6c65cc2f46b1841bd9852020bf44
               name: 'RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages redelivered per second'
@@ -857,8 +969,17 @@ zabbix_export:
                 key: rabbitmq.get_exchanges
               tags:
                 -
-                  tag: Application
-                  value: 'RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"'
+                  tag: component
+                  value: messages
+                -
+                  tag: exchange
+                  value: '{#EXCHANGE}'
+                -
+                  tag: type
+                  value: '{#TYPE}'
+                -
+                  tag: vhost
+                  value: '{#VHOST}'
             -
               uuid: 3203320d008d484d917827f93b213725
               name: 'RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages redelivered'
@@ -878,8 +999,17 @@ zabbix_export:
                 key: rabbitmq.get_exchanges
               tags:
                 -
-                  tag: Application
-                  value: 'RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"'
+                  tag: component
+                  value: messages
+                -
+                  tag: exchange
+                  value: '{#EXCHANGE}'
+                -
+                  tag: type
+                  value: '{#TYPE}'
+                -
+                  tag: vhost
+                  value: '{#VHOST}'
             -
               uuid: 1aad46c39cc347f59ed953aa6bc23fbe
               name: 'RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages returned unroutable per second'
@@ -900,8 +1030,17 @@ zabbix_export:
                 key: rabbitmq.get_exchanges
               tags:
                 -
-                  tag: Application
-                  value: 'RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"'
+                  tag: component
+                  value: messages
+                -
+                  tag: exchange
+                  value: '{#EXCHANGE}'
+                -
+                  tag: type
+                  value: '{#TYPE}'
+                -
+                  tag: vhost
+                  value: '{#VHOST}'
             -
               uuid: caaaf925f72e42d2b3112098bd05b3d1
               name: 'RabbitMQ: Exchange {#VHOST}/{#EXCHANGE}/{#TYPE}: Messages returned unroutable'
@@ -921,8 +1060,17 @@ zabbix_export:
                 key: rabbitmq.get_exchanges
               tags:
                 -
-                  tag: Application
-                  value: 'RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"'
+                  tag: component
+                  value: messages
+                -
+                  tag: exchange
+                  value: '{#EXCHANGE}'
+                -
+                  tag: type
+                  value: '{#TYPE}'
+                -
+                  tag: vhost
+                  value: '{#VHOST}'
           master_item:
             key: rabbitmq.get_exchanges
           lld_macro_paths:
@@ -978,8 +1126,11 @@ zabbix_export:
               retrieve_mode: HEADERS
               tags:
                 -
-                  tag: Application
-                  value: RabbitMQ
+                  tag: component
+                  value: health
+                -
+                  tag: component
+                  value: system
               trigger_prototypes:
                 -
                   uuid: 58592bb4d473497e9942634db2001823
@@ -988,6 +1139,10 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'http://{HOST.CONN}:{$RABBITMQ.API.PORT}/api/index.html'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
           master_item:
             key: rabbitmq.get_overview
           preprocessing:
@@ -1003,6 +1158,13 @@ zabbix_export:
                                        parseInt(value.split('.')[1]) * 100 +
                                        parseInt(value.split('.')[2])
                   return JSON.stringify(rabbit_version >= 30810 ? [{'{#SINGLETON}': ''}] : []);
+      tags:
+        -
+          tag: class
+          value: software
+        -
+          tag: target
+          value: rabbitmq
       macros:
         -
           macro: '{$RABBITMQ.API.PASSWORD}'
@@ -1136,7 +1298,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/387226-discussion-thread-for-official-zabbix-template-rabbitmq
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Applications
@@ -1151,8 +1313,8 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: RabbitMQ
+              tag: component
+              value: system
           triggers:
             -
               uuid: 220eedd4f69b43fabe233b5127e09c50
@@ -1164,6 +1326,10 @@ zabbix_export:
                 -
                   name: 'RabbitMQ: Service is down'
                   expression: 'last(/RabbitMQ node by HTTP/net.tcp.service[http,"{HOST.CONN}","{$RABBITMQ.API.PORT}"])=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: f53379f858f74714b15ee12fe6fc2d08
           name: 'RabbitMQ: Service ping'
@@ -1179,8 +1345,11 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: RabbitMQ
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 636356e5255d49d992df4b7a0c7d222d
@@ -1188,6 +1357,10 @@ zabbix_export:
               name: 'RabbitMQ: Service is down'
               priority: AVERAGE
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 14468c29d16440cfb40429f58a0399f4
           name: 'RabbitMQ: Get nodes'
@@ -1203,8 +1376,8 @@ zabbix_export:
           url: '{$RABBITMQ.API.SCHEME}://{HOST.CONN}:{$RABBITMQ.API.PORT}/api/nodes/{$RABBITMQ.CLUSTER.NAME}@{HOST.NAME}?memory=true'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
           triggers:
             -
               uuid: d4452f05d08343c7a374da412c0f1de6
@@ -1217,6 +1390,10 @@ zabbix_export:
                 -
                   name: 'RabbitMQ: Service is down'
                   expression: 'last(/RabbitMQ node by HTTP/net.tcp.service[http,"{HOST.CONN}","{$RABBITMQ.API.PORT}"])=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: ff7ec5f6e2354c90bffdbd25f9360555
           name: 'RabbitMQ: Get node overview'
@@ -1232,8 +1409,8 @@ zabbix_export:
           url: '{$RABBITMQ.API.SCHEME}://{HOST.CONN}:{$RABBITMQ.API.PORT}/api/overview'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
         -
           uuid: 3d0770d550b24f5ca80289cb723c8386
           name: 'RabbitMQ: Get queues'
@@ -1249,8 +1426,8 @@ zabbix_export:
           url: '{$RABBITMQ.API.SCHEME}://{HOST.CONN}:{$RABBITMQ.API.PORT}/api/queues'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
         -
           uuid: 8cb8f380645f4d7f8250b110acd47d1c
           name: 'RabbitMQ: Free disk space'
@@ -1269,8 +1446,8 @@ zabbix_export:
             key: rabbitmq.get_nodes
           tags:
             -
-              tag: Application
-              value: RabbitMQ
+              tag: component
+              value: storage
         -
           uuid: 38099990b854421ca39f178b9c9be016
           name: 'RabbitMQ: Disk free alarm'
@@ -1294,8 +1471,8 @@ zabbix_export:
             key: rabbitmq.get_nodes
           tags:
             -
-              tag: Application
-              value: RabbitMQ
+              tag: component
+              value: storage
           triggers:
             -
               uuid: 093eec2fd9264f158087509d8364dc09
@@ -1304,6 +1481,10 @@ zabbix_export:
               opdata: 'Current state: {ITEM.LASTVALUE1}'
               priority: AVERAGE
               description: 'https://www.rabbitmq.com/disk-alarms.html'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: ce9f4b99c77545fb8acd596d72725898
           name: 'RabbitMQ: Disk free limit'
@@ -1322,8 +1503,8 @@ zabbix_export:
             key: rabbitmq.get_nodes
           tags:
             -
-              tag: Application
-              value: RabbitMQ
+              tag: component
+              value: storage
         -
           uuid: fae24c176bd34b81b0f578883c5c2760
           name: 'RabbitMQ: Used file descriptors'
@@ -1341,8 +1522,8 @@ zabbix_export:
             key: rabbitmq.get_nodes
           tags:
             -
-              tag: Application
-              value: RabbitMQ
+              tag: component
+              value: storage
         -
           uuid: 70ec112fc828476e96a469e0f94fc415
           name: 'RabbitMQ: Memory alarm'
@@ -1366,8 +1547,8 @@ zabbix_export:
             key: rabbitmq.get_nodes
           tags:
             -
-              tag: Application
-              value: RabbitMQ
+              tag: component
+              value: memory
           triggers:
             -
               uuid: 843be64cfdcd4df5b3fea4726da69c7e
@@ -1376,6 +1557,10 @@ zabbix_export:
               opdata: 'Current state: {ITEM.LASTVALUE1}'
               priority: AVERAGE
               description: 'https://www.rabbitmq.com/memory.html'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 2445b494bf0648248b333d6f0afd95a2
           name: 'RabbitMQ: Memory limit'
@@ -1394,8 +1579,8 @@ zabbix_export:
             key: rabbitmq.get_nodes
           tags:
             -
-              tag: Application
-              value: RabbitMQ
+              tag: component
+              value: memory
         -
           uuid: 9e4f2c0cb6604364ab0a2b4def7466e2
           name: 'RabbitMQ: Memory used'
@@ -1414,8 +1599,8 @@ zabbix_export:
             key: rabbitmq.get_nodes
           tags:
             -
-              tag: Application
-              value: RabbitMQ
+              tag: component
+              value: memory
         -
           uuid: 129026dd49124ff2ba4f0bcc7f1fa9de
           name: 'RabbitMQ: Management plugin version'
@@ -1439,8 +1624,8 @@ zabbix_export:
             key: rabbitmq.get_node_overview
           tags:
             -
-              tag: Application
-              value: RabbitMQ
+              tag: component
+              value: system
         -
           uuid: d63d8001d5134e2590d3e7ca8b62958c
           name: 'RabbitMQ: RabbitMQ version'
@@ -1464,8 +1649,8 @@ zabbix_export:
             key: rabbitmq.get_node_overview
           tags:
             -
-              tag: Application
-              value: RabbitMQ
+              tag: component
+              value: system
           triggers:
             -
               uuid: 19989038dfe84fcdb12262ee3782ab41
@@ -1474,6 +1659,10 @@ zabbix_export:
               priority: INFO
               description: 'RabbitMQ version has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: ac9282c012bd4249a096a462d21dcf62
           name: 'RabbitMQ: Number of network partitions'
@@ -1495,8 +1684,8 @@ zabbix_export:
             key: rabbitmq.get_nodes
           tags:
             -
-              tag: Application
-              value: RabbitMQ
+              tag: component
+              value: network
           triggers:
             -
               uuid: 943d239a9fa5443dac3205c65a4da033
@@ -1505,6 +1694,10 @@ zabbix_export:
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
               description: 'https://www.rabbitmq.com/partitions.html#detecting'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 5f819282c32b49039a2dae56b9be23cd
           name: 'RabbitMQ: Is running'
@@ -1528,8 +1721,8 @@ zabbix_export:
             key: rabbitmq.get_nodes
           tags:
             -
-              tag: Application
-              value: RabbitMQ
+              tag: component
+              value: system
           triggers:
             -
               uuid: 4b15e72e2133458ebac9c72c5fcb90e6
@@ -1542,6 +1735,10 @@ zabbix_export:
                 -
                   name: 'RabbitMQ: Service is down'
                   expression: 'last(/RabbitMQ node by HTTP/net.tcp.service[http,"{HOST.CONN}","{$RABBITMQ.API.PORT}"])=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: ddc906d9a969401ebf520490e62f4086
           name: 'RabbitMQ: Runtime run queue'
@@ -1559,8 +1756,8 @@ zabbix_export:
             key: rabbitmq.get_nodes
           tags:
             -
-              tag: Application
-              value: RabbitMQ
+              tag: component
+              value: system
         -
           uuid: 16f4f6a6d8f14980a6edcc2d84b0cd8d
           name: 'RabbitMQ: Sockets available'
@@ -1578,8 +1775,8 @@ zabbix_export:
             key: rabbitmq.get_nodes
           tags:
             -
-              tag: Application
-              value: RabbitMQ
+              tag: component
+              value: system
         -
           uuid: 31455694c0994c9d9eaa8af048e88e95
           name: 'RabbitMQ: Sockets used'
@@ -1597,8 +1794,8 @@ zabbix_export:
             key: rabbitmq.get_nodes
           tags:
             -
-              tag: Application
-              value: RabbitMQ
+              tag: component
+              value: system
         -
           uuid: 65a2fd59ddfe413b9259c547338f3351
           name: 'RabbitMQ: Uptime'
@@ -1622,8 +1819,8 @@ zabbix_export:
             key: rabbitmq.get_nodes
           tags:
             -
-              tag: Application
-              value: RabbitMQ
+              tag: component
+              value: system
           triggers:
             -
               uuid: 6edfa365704f480da4b35b51b6ed84f4
@@ -1632,6 +1829,10 @@ zabbix_export:
               priority: INFO
               description: 'Uptime is less than 10 minutes'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
       discovery_rules:
         -
           uuid: fd10dbe5b1ba407dbb52632ecd713ccf
@@ -1667,8 +1868,11 @@ zabbix_export:
               url: '{$RABBITMQ.API.SCHEME}://{HOST.CONN}:{$RABBITMQ.API.PORT}/api/healthchecks/node'
               tags:
                 -
-                  tag: Application
-                  value: RabbitMQ
+                  tag: component
+                  value: health
+                -
+                  tag: component
+                  value: system
               trigger_prototypes:
                 -
                   uuid: 5c9c080ddd3748a6b5e62ba7765d270d
@@ -1677,6 +1881,10 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'https://www.rabbitmq.com/monitoring.html#health-checks'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
           master_item:
             key: rabbitmq.get_node_overview
           preprocessing:
@@ -1735,8 +1943,11 @@ zabbix_export:
               retrieve_mode: HEADERS
               tags:
                 -
-                  tag: Application
-                  value: RabbitMQ
+                  tag: component
+                  value: certificate
+                -
+                  tag: component
+                  value: health
               trigger_prototypes:
                 -
                   uuid: 20f7cd2d1d2448d5b84711caba2f093b
@@ -1745,6 +1956,10 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'http://{HOST.CONN}:{$RABBITMQ.API.PORT}/api/index.html'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: e1359646453e43cbaf0b4e1b89bdcdeb
               name: 'RabbitMQ: Healthcheck: local alarms in effect on the this node{#SINGLETON}'
@@ -1780,8 +1995,11 @@ zabbix_export:
               retrieve_mode: HEADERS
               tags:
                 -
-                  tag: Application
-                  value: RabbitMQ
+                  tag: component
+                  value: health
+                -
+                  tag: component
+                  value: system
               trigger_prototypes:
                 -
                   uuid: 9761757a70bf4f65b9438471a5de2af0
@@ -1790,6 +2008,10 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'http://{HOST.CONN}:{$RABBITMQ.API.PORT}/api/index.html'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 9867c266760a48d981caa1f34f2c3238
               name: 'RabbitMQ: Healthcheck: classic mirrored queues without synchronized mirrors online{#SINGLETON}'
@@ -1825,8 +2047,11 @@ zabbix_export:
               retrieve_mode: HEADERS
               tags:
                 -
-                  tag: Application
-                  value: RabbitMQ
+                  tag: component
+                  value: health
+                -
+                  tag: component
+                  value: queues
               trigger_prototypes:
                 -
                   uuid: 36b4702437614a3681a5a77acef323fc
@@ -1835,6 +2060,10 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'http://{HOST.CONN}:{$RABBITMQ.API.PORT}/api/index.html'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 972b6409c80d4ac796e5472b72ce82ae
               name: 'RabbitMQ: Healthcheck: queues with minimum online quorum{#SINGLETON}'
@@ -1870,8 +2099,11 @@ zabbix_export:
               retrieve_mode: HEADERS
               tags:
                 -
-                  tag: Application
-                  value: RabbitMQ
+                  tag: component
+                  value: health
+                -
+                  tag: component
+                  value: queues
               trigger_prototypes:
                 -
                   uuid: cfaba160cc0441c09010de05316596bd
@@ -1880,6 +2112,10 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'http://{HOST.CONN}:{$RABBITMQ.API.PORT}/api/index.html'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: d701b9acae86464282b308df720a1de2
               name: 'RabbitMQ: Healthcheck: virtual hosts on the this node{#SINGLETON}'
@@ -1915,8 +2151,11 @@ zabbix_export:
               retrieve_mode: HEADERS
               tags:
                 -
-                  tag: Application
-                  value: RabbitMQ
+                  tag: component
+                  value: health
+                -
+                  tag: component
+                  value: system
               trigger_prototypes:
                 -
                   uuid: d1638953e2794c3e8113ba907837c968
@@ -1925,6 +2164,10 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'http://{HOST.CONN}:{$RABBITMQ.API.PORT}/api/index.html'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
           master_item:
             key: rabbitmq.get_node_overview
           preprocessing:
@@ -1981,8 +2224,14 @@ zabbix_export:
                 key: rabbitmq.get_queues
               tags:
                 -
-                  tag: Application
-                  value: 'RabbitMQ: Queue "{#VHOST}/{#QUEUE}"'
+                  tag: component
+                  value: consumers
+                -
+                  tag: queue
+                  value: '{#QUEUE}'
+                -
+                  tag: vhost
+                  value: '{#VHOST}'
             -
               uuid: 5d420017c0f14f37aa7c7ef986b54a77
               name: 'RabbitMQ: Queue {#VHOST}/{#QUEUE}: Memory'
@@ -2001,8 +2250,14 @@ zabbix_export:
                 key: rabbitmq.get_queues
               tags:
                 -
-                  tag: Application
-                  value: 'RabbitMQ: Queue "{#VHOST}/{#QUEUE}"'
+                  tag: component
+                  value: memory
+                -
+                  tag: queue
+                  value: '{#QUEUE}'
+                -
+                  tag: vhost
+                  value: '{#VHOST}'
             -
               uuid: 3902227627d84cad8794604bd4f091fd
               name: 'RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages acknowledged per second'
@@ -2023,8 +2278,14 @@ zabbix_export:
                 key: rabbitmq.get_queues
               tags:
                 -
-                  tag: Application
-                  value: 'RabbitMQ: Queue "{#VHOST}/{#QUEUE}"'
+                  tag: component
+                  value: messages
+                -
+                  tag: queue
+                  value: '{#QUEUE}'
+                -
+                  tag: vhost
+                  value: '{#VHOST}'
             -
               uuid: 2f2ca541c80b47cba2b5147a1c77aac5
               name: 'RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages acknowledged'
@@ -2044,8 +2305,14 @@ zabbix_export:
                 key: rabbitmq.get_queues
               tags:
                 -
-                  tag: Application
-                  value: 'RabbitMQ: Queue "{#VHOST}/{#QUEUE}"'
+                  tag: component
+                  value: messages
+                -
+                  tag: queue
+                  value: '{#QUEUE}'
+                -
+                  tag: vhost
+                  value: '{#VHOST}'
             -
               uuid: b8a9c0ca7fda4756a8b79ac83c4bcd07
               name: 'RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages delivered per second'
@@ -2066,8 +2333,14 @@ zabbix_export:
                 key: rabbitmq.get_queues
               tags:
                 -
-                  tag: Application
-                  value: 'RabbitMQ: Queue "{#VHOST}/{#QUEUE}"'
+                  tag: component
+                  value: messages
+                -
+                  tag: queue
+                  value: '{#QUEUE}'
+                -
+                  tag: vhost
+                  value: '{#VHOST}'
             -
               uuid: e150c5d35ed144ca87945ef4f7a0998a
               name: 'RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages delivered'
@@ -2087,8 +2360,14 @@ zabbix_export:
                 key: rabbitmq.get_queues
               tags:
                 -
-                  tag: Application
-                  value: 'RabbitMQ: Queue "{#VHOST}/{#QUEUE}"'
+                  tag: component
+                  value: messages
+                -
+                  tag: queue
+                  value: '{#QUEUE}'
+                -
+                  tag: vhost
+                  value: '{#VHOST}'
             -
               uuid: 9b74bc2a830e43e28ad6c44037dbd1d7
               name: 'RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages delivered per second'
@@ -2109,8 +2388,14 @@ zabbix_export:
                 key: rabbitmq.get_queues
               tags:
                 -
-                  tag: Application
-                  value: 'RabbitMQ: Queue "{#VHOST}/{#QUEUE}"'
+                  tag: component
+                  value: messages
+                -
+                  tag: queue
+                  value: '{#QUEUE}'
+                -
+                  tag: vhost
+                  value: '{#VHOST}'
             -
               uuid: 837c46d0fd7d4ad18669dcbf62ae7025
               name: 'RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages delivered'
@@ -2130,8 +2415,14 @@ zabbix_export:
                 key: rabbitmq.get_queues
               tags:
                 -
-                  tag: Application
-                  value: 'RabbitMQ: Queue "{#VHOST}/{#QUEUE}"'
+                  tag: component
+                  value: messages
+                -
+                  tag: queue
+                  value: '{#QUEUE}'
+                -
+                  tag: vhost
+                  value: '{#VHOST}'
             -
               uuid: 232ee8103a5d4fb6b2b41ca641f19088
               name: 'RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages published per second'
@@ -2152,8 +2443,14 @@ zabbix_export:
                 key: rabbitmq.get_queues
               tags:
                 -
-                  tag: Application
-                  value: 'RabbitMQ: Queue "{#VHOST}/{#QUEUE}"'
+                  tag: component
+                  value: messages
+                -
+                  tag: queue
+                  value: '{#QUEUE}'
+                -
+                  tag: vhost
+                  value: '{#VHOST}'
             -
               uuid: dfafc461ad8a45ba8f08a12ec9f4e2d3
               name: 'RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages published'
@@ -2173,8 +2470,14 @@ zabbix_export:
                 key: rabbitmq.get_queues
               tags:
                 -
-                  tag: Application
-                  value: 'RabbitMQ: Queue "{#VHOST}/{#QUEUE}"'
+                  tag: component
+                  value: messages
+                -
+                  tag: queue
+                  value: '{#QUEUE}'
+                -
+                  tag: vhost
+                  value: '{#VHOST}'
             -
               uuid: 888dbb2c1b13429b9d20034fcc783f14
               name: 'RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages per second'
@@ -2193,8 +2496,14 @@ zabbix_export:
                 key: rabbitmq.get_queues
               tags:
                 -
-                  tag: Application
-                  value: 'RabbitMQ: Queue "{#VHOST}/{#QUEUE}"'
+                  tag: component
+                  value: messages
+                -
+                  tag: queue
+                  value: '{#QUEUE}'
+                -
+                  tag: vhost
+                  value: '{#VHOST}'
             -
               uuid: a34e852ddce64d80a88129eef9ba1ab2
               name: 'RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages redelivered per second'
@@ -2215,8 +2524,14 @@ zabbix_export:
                 key: rabbitmq.get_queues
               tags:
                 -
-                  tag: Application
-                  value: 'RabbitMQ: Queue "{#VHOST}/{#QUEUE}"'
+                  tag: component
+                  value: messages
+                -
+                  tag: queue
+                  value: '{#QUEUE}'
+                -
+                  tag: vhost
+                  value: '{#VHOST}'
             -
               uuid: 75501a52ffab4972a5988ac4ae0c82d8
               name: 'RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages redelivered'
@@ -2236,8 +2551,14 @@ zabbix_export:
                 key: rabbitmq.get_queues
               tags:
                 -
-                  tag: Application
-                  value: 'RabbitMQ: Queue "{#VHOST}/{#QUEUE}"'
+                  tag: component
+                  value: messages
+                -
+                  tag: queue
+                  value: '{#QUEUE}'
+                -
+                  tag: vhost
+                  value: '{#VHOST}'
             -
               uuid: 171e5dbff18f47c98da2c1a3b7120622
               name: 'RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages'
@@ -2255,8 +2576,14 @@ zabbix_export:
                 key: rabbitmq.get_queues
               tags:
                 -
-                  tag: Application
-                  value: 'RabbitMQ: Queue "{#VHOST}/{#QUEUE}"'
+                  tag: component
+                  value: messages
+                -
+                  tag: queue
+                  value: '{#QUEUE}'
+                -
+                  tag: vhost
+                  value: '{#VHOST}'
               trigger_prototypes:
                 -
                   uuid: b6f52153a22144338e6d002287446ac1
@@ -2264,6 +2591,10 @@ zabbix_export:
                   name: 'RabbitMQ: Too many messages in queue (over {$RABBITMQ.MESSAGES.MAX.WARN} for 5m)'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: f55c5f66ddac46fd95c5379875342284
               name: 'RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages ready per second'
@@ -2282,8 +2613,14 @@ zabbix_export:
                 key: rabbitmq.get_queues
               tags:
                 -
-                  tag: Application
-                  value: 'RabbitMQ: Queue "{#VHOST}/{#QUEUE}"'
+                  tag: component
+                  value: messages
+                -
+                  tag: queue
+                  value: '{#QUEUE}'
+                -
+                  tag: vhost
+                  value: '{#VHOST}'
             -
               uuid: 67c9a8eee9a54eed946ab141927494c4
               name: 'RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages ready'
@@ -2301,8 +2638,14 @@ zabbix_export:
                 key: rabbitmq.get_queues
               tags:
                 -
-                  tag: Application
-                  value: 'RabbitMQ: Queue "{#VHOST}/{#QUEUE}"'
+                  tag: component
+                  value: messages
+                -
+                  tag: queue
+                  value: '{#QUEUE}'
+                -
+                  tag: vhost
+                  value: '{#VHOST}'
             -
               uuid: a8cc3296990640a6bf5d7319ba2e8650
               name: 'RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages unacknowledged per second'
@@ -2321,8 +2664,14 @@ zabbix_export:
                 key: rabbitmq.get_queues
               tags:
                 -
-                  tag: Application
-                  value: 'RabbitMQ: Queue "{#VHOST}/{#QUEUE}"'
+                  tag: component
+                  value: messages
+                -
+                  tag: queue
+                  value: '{#QUEUE}'
+                -
+                  tag: vhost
+                  value: '{#VHOST}'
             -
               uuid: bb6a84983caa486482e241c6bf7e9534
               name: 'RabbitMQ: Queue {#VHOST}/{#QUEUE}: Messages unacknowledged'
@@ -2340,8 +2689,14 @@ zabbix_export:
                 key: rabbitmq.get_queues
               tags:
                 -
-                  tag: Application
-                  value: 'RabbitMQ: Queue "{#VHOST}/{#QUEUE}"'
+                  tag: component
+                  value: messages
+                -
+                  tag: queue
+                  value: '{#QUEUE}'
+                -
+                  tag: vhost
+                  value: '{#VHOST}'
           graph_prototypes:
             -
               uuid: 4e6b194fd13f4b97a66ee4d335958003
@@ -2457,6 +2812,13 @@ zabbix_export:
             -
               lld_macro: '{#VHOST}'
               path: $.vhost
+      tags:
+        -
+          tag: class
+          value: software
+        -
+          tag: target
+          value: rabbitmq
       macros:
         -
           macro: '{$RABBITMQ.API.PASSWORD}'
diff --git a/templates/app/sharepoint_http/template_app_sharepoint_http.yaml b/templates/app/sharepoint_http/template_app_sharepoint_http.yaml
index 07961ad462a..63995d473fd 100644
--- a/templates/app/sharepoint_http/template_app_sharepoint_http.yaml
+++ b/templates/app/sharepoint_http/template_app_sharepoint_http.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-15T07:20:29Z'
+  date: '2022-01-26T10:48:22Z'
   groups:
     -
       uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
@@ -19,7 +19,7 @@ zabbix_export:
         It is recommended to fill in the values of the filter macros to avoid getting redundant data.
         
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Applications
@@ -141,6 +141,9 @@ zabbix_export:
               error_handler_params: '{"status":520,"data":{},"time":0}'
           parameters:
             -
+              name: root
+              value: '{$SHAREPOINT.ROOT}'
+            -
               name: password
               value: '{$SHAREPOINT.PASSWORD}'
             -
@@ -149,13 +152,10 @@ zabbix_export:
             -
               name: user
               value: '{$SHAREPOINT.USER}'
-            -
-              name: root
-              value: '{$SHAREPOINT.ROOT}'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
         -
           uuid: cd47c3d00ce545b0a557e0e68c89d53e
           name: 'Sharepoint: Get directory structure: Status'
@@ -181,8 +181,11 @@ zabbix_export:
             key: sharepoint.get_dir
           tags:
             -
-              tag: Application
-              value: Sharepoint
+              tag: component
+              value: application
+            -
+              tag: component
+              value: health
           triggers:
             -
               uuid: ed1d66a1410e4af79af462e749ce979b
@@ -190,6 +193,10 @@ zabbix_export:
               name: 'Sharepoint: Error getting directory structure.'
               priority: WARNING
               description: 'Error getting directory structure. Check the Zabbix server log for more details.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: b2daa471665541168b2a394b9b226d73
           name: 'Sharepoint: Get directory structure: Exec time'
@@ -214,14 +221,18 @@ zabbix_export:
             key: sharepoint.get_dir
           tags:
             -
-              tag: Application
-              value: Sharepoint
+              tag: component
+              value: performance
           triggers:
             -
               uuid: 9e5bcc08d5f040de86afa38f5a653dd7
               expression: 'last(/Microsoft SharePoint by HTTP/sharepoint.get_dir.time)>2000'
               name: 'Sharepoint: Server responds slowly to API request'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 7b59d767712f49b3bbc17947999ca944
           name: 'Sharepoint: Health score'
@@ -253,14 +264,18 @@ zabbix_export:
           request_method: HEAD
           tags:
             -
-              tag: Application
-              value: Sharepoint
+              tag: component
+              value: health
           triggers:
             -
               uuid: 3a0451e3edda4a73aded57aa254fd813
               expression: 'last(/Microsoft SharePoint by HTTP/sharepoint.health_score)>"{$SHAREPOINT.MAX_HEALT_SCORE}"'
               name: 'Sharepoint: Bad health score'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
       discovery_rules:
         -
           uuid: 0fe7e8e5480a42b7903cb7ac9bf931cc
@@ -395,8 +410,11 @@ zabbix_export:
                 key: sharepoint.get_dir
               tags:
                 -
-                  tag: Application
-                  value: 'Sharepoint object [{#SHAREPOINT.LLD.FULL_PATH}]"'
+                  tag: component
+                  value: storage
+                -
+                  tag: full-path
+                  value: '{#SHAREPOINT.LLD.FULL_PATH}'
             -
               uuid: b230bfba317e4d2eb2c6a816bd357d71
               name: 'Sharepoint: Modified ({#SHAREPOINT.LLD.FULL_PATH})'
@@ -422,8 +440,11 @@ zabbix_export:
                 key: sharepoint.get_dir
               tags:
                 -
-                  tag: Application
-                  value: 'Sharepoint object [{#SHAREPOINT.LLD.FULL_PATH}]"'
+                  tag: component
+                  value: storage
+                -
+                  tag: full-path
+                  value: '{#SHAREPOINT.LLD.FULL_PATH}'
               trigger_prototypes:
                 -
                   uuid: d1683e2fcdda45969ff451e43ae696c2
@@ -433,6 +454,10 @@ zabbix_export:
                   priority: INFO
                   description: 'Updated date of modification of folder / file'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 68c3d2d2b33a494ab85ca6b883398fbb
               name: 'Sharepoint: Size ({#SHAREPOINT.LLD.FULL_PATH})'
@@ -458,8 +483,11 @@ zabbix_export:
                 key: sharepoint.get_dir
               tags:
                 -
-                  tag: Application
-                  value: 'Sharepoint object [{#SHAREPOINT.LLD.FULL_PATH}]"'
+                  tag: component
+                  value: storage
+                -
+                  tag: full-path
+                  value: '{#SHAREPOINT.LLD.FULL_PATH}'
           parameters:
             -
               name: password
@@ -478,6 +506,16 @@ zabbix_export:
               type: DISCARD_UNCHANGED_HEARTBEAT
               parameters:
                 - 6h
+      tags:
+        -
+          tag: class
+          value: software
+        -
+          tag: target
+          value: microsoft
+        -
+          tag: target
+          value: sharepoint
       macros:
         -
           macro: '{$SHAREPOINT.GET_INTERVAL}'
diff --git a/templates/app/smtp_service/README.md b/templates/app/smtp_service/README.md
new file mode 100644
index 00000000000..5fc01b08ae1
--- /dev/null
+++ b/templates/app/smtp_service/README.md
@@ -0,0 +1,39 @@
+
+# SMTP Service
+
+## Overview
+
+For Zabbix version: 6.0 and higher  
+
+## Setup
+
+Refer to the vendor documentation.
+
+## Zabbix configuration
+
+No specific Zabbix configuration is required.
+
+
+## Template links
+
+There are no template links in this template.
+
+## Discovery rules
+
+
+## Items collected
+
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|Services |SMTP service is running |<p>-</p> |SIMPLE |net.tcp.service[smtp] |
+
+## Triggers
+
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|SMTP service is down on {HOST.NAME} |<p>-</p> |`max(/SMTP Service/net.tcp.service[smtp],#3)=0` |AVERAGE | |
+
+## Feedback
+
+Please report any issues with the template at https://support.zabbix.com
+
diff --git a/templates/classic/template_app_smtp_service.yaml b/templates/app/smtp_service/template_app_smtp_service.yaml
index 187c771fcbb..e202de82f2f 100644
--- a/templates/classic/template_app_smtp_service.yaml
+++ b/templates/app/smtp_service/template_app_smtp_service.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:30Z'
+  version: '6.0'
+  date: '2022-01-26T10:49:43Z'
   groups:
     -
       uuid: 57b7ae836ca64446ba2c296389c009b7
@@ -10,6 +10,10 @@ zabbix_export:
       uuid: ea3cad7f70f9481ea85f797ef6ea684e
       template: 'SMTP Service'
       name: 'SMTP Service'
+      description: |
+        Template module for monitoring SMTP service
+        
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Modules
@@ -24,14 +28,25 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: 'SMTP service'
+              tag: component
+              value: network
           triggers:
             -
               uuid: b90e7dafca6c4b92b318f74bb07e8ac4
               expression: 'max(/SMTP Service/net.tcp.service[smtp],#3)=0'
               name: 'SMTP service is down on {HOST.NAME}'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: availability
+      tags:
+        -
+          tag: class
+          value: service
+        -
+          tag: target
+          value: smtp
       valuemaps:
         -
           uuid: 41d22d9ad511457ba57ff86c11453f0b
diff --git a/templates/app/squid_snmp/template_app_squid_snmp.yaml b/templates/app/squid_snmp/template_app_squid_snmp.yaml
index 64e7eb075b5..b997bdd0c29 100644
--- a/templates/app/squid_snmp/template_app_squid_snmp.yaml
+++ b/templates/app/squid_snmp/template_app_squid_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-10T07:40:16Z'
+  date: '2022-01-26T09:59:31Z'
   groups:
     -
       uuid: 57b7ae836ca64446ba2c296389c009b7
@@ -15,7 +15,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/409339-discussion-thread-for-official-zabbix-template-squid
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Modules
@@ -35,8 +35,11 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: Squid
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 7e0f0a9e8a9d4f6193946e4f8cd4a2e3
@@ -44,6 +47,10 @@ zabbix_export:
               name: 'Squid: Port {$SQUID.HTTP.PORT} is down'
               priority: AVERAGE
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 6d7f0f6b0f89462e96e86940b779eb69
           name: 'Squid: CPU usage'
@@ -56,8 +63,8 @@ zabbix_export:
           description: 'The percentage use of the CPU'
           tags:
             -
-              tag: Application
-              value: Squid
+              tag: component
+              value: cpu
         -
           uuid: 960b137ab773492ab3073e108575e4fc
           name: 'Squid: File descriptor count - current used'
@@ -69,8 +76,8 @@ zabbix_export:
           description: 'Number of file descriptors in use'
           tags:
             -
-              tag: Application
-              value: Squid
+              tag: component
+              value: system
         -
           uuid: 37b45201f8444583b01e0df5af2bc14e
           name: 'Squid: File descriptor count - current maximum'
@@ -82,8 +89,8 @@ zabbix_export:
           description: 'Highest number of file descriptors in use'
           tags:
             -
-              tag: Application
-              value: Squid
+              tag: component
+              value: system
         -
           uuid: 910afdc20767408f90d1bc5b7a9fd6a4
           name: 'Squid: Objects LRU expiration age'
@@ -101,8 +108,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Squid
+              tag: component
+              value: objects
         -
           uuid: 26b8b1a25dc74099b61813905477b414
           name: 'Squid: File descriptor count - current reserved'
@@ -114,8 +121,8 @@ zabbix_export:
           description: 'Reserved number of file descriptors'
           tags:
             -
-              tag: Application
-              value: Squid
+              tag: component
+              value: system
         -
           uuid: 35f3009401b6449d95988d9ee7a621a7
           name: 'Squid: Cache swap current size'
@@ -128,8 +135,11 @@ zabbix_export:
           description: 'Storage Swap Size'
           tags:
             -
-              tag: Application
-              value: Squid
+              tag: component
+              value: memory
+            -
+              tag: component
+              value: storage
         -
           uuid: 0789a0fa3e3b42a08a5e5bf8d0307970
           name: 'Squid: Objects unlinkd requests'
@@ -141,8 +151,8 @@ zabbix_export:
           description: 'Requests given to unlinkd'
           tags:
             -
-              tag: Application
-              value: Squid
+              tag: component
+              value: objects
         -
           uuid: 6bc024be663b466ca677941130e11f50
           name: 'Squid: File descriptor count - current available'
@@ -154,14 +164,18 @@ zabbix_export:
           description: 'Available number of file descriptors'
           tags:
             -
-              tag: Application
-              value: Squid
+              tag: component
+              value: system
           triggers:
             -
               uuid: 40c41c87e46443f886506da5e580657e
               expression: 'last(/Squid SNMP/squid[cacheCurrentUnusedFDescrCnt])<{$SQUID.FILE.DESC.WARN.MIN}'
               name: 'Squid: Squid is running out of file descriptors (<{$SQUID.FILE.DESC.WARN.MIN})'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 1aecf10756f949999c8f3fe5ce9c2a32
           name: 'Squid: DNS server replies per second'
@@ -178,8 +192,11 @@ zabbix_export:
                 - ''
           tags:
             -
-              tag: Application
-              value: Squid
+              tag: component
+              value: dns
+            -
+              tag: component
+              value: replies
         -
           uuid: e5f647c77bdb498e9cc286795bc4077c
           name: 'Squid: DNS server requests per second'
@@ -196,8 +213,11 @@ zabbix_export:
                 - ''
           tags:
             -
-              tag: Application
-              value: Squid
+              tag: component
+              value: dns
+            -
+              tag: component
+              value: requests
         -
           uuid: 3f4366896dd84b8ab78d6e3dc8a6ab63
           name: 'Squid: DNS service time per 5 minutes'
@@ -215,8 +235,8 @@ zabbix_export:
                 - '0.001'
           tags:
             -
-              tag: Application
-              value: Squid
+              tag: component
+              value: dns
         -
           uuid: 99448052f1a34e15a5c042124db7b651
           name: 'Squid: DNS service time per hour'
@@ -234,8 +254,8 @@ zabbix_export:
                 - '0.001'
           tags:
             -
-              tag: Application
-              value: Squid
+              tag: component
+              value: dns
         -
           uuid: 0aea1fe702004d65919fc010c971c3b5
           name: 'Squid: FQDN cache hits per second'
@@ -252,8 +272,11 @@ zabbix_export:
                 - ''
           tags:
             -
-              tag: Application
-              value: Squid
+              tag: component
+              value: dns
+            -
+              tag: component
+              value: hits
         -
           uuid: 2dea9b707b844d32b65a2d479ddb7d72
           name: 'Squid: FQDN cache misses per second'
@@ -270,8 +293,11 @@ zabbix_export:
                 - ''
           tags:
             -
-              tag: Application
-              value: Squid
+              tag: component
+              value: dns
+            -
+              tag: component
+              value: misses
         -
           uuid: 1dad3f381c174b869c73f55cd831b40a
           name: 'Squid: FQDN cache requests per second'
@@ -288,8 +314,11 @@ zabbix_export:
                 - ''
           tags:
             -
-              tag: Application
-              value: Squid
+              tag: component
+              value: dns
+            -
+              tag: component
+              value: requests
         -
           uuid: 633a70cd41c44f2c895148a7ae394acd
           name: 'Squid: HTTP all service time per 5 minutes'
@@ -307,8 +336,8 @@ zabbix_export:
                 - '0.001'
           tags:
             -
-              tag: Application
-              value: Squid
+              tag: component
+              value: http
         -
           uuid: d3aa021743134d97af9dd8840b0ef692
           name: 'Squid: HTTP all service time per hour'
@@ -326,8 +355,8 @@ zabbix_export:
                 - '0.001'
           tags:
             -
-              tag: Application
-              value: Squid
+              tag: component
+              value: http
         -
           uuid: 7f5bd8f89ea0495ea87c294fb8c606dd
           name: 'Squid: HTTP Errors sent per second'
@@ -344,11 +373,14 @@ zabbix_export:
                 - ''
           tags:
             -
-              tag: Application
-              value: Squid
+              tag: component
+              value: errors
+            -
+              tag: component
+              value: http
         -
           uuid: 0c4fd7c154a44442a3cec82ba4026b7d
-          name: 'Squid: HTTP miss service time per 5 minutes'
+          name: 'Squid: HTTP hit service time per 5 minutes'
           type: SNMP_AGENT
           snmp_oid: 1.3.6.1.4.1.3495.1.3.2.2.1.5.5
           key: 'squid[cacheHttpHitSvcTime.5]'
@@ -363,8 +395,11 @@ zabbix_export:
                 - '0.001'
           tags:
             -
-              tag: Application
-              value: Squid
+              tag: component
+              value: hits
+            -
+              tag: component
+              value: http
         -
           uuid: a642c99d6c3f4f5e8ec218459fd76f04
           name: 'Squid: HTTP hit service time per hour'
@@ -382,8 +417,11 @@ zabbix_export:
                 - '0.001'
           tags:
             -
-              tag: Application
-              value: Squid
+              tag: component
+              value: hits
+            -
+              tag: component
+              value: http
         -
           uuid: adfe3e2fc775400991d2ea2f06218daf
           name: 'Squid: HTTP Hits sent from cache per second'
@@ -400,8 +438,11 @@ zabbix_export:
                 - ''
           tags:
             -
-              tag: Application
-              value: Squid
+              tag: component
+              value: hits
+            -
+              tag: component
+              value: http
         -
           uuid: f2366a6008cb4dc7856904ea5c6631dd
           name: 'Squid: HTTP traffic received per second'
@@ -423,8 +464,11 @@ zabbix_export:
                 - ''
           tags:
             -
-              tag: Application
-              value: Squid
+              tag: component
+              value: http
+            -
+              tag: component
+              value: network
         -
           uuid: f8fa271a272442369b6cbc4fb1a2decc
           name: 'Squid: HTTP miss service time per 5 minutes'
@@ -442,8 +486,11 @@ zabbix_export:
                 - '0.001'
           tags:
             -
-              tag: Application
-              value: Squid
+              tag: component
+              value: http
+            -
+              tag: component
+              value: misses
         -
           uuid: 23e5a3bd6e9a4c50a7d54336a6afc1e1
           name: 'Squid: HTTP miss service time per hour'
@@ -461,8 +508,11 @@ zabbix_export:
                 - '0.001'
           tags:
             -
-              tag: Application
-              value: Squid
+              tag: component
+              value: http
+            -
+              tag: component
+              value: misses
         -
           uuid: ff6b7946363d44bba5721c82c8f84df7
           name: 'Squid: HTTP traffic sent per second'
@@ -484,8 +534,11 @@ zabbix_export:
                 - ''
           tags:
             -
-              tag: Application
-              value: Squid
+              tag: component
+              value: http
+            -
+              tag: component
+              value: network
         -
           uuid: bde307ead15d48859a97e35e52327d50
           name: 'Squid: ICP traffic received per second'
@@ -507,8 +560,11 @@ zabbix_export:
                 - ''
           tags:
             -
-              tag: Application
-              value: Squid
+              tag: component
+              value: icp
+            -
+              tag: component
+              value: network
         -
           uuid: 7234b612b50a45e0a1bb69654e2e784d
           name: 'Squid: ICP traffic transmitted per second'
@@ -530,8 +586,11 @@ zabbix_export:
                 - ''
           tags:
             -
-              tag: Application
-              value: Squid
+              tag: component
+              value: icp
+            -
+              tag: component
+              value: network
         -
           uuid: 9ee83c13fa6d41dfb8bfea91c02341b9
           name: 'Squid: ICP messages received per second'
@@ -548,8 +607,8 @@ zabbix_export:
                 - ''
           tags:
             -
-              tag: Application
-              value: Squid
+              tag: component
+              value: icp
         -
           uuid: dee7d8cf211b4ad0a645a8d6d4f24c31
           name: 'Squid: ICP messages sent per second'
@@ -566,8 +625,8 @@ zabbix_export:
                 - ''
           tags:
             -
-              tag: Application
-              value: Squid
+              tag: component
+              value: icp
         -
           uuid: cb9d0c300beb47568e99ff7966e1b10e
           name: 'Squid: ICP query service time per 5 minutes'
@@ -585,8 +644,11 @@ zabbix_export:
                 - '0.001'
           tags:
             -
-              tag: Application
-              value: Squid
+              tag: component
+              value: icp
+            -
+              tag: component
+              value: queries
         -
           uuid: 9130a0bc53144fe992b701aa9159ff70
           name: 'Squid: ICP query service time per hour'
@@ -604,8 +666,11 @@ zabbix_export:
                 - '0.001'
           tags:
             -
-              tag: Application
-              value: Squid
+              tag: component
+              value: icp
+            -
+              tag: component
+              value: queries
         -
           uuid: 35a7585432b3467585ff98b23e610d82
           name: 'Squid: ICP reply service time per 5 minutes'
@@ -623,8 +688,11 @@ zabbix_export:
                 - '0.001'
           tags:
             -
-              tag: Application
-              value: Squid
+              tag: component
+              value: icp
+            -
+              tag: component
+              value: replies
         -
           uuid: 94eab55af41a465196588d08acbacb56
           name: 'Squid: ICP reply service time per hour'
@@ -642,8 +710,11 @@ zabbix_export:
                 - '0.001'
           tags:
             -
-              tag: Application
-              value: Squid
+              tag: component
+              value: icp
+            -
+              tag: component
+              value: replies
         -
           uuid: c5409583483e4024aabaab500bcb637a
           name: 'Squid: IP cache hits per second'
@@ -660,8 +731,11 @@ zabbix_export:
                 - ''
           tags:
             -
-              tag: Application
-              value: Squid
+              tag: component
+              value: hits
+            -
+              tag: component
+              value: ip
         -
           uuid: 8e474d2fd410472bb03024d2a2361b5d
           name: 'Squid: IP cache misses per second'
@@ -678,8 +752,11 @@ zabbix_export:
                 - ''
           tags:
             -
-              tag: Application
-              value: Squid
+              tag: component
+              value: ip
+            -
+              tag: component
+              value: misses
         -
           uuid: dc837a887c3c463a9011d923dbbfbc0f
           name: 'Squid: IP cache requests per second'
@@ -696,8 +773,11 @@ zabbix_export:
                 - ''
           tags:
             -
-              tag: Application
-              value: Squid
+              tag: component
+              value: ip
+            -
+              tag: component
+              value: requests
         -
           uuid: 70786920f94f41eeb0fc525c2e6431cf
           name: 'Squid: Memory maximum resident size'
@@ -715,8 +795,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Squid
+              tag: component
+              value: memory
         -
           uuid: d84c3a3633784f77bf9375bf59da490b
           name: 'Squid: Memory maximum cache size'
@@ -734,8 +814,8 @@ zabbix_export:
                 - '1048576'
           tags:
             -
-              tag: Application
-              value: Squid
+              tag: component
+              value: memory
         -
           uuid: c14fe87f87ca48f39bbe765db60e0a41
           name: 'Squid: Memory cache usage'
@@ -753,8 +833,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Squid
+              tag: component
+              value: memory
         -
           uuid: 387bbd61d3bd469baa6c560afe8a18ae
           name: 'Squid: Objects count'
@@ -766,8 +846,8 @@ zabbix_export:
           description: 'Number of objects stored by the cache'
           tags:
             -
-              tag: Application
-              value: Squid
+              tag: component
+              value: objects
         -
           uuid: 1e648a20db904e92ae4ec0c3f9037a99
           name: 'Squid: HTTP requests received per second'
@@ -784,8 +864,11 @@ zabbix_export:
                 - ''
           tags:
             -
-              tag: Application
-              value: Squid
+              tag: component
+              value: http
+            -
+              tag: component
+              value: requests
         -
           uuid: 31f3e3bb57d645ff8df6b9b8d1b70a49
           name: 'Squid: Byte hit ratio per 1 minute'
@@ -797,8 +880,8 @@ zabbix_export:
           description: 'Byte Hit Ratios'
           tags:
             -
-              tag: Application
-              value: Squid
+              tag: component
+              value: hits
         -
           uuid: e19775b9c83648d58655a1130c5771e4
           name: 'Squid: Byte hit ratio per 5 minutes'
@@ -810,8 +893,8 @@ zabbix_export:
           description: 'Byte Hit Ratios'
           tags:
             -
-              tag: Application
-              value: Squid
+              tag: component
+              value: hits
         -
           uuid: ffb3fc17631f4cd6b55ed6eefd2e6cea
           name: 'Squid: Byte hit ratio per 1 hour'
@@ -823,8 +906,8 @@ zabbix_export:
           description: 'Byte Hit Ratios'
           tags:
             -
-              tag: Application
-              value: Squid
+              tag: component
+              value: hits
         -
           uuid: a4ba5af69dd64fd8acf707ee1eaaeb32
           name: 'Squid: Request hit ratio per 1 minute'
@@ -836,8 +919,11 @@ zabbix_export:
           description: 'Byte Hit Ratios'
           tags:
             -
-              tag: Application
-              value: Squid
+              tag: component
+              value: hits
+            -
+              tag: component
+              value: requests
         -
           uuid: b5ae7935e9be40e18c3020820a7865c7
           name: 'Squid: Request hit ratio per 5 minutes'
@@ -849,8 +935,11 @@ zabbix_export:
           description: 'Byte Hit Ratios'
           tags:
             -
-              tag: Application
-              value: Squid
+              tag: component
+              value: hits
+            -
+              tag: component
+              value: requests
         -
           uuid: b09f7a1d9dc340b88106016586099dba
           name: 'Squid: Request hit ratio per 1 hour'
@@ -862,8 +951,11 @@ zabbix_export:
           description: 'Byte Hit Ratios'
           tags:
             -
-              tag: Application
-              value: Squid
+              tag: component
+              value: hits
+            -
+              tag: component
+              value: requests
         -
           uuid: 69e4fb088c6949ac94eabcb892df46ab
           name: 'Squid: Cache swap high water mark'
@@ -876,8 +968,11 @@ zabbix_export:
           description: 'Cache Swap High Water Mark'
           tags:
             -
-              tag: Application
-              value: Squid
+              tag: component
+              value: memory
+            -
+              tag: component
+              value: storage
         -
           uuid: 221e583d7cf2455b9d848462de4b1e9a
           name: 'Squid: Cache swap low water mark'
@@ -890,8 +985,11 @@ zabbix_export:
           description: 'Cache Swap Low Water Mark'
           tags:
             -
-              tag: Application
-              value: Squid
+              tag: component
+              value: memory
+            -
+              tag: component
+              value: storage
         -
           uuid: 215aefddd30e41aea54e30678f290215
           name: 'Squid: Cache swap directory size'
@@ -909,8 +1007,11 @@ zabbix_export:
                 - '1048576'
           tags:
             -
-              tag: Application
-              value: Squid
+              tag: component
+              value: memory
+            -
+              tag: component
+              value: storage
         -
           uuid: 38ad99f9b30c4d729030ceab6575f4f5
           name: 'Squid: Sys page faults per second'
@@ -927,8 +1028,8 @@ zabbix_export:
                 - ''
           tags:
             -
-              tag: Application
-              value: Squid
+              tag: component
+              value: faults
         -
           uuid: 67460731d9c94166870874239c9a60da
           name: 'Squid: Uptime'
@@ -946,8 +1047,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Squid
+              tag: component
+              value: application
           triggers:
             -
               uuid: 89efc9400197427fa718395286dd3583
@@ -956,6 +1057,10 @@ zabbix_export:
               priority: INFO
               description: 'Uptime is less than 10 minutes'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: d7c7f0faa1f64745be774e30e6f0b68f
           name: 'Squid: Version'
@@ -973,8 +1078,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Squid
+              tag: component
+              value: application
           triggers:
             -
               uuid: c5991152d2da4df7ae0d978233c5a859
@@ -983,6 +1088,17 @@ zabbix_export:
               priority: INFO
               description: 'Squid version has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+      tags:
+        -
+          tag: class
+          value: application
+        -
+          tag: target
+          value: squid
       macros:
         -
           macro: '{$SQUID.FILE.DESC.WARN.MIN}'
@@ -1021,18 +1137,36 @@ zabbix_export:
       expression: 'avg(/Squid SNMP/squid[cacheSysPageFaults],5m)>avg(/Squid SNMP/squid[cacheProtoClientHttpRequests],5m)/100*{$SQUID.PAGE.FAULT.WARN}'
       name: 'Squid: High sys page faults rate (>{$SQUID.PAGE.FAULT.WARN}% of received HTTP requests)'
       priority: WARNING
+      tags:
+        -
+          tag: scope
+          value: performance
     -
       uuid: 5676f1e02dc7413fb1a34543ccaf1384
       expression: 'last(/Squid SNMP/squid[cacheCurrentSwapSize])>last(/Squid SNMP/squid[cacheSwapHighWM])*last(/Squid SNMP/squid[cacheSwapMaxSize])/100'
       name: 'Squid: Swap usage is more than high watermark (>{ITEM.VALUE2}%)'
       opdata: 'Used: {ITEM.LASTVALUE1}'
       priority: HIGH
+      tags:
+        -
+          tag: scope
+          value: capacity
+        -
+          tag: scope
+          value: performance
     -
       uuid: 2cf87472ebf74239bb782580448f696c
       expression: 'last(/Squid SNMP/squid[cacheCurrentSwapSize])>last(/Squid SNMP/squid[cacheSwapLowWM])*last(/Squid SNMP/squid[cacheSwapMaxSize])/100'
       name: 'Squid: Swap usage is more than low watermark (>{ITEM.VALUE2}%)'
       opdata: 'Used: {ITEM.LASTVALUE1}'
       priority: WARNING
+      tags:
+        -
+          tag: scope
+          value: capacity
+        -
+          tag: scope
+          value: performance
   graphs:
     -
       uuid: d8bb2c1dac8a4cb5999d29227a8510e6
diff --git a/templates/app/ssh_service/README.md b/templates/app/ssh_service/README.md
new file mode 100644
index 00000000000..4ae79170c00
--- /dev/null
+++ b/templates/app/ssh_service/README.md
@@ -0,0 +1,39 @@
+
+# SSH Service
+
+## Overview
+
+For Zabbix version: 6.0 and higher  
+
+## Setup
+
+Refer to the vendor documentation.
+
+## Zabbix configuration
+
+No specific Zabbix configuration is required.
+
+
+## Template links
+
+There are no template links in this template.
+
+## Discovery rules
+
+
+## Items collected
+
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|Services |SSH service is running |<p>-</p> |SIMPLE |net.tcp.service[ssh] |
+
+## Triggers
+
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|SSH service is down on {HOST.NAME} |<p>-</p> |`max(/SSH Service/net.tcp.service[ssh],#3)=0` |AVERAGE | |
+
+## Feedback
+
+Please report any issues with the template at https://support.zabbix.com
+
diff --git a/templates/classic/template_app_ssh_service.yaml b/templates/app/ssh_service/template_app_ssh_service.yaml
index 83161e5386a..a7ab7202a76 100644
--- a/templates/classic/template_app_ssh_service.yaml
+++ b/templates/app/ssh_service/template_app_ssh_service.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:29Z'
+  version: '6.0'
+  date: '2022-01-26T10:49:11Z'
   groups:
     -
       uuid: 57b7ae836ca64446ba2c296389c009b7
@@ -10,6 +10,10 @@ zabbix_export:
       uuid: 0bbd5e407d7544b28a508e18db81c235
       template: 'SSH Service'
       name: 'SSH Service'
+      description: |
+        Template module for monitoring SSH service
+        
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Modules
@@ -24,14 +28,25 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: 'SSH service'
+              tag: component
+              value: network
           triggers:
             -
               uuid: 8f6ce4930afd48f0acc229bad5092c79
               expression: 'max(/SSH Service/net.tcp.service[ssh],#3)=0'
               name: 'SSH service is down on {HOST.NAME}'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: availability
+      tags:
+        -
+          tag: class
+          value: service
+        -
+          tag: target
+          value: ssh
       valuemaps:
         -
           uuid: 80377235a65c4d119745137e4658ef67
diff --git a/templates/app/systemd/README.md b/templates/app/systemd/README.md
index 5e7886f1272..e695d678d2b 100644
--- a/templates/app/systemd/README.md
+++ b/templates/app/systemd/README.md
@@ -65,8 +65,8 @@ There are no template links in this template.
 |Systemd |{#UNIT.NAME}: Active time |<p>Number of seconds since unit entered the active state.</p> |DEPENDENT |systemd.service.uptime["{#UNIT.NAME}"]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
 |Systemd |{#UNIT.NAME}: Connections accepted per sec |<p>The number of accepted socket connections (NAccepted) per second.</p> |DEPENDENT |systemd.socket.conn_accepted.rate["{#UNIT.NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.NAccepted`</p><p>- CHANGE_PER_SECOND</p> |
 |Systemd |{#UNIT.NAME}: Connections connected |<p>The current number of socket connections (NConnections).</p> |DEPENDENT |systemd.socket.conn_count["{#UNIT.NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.NConnections`</p> |
-|Zabbix_raw_items |{#UNIT.NAME}: Get unit info |<p>Returns all properties of a systemd service unit.</p><p> Unit description: {#UNIT.DESCRIPTION}.</p> |ZABBIX_PASSIVE |systemd.unit.get["{#UNIT.NAME}"] |
-|Zabbix_raw_items |{#UNIT.NAME}: Get unit info |<p>Returns all properties of a systemd socket unit.</p><p> Unit description: {#UNIT.DESCRIPTION}.</p> |ZABBIX_PASSIVE |systemd.unit.get["{#UNIT.NAME}",Socket] |
+|Zabbix raw items |{#UNIT.NAME}: Get unit info |<p>Returns all properties of a systemd service unit.</p><p> Unit description: {#UNIT.DESCRIPTION}.</p> |ZABBIX_PASSIVE |systemd.unit.get["{#UNIT.NAME}"] |
+|Zabbix raw items |{#UNIT.NAME}: Get unit info |<p>Returns all properties of a systemd socket unit.</p><p> Unit description: {#UNIT.DESCRIPTION}.</p> |ZABBIX_PASSIVE |systemd.unit.get["{#UNIT.NAME}",Socket] |
 
 ## Triggers
 
@@ -79,5 +79,5 @@ There are no template links in this template.
 
 Please report any issues with the template at https://support.zabbix.com
 
-You can also provide a feedback, discuss the template or ask for help with it at [ZABBIX forums](https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/).
+You can also provide feedback, discuss the template or ask for help with it at [ZABBIX forums](https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/).
 
diff --git a/templates/app/systemd/template_app_systemd.yaml b/templates/app/systemd/template_app_systemd.yaml
index fc388194dd3..ac110501e02 100644
--- a/templates/app/systemd/template_app_systemd.yaml
+++ b/templates/app/systemd/template_app_systemd.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-15T06:58:10Z'
+  date: '2022-01-26T10:01:58Z'
   groups:
     -
       uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
@@ -17,7 +17,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Applications
@@ -82,8 +82,8 @@ zabbix_export:
                 key: 'systemd.unit.get["{#UNIT.NAME}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Systemd service: {#UNIT.NAME}'
+                  tag: component
+                  value: service
               trigger_prototypes:
                 -
                   uuid: 5237bd423307449b8a58f692082d2a0a
@@ -91,6 +91,10 @@ zabbix_export:
                   name: '{#UNIT.NAME}: Service is not running'
                   priority: WARNING
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: bed610e6ce33494b817eb787e34e18c2
               name: '{#UNIT.NAME}: Load state'
@@ -114,8 +118,8 @@ zabbix_export:
                 key: 'systemd.unit.get["{#UNIT.NAME}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Systemd service: {#UNIT.NAME}'
+                  tag: component
+                  value: service
             -
               uuid: f1174eb5abf74e028a75ab9bb8eec649
               name: '{#UNIT.NAME}: Unit file state'
@@ -139,8 +143,8 @@ zabbix_export:
                 key: 'systemd.unit.get["{#UNIT.NAME}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Systemd service: {#UNIT.NAME}'
+                  tag: component
+                  value: service
             -
               uuid: a35992b54d944a389c1bb44748a37fdb
               name: '{#UNIT.NAME}: Active time'
@@ -165,8 +169,8 @@ zabbix_export:
                 key: 'systemd.unit.get["{#UNIT.NAME}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Systemd service: {#UNIT.NAME}'
+                  tag: component
+                  value: service
               trigger_prototypes:
                 -
                   uuid: e2292c5ead924500a06d38b6356930c7
@@ -175,6 +179,10 @@ zabbix_export:
                   priority: INFO
                   description: 'Uptime is less than 10 minutes'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: bdb94d1182114985a8734de7d5d92380
               name: '{#UNIT.NAME}: Get unit info'
@@ -187,8 +195,11 @@ zabbix_export:
                  Unit description: {#UNIT.DESCRIPTION}.
               tags:
                 -
-                  tag: Application
-                  value: 'Zabbix raw items'
+                  tag: component
+                  value: raw
+                -
+                  tag: component
+                  value: unit
         -
           uuid: 5c337762ae7b43a98fcb9dc3102a8467
           name: 'Socket units discovery'
@@ -247,8 +258,8 @@ zabbix_export:
                 key: 'systemd.unit.get["{#UNIT.NAME}",Socket]'
               tags:
                 -
-                  tag: Application
-                  value: 'Systemd socket: {#UNIT.NAME}'
+                  tag: component
+                  value: socket
             -
               uuid: 258a899aba9546db956b8e235738bd89
               name: '{#UNIT.NAME}: Connections connected'
@@ -266,8 +277,8 @@ zabbix_export:
                 key: 'systemd.unit.get["{#UNIT.NAME}",Socket]'
               tags:
                 -
-                  tag: Application
-                  value: 'Systemd socket: {#UNIT.NAME}'
+                  tag: component
+                  value: socket
             -
               uuid: 83ffad5a484d48e388ac658511d4b803
               name: '{#UNIT.NAME}: Get unit info'
@@ -280,8 +291,18 @@ zabbix_export:
                  Unit description: {#UNIT.DESCRIPTION}.
               tags:
                 -
-                  tag: Application
-                  value: 'Zabbix raw items'
+                  tag: component
+                  value: raw
+                -
+                  tag: component
+                  value: socket
+      tags:
+        -
+          tag: class
+          value: software
+        -
+          tag: target
+          value: systemd
       macros:
         -
           macro: '{$SYSTEMD.ACTIVESTATE.SERVICE.MATCHES}'
diff --git a/templates/app/telnet_service/README.md b/templates/app/telnet_service/README.md
new file mode 100644
index 00000000000..8235d01dd72
--- /dev/null
+++ b/templates/app/telnet_service/README.md
@@ -0,0 +1,39 @@
+
+# Telnet Service
+
+## Overview
+
+For Zabbix version: 6.0 and higher  
+
+## Setup
+
+Refer to the vendor documentation.
+
+## Zabbix configuration
+
+No specific Zabbix configuration is required.
+
+
+## Template links
+
+There are no template links in this template.
+
+## Discovery rules
+
+
+## Items collected
+
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|Services |Telnet service is running |<p>-</p> |SIMPLE |net.tcp.service[telnet] |
+
+## Triggers
+
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|Telnet service is down on {HOST.NAME} |<p>-</p> |`max(/Telnet Service/net.tcp.service[telnet],#3)=0` |AVERAGE | |
+
+## Feedback
+
+Please report any issues with the template at https://support.zabbix.com
+
diff --git a/templates/classic/template_app_telnet_service.yaml b/templates/app/telnet_service/template_app_telnet_service.yaml
index d89f99968a8..607192d21a4 100644
--- a/templates/classic/template_app_telnet_service.yaml
+++ b/templates/app/telnet_service/template_app_telnet_service.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:28Z'
+  version: '6.0'
+  date: '2022-01-26T10:49:53Z'
   groups:
     -
       uuid: 57b7ae836ca64446ba2c296389c009b7
@@ -10,6 +10,10 @@ zabbix_export:
       uuid: 7fc69c6afd334bcab0a133174983939f
       template: 'Telnet Service'
       name: 'Telnet Service'
+      description: |
+        Template module for monitoring telnet service
+        
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Modules
@@ -24,14 +28,25 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: 'Telnet service'
+              tag: component
+              value: network
           triggers:
             -
               uuid: 7135280c598548e6bf17fd1909d4281a
               expression: 'max(/Telnet Service/net.tcp.service[telnet],#3)=0'
               name: 'Telnet service is down on {HOST.NAME}'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: availability
+      tags:
+        -
+          tag: class
+          value: service
+        -
+          tag: target
+          value: telnet
       valuemaps:
         -
           uuid: 1d4d40a040d84b0eae345be144dee1b7
diff --git a/templates/app/tomcat_jmx/template_app_tomcat_jmx.yaml b/templates/app/tomcat_jmx/template_app_tomcat_jmx.yaml
index d7fea97f235..c0e483a1f53 100644
--- a/templates/app/tomcat_jmx/template_app_tomcat_jmx.yaml
+++ b/templates/app/tomcat_jmx/template_app_tomcat_jmx.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-15T06:58:14Z'
+  date: '2022-01-26T10:02:46Z'
   groups:
     -
       uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
@@ -17,7 +17,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/411862-discussion-thread-for-official-zabbix-template-tomcat
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Applications
@@ -41,8 +41,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Tomcat
+              tag: component
+              value: system
           triggers:
             -
               uuid: 152d235652914aa2af78334385334214
@@ -51,6 +51,10 @@ zabbix_export:
               priority: INFO
               description: 'Tomcat version has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
       discovery_rules:
         -
           uuid: a478be537e5f48fe95310997d0df0eda
@@ -88,8 +92,11 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Tomcat: ProtocolHandler {#JMXVALUE}'
+                  tag: component
+                  value: protocol-handler
+                -
+                  tag: protocol-handler
+                  value: '{#JMXVALUE}'
               trigger_prototypes:
                 -
                   uuid: 7d707de73a164f1db6b69e4dcb8c6ae9
@@ -98,6 +105,10 @@ zabbix_export:
                   priority: INFO
                   description: 'gzip compression is disabled for connector {#JMXVALUE}.'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
         -
           uuid: 77175f79fe844bb8bca66de437a3ba32
@@ -139,8 +150,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Tomcat: {#JMXTYPE} {#JMXNAME}'
+                  tag: component
+                  value: request
+                -
+                  tag: jmx-name
+                  value: '{#JMXNAME}'
+                -
+                  tag: jmx-type
+                  value: '{#JMXTYPE}'
             -
               uuid: abad7332ed6b417c92f6038ce12ae000
               name: '{#JMXNAME}: Bytes sent per second'
@@ -159,8 +176,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Tomcat: {#JMXTYPE} {#JMXNAME}'
+                  tag: component
+                  value: request
+                -
+                  tag: jmx-name
+                  value: '{#JMXNAME}'
+                -
+                  tag: jmx-type
+                  value: '{#JMXTYPE}'
             -
               uuid: 1596a335401d47d6b2bde7a5b0de7b07
               name: '{#JMXNAME}: Errors per second'
@@ -178,8 +201,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Tomcat: {#JMXTYPE} {#JMXNAME}'
+                  tag: component
+                  value: request
+                -
+                  tag: jmx-name
+                  value: '{#JMXNAME}'
+                -
+                  tag: jmx-type
+                  value: '{#JMXTYPE}'
             -
               uuid: 985d3eeacd9d404385bfcef693add39a
               name: '{#JMXNAME}: Requests processing time'
@@ -189,7 +218,9 @@ zabbix_export:
               units: s
               username: '{$TOMCAT.USER}'
               password: '{$TOMCAT.PASSWORD}'
-              description: 'The total time to process all incoming requests of request processor {#JMXNAME}'
+              description: |
+                The total time to process all incoming requests of request processor
+                {#JMXNAME}
               preprocessing:
                 -
                   type: MULTIPLIER
@@ -198,8 +229,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Tomcat: {#JMXTYPE} {#JMXNAME}'
+                  tag: component
+                  value: request
+                -
+                  tag: jmx-name
+                  value: '{#JMXNAME}'
+                -
+                  tag: jmx-type
+                  value: '{#JMXTYPE}'
             -
               uuid: 8e0307b5063549dab118e0e374a62aad
               name: '{#JMXNAME}: Requests per second'
@@ -217,8 +254,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Tomcat: {#JMXTYPE} {#JMXNAME}'
+                  tag: component
+                  value: request
+                -
+                  tag: jmx-name
+                  value: '{#JMXNAME}'
+                -
+                  tag: jmx-type
+                  value: '{#JMXTYPE}'
           graph_prototypes:
             -
               uuid: 87de97d55baa4be1964652957a051fc2
@@ -272,8 +315,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Tomcat: Context {#JMXHOST}{#JMXCONTEXT}'
+                  tag: component
+                  value: context
+                -
+                  tag: jmx-context
+                  value: '{#JMXCONTEXT}'
+                -
+                  tag: jmx-host
+                  value: '{#JMXHOST}'
             -
               uuid: bc3c2a3cff614f3eaf001463df1b2364
               name: '{#JMXHOST}{#JMXCONTEXT}: Sessions allowed maximum'
@@ -287,8 +336,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Tomcat: Context {#JMXHOST}{#JMXCONTEXT}'
+                  tag: component
+                  value: context
+                -
+                  tag: jmx-context
+                  value: '{#JMXCONTEXT}'
+                -
+                  tag: jmx-host
+                  value: '{#JMXHOST}'
             -
               uuid: fd8678e68cf440939af2dd8f3568a42f
               name: '{#JMXHOST}{#JMXCONTEXT}: Sessions active maximum so far'
@@ -301,8 +356,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Tomcat: Context {#JMXHOST}{#JMXCONTEXT}'
+                  tag: component
+                  value: context
+                -
+                  tag: jmx-context
+                  value: '{#JMXCONTEXT}'
+                -
+                  tag: jmx-host
+                  value: '{#JMXHOST}'
             -
               uuid: 34702e2d6b2142ec9aa43bea1059a98a
               name: '{#JMXHOST}{#JMXCONTEXT}: Sessions rejected per second'
@@ -320,8 +381,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Tomcat: Context {#JMXHOST}{#JMXCONTEXT}'
+                  tag: component
+                  value: context
+                -
+                  tag: jmx-context
+                  value: '{#JMXCONTEXT}'
+                -
+                  tag: jmx-host
+                  value: '{#JMXHOST}'
             -
               uuid: eb28f9bd99d440f4a50d1c24ae758029
               name: '{#JMXHOST}{#JMXCONTEXT}: Sessions created per second'
@@ -339,8 +406,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Tomcat: Context {#JMXHOST}{#JMXCONTEXT}'
+                  tag: component
+                  value: context
+                -
+                  tag: jmx-context
+                  value: '{#JMXCONTEXT}'
+                -
+                  tag: jmx-host
+                  value: '{#JMXHOST}'
           graph_prototypes:
             -
               uuid: dfd46f5443f9438fb21ae23dfd4010c0
@@ -413,8 +486,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Tomcat: {#JMXTYPE} {#JMXNAME}'
+                  tag: component
+                  value: thread-pool
+                -
+                  tag: jmx-name
+                  value: '{#JMXNAME}'
+                -
+                  tag: jmx-type
+                  value: '{#JMXTYPE}'
             -
               uuid: 35b1e99fbc44448083b5aad0ce1239a1
               name: '{#JMXNAME}: Threads busy'
@@ -427,8 +506,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Tomcat: {#JMXTYPE} {#JMXNAME}'
+                  tag: component
+                  value: thread-pool
+                -
+                  tag: jmx-name
+                  value: '{#JMXNAME}'
+                -
+                  tag: jmx-type
+                  value: '{#JMXTYPE}'
             -
               uuid: 32e316ce567c4f94aecb89d9763e4d27
               name: '{#JMXNAME}: Threads limit'
@@ -446,8 +531,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Tomcat: {#JMXTYPE} {#JMXNAME}'
+                  tag: component
+                  value: thread-pool
+                -
+                  tag: jmx-name
+                  value: '{#JMXNAME}'
+                -
+                  tag: jmx-type
+                  value: '{#JMXTYPE}'
           trigger_prototypes:
             -
               uuid: 7a15296553a447f6aebf4958631b6704
@@ -455,6 +546,10 @@ zabbix_export:
               name: '{#JMXNAME}: Busy worker threads count are more than {$TOMCAT.THREADS.MAX.PCT:"{#JMXNAME}"}% of the limit for {$TOMCAT.THREADS.MAX.TIME:"{#JMXNAME}"}'
               priority: HIGH
               description: 'When current threads busy counter reaches the limit, no more requests could be handled, and the application chokes.'
+              tags:
+                -
+                  tag: scope
+                  value: notice
           graph_prototypes:
             -
               uuid: d8236335204a42488c6221c8b2d31e77
@@ -481,6 +576,13 @@ zabbix_export:
                     host: 'Apache Tomcat by JMX'
                     key: 'jmx[{#JMXOBJ},currentThreadsBusy]'
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
+      tags:
+        -
+          tag: class
+          value: software
+        -
+          tag: target
+          value: tomcat
       macros:
         -
           macro: '{$TOMCAT.LLD.FILTER.MATCHES}'
diff --git a/templates/app/travis_ci_http/README.md b/templates/app/travis_ci_http/README.md
index 3e50d373b1c..adacafb2523 100644
--- a/templates/app/travis_ci_http/README.md
+++ b/templates/app/travis_ci_http/README.md
@@ -67,11 +67,11 @@ There are no template links in this template.
 |Travis |Travis: Repo [{#SLUG}]: Last build state |<p>Last build state in {#SLUG} repo.</p> |DEPENDENT |travis.repo.last_build.state[{#SLUG}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.builds[0].state`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Travis |Travis: Repo [{#SLUG}]: Last build number |<p>Last build number in {#SLUG} repo.</p> |DEPENDENT |travis.repo.last_build.number[{#SLUG}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.builds[0].number`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Travis |Travis: Repo [{#SLUG}]: Last build id |<p>Last build id in {#SLUG} repo.</p> |DEPENDENT |travis.repo.last_build.id[{#SLUG}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.builds[0].id`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Zabbix_raw_items |Travis: Get repos |<p>Getting repos using Travis API.</p> |HTTP_AGENT |travis.get_repos |
-|Zabbix_raw_items |Travis: Get builds |<p>Getting builds using Travis API.</p> |HTTP_AGENT |travis.get_builds |
-|Zabbix_raw_items |Travis: Get jobs |<p>Getting jobs using Travis API.</p> |HTTP_AGENT |travis.get_jobs |
-|Zabbix_raw_items |Travis: Repo [{#SLUG}]: Get builds |<p>Getting builds of {#SLUG} using Travis API.</p> |HTTP_AGENT |travis.repo.get_builds[{#SLUG}] |
-|Zabbix_raw_items |Travis: Repo [{#SLUG}]: Get caches |<p>Getting caches of {#SLUG} using Travis API.</p> |HTTP_AGENT |travis.repo.get_caches[{#SLUG}] |
+|Zabbix raw items |Travis: Get repos |<p>Getting repos using Travis API.</p> |HTTP_AGENT |travis.get_repos |
+|Zabbix raw items |Travis: Get builds |<p>Getting builds using Travis API.</p> |HTTP_AGENT |travis.get_builds |
+|Zabbix raw items |Travis: Get jobs |<p>Getting jobs using Travis API.</p> |HTTP_AGENT |travis.get_jobs |
+|Zabbix raw items |Travis: Repo [{#SLUG}]: Get builds |<p>Getting builds of {#SLUG} using Travis API.</p> |HTTP_AGENT |travis.repo.get_builds[{#SLUG}] |
+|Zabbix raw items |Travis: Repo [{#SLUG}]: Get caches |<p>Getting caches of {#SLUG} using Travis API.</p> |HTTP_AGENT |travis.repo.get_caches[{#SLUG}] |
 
 ## Triggers
 
@@ -86,5 +86,5 @@ There are no template links in this template.
 
 Please report any issues with the template at https://support.zabbix.com
 
-You can also provide a feedback, discuss the template or ask for help with it at [ZABBIX forums](https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/).
+You can also provide feedback, discuss the template or ask for help with it at [ZABBIX forums](https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/).
 
diff --git a/templates/app/travis_ci_http/template_app_travis_ci_http.yaml b/templates/app/travis_ci_http/template_app_travis_ci_http.yaml
index c230416b22a..99539c8039a 100644
--- a/templates/app/travis_ci_http/template_app_travis_ci_http.yaml
+++ b/templates/app/travis_ci_http/template_app_travis_ci_http.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-15T08:56:34Z'
+  date: '2022-01-26T10:46:52Z'
   groups:
     -
       uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
@@ -20,7 +20,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Applications
@@ -44,8 +44,8 @@ zabbix_export:
             key: travis.get_builds
           tags:
             -
-              tag: Application
-              value: Travis
+              tag: component
+              value: builds
         -
           uuid: e0d31827266f4d1599cb687d15d42747
           name: 'Travis: Builds'
@@ -63,8 +63,8 @@ zabbix_export:
             key: travis.get_builds
           tags:
             -
-              tag: Application
-              value: Travis
+              tag: component
+              value: builds
         -
           uuid: 08466cd6902441299856cba3ce601510
           name: 'Travis: Get builds'
@@ -88,8 +88,11 @@ zabbix_export:
               value: 'token {$TRAVIS.API.TOKEN}'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: builds
+            -
+              tag: component
+              value: raw
         -
           uuid: 997172d503c54798800d01c613aca92a
           name: 'Travis: Get health'
@@ -120,8 +123,8 @@ zabbix_export:
               value: 'token {$TRAVIS.API.TOKEN}'
           tags:
             -
-              tag: Application
-              value: Travis
+              tag: component
+              value: health
           triggers:
             -
               uuid: 6baed695cac34d349a42ab6e8295910d
@@ -130,6 +133,10 @@ zabbix_export:
               priority: WARNING
               description: 'Zabbix has not received data for items for the last 30 minutes.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
             -
               uuid: e8398acab5a74505a85ade5d3ca5f590
               expression: 'last(/Travis CI by HTTP/travis.get_health)=0'
@@ -137,6 +144,10 @@ zabbix_export:
               priority: HIGH
               description: 'Travis API is unavailable. Please check if the correct macros are set.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 5a01061d1f3d48f8ad0beb4d32e2168d
           name: 'Travis: Get jobs'
@@ -156,8 +167,11 @@ zabbix_export:
               value: 'token {$TRAVIS.API.TOKEN}'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: jobs
+            -
+              tag: component
+              value: raw
         -
           uuid: 5212bfa6de6c4a17b98a80012f617eea
           name: 'Travis: Get repos'
@@ -181,8 +195,11 @@ zabbix_export:
               value: 'token {$TRAVIS.API.TOKEN}'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
+            -
+              tag: component
+              value: repos
         -
           uuid: 81504a37965b402bad9b71507c4a8926
           name: 'Travis: Jobs active'
@@ -202,8 +219,8 @@ zabbix_export:
             key: travis.get_jobs
           tags:
             -
-              tag: Application
-              value: Travis
+              tag: component
+              value: jobs
         -
           uuid: a1045b05877941bfba97e086ef33234c
           name: 'Travis: Jobs in queue'
@@ -223,8 +240,8 @@ zabbix_export:
             key: travis.get_jobs
           tags:
             -
-              tag: Application
-              value: Travis
+              tag: component
+              value: jobs
         -
           uuid: 421a1a1a886c46188047914d5149c075
           name: 'Travis: Jobs passed'
@@ -242,8 +259,8 @@ zabbix_export:
             key: travis.get_jobs
           tags:
             -
-              tag: Application
-              value: Travis
+              tag: component
+              value: jobs
       discovery_rules:
         -
           uuid: 0bd67f5bd26f4dbbbda7e2d36efac649
@@ -270,8 +287,11 @@ zabbix_export:
                 key: 'travis.repo.get_builds[{#SLUG}]'
               tags:
                 -
-                  tag: Application
-                  value: 'Travis: Repo [{#SLUG}]'
+                  tag: component
+                  value: builds
+                -
+                  tag: repo
+                  value: '{#SLUG}'
             -
               uuid: 0d2f2c7b23284836ad52b4ddc98dcfc8
               name: 'Travis: Repo [{#SLUG}]: Builds passed, %'
@@ -283,8 +303,11 @@ zabbix_export:
               description: 'Percent of passed builds in {#SLUG} repo.'
               tags:
                 -
-                  tag: Application
-                  value: 'Travis: Repo [{#SLUG}]'
+                  tag: component
+                  value: builds
+                -
+                  tag: repo
+                  value: '{#SLUG}'
               trigger_prototypes:
                 -
                   uuid: 8279ce31c4fe4cb7a03baa8a0149a557
@@ -293,6 +316,10 @@ zabbix_export:
                   priority: WARNING
                   description: 'Low successful builds rate.'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 1b2143c3e6934e0fae5589b4bb0063b5
               name: 'Travis: Repo [{#SLUG}]: Builds passed'
@@ -310,8 +337,11 @@ zabbix_export:
                 key: 'travis.repo.get_builds[{#SLUG}]'
               tags:
                 -
-                  tag: Application
-                  value: 'Travis: Repo [{#SLUG}]'
+                  tag: component
+                  value: builds
+                -
+                  tag: repo
+                  value: '{#SLUG}'
             -
               uuid: d67070c3c7b44c5b8849a315f5f97c8b
               name: 'Travis: Repo [{#SLUG}]: Builds total'
@@ -329,8 +359,11 @@ zabbix_export:
                 key: 'travis.repo.get_builds[{#SLUG}]'
               tags:
                 -
-                  tag: Application
-                  value: 'Travis: Repo [{#SLUG}]'
+                  tag: component
+                  value: builds
+                -
+                  tag: repo
+                  value: '{#SLUG}'
             -
               uuid: 5fa0c9393f224efa8d6b42c3a0f12319
               name: 'Travis: Repo [{#SLUG}]: Cache files'
@@ -348,8 +381,11 @@ zabbix_export:
                 key: 'travis.repo.get_caches[{#SLUG}]'
               tags:
                 -
-                  tag: Application
-                  value: 'Travis: Repo [{#SLUG}]'
+                  tag: component
+                  value: caches
+                -
+                  tag: repo
+                  value: '{#SLUG}'
             -
               uuid: 6fe5a61db38e4a2da25314a18cf10a8e
               name: 'Travis: Repo [{#SLUG}]: Cache size'
@@ -370,8 +406,11 @@ zabbix_export:
                 key: 'travis.repo.get_caches[{#SLUG}]'
               tags:
                 -
-                  tag: Application
-                  value: 'Travis: Repo [{#SLUG}]'
+                  tag: component
+                  value: caches
+                -
+                  tag: repo
+                  value: '{#SLUG}'
             -
               uuid: 2705ff3b0b51434ba0469362aa91c67d
               name: 'Travis: Repo [{#SLUG}]: Description'
@@ -395,8 +434,11 @@ zabbix_export:
                 key: travis.get_repos
               tags:
                 -
-                  tag: Application
-                  value: 'Travis: Repo [{#SLUG}]'
+                  tag: component
+                  value: repo
+                -
+                  tag: repo
+                  value: '{#SLUG}'
             -
               uuid: ed33292bc0924b9c85cb54443d5aa999
               name: 'Travis: Repo [{#SLUG}]: Get builds'
@@ -420,8 +462,14 @@ zabbix_export:
                   value: 'token {$TRAVIS.API.TOKEN}'
               tags:
                 -
-                  tag: Application
-                  value: 'Zabbix raw items'
+                  tag: component
+                  value: builds
+                -
+                  tag: component
+                  value: raw
+                -
+                  tag: repo
+                  value: '{#SLUG}'
             -
               uuid: 2e0c047997624373a50001b8399b3d7c
               name: 'Travis: Repo [{#SLUG}]: Get caches'
@@ -445,8 +493,14 @@ zabbix_export:
                   value: 'token {$TRAVIS.API.TOKEN}'
               tags:
                 -
-                  tag: Application
-                  value: 'Zabbix raw items'
+                  tag: component
+                  value: caches
+                -
+                  tag: component
+                  value: raw
+                -
+                  tag: repo
+                  value: '{#SLUG}'
             -
               uuid: 7391c532acf649259be018cbf499b565
               name: 'Travis: Repo [{#SLUG}]: Last build duration'
@@ -470,8 +524,11 @@ zabbix_export:
                 key: 'travis.repo.get_builds[{#SLUG}]'
               tags:
                 -
-                  tag: Application
-                  value: 'Travis: Repo [{#SLUG}]'
+                  tag: component
+                  value: last_build
+                -
+                  tag: repo
+                  value: '{#SLUG}'
             -
               uuid: fbcb7b4001b949889fc85f2499684aae
               name: 'Travis: Repo [{#SLUG}]: Last build id'
@@ -493,8 +550,11 @@ zabbix_export:
                 key: 'travis.repo.get_builds[{#SLUG}]'
               tags:
                 -
-                  tag: Application
-                  value: 'Travis: Repo [{#SLUG}]'
+                  tag: component
+                  value: last_build
+                -
+                  tag: repo
+                  value: '{#SLUG}'
             -
               uuid: d9dbe9ffeafa46569fce1ca5ba4897cf
               name: 'Travis: Repo [{#SLUG}]: Last build number'
@@ -516,8 +576,11 @@ zabbix_export:
                 key: 'travis.repo.get_builds[{#SLUG}]'
               tags:
                 -
-                  tag: Application
-                  value: 'Travis: Repo [{#SLUG}]'
+                  tag: component
+                  value: last_build
+                -
+                  tag: repo
+                  value: '{#SLUG}'
             -
               uuid: a081582913ca40ee93a6e5fb326c5c64
               name: 'Travis: Repo [{#SLUG}]: Last build state'
@@ -541,8 +604,11 @@ zabbix_export:
                 key: 'travis.repo.get_builds[{#SLUG}]'
               tags:
                 -
-                  tag: Application
-                  value: 'Travis: Repo [{#SLUG}]'
+                  tag: component
+                  value: last_build
+                -
+                  tag: repo
+                  value: '{#SLUG}'
               trigger_prototypes:
                 -
                   uuid: 9b26f06ae3854aad8d2c0f4623bb1533
@@ -551,6 +617,10 @@ zabbix_export:
                   priority: WARNING
                   description: 'Last build status is errored.'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: b13d986ae110458a80d74f32bb267ed7
@@ -591,6 +661,13 @@ zabbix_export:
               type: DISCARD_UNCHANGED_HEARTBEAT
               parameters:
                 - 1h
+      tags:
+        -
+          tag: class
+          value: service
+        -
+          tag: target
+          value: travis
       macros:
         -
           macro: '{$TRAVIS.API.TOKEN}'
diff --git a/templates/app/vault_http/README.md b/templates/app/vault_http/README.md
index 66812c5b4b3..afc90ec0987 100644
--- a/templates/app/vault_http/README.md
+++ b/templates/app/vault_http/README.md
@@ -53,11 +53,11 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|Storage metrics discovery |<p>Storage backend metrics discovery.</p> |DEPENDENT |vault.storage.discovery<p>**Filter**:</p>AND <p>- {#STORAGE} MATCHES_REGEX `{$VAULT.LLD.FILTER.STORAGE.MATCHES}`</p> |
 |Mountpoint metrics discovery |<p>Mountpoint metrics discovery.</p> |DEPENDENT |vault.mountpoint.discovery |
-|WAL metrics discovery |<p>Discovery for WAL metrics.</p> |DEPENDENT |vault.wal.discovery |
 |Replication metrics discovery |<p>Discovery for replication metrics.</p> |DEPENDENT |vault.replication.discovery |
+|Storage metrics discovery |<p>Storage backend metrics discovery.</p> |DEPENDENT |vault.storage.discovery<p>**Filter**:</p>AND <p>- {#STORAGE} MATCHES_REGEX `{$VAULT.LLD.FILTER.STORAGE.MATCHES}`</p> |
 |Token metrics discovery |<p>Tokens metrics discovery.</p> |DEPENDENT |vault.tokens.discovery |
+|WAL metrics discovery |<p>Discovery for WAL metrics.</p> |DEPENDENT |vault.wal.discovery |
 
 ## Items collected
 
@@ -159,15 +159,15 @@ There are no template links in this template.
 |Vault |Vault: Token [{#TOKEN_NAME}] error |<p>Token lookup error text.</p> |DEPENDENT |vault.token_via_accessor.error["{#ACCESSOR}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.accessor == "{#ACCESSOR}")].error.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Vault |Vault: Token [{#TOKEN_NAME}] has TTL |<p>The Token has TTL.</p> |DEPENDENT |vault.token_via_accessor.has_ttl["{#ACCESSOR}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.accessor == "{#ACCESSOR}")].has_ttl.first()`</p><p>- BOOL_TO_DECIMAL</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Vault |Vault: Token [{#TOKEN_NAME}] TTL |<p>The TTL period of the token.</p> |DEPENDENT |vault.token_via_accessor.ttl["{#ACCESSOR}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$.[?(@.accessor == "{#ACCESSOR}")].ttl.first()`</p> |
-|Zabbix_raw_items |Vault: Get health |<p>-</p> |HTTP_AGENT |vault.get_health<p>**Preprocessing**:</p><p>- CHECK_NOT_SUPPORTED</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> {"healthcheck": 0}`</p> |
-|Zabbix_raw_items |Vault: Get leader |<p>-</p> |HTTP_AGENT |vault.get_leader<p>**Preprocessing**:</p><p>- CHECK_NOT_SUPPORTED</p> |
-|Zabbix_raw_items |Vault: Get metrics |<p>-</p> |HTTP_AGENT |vault.get_metrics<p>**Preprocessing**:</p><p>- CHECK_NOT_SUPPORTED</p> |
-|Zabbix_raw_items |Vault: Clear metrics |<p>-</p> |DEPENDENT |vault.clear_metrics<p>**Preprocessing**:</p><p>- CHECK_JSON_ERROR: `$.errors`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
-|Zabbix_raw_items |Vault: Get tokens |<p>Get information about tokens via their accessors. Accessors are defined in the macro "{$VAULT.TOKEN.ACCESSORS}".</p> |SCRIPT |vault.get_tokens<p>**Expression**:</p>`The text is too long. Please see the template.` |
-|Zabbix_raw_items |Vault: Check WAL discovery |<p>-</p> |DEPENDENT |vault.check_wal_discovery<p>**Preprocessing**:</p><p>- PROMETHEUS_TO_JSON: `{__name__=~"^vault_wal_(?:.+)$"}`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return JSON.stringify(value !== "[]" ? [{'{#SINGLETON}': ''}] : []);`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
-|Zabbix_raw_items |Vault: Check replication discovery |<p>-</p> |DEPENDENT |vault.check_replication_discovery<p>**Preprocessing**:</p><p>- PROMETHEUS_TO_JSON: `{__name__=~"^replication_(?:.+)$"}`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return JSON.stringify(value !== "[]" ? [{'{#SINGLETON}': ''}] : []);`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
-|Zabbix_raw_items |Vault: Check storage discovery |<p>-</p> |DEPENDENT |vault.check_storage_discovery<p>**Preprocessing**:</p><p>- PROMETHEUS_TO_JSON: `{__name__=~"^vault_(?:.+)_(?:get|put|list|delete)_count$"}`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
-|Zabbix_raw_items |Vault: Check mountpoint discovery |<p>-</p> |DEPENDENT |vault.check_mountpoint_discovery<p>**Preprocessing**:</p><p>- PROMETHEUS_TO_JSON: `{__name__=~"^vault_rollback_attempt_(?:.+?)_count$"}`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
+|Zabbix raw items |Vault: Get health |<p>-</p> |HTTP_AGENT |vault.get_health<p>**Preprocessing**:</p><p>- CHECK_NOT_SUPPORTED</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> {"healthcheck": 0}`</p> |
+|Zabbix raw items |Vault: Get leader |<p>-</p> |HTTP_AGENT |vault.get_leader<p>**Preprocessing**:</p><p>- CHECK_NOT_SUPPORTED</p> |
+|Zabbix raw items |Vault: Get metrics |<p>-</p> |HTTP_AGENT |vault.get_metrics<p>**Preprocessing**:</p><p>- CHECK_NOT_SUPPORTED</p> |
+|Zabbix raw items |Vault: Clear metrics |<p>-</p> |DEPENDENT |vault.clear_metrics<p>**Preprocessing**:</p><p>- CHECK_JSON_ERROR: `$.errors`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
+|Zabbix raw items |Vault: Get tokens |<p>Get information about tokens via their accessors. Accessors are defined in the macro "{$VAULT.TOKEN.ACCESSORS}".</p> |SCRIPT |vault.get_tokens<p>**Expression**:</p>`The text is too long. Please see the template.` |
+|Zabbix raw items |Vault: Check WAL discovery |<p>-</p> |DEPENDENT |vault.check_wal_discovery<p>**Preprocessing**:</p><p>- PROMETHEUS_TO_JSON: `{__name__=~"^vault_wal_(?:.+)$"}`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return JSON.stringify(value !== "[]" ? [{'{#SINGLETON}': ''}] : []);`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
+|Zabbix raw items |Vault: Check replication discovery |<p>-</p> |DEPENDENT |vault.check_replication_discovery<p>**Preprocessing**:</p><p>- PROMETHEUS_TO_JSON: `{__name__=~"^replication_(?:.+)$"}`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return JSON.stringify(value !== "[]" ? [{'{#SINGLETON}': ''}] : []);`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
+|Zabbix raw items |Vault: Check storage discovery |<p>-</p> |DEPENDENT |vault.check_storage_discovery<p>**Preprocessing**:</p><p>- PROMETHEUS_TO_JSON: `{__name__=~"^vault_(?:.+)_(?:get|put|list|delete)_count$"}`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
+|Zabbix raw items |Vault: Check mountpoint discovery |<p>-</p> |DEPENDENT |vault.check_mountpoint_discovery<p>**Preprocessing**:</p><p>- PROMETHEUS_TO_JSON: `{__name__=~"^vault_rollback_attempt_(?:.+?)_count$"}`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
 
 ## Triggers
 
@@ -190,5 +190,5 @@ There are no template links in this template.
 
 Please report any issues with the template at https://support.zabbix.com
 
-You can also provide a feedback, discuss the template or ask for help with it at [ZABBIX forums](https://www.zabbix.com/forum/zabbix-suggestions-and-feedback).
+You can also provide feedback, discuss the template or ask for help with it at [ZABBIX forums](https://www.zabbix.com/forum/zabbix-suggestions-and-feedback).
 
diff --git a/templates/app/vault_http/template_app_vault_http.yaml b/templates/app/vault_http/template_app_vault_http.yaml
index d512afbb9a9..2ecec22018a 100644
--- a/templates/app/vault_http/template_app_vault_http.yaml
+++ b/templates/app/vault_http/template_app_vault_http.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-10T07:40:33Z'
+  date: '2022-01-26T10:03:10Z'
   groups:
     -
       uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
@@ -17,7 +17,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Applications
@@ -65,8 +65,11 @@ zabbix_export:
             key: vault.clear_metrics
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: discovery
+            -
+              tag: component
+              value: mountpoint
         -
           uuid: 940cacdb967c40a1b9fba1c143c8589b
           name: 'Vault: Check replication discovery'
@@ -94,8 +97,11 @@ zabbix_export:
             key: vault.clear_metrics
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: discovery
+            -
+              tag: component
+              value: replication
         -
           uuid: f9c8f0ec3a5640af8464f69d1cebbd42
           name: 'Vault: Check storage discovery'
@@ -140,8 +146,11 @@ zabbix_export:
             key: vault.clear_metrics
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: discovery
+            -
+              tag: component
+              value: storage
         -
           uuid: febb5558b1944187a0ac6e87ed153267
           name: 'Vault: Check WAL discovery'
@@ -169,8 +178,11 @@ zabbix_export:
             key: vault.clear_metrics
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: discovery
+            -
+              tag: component
+              value: wal
         -
           uuid: 9607f909cfed4515bed2e0ea16749e0d
           name: 'Vault: Clear metrics'
@@ -190,8 +202,11 @@ zabbix_export:
             key: vault.get_metrics
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: metrics
+            -
+              tag: component
+              value: raw
         -
           uuid: a78063c1186540fb88d3b958b14250bf
           name: 'Vault: Get health'
@@ -215,8 +230,11 @@ zabbix_export:
               value: '{$VAULT.TOKEN}'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: health
+            -
+              tag: component
+              value: raw
         -
           uuid: f92c90b99edc42d9b170d775c714fa0a
           name: 'Vault: Get leader'
@@ -237,8 +255,11 @@ zabbix_export:
               value: '{$VAULT.TOKEN}'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: leader
+            -
+              tag: component
+              value: raw
         -
           uuid: 4ccc4256252f4345a264db340f4ddbf5
           name: 'Vault: Get metrics'
@@ -260,8 +281,11 @@ zabbix_export:
               value: '{$VAULT.TOKEN}'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: metrics
+            -
+              tag: component
+              value: raw
         -
           uuid: cf264b78e4c44d49a81eac141a86d011
           name: 'Vault: Get metrics error'
@@ -286,8 +310,11 @@ zabbix_export:
             key: vault.get_metrics
           tags:
             -
-              tag: Application
-              value: Vault
+              tag: component
+              value: health
+            -
+              tag: component
+              value: metrics
           triggers:
             -
               uuid: a43a4139d225461289d16b7a78002cb0
@@ -298,6 +325,10 @@ zabbix_export:
                 -
                   name: 'Vault: Vault server is sealed'
                   expression: 'last(/HashiCorp Vault by HTTP/vault.health.sealed)=1'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: e8cb015d45ad4e3b9f87d3cbbae3a980
           name: 'Vault: Get tokens'
@@ -371,6 +402,9 @@ zabbix_export:
               name: host
               value: '{$VAULT.HOST}'
             -
+              name: accessors
+              value: '{$VAULT.TOKEN.ACCESSORS}'
+            -
               name: token
               value: '{$VAULT.TOKEN}'
             -
@@ -379,13 +413,13 @@ zabbix_export:
             -
               name: port
               value: '{$VAULT.API.PORT}'
-            -
-              name: accessors
-              value: '{$VAULT.TOKEN.ACCESSORS}'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
+            -
+              tag: component
+              value: tokens
         -
           uuid: df395f64c8fc45d2a9442bb655474b4a
           name: 'Vault: Healthcheck'
@@ -411,14 +445,18 @@ zabbix_export:
             key: vault.get_health
           tags:
             -
-              tag: Application
-              value: Vault
+              tag: component
+              value: health
           triggers:
             -
               uuid: 93b4ae5089834a87ae41091fc9773501
               expression: 'last(/HashiCorp Vault by HTTP/vault.health.check)=0'
               name: 'Vault: Vault server is not responding'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 05c46e931d29415f9a6a32f4dadd1eed
           name: 'Vault: Initialized'
@@ -447,8 +485,8 @@ zabbix_export:
             key: vault.get_health
           tags:
             -
-              tag: Application
-              value: Vault
+              tag: component
+              value: health
         -
           uuid: 75a3c56f1bb24646927cf9b490471cae
           name: 'Vault: Performance standby'
@@ -477,8 +515,8 @@ zabbix_export:
             key: vault.get_health
           tags:
             -
-              tag: Application
-              value: Vault
+              tag: component
+              value: health
         -
           uuid: 488a43102a304f7ab4d2586088a2fded
           name: 'Vault: Disaster Recovery replication'
@@ -505,8 +543,8 @@ zabbix_export:
             key: vault.get_health
           tags:
             -
-              tag: Application
-              value: Vault
+              tag: component
+              value: health
         -
           uuid: 509982bde325478a9d77f99c256f1068
           name: 'Vault: Performance replication'
@@ -533,8 +571,8 @@ zabbix_export:
             key: vault.get_health
           tags:
             -
-              tag: Application
-              value: Vault
+              tag: component
+              value: health
         -
           uuid: e6d2183bb8b14fa3a647d5cea1f56d4c
           name: 'Vault: Sealed'
@@ -563,8 +601,8 @@ zabbix_export:
             key: vault.get_health
           tags:
             -
-              tag: Application
-              value: Vault
+              tag: component
+              value: health
           triggers:
             -
               uuid: 3f4ebf7094914c219ac32132400f90c8
@@ -572,6 +610,10 @@ zabbix_export:
               name: 'Vault: Vault server is sealed'
               priority: AVERAGE
               description: 'https://www.vaultproject.io/docs/concepts/seal'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 0641c979cf774d97a9bc52dbaffe8a0f
           name: 'Vault: Standby'
@@ -600,8 +642,8 @@ zabbix_export:
             key: vault.get_health
           tags:
             -
-              tag: Application
-              value: Vault
+              tag: component
+              value: health
         -
           uuid: e7e79cc09faa409dbe3fa74e1db4cb5f
           name: 'Vault: Version'
@@ -636,6 +678,10 @@ zabbix_export:
               priority: INFO
               description: 'Vault version has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 77da3cf43b0d4a449399f3de6d5e8477
           name: 'Vault: HA enabled'
@@ -663,8 +709,8 @@ zabbix_export:
             key: vault.get_leader
           tags:
             -
-              tag: Application
-              value: Vault
+              tag: component
+              value: leader
         -
           uuid: ea6a7f625c144dc6beff71d3a19004ab
           name: 'Vault: Is leader'
@@ -692,8 +738,8 @@ zabbix_export:
             key: vault.get_leader
           tags:
             -
-              tag: Application
-              value: Vault
+              tag: component
+              value: leader
         -
           uuid: f23cbc80bf2d4064bf45cc27f6ec752e
           name: 'Vault: Audit log request failures, rate'
@@ -719,8 +765,8 @@ zabbix_export:
             key: vault.clear_metrics
           tags:
             -
-              tag: Application
-              value: Vault
+              tag: component
+              value: audit_log
         -
           uuid: 33f2ce934ae5451dace5f880b3a2e6b7
           name: 'Vault: Audit log requests, rate'
@@ -747,8 +793,8 @@ zabbix_export:
             key: vault.clear_metrics
           tags:
             -
-              tag: Application
-              value: Vault
+              tag: component
+              value: audit_log
         -
           uuid: 6b8b37e62e374bc38994c5dcc6f0fc6d
           name: 'Vault: Audit log response failures, rate'
@@ -774,8 +820,8 @@ zabbix_export:
             key: vault.clear_metrics
           tags:
             -
-              tag: Application
-              value: Vault
+              tag: component
+              value: audit_log
         -
           uuid: c336a5cecd4641b58be6ab1ba511f6ef
           name: 'Vault: Audit log response, rate'
@@ -802,8 +848,8 @@ zabbix_export:
             key: vault.clear_metrics
           tags:
             -
-              tag: Application
-              value: Vault
+              tag: component
+              value: audit_log
         -
           uuid: e1d11f77e8394b22b88ddcf9a1b8159b
           name: 'Vault: Barrier DELETE ops, rate'
@@ -829,8 +875,8 @@ zabbix_export:
             key: vault.clear_metrics
           tags:
             -
-              tag: Application
-              value: Vault
+              tag: component
+              value: barrier
         -
           uuid: 8a854323d051485091917391c630cc28
           name: 'Vault: Barrier LIST ops, rate'
@@ -856,8 +902,8 @@ zabbix_export:
             key: vault.clear_metrics
           tags:
             -
-              tag: Application
-              value: Vault
+              tag: component
+              value: barrier
         -
           uuid: 1dbf0413b1574f6e9b04abe5d06ab8aa
           name: 'Vault: Barrier PUT ops, rate'
@@ -883,8 +929,8 @@ zabbix_export:
             key: vault.clear_metrics
           tags:
             -
-              tag: Application
-              value: Vault
+              tag: component
+              value: barrier
         -
           uuid: f0069229811749e5b399f1214176ae11
           name: 'Vault: Cache hit, rate'
@@ -910,8 +956,8 @@ zabbix_export:
             key: vault.clear_metrics
           tags:
             -
-              tag: Application
-              value: Vault
+              tag: component
+              value: cache
         -
           uuid: 4df07a4ea4a048c7bc11b21b56cf96c6
           name: 'Vault: Cache miss, rate'
@@ -937,8 +983,8 @@ zabbix_export:
             key: vault.clear_metrics
           tags:
             -
-              tag: Application
-              value: Vault
+              tag: component
+              value: cache
         -
           uuid: d99841c57aa349ae8676072e12add35c
           name: 'Vault: Cache write, rate'
@@ -964,8 +1010,8 @@ zabbix_export:
             key: vault.clear_metrics
           tags:
             -
-              tag: Application
-              value: Vault
+              tag: component
+              value: cache
         -
           uuid: 004f1eebd08c46d4bbdab7a6c6e3f3ec
           name: 'Vault: Check token, rate'
@@ -991,8 +1037,8 @@ zabbix_export:
             key: vault.clear_metrics
           tags:
             -
-              tag: Application
-              value: Vault
+              tag: component
+              value: core
         -
           uuid: 77bf09bd2b554e5a8d0dde53045f05c7
           name: 'Vault: Fetch ACL and token, rate'
@@ -1018,8 +1064,8 @@ zabbix_export:
             key: vault.clear_metrics
           tags:
             -
-              tag: Application
-              value: Vault
+              tag: component
+              value: core
         -
           uuid: 4ddf18c7768147a396fe13608b5508fb
           name: 'Vault: Requests, rate'
@@ -1045,8 +1091,8 @@ zabbix_export:
             key: vault.clear_metrics
           tags:
             -
-              tag: Application
-              value: Vault
+              tag: component
+              value: core
         -
           uuid: 2aa54d38cc2541e3ae4df89e86d63d20
           name: 'Vault: Leadership setup failed, counter'
@@ -1070,8 +1116,8 @@ zabbix_export:
             key: vault.clear_metrics
           tags:
             -
-              tag: Application
-              value: Vault
+              tag: component
+              value: core
           triggers:
             -
               uuid: c68ab0c784314291bde1cc8693fd5959
@@ -1079,6 +1125,10 @@ zabbix_export:
               name: 'Vault: High frequency of leadership setup failures (over {$VAULT.LEADERSHIP.SETUP.FAILED.MAX.WARN} for 1h)'
               priority: AVERAGE
               description: 'There have been more than {$VAULT.LEADERSHIP.SETUP.FAILED.MAX.WARN} Vault leadership setup failures in the past 1h.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: f0ca68774b5842d7803d2c2619958184
           name: 'Vault: Leadership setup lost, counter'
@@ -1102,8 +1152,8 @@ zabbix_export:
             key: vault.clear_metrics
           tags:
             -
-              tag: Application
-              value: Vault
+              tag: component
+              value: core
           triggers:
             -
               uuid: 8d7f4f51272a4ce5a3a7ab9642e51d63
@@ -1111,6 +1161,10 @@ zabbix_export:
               name: 'Vault: High frequency of leadership losses (over {$VAULT.LEADERSHIP.LOSSES.MAX.WARN} for 1h)'
               priority: AVERAGE
               description: 'There have been more than {$VAULT.LEADERSHIP.LOSSES.MAX.WARN} Vault leadership losses in the past 1h.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 2bdb273b513d4a06914cd6ea11ac2368
           name: 'Vault: Post-unseal ops, counter'
@@ -1131,8 +1185,8 @@ zabbix_export:
             key: vault.clear_metrics
           tags:
             -
-              tag: Application
-              value: Vault
+              tag: component
+              value: core
         -
           uuid: 81738d2323a94aa8a7f2b1d9721ac9f9
           name: 'Vault: Pre-seal ops, counter'
@@ -1153,8 +1207,8 @@ zabbix_export:
             key: vault.clear_metrics
           tags:
             -
-              tag: Application
-              value: Vault
+              tag: component
+              value: core
         -
           uuid: 42d7e5c3d5b24a65b9821e1aaf0df2a0
           name: 'Vault: Seal ops, counter'
@@ -1176,8 +1230,8 @@ zabbix_export:
             key: vault.clear_metrics
           tags:
             -
-              tag: Application
-              value: Vault
+              tag: component
+              value: core
         -
           uuid: 95f6ab7294c547e7976a292447ef31fb
           name: 'Vault: Internal seal ops, counter'
@@ -1198,8 +1252,8 @@ zabbix_export:
             key: vault.clear_metrics
           tags:
             -
-              tag: Application
-              value: Vault
+              tag: component
+              value: core
         -
           uuid: e0ecf5aa8c2a4e0886b5a12588839efd
           name: 'Vault: Requested seal ops, counter'
@@ -1220,8 +1274,8 @@ zabbix_export:
             key: vault.clear_metrics
           tags:
             -
-              tag: Application
-              value: Vault
+              tag: component
+              value: core
         -
           uuid: 1d66f20a1d594b4fa7c81849b83a4ef9
           name: 'Vault: Leadership step downs, counter'
@@ -1245,8 +1299,8 @@ zabbix_export:
             key: vault.clear_metrics
           tags:
             -
-              tag: Application
-              value: Vault
+              tag: component
+              value: core
           triggers:
             -
               uuid: 5f2895eb5a94441f858c573584ec8b19
@@ -1254,6 +1308,10 @@ zabbix_export:
               name: 'Vault: High frequency of leadership step downs (over {$VAULT.LEADERSHIP.STEPDOWNS.MAX.WARN} for 1h)'
               priority: AVERAGE
               description: 'There have been more than {$VAULT.LEADERSHIP.STEPDOWNS.MAX.WARN} Vault leadership step downs in the past 1h.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 075c83114d1746b6b773579404e0268d
           name: 'Vault: Unseal ops, counter'
@@ -1274,8 +1332,8 @@ zabbix_export:
             key: vault.clear_metrics
           tags:
             -
-              tag: Application
-              value: Vault
+              tag: component
+              value: core
         -
           uuid: 5edebc9e295844ee8716d2b17152bdd9
           name: 'Vault: Fetch lease times, counter'
@@ -1296,8 +1354,8 @@ zabbix_export:
             key: vault.clear_metrics
           tags:
             -
-              tag: Application
-              value: Vault
+              tag: component
+              value: expire
         -
           uuid: 7f3ab929e48848e294cfa68b8e1783ad
           name: 'Vault: Fetch lease times by token, counter'
@@ -1318,8 +1376,8 @@ zabbix_export:
             key: vault.clear_metrics
           tags:
             -
-              tag: Application
-              value: Vault
+              tag: component
+              value: expire
         -
           uuid: 66f1855a47624f10ae69735053e326f1
           name: 'Vault: Number of expiring leases'
@@ -1340,8 +1398,8 @@ zabbix_export:
             key: vault.clear_metrics
           tags:
             -
-              tag: Application
-              value: Vault
+              tag: component
+              value: expire
         -
           uuid: b160780f06c846809f7aca043777754f
           name: 'Vault: Register ops, count'
@@ -1363,8 +1421,8 @@ zabbix_export:
             key: vault.clear_metrics
           tags:
             -
-              tag: Application
-              value: Vault
+              tag: component
+              value: expire
         -
           uuid: 89dcbfb69b8a44dcbf330d16d292ec1b
           name: 'Vault: Register auth ops, count'
@@ -1386,8 +1444,8 @@ zabbix_export:
             key: vault.clear_metrics
           tags:
             -
-              tag: Application
-              value: Vault
+              tag: component
+              value: expire
         -
           uuid: 2d418cd62ada44c6bd527db8da0731e1
           name: 'Vault: Expire renew, count'
@@ -1409,8 +1467,8 @@ zabbix_export:
             key: vault.clear_metrics
           tags:
             -
-              tag: Application
-              value: Vault
+              tag: component
+              value: expire
         -
           uuid: 091c66e0f2794a72a97ddfc3a7142b72
           name: 'Vault: Renew token, count'
@@ -1432,8 +1490,8 @@ zabbix_export:
             key: vault.clear_metrics
           tags:
             -
-              tag: Application
-              value: Vault
+              tag: component
+              value: expire
         -
           uuid: 21a1b8470a31484da1e3fd76d3c8094b
           name: 'Vault: Expire revoke, count'
@@ -1455,8 +1513,8 @@ zabbix_export:
             key: vault.clear_metrics
           tags:
             -
-              tag: Application
-              value: Vault
+              tag: component
+              value: expire
         -
           uuid: bc023bdad9504a86b17d2308db62e98f
           name: 'Vault: Revoke secrets by token, count'
@@ -1478,8 +1536,8 @@ zabbix_export:
             key: vault.clear_metrics
           tags:
             -
-              tag: Application
-              value: Vault
+              tag: component
+              value: expire
         -
           uuid: 6bed679f33b4415d833cb5033c5f824c
           name: 'Vault: Expire revoke force, count'
@@ -1501,8 +1559,8 @@ zabbix_export:
             key: vault.clear_metrics
           tags:
             -
-              tag: Application
-              value: Vault
+              tag: component
+              value: expire
         -
           uuid: 93041bd251d148c39e6e2e162f6f1078
           name: 'Vault: Expire revoke prefix, count'
@@ -1524,8 +1582,8 @@ zabbix_export:
             key: vault.clear_metrics
           tags:
             -
-              tag: Application
-              value: Vault
+              tag: component
+              value: expire
         -
           uuid: 5c3e5032315e466e81fca67ea880b33a
           name: 'Vault: Policy DELETE ops, rate'
@@ -1551,8 +1609,8 @@ zabbix_export:
             key: vault.clear_metrics
           tags:
             -
-              tag: Application
-              value: Vault
+              tag: component
+              value: policy
         -
           uuid: bd790a83c48e4ea6bcc9271703036101
           name: 'Vault: Policy GET ops, rate'
@@ -1578,8 +1636,8 @@ zabbix_export:
             key: vault.clear_metrics
           tags:
             -
-              tag: Application
-              value: Vault
+              tag: component
+              value: policy
         -
           uuid: 6650bc3487934dcebc2e1f4da2e1db13
           name: 'Vault: Policy LIST ops, rate'
@@ -1605,8 +1663,8 @@ zabbix_export:
             key: vault.clear_metrics
           tags:
             -
-              tag: Application
-              value: Vault
+              tag: component
+              value: policy
         -
           uuid: c8010706f8274e898812b722a82e9add
           name: 'Vault: Policy SET ops, rate'
@@ -1632,8 +1690,8 @@ zabbix_export:
             key: vault.clear_metrics
           tags:
             -
-              tag: Application
-              value: Vault
+              tag: component
+              value: policy
         -
           uuid: d7602cb55879403982afeabecb4c130a
           name: 'Vault: Process CPU seconds, total'
@@ -1656,8 +1714,8 @@ zabbix_export:
             key: vault.clear_metrics
           tags:
             -
-              tag: Application
-              value: Vault
+              tag: component
+              value: process
         -
           uuid: 095af4564c5445c0be7ad38811404535
           name: 'Vault: Open file descriptors, max'
@@ -1683,8 +1741,8 @@ zabbix_export:
             key: vault.clear_metrics
           tags:
             -
-              tag: Application
-              value: Vault
+              tag: component
+              value: process
         -
           uuid: 0b2c6c947c46409b93acea8e67a0f058
           name: 'Vault: Open file descriptors, current'
@@ -1706,8 +1764,8 @@ zabbix_export:
             key: vault.clear_metrics
           tags:
             -
-              tag: Application
-              value: Vault
+              tag: component
+              value: process
         -
           uuid: ddd6b5b8206442a7b5f0026e82bc2bd2
           name: 'Vault: Process resident memory'
@@ -1730,8 +1788,8 @@ zabbix_export:
             key: vault.clear_metrics
           tags:
             -
-              tag: Application
-              value: Vault
+              tag: component
+              value: process
         -
           uuid: 241f8503d30c41df9e902cf31ddf715e
           name: 'Vault: Uptime'
@@ -1757,8 +1815,8 @@ zabbix_export:
             key: vault.clear_metrics
           tags:
             -
-              tag: Application
-              value: Vault
+              tag: component
+              value: process
           triggers:
             -
               uuid: a60eed70ecbc44fa935ec87d83fe4793
@@ -1767,6 +1825,10 @@ zabbix_export:
               priority: INFO
               description: 'Uptime is less than 10 minutes'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: bf3a561bc96b46fc9a818a9f43c57be5
           name: 'Vault: Process virtual memory, current'
@@ -1789,8 +1851,8 @@ zabbix_export:
             key: vault.clear_metrics
           tags:
             -
-              tag: Application
-              value: Vault
+              tag: component
+              value: process
         -
           uuid: 17c568d745534c218dc292043234b215
           name: 'Vault: Process virtual memory, max'
@@ -1817,8 +1879,8 @@ zabbix_export:
             key: vault.clear_metrics
           tags:
             -
-              tag: Application
-              value: Vault
+              tag: component
+              value: process
         -
           uuid: 58e6fbc8a6084008b08c7fc03ad4a703
           name: 'Vault: Runtime allocated bytes'
@@ -1841,8 +1903,8 @@ zabbix_export:
             key: vault.clear_metrics
           tags:
             -
-              tag: Application
-              value: Vault
+              tag: component
+              value: runtime
         -
           uuid: 3b2208b0248b4288ad91a8a5e3090b29
           name: 'Vault: Runtime freed objects'
@@ -1864,8 +1926,8 @@ zabbix_export:
             key: vault.clear_metrics
           tags:
             -
-              tag: Application
-              value: Vault
+              tag: component
+              value: runtime
         -
           uuid: c1a159a37d4e4130a4a19d0ded2b0b72
           name: 'Vault: Runtime heap objects'
@@ -1887,8 +1949,8 @@ zabbix_export:
             key: vault.clear_metrics
           tags:
             -
-              tag: Application
-              value: Vault
+              tag: component
+              value: runtime
         -
           uuid: f8f0f80be7514fe5b085f04858ac4d7a
           name: 'Vault: Runtime malloc count'
@@ -1910,8 +1972,8 @@ zabbix_export:
             key: vault.clear_metrics
           tags:
             -
-              tag: Application
-              value: Vault
+              tag: component
+              value: runtime
         -
           uuid: b728e92f88db47308272eff7e3bb8c08
           name: 'Vault: Runtime num goroutines'
@@ -1933,8 +1995,8 @@ zabbix_export:
             key: vault.clear_metrics
           tags:
             -
-              tag: Application
-              value: Vault
+              tag: component
+              value: runtime
         -
           uuid: 9af322bade374b45b78d949e632747a8
           name: 'Vault: Runtime sys bytes'
@@ -1957,8 +2019,8 @@ zabbix_export:
             key: vault.clear_metrics
           tags:
             -
-              tag: Application
-              value: Vault
+              tag: component
+              value: runtime
         -
           uuid: 38f50f3173c346cebe6e321347e0270f
           name: 'Vault: Runtime GC runs, total'
@@ -1979,8 +2041,8 @@ zabbix_export:
             key: vault.clear_metrics
           tags:
             -
-              tag: Application
-              value: Vault
+              tag: component
+              value: runtime
         -
           uuid: 20f0708b63784c4190e8e6256f2d57f3
           name: 'Vault: Secret kv entries'
@@ -2004,8 +2066,8 @@ zabbix_export:
             key: vault.clear_metrics
           tags:
             -
-              tag: Application
-              value: Vault
+              tag: component
+              value: secret
         -
           uuid: 568b4b77ae58468da7bb407d349bd330
           name: 'Vault: Token secret lease creation, rate'
@@ -2034,8 +2096,8 @@ zabbix_export:
             key: vault.clear_metrics
           tags:
             -
-              tag: Application
-              value: Vault
+              tag: component
+              value: secret
         -
           uuid: 37576dbac47349fca97fe27c4906124d
           name: 'Vault: Token count, total'
@@ -2059,8 +2121,8 @@ zabbix_export:
             key: vault.clear_metrics
           tags:
             -
-              tag: Application
-              value: Vault
+              tag: component
+              value: token
         -
           uuid: 4c7ae38abae146fdbaf334501b3644f1
           name: 'Vault: Token count by auth, total'
@@ -2084,8 +2146,8 @@ zabbix_export:
             key: vault.clear_metrics
           tags:
             -
-              tag: Application
-              value: Vault
+              tag: component
+              value: token
         -
           uuid: 2f9011a7dd6f4b078402dbb50256ee0a
           name: 'Vault: Token count by policy, total'
@@ -2109,8 +2171,8 @@ zabbix_export:
             key: vault.clear_metrics
           tags:
             -
-              tag: Application
-              value: Vault
+              tag: component
+              value: token
         -
           uuid: c5b512233ae745c390d85e604bf7449e
           name: 'Vault: Token count by ttl, total'
@@ -2134,8 +2196,8 @@ zabbix_export:
             key: vault.clear_metrics
           tags:
             -
-              tag: Application
-              value: Vault
+              tag: component
+              value: token
         -
           uuid: 1a203f57eb0647ca98a848913bb5b707
           name: 'Vault: Token create, count'
@@ -2157,8 +2219,8 @@ zabbix_export:
             key: vault.clear_metrics
           tags:
             -
-              tag: Application
-              value: Vault
+              tag: component
+              value: token
         -
           uuid: 0033d69a310041e58107e06a296492bd
           name: 'Vault: Token createAccessor, count'
@@ -2180,8 +2242,8 @@ zabbix_export:
             key: vault.clear_metrics
           tags:
             -
-              tag: Application
-              value: Vault
+              tag: component
+              value: token
         -
           uuid: 3c73e0cdfe4147abb86ce939189e4cec
           name: 'Vault: Token creation, rate'
@@ -2210,8 +2272,8 @@ zabbix_export:
             key: vault.clear_metrics
           tags:
             -
-              tag: Application
-              value: Vault
+              tag: component
+              value: token
         -
           uuid: ad0c38837e774d9b8164bad51ae9fd4c
           name: 'Vault: Token lookup, rate'
@@ -2237,8 +2299,8 @@ zabbix_export:
             key: vault.clear_metrics
           tags:
             -
-              tag: Application
-              value: Vault
+              tag: component
+              value: token
         -
           uuid: 0d30ca2565b24659839e7e31fc8f6739
           name: 'Vault: Token revoke, count'
@@ -2260,8 +2322,8 @@ zabbix_export:
             key: vault.clear_metrics
           tags:
             -
-              tag: Application
-              value: Vault
+              tag: component
+              value: token
         -
           uuid: c851263be6d94ab39b548a57bbad4eab
           name: 'Vault: Token revoke tree, count'
@@ -2283,8 +2345,8 @@ zabbix_export:
             key: vault.clear_metrics
           tags:
             -
-              tag: Application
-              value: Vault
+              tag: component
+              value: token
         -
           uuid: 830ff368911c4532b10ff1e8c6c9e59b
           name: 'Vault: Token store, count'
@@ -2306,8 +2368,8 @@ zabbix_export:
             key: vault.clear_metrics
           tags:
             -
-              tag: Application
-              value: Vault
+              tag: component
+              value: token
         -
           uuid: 2f0e733e6b1c406b88d012e727ab0169
           name: 'Vault: Runtime GC pause, total'
@@ -2333,8 +2395,8 @@ zabbix_export:
             key: vault.clear_metrics
           tags:
             -
-              tag: Application
-              value: Vault
+              tag: component
+              value: runtime
         -
           uuid: f616fbcd3d20456bb34cde735cf7fad5
           name: 'Vault: Barrier GET ops, rate'
@@ -2360,8 +2422,8 @@ zabbix_export:
             key: vault.clear_metrics
           tags:
             -
-              tag: Application
-              value: Vault
+              tag: component
+              value: barrier
       discovery_rules:
         -
           uuid: ca7bbea60da54770b164ee11d9cd325f
@@ -2396,8 +2458,11 @@ zabbix_export:
                 key: vault.clear_metrics
               tags:
                 -
-                  tag: Application
-                  value: 'Vault: Mountpoint {#MOUNTPOINT}'
+                  tag: component
+                  value: mountpoint
+                -
+                  tag: mountpoint
+                  value: '{#MOUNTPOINT}'
             -
               uuid: e0a4232e6a20433ba26e4313ff9ec1bc
               name: 'Vault: Route rollback [{#MOUNTPOINT}] ops, rate'
@@ -2423,8 +2488,11 @@ zabbix_export:
                 key: vault.clear_metrics
               tags:
                 -
-                  tag: Application
-                  value: 'Vault: Mountpoint {#MOUNTPOINT}'
+                  tag: component
+                  value: mountpoint
+                -
+                  tag: mountpoint
+                  value: '{#MOUNTPOINT}'
           master_item:
             key: vault.check_mountpoint_discovery
         -
@@ -2456,8 +2524,8 @@ zabbix_export:
                 key: vault.clear_metrics
               tags:
                 -
-                  tag: Application
-                  value: 'Vault: Replication'
+                  tag: component
+                  value: replication
             -
               uuid: df61d6db369540fd9934648189e9175a
               name: 'Vault: Stream WAL missing guard, count{#SINGLETON}'
@@ -2479,8 +2547,8 @@ zabbix_export:
                 key: vault.clear_metrics
               tags:
                 -
-                  tag: Application
-                  value: 'Vault: Replication'
+                  tag: component
+                  value: replication
             -
               uuid: 288ffb2cd8bc45f39a7e6d98a2100022
               name: 'Vault: Last remote WAL{#SINGLETON}'
@@ -2502,8 +2570,8 @@ zabbix_export:
                 key: vault.clear_metrics
               tags:
                 -
-                  tag: Application
-                  value: 'Vault: Replication'
+                  tag: component
+                  value: replication
             -
               uuid: ca9c56e53093436f99a6a80f499aac45
               name: 'Vault: Merkle commit index{#SINGLETON}'
@@ -2525,8 +2593,8 @@ zabbix_export:
                 key: vault.clear_metrics
               tags:
                 -
-                  tag: Application
-                  value: 'Vault: Replication'
+                  tag: component
+                  value: replication
             -
               uuid: 854a4541b78c4df6b9d4971d71c7df49
               name: 'Vault: Last DR WAL{#SINGLETON}'
@@ -2548,8 +2616,8 @@ zabbix_export:
                 key: vault.clear_metrics
               tags:
                 -
-                  tag: Application
-                  value: 'Vault: Replication'
+                  tag: component
+                  value: replication
             -
               uuid: 5aed3273a8c24236817f8bd3b5860f87
               name: 'Vault: Last performance WAL{#SINGLETON}'
@@ -2571,8 +2639,8 @@ zabbix_export:
                 key: vault.clear_metrics
               tags:
                 -
-                  tag: Application
-                  value: 'Vault: Replication'
+                  tag: component
+                  value: replication
             -
               uuid: f5bcef9569f44212b813cc0ec821b1ea
               name: 'Vault: Last WAL{#SINGLETON}'
@@ -2594,8 +2662,8 @@ zabbix_export:
                 key: vault.clear_metrics
               tags:
                 -
-                  tag: Application
-                  value: 'Vault: Replication'
+                  tag: component
+                  value: replication
           master_item:
             key: vault.check_replication_discovery
         -
@@ -2638,8 +2706,14 @@ zabbix_export:
                 key: vault.clear_metrics
               tags:
                 -
-                  tag: Application
-                  value: 'Vault: Storage {#STORAGE}'
+                  tag: component
+                  value: storage
+                -
+                  tag: operation
+                  value: '{#OPERATION}'
+                -
+                  tag: storage
+                  value: '{#STORAGE}'
           master_item:
             key: vault.check_storage_discovery
         -
@@ -2675,8 +2749,11 @@ zabbix_export:
                 key: vault.get_tokens
               tags:
                 -
-                  tag: Application
-                  value: 'Vault: Token {#TOKEN_NAME}'
+                  tag: component
+                  value: token
+                -
+                  tag: token
+                  value: '{#TOKEN_NAME}'
               trigger_prototypes:
                 -
                   uuid: 8cd5d903d4e74974a8469554b737ee3d
@@ -2687,6 +2764,10 @@ zabbix_export:
                     -
                       name: 'Vault: Vault server is sealed'
                       expression: 'last(/HashiCorp Vault by HTTP/vault.health.sealed)=1'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: caa3f9ca96b14b929dd75238602fead9
               name: 'Vault: Token [{#TOKEN_NAME}] has TTL'
@@ -2714,8 +2795,11 @@ zabbix_export:
                 key: vault.get_tokens
               tags:
                 -
-                  tag: Application
-                  value: 'Vault: Token {#TOKEN_NAME}'
+                  tag: component
+                  value: token
+                -
+                  tag: token
+                  value: '{#TOKEN_NAME}'
             -
               uuid: 0f872d9d811c44f6a9a9f8f5089ca0a1
               name: 'Vault: Token [{#TOKEN_NAME}] TTL'
@@ -2734,14 +2818,21 @@ zabbix_export:
                 key: vault.get_tokens
               tags:
                 -
-                  tag: Application
-                  value: 'Vault: Token {#TOKEN_NAME}'
+                  tag: component
+                  value: token
+                -
+                  tag: token
+                  value: '{#TOKEN_NAME}'
           trigger_prototypes:
             -
               uuid: f4f0db7e26d9470a86d11e86d1ae26e2
               expression: 'last(/HashiCorp Vault by HTTP/vault.token_via_accessor.has_ttl["{#ACCESSOR}"])=1 and last(/HashiCorp Vault by HTTP/vault.token_via_accessor.ttl["{#ACCESSOR}"])<{$VAULT.TOKEN.TTL.MIN.CRIT}'
               name: 'Vault: Token [{#TOKEN_NAME}] will expire soon (less than {$VAULT.TOKEN.TTL.MIN.CRIT})'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: security
             -
               uuid: 0e2143a2a46d44778db34ac9af69bbfc
               expression: 'last(/HashiCorp Vault by HTTP/vault.token_via_accessor.has_ttl["{#ACCESSOR}"])=1 and last(/HashiCorp Vault by HTTP/vault.token_via_accessor.ttl["{#ACCESSOR}"])<{$VAULT.TOKEN.TTL.MIN.WARN}'
@@ -2751,6 +2842,10 @@ zabbix_export:
                 -
                   name: 'Vault: Token [{#TOKEN_NAME}] will expire soon (less than {$VAULT.TOKEN.TTL.MIN.CRIT})'
                   expression: 'last(/HashiCorp Vault by HTTP/vault.token_via_accessor.has_ttl["{#ACCESSOR}"])=1 and last(/HashiCorp Vault by HTTP/vault.token_via_accessor.ttl["{#ACCESSOR}"])<{$VAULT.TOKEN.TTL.MIN.CRIT}'
+              tags:
+                -
+                  tag: scope
+                  value: security
           master_item:
             key: vault.get_tokens
           lld_macro_paths:
@@ -2789,8 +2884,8 @@ zabbix_export:
                 key: vault.clear_metrics
               tags:
                 -
-                  tag: Application
-                  value: 'Vault: WAL'
+                  tag: component
+                  value: wal
             -
               uuid: 80d5a79d35bc4b3a970f311b0c8c3fbf
               name: 'Vault: Flush ready WAL, count{#SINGLETON}'
@@ -2812,8 +2907,8 @@ zabbix_export:
                 key: vault.clear_metrics
               tags:
                 -
-                  tag: Application
-                  value: 'Vault: WAL'
+                  tag: component
+                  value: wal
             -
               uuid: daee033751164b6591d326d2d59b7e3a
               name: 'Vault: GC deleted WAL{#SINGLETON}'
@@ -2835,8 +2930,8 @@ zabbix_export:
                 key: vault.clear_metrics
               tags:
                 -
-                  tag: Application
-                  value: 'Vault: WAL'
+                  tag: component
+                  value: wal
             -
               uuid: b45b43ac739246719e517d04eb384787
               name: 'Vault: WALs on disk, total{#SINGLETON}'
@@ -2858,8 +2953,8 @@ zabbix_export:
                 key: vault.clear_metrics
               tags:
                 -
-                  tag: Application
-                  value: 'Vault: WAL'
+                  tag: component
+                  value: wal
             -
               uuid: b1e306d6136a4b6d933bd2154b3d5d6e
               name: 'Vault: Load WALs, count{#SINGLETON}'
@@ -2881,8 +2976,8 @@ zabbix_export:
                 key: vault.clear_metrics
               tags:
                 -
-                  tag: Application
-                  value: 'Vault: WAL'
+                  tag: component
+                  value: wal
             -
               uuid: de8fea26aa1546d2bdf1ec7dd5205a3b
               name: 'Vault: Persist WALs, count{#SINGLETON}'
@@ -2904,10 +2999,17 @@ zabbix_export:
                 key: vault.clear_metrics
               tags:
                 -
-                  tag: Application
-                  value: 'Vault: WAL'
+                  tag: component
+                  value: wal
           master_item:
             key: vault.check_wal_discovery
+      tags:
+        -
+          tag: class
+          value: software
+        -
+          tag: target
+          value: vault
       macros:
         -
           macro: '{$VAULT.API.PORT}'
@@ -2983,6 +3085,10 @@ zabbix_export:
       expression: 'min(/HashiCorp Vault by HTTP/vault.metrics.process.open.fds,5m)/last(/HashiCorp Vault by HTTP/vault.metrics.process.max.fds)*100>{$VAULT.OPEN.FDS.MAX.WARN}'
       name: 'Vault: Current number of open files is too high (over {$VAULT.OPEN.FDS.MAX.WARN}% for 5m)'
       priority: WARNING
+      tags:
+        -
+          tag: scope
+          value: capacity
   graphs:
     -
       uuid: b4fc517d099340558fe813c6fb8c6be2
diff --git a/templates/app/vmware/template_app_vmware.yaml b/templates/app/vmware/template_app_vmware.yaml
index 6f0030230c1..9a492b3d977 100644
--- a/templates/app/vmware/template_app_vmware.yaml
+++ b/templates/app/vmware/template_app_vmware.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:38:26Z'
+  date: '2022-01-26T10:31:39Z'
   groups:
     -
       uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
@@ -31,8 +31,8 @@ zabbix_export:
           description: 'Collect VMware event log. See also: https://www.zabbix.com/documentation/6.0/manual/config/items/preprocessing/examples#filtering_vmware_event_log_records'
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: log
         -
           uuid: ee2edadb8ce943ef81d25dbbba8667a4
           name: 'VMware: Full name'
@@ -52,8 +52,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: system
         -
           uuid: a0ec9145f2234fbea79a28c57ebdb44d
           name: 'VMware: Version'
@@ -73,8 +73,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: system
       discovery_rules:
         -
           uuid: 16ffc933cce74cf28a6edf306aa99782
@@ -99,8 +99,11 @@ zabbix_export:
                 name: 'VMware status'
               tags:
                 -
-                  tag: Application
-                  value: VMware
+                  tag: cluster
+                  value: '{#CLUSTER.NAME}'
+                -
+                  tag: component
+                  value: cluster
         -
           uuid: 8fb6a45cbe074b0cb6df53758e2c6623
           name: 'Discover VMware datastores'
@@ -121,8 +124,11 @@ zabbix_export:
               description: 'Amount of time for a read operation from the datastore (milliseconds).'
               tags:
                 -
-                  tag: Application
-                  value: VMware
+                  tag: component
+                  value: datastore
+                -
+                  tag: datastore
+                  value: '{#DATASTORE}'
             -
               uuid: 5355c401dc244bc588ccd18767577c93
               name: 'VMware: Free space on datastore {#DATASTORE} (percentage)'
@@ -137,8 +143,11 @@ zabbix_export:
               description: 'VMware datastore space in percentage from total.'
               tags:
                 -
-                  tag: Application
-                  value: VMware
+                  tag: component
+                  value: datastore
+                -
+                  tag: datastore
+                  value: '{#DATASTORE}'
             -
               uuid: 84f13c4fde2d4a17baaf0c8c1eb4f2c0
               name: 'VMware: Total size of datastore {#DATASTORE}'
@@ -152,8 +161,11 @@ zabbix_export:
               description: 'VMware datastore space in bytes.'
               tags:
                 -
-                  tag: Application
-                  value: VMware
+                  tag: component
+                  value: datastore
+                -
+                  tag: datastore
+                  value: '{#DATASTORE}'
             -
               uuid: 540cd0fbc56c4b8ea19f2ff5839ce00d
               name: 'VMware: Average write latency of the datastore {#DATASTORE}'
@@ -165,8 +177,11 @@ zabbix_export:
               description: 'Amount of time for a write operation to the datastore (milliseconds).'
               tags:
                 -
-                  tag: Application
-                  value: VMware
+                  tag: component
+                  value: datastore
+                -
+                  tag: datastore
+                  value: '{#DATASTORE}'
         -
           uuid: a5bc075e89f248e7b411d8f960897a08
           name: 'Discover VMware hypervisors'
@@ -239,6 +254,13 @@ zabbix_export:
               interfaces:
                 -
                   ip: '{#VM.IP}'
+      tags:
+        -
+          tag: class
+          value: software
+        -
+          tag: target
+          value: vmware
       macros:
         -
           macro: '{$VMWARE.PASSWORD}'
@@ -294,8 +316,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: cluster
         -
           uuid: 31389342688f4b0696a49431923a528f
           name: 'VMware: CPU latency in percents'
@@ -309,8 +331,8 @@ zabbix_export:
           description: 'Percentage of time the virtual machine is unable to run because it is contending for access to the physical CPU(s).'
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: cpu
         -
           uuid: bbfb146e74144160b2e47c0f2cdc6c20
           name: 'VMware: Number of virtual CPUs'
@@ -328,8 +350,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: cpu
         -
           uuid: f4d72109b7ee4e0bb65aab1de85b6b05
           name: 'VMware: CPU readiness latency in percents'
@@ -343,8 +365,8 @@ zabbix_export:
           description: 'Percentage of time that the virtual machine was ready, but could not get scheduled to run on the physical CPU.'
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: cpu
         -
           uuid: ff0a31df94784cfbbf10deca55f76145
           name: 'VMware: CPU ready'
@@ -357,8 +379,8 @@ zabbix_export:
           description: 'Time that the virtual machine was ready, but could not get scheduled to run on the physical CPU during last measurement interval (VMware vCenter/ESXi Server performance counter sampling interval - 20 seconds)'
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: cpu
         -
           uuid: 50de05f27f33425cb207a3fdece7ecb1
           name: 'VMware: CPU swap-in latency in percents'
@@ -371,8 +393,8 @@ zabbix_export:
           description: 'Percentage of CPU time spent waiting for swap-in.'
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: cpu
         -
           uuid: 50606be978814b51b4bae54340965cdc
           name: 'VMware: CPU usage in percents'
@@ -386,8 +408,8 @@ zabbix_export:
           description: 'CPU usage as a percentage during the interval.'
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: cpu
         -
           uuid: ea416ff054cc4031ac6b5cf446156540
           name: 'VMware: CPU usage'
@@ -400,8 +422,8 @@ zabbix_export:
           description: 'Current upper-bound on CPU usage. The upper-bound is based on the host the virtual machine is current running on, as well as limits configured on the virtual machine itself or any parent resource pool. Valid while the virtual machine is running.'
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: cpu
         -
           uuid: 3e70b5d443b942db974b5f92a7acce19
           name: 'VMware: Datacenter name'
@@ -421,8 +443,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: datacenter
         -
           uuid: e645130999db470fbbf14a8055c95b23
           name: 'VMware: Guest memory swapped'
@@ -435,8 +457,8 @@ zabbix_export:
           description: 'Amount of guest physical memory that is swapped out to the swap space.'
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: memory
         -
           uuid: 521a0396514845e3bc5d3dc54ec3d940
           name: 'VMware: Uptime of guest OS'
@@ -449,8 +471,8 @@ zabbix_export:
           description: 'Total time elapsed since the last operating system boot-up (in seconds).'
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: system
           triggers:
             -
               uuid: da703e83e2e146569c173fd9bc6988dd
@@ -459,6 +481,10 @@ zabbix_export:
               priority: WARNING
               description: 'Uptime is less than 10 minutes'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: fedec469a1d040ae971e0013102e1e7c
           name: 'VMware: Hypervisor name'
@@ -478,8 +504,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: hypervisor
         -
           uuid: fbe7477fd85a4ee39a9226b2c6995446
           name: 'VMware: Ballooned memory'
@@ -492,8 +518,8 @@ zabbix_export:
           description: 'The amount of guest physical memory that is currently reclaimed through the balloon driver.'
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: memory
         -
           uuid: 9e7b9360e4d84e9397b5f0a7ab074726
           name: 'VMware: Compressed memory'
@@ -506,8 +532,8 @@ zabbix_export:
           description: 'The amount of memory currently in the compression cache for this VM.'
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: memory
         -
           uuid: 04a40f805fed4ddfa1590274a996a019
           name: 'VMware: Host memory consumed'
@@ -520,8 +546,8 @@ zabbix_export:
           description: 'Amount of host physical memory consumed for backing up guest physical memory pages.'
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: memory
         -
           uuid: 6563409185804ed89b49dfde92edfa10
           name: 'VMware: Private memory'
@@ -534,8 +560,8 @@ zabbix_export:
           description: 'Amount of memory backed by host memory and not being shared.'
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: memory
         -
           uuid: c6a539ee57bf48f78342358c391c65ea
           name: 'VMware: Shared memory'
@@ -548,8 +574,8 @@ zabbix_export:
           description: 'The amount of guest physical memory shared through transparent page sharing.'
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: memory
         -
           uuid: b064f0e0a53f4f6588827100becb4335
           name: 'VMware: Swapped memory'
@@ -562,8 +588,8 @@ zabbix_export:
           description: 'The amount of guest physical memory swapped out to the VM''s swap device by ESX.'
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: memory
         -
           uuid: e960399726a240de9ecc12eff65415ae
           name: 'VMware: Guest memory usage'
@@ -576,8 +602,8 @@ zabbix_export:
           description: 'The amount of guest physical memory that is being used by the VM.'
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: memory
         -
           uuid: 6fcbe4e95fce445aa417b9738004391f
           name: 'VMware: Host memory usage'
@@ -590,8 +616,8 @@ zabbix_export:
           description: 'The amount of host physical memory allocated to the VM, accounting for saving from memory sharing with other VMs.'
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: memory
         -
           uuid: 9533bc39366443fe8a3808190801441a
           name: 'VMware: Memory size'
@@ -610,8 +636,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: memory
         -
           uuid: e82daa73e03e43b9838d9e414d710e38
           name: 'VMware: Host memory usage in percents'
@@ -625,8 +651,8 @@ zabbix_export:
           description: 'Percentage of host physical memory that has been consumed.'
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: memory
         -
           uuid: 0943ff346c9d4cc69fc773843066c473
           name: 'VMware: Power state'
@@ -645,8 +671,8 @@ zabbix_export:
                 - 1h
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: power
         -
           uuid: 13173517c99e4a87aa6750392d14b255
           name: 'VMware: Committed storage space'
@@ -659,8 +685,8 @@ zabbix_export:
           description: 'Total storage space, in bytes, committed to this virtual machine across all datastores.'
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: storage
         -
           uuid: 8183cf2c54774d7eb544f645d5c26b8c
           name: 'VMware: Uncommitted storage space'
@@ -673,8 +699,8 @@ zabbix_export:
           description: 'Additional storage space, in bytes, potentially used by this virtual machine on all datastores.'
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: storage
         -
           uuid: 35aa9ee1743e4c1787c426da20f48097
           name: 'VMware: Unshared storage space'
@@ -687,8 +713,8 @@ zabbix_export:
           description: 'Total storage space, in bytes, occupied by the virtual machine across all datastores, that is not shared with any other virtual machine.'
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: storage
         -
           uuid: 4c3b010d7ea74da6b0dc1dd4e625bbb0
           name: 'VMware: Uptime'
@@ -701,8 +727,8 @@ zabbix_export:
           description: 'System uptime.'
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: system
       discovery_rules:
         -
           uuid: 914634668bab4266bd641ee224dbc1e4
@@ -726,8 +752,11 @@ zabbix_export:
               description: 'VMware virtual machine network interface input statistics (bytes per second).'
               tags:
                 -
-                  tag: Application
-                  value: VMware
+                  tag: component
+                  value: interface
+                -
+                  tag: interface
+                  value: '{#IFDESC}'
             -
               uuid: 863c3aee5d9248d48adbf86832fa6c8e
               name: 'VMware: Number of packets received on interface {#IFDESC}'
@@ -739,8 +768,11 @@ zabbix_export:
               description: 'VMware virtual machine network interface input statistics (packets per second).'
               tags:
                 -
-                  tag: Application
-                  value: VMware
+                  tag: component
+                  value: interface
+                -
+                  tag: interface
+                  value: '{#IFDESC}'
             -
               uuid: 0993e42664a14cd7936351c55b1d64a4
               name: 'VMware: Number of bytes transmitted on interface {#IFDESC}'
@@ -753,8 +785,11 @@ zabbix_export:
               description: 'VMware virtual machine network interface output statistics (bytes per second).'
               tags:
                 -
-                  tag: Application
-                  value: VMware
+                  tag: component
+                  value: interface
+                -
+                  tag: interface
+                  value: '{#IFDESC}'
             -
               uuid: 144a2ed3f76e49af92462e0fea275ede
               name: 'VMware: Number of packets transmitted on interface {#IFDESC}'
@@ -766,8 +801,11 @@ zabbix_export:
               description: 'VMware virtual machine network interface output statistics (packets per second).'
               tags:
                 -
-                  tag: Application
-                  value: VMware
+                  tag: component
+                  value: interface
+                -
+                  tag: interface
+                  value: '{#IFDESC}'
             -
               uuid: 9c3cd13576cc4c0a8972fa188f911e96
               name: 'VMware: Network utilization on interface {#IFDESC}'
@@ -785,8 +823,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: VMware
+                  tag: component
+                  value: interface
+                -
+                  tag: interface
+                  value: '{#IFDESC}'
         -
           uuid: b1543bdfb5a342d7ad694c87248fe173
           name: 'Disk device discovery'
@@ -808,8 +849,11 @@ zabbix_export:
               description: 'Average number of outstanding read requests to the virtual disk during the collection interval.'
               tags:
                 -
-                  tag: Application
-                  value: VMware
+                  tag: component
+                  value: disk
+                -
+                  tag: disk
+                  value: '{#DISKDESC}'
             -
               uuid: 172e4882d39f49d486ab5590163fdd4b
               name: 'VMware: Average read latency to the disk {#DISKDESC}'
@@ -822,8 +866,11 @@ zabbix_export:
               description: 'The average time a read from the virtual disk takes.'
               tags:
                 -
-                  tag: Application
-                  value: VMware
+                  tag: component
+                  value: disk
+                -
+                  tag: disk
+                  value: '{#DISKDESC}'
             -
               uuid: 4fe54828be084b15bb92507106756a5f
               name: 'VMware: Average write latency to the disk {#DISKDESC}'
@@ -836,8 +883,11 @@ zabbix_export:
               description: 'The average time a write to the virtual disk takes.'
               tags:
                 -
-                  tag: Application
-                  value: VMware
+                  tag: component
+                  value: disk
+                -
+                  tag: disk
+                  value: '{#DISKDESC}'
             -
               uuid: a74614af101c404eb7ebec10319dca05
               name: 'VMware: Average number of outstanding write requests to the disk {#DISKDESC}'
@@ -849,8 +899,11 @@ zabbix_export:
               description: 'Average number of outstanding write requests to the virtual disk during the collection interval.'
               tags:
                 -
-                  tag: Application
-                  value: VMware
+                  tag: component
+                  value: disk
+                -
+                  tag: disk
+                  value: '{#DISKDESC}'
             -
               uuid: bd151efc8a0b41e9b64cbf21303fc659
               name: 'VMware: Average number of bytes read from the disk {#DISKDESC}'
@@ -863,8 +916,11 @@ zabbix_export:
               description: 'VMware virtual machine disk device read statistics (bytes per second).'
               tags:
                 -
-                  tag: Application
-                  value: VMware
+                  tag: component
+                  value: disk
+                -
+                  tag: disk
+                  value: '{#DISKDESC}'
             -
               uuid: e6248013150d4f23a0774f6cc80e8df3
               name: 'VMware: Average number of reads from the disk {#DISKDESC}'
@@ -876,8 +932,11 @@ zabbix_export:
               description: 'VMware virtual machine disk device read statistics (operations per second).'
               tags:
                 -
-                  tag: Application
-                  value: VMware
+                  tag: component
+                  value: disk
+                -
+                  tag: disk
+                  value: '{#DISKDESC}'
             -
               uuid: 7ea68380b855460b8e51281223659661
               name: 'VMware: Average number of bytes written to the disk {#DISKDESC}'
@@ -890,8 +949,11 @@ zabbix_export:
               description: 'VMware virtual machine disk device write statistics (bytes per second).'
               tags:
                 -
-                  tag: Application
-                  value: VMware
+                  tag: component
+                  value: disk
+                -
+                  tag: disk
+                  value: '{#DISKDESC}'
             -
               uuid: 8344a1066f5c4ef49894d2d18fac2339
               name: 'VMware: Average number of writes to the disk {#DISKDESC}'
@@ -903,8 +965,11 @@ zabbix_export:
               description: 'VMware virtual machine disk device write statistics (operations per second).'
               tags:
                 -
-                  tag: Application
-                  value: VMware
+                  tag: component
+                  value: disk
+                -
+                  tag: disk
+                  value: '{#DISKDESC}'
         -
           uuid: 44ff9ef164dc4d20acf06b3368d64456
           name: 'Mounted filesystem discovery'
@@ -927,8 +992,11 @@ zabbix_export:
               description: 'VMware virtual machine file system statistics (bytes).'
               tags:
                 -
-                  tag: Application
-                  value: VMware
+                  tag: component
+                  value: filesystem
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 3103537bb1d24633a064d173b3b530f2
               name: 'VMware: Free disk space on {#FSNAME} (percentage)'
@@ -942,8 +1010,11 @@ zabbix_export:
               description: 'VMware virtual machine file system statistics (percentages).'
               tags:
                 -
-                  tag: Application
-                  value: VMware
+                  tag: component
+                  value: filesystem
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 08d05eac03994b56867ec302a346735c
               name: 'VMware: Total disk space on {#FSNAME}'
@@ -962,8 +1033,11 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: VMware
+                  tag: component
+                  value: filesystem
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 09bb15da42464d8295d5e94b1d42cc87
               name: 'VMware: Used disk space on {#FSNAME}'
@@ -976,8 +1050,21 @@ zabbix_export:
               description: 'VMware virtual machine used disk space (bytes).'
               tags:
                 -
-                  tag: Application
-                  value: VMware
+                  tag: component
+                  value: filesystem
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
+      tags:
+        -
+          tag: class
+          value: software
+        -
+          tag: target
+          value: vmware
+        -
+          tag: target
+          value: vmware-guest
       macros:
         -
           macro: '{$VMWARE.PASSWORD}'
@@ -1027,8 +1114,11 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: application
+            -
+              tag: component
+              value: health
           triggers:
             -
               uuid: ab84a61566a5402db59efd40d20714a5
@@ -1037,6 +1127,10 @@ zabbix_export:
               priority: AVERAGE
               description: 'The service is unavailable or does not accept ICMP ping.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: af4d0877fda84753816c817ad76162f1
           name: 'VMware: Cluster name'
@@ -1056,8 +1150,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: cluster
         -
           uuid: c4ebd62118464e7a8d1945f80d70f8ae
           name: 'VMware: CPU usage in percents'
@@ -1071,8 +1165,8 @@ zabbix_export:
           description: 'CPU usage as a percentage during the interval.'
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: cpu
         -
           uuid: 1bff6fbd300d4455a787a273d957bba3
           name: 'VMware: CPU usage'
@@ -1085,8 +1179,8 @@ zabbix_export:
           description: 'Aggregated CPU usage across all cores on the host in Hz. This is only available if the host is connected.'
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: cpu
         -
           uuid: aad168c33cd14f76aa14ab5ca26498ec
           name: 'VMware: CPU utilization'
@@ -1100,8 +1194,8 @@ zabbix_export:
           description: 'CPU usage as a percentage during the interval depends on power management or HT.'
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: cpu
         -
           uuid: e4d27d7f9b9048d4ae6c60cbdd6c0091
           name: 'VMware: Datacenter name'
@@ -1121,8 +1215,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: datacenter
         -
           uuid: 5c29837f75f04d7f9a5786691b3dd991
           name: 'VMware: Full name'
@@ -1142,8 +1236,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: system
         -
           uuid: ad0053d57b834e6a9776c08e1c455d55
           name: 'VMware: CPU frequency'
@@ -1157,8 +1251,8 @@ zabbix_export:
           description: 'The speed of the CPU cores. This is an average value if there are multiple speeds. The product of CPU frequency and number of cores is approximately equal to the sum of the MHz for all the individual cores on the host.'
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: cpu
         -
           uuid: 3f0c35fcef9e4699ac5a1c51d80f8da4
           name: 'VMware: CPU model'
@@ -1173,8 +1267,8 @@ zabbix_export:
           description: 'The CPU model.'
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: cpu
         -
           uuid: c99a5bf2e3904f97b3d361ca20af7883
           name: 'VMware: CPU cores'
@@ -1192,8 +1286,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: cpu
         -
           uuid: 89cb0a4809e7454a862f398a0e9d6bed
           name: 'VMware: CPU threads'
@@ -1206,8 +1300,8 @@ zabbix_export:
           description: 'Number of physical CPU threads on the host.'
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: cpu
         -
           uuid: ce89c38e6e5d4338a30ee150be1b2b67
           name: 'VMware: Total memory'
@@ -1221,8 +1315,8 @@ zabbix_export:
           description: 'The physical memory size.'
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: memory
         -
           uuid: 7ed7ac26da384bcda976badf24ebbec1
           name: 'VMware: Model'
@@ -1237,8 +1331,8 @@ zabbix_export:
           description: 'The system model identification.'
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: system
         -
           uuid: 6c4aab55b3e640779a25ac90b9ca2a43
           name: 'VMware: Bios UUID'
@@ -1253,8 +1347,8 @@ zabbix_export:
           description: 'The hardware BIOS identification.'
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: system
         -
           uuid: aec06090d16d4bdd8ed3494b448f19d8
           name: 'VMware: Vendor'
@@ -1269,8 +1363,8 @@ zabbix_export:
           description: 'The hardware vendor identification.'
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: system
         -
           uuid: 21020a79436a49c38caf8941f6b68da3
           name: 'VMware: Ballooned memory'
@@ -1283,8 +1377,8 @@ zabbix_export:
           description: 'The amount of guest physical memory that is currently reclaimed through the balloon driver. Sum of all guest VMs.'
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: memory
         -
           uuid: 93d680d6886d446badbbe995ddd9ba9c
           name: 'VMware: Used memory'
@@ -1297,8 +1391,8 @@ zabbix_export:
           description: 'Physical memory usage on the host.'
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: memory
         -
           uuid: 33f78ab6ee6c4e7585a83a60cdecab6f
           name: 'VMware: Number of bytes received'
@@ -1311,8 +1405,8 @@ zabbix_export:
           description: 'VMware hypervisor network input statistics (bytes per second).'
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: network
         -
           uuid: b013afcba08b47f4a5b590a59f464a58
           name: 'VMware: Number of bytes transmitted'
@@ -1325,8 +1419,8 @@ zabbix_export:
           description: 'VMware hypervisor network output statistics (bytes per second).'
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: network
         -
           uuid: e4116d7c7e234c5ebd5784f42ade1f2e
           name: 'VMware: Power usage maximum allowed'
@@ -1344,8 +1438,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: power
         -
           uuid: 179a981cf30f4f77869e3b50dc2bc333
           name: 'VMware: Power usage'
@@ -1358,8 +1452,8 @@ zabbix_export:
           description: 'Current power usage.'
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: power
         -
           uuid: 36b28fccf6db4c49bf20157c419400d0
           name: 'VMware: Health state rollup'
@@ -1373,8 +1467,8 @@ zabbix_export:
             name: 'VMware status'
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: health
           triggers:
             -
               uuid: ffb8e14b1ea546b69f40070c628ac653
@@ -1386,6 +1480,13 @@ zabbix_export:
                 -
                   name: 'VMware: The {$VMWARE.HV.UUID} health is Red'
                   expression: 'last(/VMware Hypervisor/vmware.hv.status[{$VMWARE.URL},{$VMWARE.HV.UUID}])=3'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 4825f11dcbf74e2c8e7e2b251cbeb7d9
               expression: 'last(/VMware Hypervisor/vmware.hv.sensor.health.state[{$VMWARE.URL},{$VMWARE.HV.UUID}])=2'
@@ -1402,6 +1503,13 @@ zabbix_export:
                 -
                   name: 'VMware: The {$VMWARE.HV.UUID} health is Yellow'
                   expression: 'last(/VMware Hypervisor/vmware.hv.status[{$VMWARE.URL},{$VMWARE.HV.UUID}])=2'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 0cec294521314c5482233b5b96e90c8d
           name: 'VMware: Overall status'
@@ -1415,8 +1523,8 @@ zabbix_export:
             name: 'VMware status'
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: health
           triggers:
             -
               uuid: 378511e0f1794874a68aef1b43561ee5
@@ -1424,6 +1532,13 @@ zabbix_export:
               name: 'VMware: The {$VMWARE.HV.UUID} health is Red'
               priority: HIGH
               description: 'One or more components in the appliance might be in an unusable status and the appliance might become unresponsive soon. Security patches might be available.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: ef6ca4d7033c4c8cb963eb7d493b3c7b
               expression: 'last(/VMware Hypervisor/vmware.hv.status[{$VMWARE.URL},{$VMWARE.HV.UUID}])=2'
@@ -1434,6 +1549,13 @@ zabbix_export:
                 -
                   name: 'VMware: The {$VMWARE.HV.UUID} health is Red'
                   expression: 'last(/VMware Hypervisor/vmware.hv.status[{$VMWARE.URL},{$VMWARE.HV.UUID}])=3'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: ecad96137494476293b57a0440de3f65
           name: 'VMware: Uptime'
@@ -1446,8 +1568,8 @@ zabbix_export:
           description: 'System uptime.'
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: system
           triggers:
             -
               uuid: 01d316b0a8cf4998b344f0c4ef1daa32
@@ -1456,6 +1578,10 @@ zabbix_export:
               priority: WARNING
               description: 'Uptime is less than 10 minutes'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 222ad20887cf479b8e81a4c338078d17
           name: 'VMware: Version'
@@ -1470,8 +1596,8 @@ zabbix_export:
           description: 'Dot-separated version string.'
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: system
         -
           uuid: 2045df572e864834bd4bd97046353f4e
           name: 'VMware: Number of guest VMs'
@@ -1484,8 +1610,8 @@ zabbix_export:
           description: 'Number of guest virtual machines.'
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: system
       discovery_rules:
         -
           uuid: fb7774df87994355baff7402d9fabcc2
@@ -1507,8 +1633,11 @@ zabbix_export:
               description: 'Number of available datastore paths.'
               tags:
                 -
-                  tag: Application
-                  value: VMware
+                  tag: component
+                  value: datastore
+                -
+                  tag: datastore
+                  value: '{#DATASTORE}'
               trigger_prototypes:
                 -
                   uuid: 8f1de4827ba446ef902ca5fa44109c6d
@@ -1518,6 +1647,10 @@ zabbix_export:
                   priority: AVERAGE
                   description: 'The number of available datastore paths less than registered ({#MULTIPATH.COUNT}).'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 259d1ff4bde143248f7ee2f7f880cb62
               name: 'VMware: Average read latency of the datastore {#DATASTORE}'
@@ -1529,8 +1662,11 @@ zabbix_export:
               description: 'Average amount of time for a read operation from the datastore (milliseconds).'
               tags:
                 -
-                  tag: Application
-                  value: VMware
+                  tag: component
+                  value: datastore
+                -
+                  tag: datastore
+                  value: '{#DATASTORE}'
             -
               uuid: f36245398cc4460a9cb4ec741612693b
               name: 'VMware: Free space on datastore {#DATASTORE} (percentage)'
@@ -1545,8 +1681,11 @@ zabbix_export:
               description: 'VMware datastore space in percentage from total.'
               tags:
                 -
-                  tag: Application
-                  value: VMware
+                  tag: component
+                  value: datastore
+                -
+                  tag: datastore
+                  value: '{#DATASTORE}'
             -
               uuid: cc83e8f5ec08483db75482706bf01aba
               name: 'VMware: Total size of datastore {#DATASTORE}'
@@ -1560,8 +1699,11 @@ zabbix_export:
               description: 'VMware datastore space in bytes.'
               tags:
                 -
-                  tag: Application
-                  value: VMware
+                  tag: component
+                  value: datastore
+                -
+                  tag: datastore
+                  value: '{#DATASTORE}'
             -
               uuid: 9db980d8f5f44af5ad11a5949d80031d
               name: 'VMware: Average write latency of the datastore {#DATASTORE}'
@@ -1573,8 +1715,21 @@ zabbix_export:
               description: 'Average amount of time for a write operation to the datastore (milliseconds).'
               tags:
                 -
-                  tag: Application
-                  value: VMware
+                  tag: component
+                  value: datastore
+                -
+                  tag: datastore
+                  value: '{#DATASTORE}'
+      tags:
+        -
+          tag: class
+          value: software
+        -
+          tag: target
+          value: vmware
+        -
+          tag: target
+          value: vmware-hypervisor
       macros:
         -
           macro: '{$VMWARE.PASSWORD}'
diff --git a/templates/app/vmware_fqdn/template_app_vmware_fqdn.yaml b/templates/app/vmware_fqdn/template_app_vmware_fqdn.yaml
index 69ed5afd782..f807f3a3a26 100644
--- a/templates/app/vmware_fqdn/template_app_vmware_fqdn.yaml
+++ b/templates/app/vmware_fqdn/template_app_vmware_fqdn.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:38:31Z'
+  date: '2022-01-26T10:48:01Z'
   groups:
     -
       uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
@@ -247,6 +247,16 @@ zabbix_export:
               interfaces:
                 -
                   ip: '{#VM.IP}'
+      tags:
+        -
+          tag: class
+          value: software
+        -
+          tag: target
+          value: vmware
+        -
+          tag: target
+          value: vmware-fqdn
       macros:
         -
           macro: '{$VMWARE.PASSWORD}'
@@ -302,8 +312,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: cluster
         -
           uuid: 31389342688f4b0696a49431923a528f
           name: 'VMware: CPU latency in percents'
@@ -317,8 +327,8 @@ zabbix_export:
           description: 'Percentage of time the virtual machine is unable to run because it is contending for access to the physical CPU(s).'
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: cpu
         -
           uuid: bbfb146e74144160b2e47c0f2cdc6c20
           name: 'VMware: Number of virtual CPUs'
@@ -336,8 +346,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: cpu
         -
           uuid: f4d72109b7ee4e0bb65aab1de85b6b05
           name: 'VMware: CPU readiness latency in percents'
@@ -351,8 +361,8 @@ zabbix_export:
           description: 'Percentage of time that the virtual machine was ready, but could not get scheduled to run on the physical CPU.'
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: cpu
         -
           uuid: ff0a31df94784cfbbf10deca55f76145
           name: 'VMware: CPU ready'
@@ -365,8 +375,8 @@ zabbix_export:
           description: 'Time that the virtual machine was ready, but could not get scheduled to run on the physical CPU during last measurement interval (VMware vCenter/ESXi Server performance counter sampling interval - 20 seconds)'
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: cpu
         -
           uuid: 50de05f27f33425cb207a3fdece7ecb1
           name: 'VMware: CPU swap-in latency in percents'
@@ -379,8 +389,8 @@ zabbix_export:
           description: 'Percentage of CPU time spent waiting for swap-in.'
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: cpu
         -
           uuid: 50606be978814b51b4bae54340965cdc
           name: 'VMware: CPU usage in percents'
@@ -394,8 +404,8 @@ zabbix_export:
           description: 'CPU usage as a percentage during the interval.'
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: cpu
         -
           uuid: ea416ff054cc4031ac6b5cf446156540
           name: 'VMware: CPU usage'
@@ -408,8 +418,8 @@ zabbix_export:
           description: 'Current upper-bound on CPU usage. The upper-bound is based on the host the virtual machine is current running on, as well as limits configured on the virtual machine itself or any parent resource pool. Valid while the virtual machine is running.'
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: cpu
         -
           uuid: 3e70b5d443b942db974b5f92a7acce19
           name: 'VMware: Datacenter name'
@@ -429,8 +439,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: datacenter
         -
           uuid: e645130999db470fbbf14a8055c95b23
           name: 'VMware: Guest memory swapped'
@@ -443,8 +453,8 @@ zabbix_export:
           description: 'Amount of guest physical memory that is swapped out to the swap space.'
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: memory
         -
           uuid: 521a0396514845e3bc5d3dc54ec3d940
           name: 'VMware: Uptime of guest OS'
@@ -457,8 +467,8 @@ zabbix_export:
           description: 'Total time elapsed since the last operating system boot-up (in seconds).'
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: system
           triggers:
             -
               uuid: da703e83e2e146569c173fd9bc6988dd
@@ -467,6 +477,10 @@ zabbix_export:
               priority: WARNING
               description: 'Uptime is less than 10 minutes'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: fedec469a1d040ae971e0013102e1e7c
           name: 'VMware: Hypervisor name'
@@ -486,8 +500,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: hypervisor
         -
           uuid: fbe7477fd85a4ee39a9226b2c6995446
           name: 'VMware: Ballooned memory'
@@ -500,8 +514,8 @@ zabbix_export:
           description: 'The amount of guest physical memory that is currently reclaimed through the balloon driver.'
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: memory
         -
           uuid: 9e7b9360e4d84e9397b5f0a7ab074726
           name: 'VMware: Compressed memory'
@@ -514,8 +528,8 @@ zabbix_export:
           description: 'The amount of memory currently in the compression cache for this VM.'
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: memory
         -
           uuid: 04a40f805fed4ddfa1590274a996a019
           name: 'VMware: Host memory consumed'
@@ -528,8 +542,8 @@ zabbix_export:
           description: 'Amount of host physical memory consumed for backing up guest physical memory pages.'
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: memory
         -
           uuid: 6563409185804ed89b49dfde92edfa10
           name: 'VMware: Private memory'
@@ -542,8 +556,8 @@ zabbix_export:
           description: 'Amount of memory backed by host memory and not being shared.'
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: memory
         -
           uuid: c6a539ee57bf48f78342358c391c65ea
           name: 'VMware: Shared memory'
@@ -556,8 +570,8 @@ zabbix_export:
           description: 'The amount of guest physical memory shared through transparent page sharing.'
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: memory
         -
           uuid: b064f0e0a53f4f6588827100becb4335
           name: 'VMware: Swapped memory'
@@ -570,8 +584,8 @@ zabbix_export:
           description: 'The amount of guest physical memory swapped out to the VM''s swap device by ESX.'
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: memory
         -
           uuid: e960399726a240de9ecc12eff65415ae
           name: 'VMware: Guest memory usage'
@@ -584,8 +598,8 @@ zabbix_export:
           description: 'The amount of guest physical memory that is being used by the VM.'
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: memory
         -
           uuid: 6fcbe4e95fce445aa417b9738004391f
           name: 'VMware: Host memory usage'
@@ -598,8 +612,8 @@ zabbix_export:
           description: 'The amount of host physical memory allocated to the VM, accounting for saving from memory sharing with other VMs.'
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: memory
         -
           uuid: 9533bc39366443fe8a3808190801441a
           name: 'VMware: Memory size'
@@ -618,8 +632,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: memory
         -
           uuid: e82daa73e03e43b9838d9e414d710e38
           name: 'VMware: Host memory usage in percents'
@@ -633,8 +647,8 @@ zabbix_export:
           description: 'Percentage of host physical memory that has been consumed.'
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: memory
         -
           uuid: 0943ff346c9d4cc69fc773843066c473
           name: 'VMware: Power state'
@@ -653,8 +667,8 @@ zabbix_export:
                 - 1h
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: power
         -
           uuid: 13173517c99e4a87aa6750392d14b255
           name: 'VMware: Committed storage space'
@@ -667,8 +681,8 @@ zabbix_export:
           description: 'Total storage space, in bytes, committed to this virtual machine across all datastores.'
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: storage
         -
           uuid: 8183cf2c54774d7eb544f645d5c26b8c
           name: 'VMware: Uncommitted storage space'
@@ -681,8 +695,8 @@ zabbix_export:
           description: 'Additional storage space, in bytes, potentially used by this virtual machine on all datastores.'
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: storage
         -
           uuid: 35aa9ee1743e4c1787c426da20f48097
           name: 'VMware: Unshared storage space'
@@ -695,8 +709,8 @@ zabbix_export:
           description: 'Total storage space, in bytes, occupied by the virtual machine across all datastores, that is not shared with any other virtual machine.'
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: storage
         -
           uuid: 4c3b010d7ea74da6b0dc1dd4e625bbb0
           name: 'VMware: Uptime'
@@ -709,8 +723,8 @@ zabbix_export:
           description: 'System uptime.'
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: system
       discovery_rules:
         -
           uuid: 914634668bab4266bd641ee224dbc1e4
@@ -734,8 +748,11 @@ zabbix_export:
               description: 'VMware virtual machine network interface input statistics (bytes per second).'
               tags:
                 -
-                  tag: Application
-                  value: VMware
+                  tag: component
+                  value: interface
+                -
+                  tag: interface
+                  value: '{#IFDESC}'
             -
               uuid: 863c3aee5d9248d48adbf86832fa6c8e
               name: 'VMware: Number of packets received on interface {#IFDESC}'
@@ -747,8 +764,11 @@ zabbix_export:
               description: 'VMware virtual machine network interface input statistics (packets per second).'
               tags:
                 -
-                  tag: Application
-                  value: VMware
+                  tag: component
+                  value: interface
+                -
+                  tag: interface
+                  value: '{#IFDESC}'
             -
               uuid: 0993e42664a14cd7936351c55b1d64a4
               name: 'VMware: Number of bytes transmitted on interface {#IFDESC}'
@@ -761,8 +781,11 @@ zabbix_export:
               description: 'VMware virtual machine network interface output statistics (bytes per second).'
               tags:
                 -
-                  tag: Application
-                  value: VMware
+                  tag: component
+                  value: interface
+                -
+                  tag: interface
+                  value: '{#IFDESC}'
             -
               uuid: 144a2ed3f76e49af92462e0fea275ede
               name: 'VMware: Number of packets transmitted on interface {#IFDESC}'
@@ -774,8 +797,11 @@ zabbix_export:
               description: 'VMware virtual machine network interface output statistics (packets per second).'
               tags:
                 -
-                  tag: Application
-                  value: VMware
+                  tag: component
+                  value: interface
+                -
+                  tag: interface
+                  value: '{#IFDESC}'
             -
               uuid: 9c3cd13576cc4c0a8972fa188f911e96
               name: 'VMware: Network utilization on interface {#IFDESC}'
@@ -793,8 +819,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: VMware
+                  tag: component
+                  value: interface
+                -
+                  tag: interface
+                  value: '{#IFDESC}'
         -
           uuid: b1543bdfb5a342d7ad694c87248fe173
           name: 'Disk device discovery'
@@ -816,8 +845,11 @@ zabbix_export:
               description: 'Average number of outstanding read requests to the virtual disk during the collection interval.'
               tags:
                 -
-                  tag: Application
-                  value: VMware
+                  tag: component
+                  value: disk
+                -
+                  tag: disk
+                  value: '{#DISKDESC}'
             -
               uuid: 172e4882d39f49d486ab5590163fdd4b
               name: 'VMware: Average read latency to the disk {#DISKDESC}'
@@ -830,8 +862,11 @@ zabbix_export:
               description: 'The average time a read from the virtual disk takes.'
               tags:
                 -
-                  tag: Application
-                  value: VMware
+                  tag: component
+                  value: disk
+                -
+                  tag: disk
+                  value: '{#DISKDESC}'
             -
               uuid: 4fe54828be084b15bb92507106756a5f
               name: 'VMware: Average write latency to the disk {#DISKDESC}'
@@ -844,8 +879,11 @@ zabbix_export:
               description: 'The average time a write to the virtual disk takes.'
               tags:
                 -
-                  tag: Application
-                  value: VMware
+                  tag: component
+                  value: disk
+                -
+                  tag: disk
+                  value: '{#DISKDESC}'
             -
               uuid: a74614af101c404eb7ebec10319dca05
               name: 'VMware: Average number of outstanding write requests to the disk {#DISKDESC}'
@@ -857,8 +895,11 @@ zabbix_export:
               description: 'Average number of outstanding write requests to the virtual disk during the collection interval.'
               tags:
                 -
-                  tag: Application
-                  value: VMware
+                  tag: component
+                  value: disk
+                -
+                  tag: disk
+                  value: '{#DISKDESC}'
             -
               uuid: bd151efc8a0b41e9b64cbf21303fc659
               name: 'VMware: Average number of bytes read from the disk {#DISKDESC}'
@@ -871,8 +912,11 @@ zabbix_export:
               description: 'VMware virtual machine disk device read statistics (bytes per second).'
               tags:
                 -
-                  tag: Application
-                  value: VMware
+                  tag: component
+                  value: disk
+                -
+                  tag: disk
+                  value: '{#DISKDESC}'
             -
               uuid: e6248013150d4f23a0774f6cc80e8df3
               name: 'VMware: Average number of reads from the disk {#DISKDESC}'
@@ -884,8 +928,11 @@ zabbix_export:
               description: 'VMware virtual machine disk device read statistics (operations per second).'
               tags:
                 -
-                  tag: Application
-                  value: VMware
+                  tag: component
+                  value: disk
+                -
+                  tag: disk
+                  value: '{#DISKDESC}'
             -
               uuid: 7ea68380b855460b8e51281223659661
               name: 'VMware: Average number of bytes written to the disk {#DISKDESC}'
@@ -898,8 +945,11 @@ zabbix_export:
               description: 'VMware virtual machine disk device write statistics (bytes per second).'
               tags:
                 -
-                  tag: Application
-                  value: VMware
+                  tag: component
+                  value: disk
+                -
+                  tag: disk
+                  value: '{#DISKDESC}'
             -
               uuid: 8344a1066f5c4ef49894d2d18fac2339
               name: 'VMware: Average number of writes to the disk {#DISKDESC}'
@@ -911,8 +961,11 @@ zabbix_export:
               description: 'VMware virtual machine disk device write statistics (operations per second).'
               tags:
                 -
-                  tag: Application
-                  value: VMware
+                  tag: component
+                  value: disk
+                -
+                  tag: disk
+                  value: '{#DISKDESC}'
         -
           uuid: 44ff9ef164dc4d20acf06b3368d64456
           name: 'Mounted filesystem discovery'
@@ -935,8 +988,11 @@ zabbix_export:
               description: 'VMware virtual machine file system statistics (bytes).'
               tags:
                 -
-                  tag: Application
-                  value: VMware
+                  tag: component
+                  value: filesystem
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 3103537bb1d24633a064d173b3b530f2
               name: 'VMware: Free disk space on {#FSNAME} (percentage)'
@@ -950,8 +1006,11 @@ zabbix_export:
               description: 'VMware virtual machine file system statistics (percentages).'
               tags:
                 -
-                  tag: Application
-                  value: VMware
+                  tag: component
+                  value: filesystem
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 08d05eac03994b56867ec302a346735c
               name: 'VMware: Total disk space on {#FSNAME}'
@@ -970,8 +1029,11 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: VMware
+                  tag: component
+                  value: filesystem
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 09bb15da42464d8295d5e94b1d42cc87
               name: 'VMware: Used disk space on {#FSNAME}'
@@ -984,8 +1046,21 @@ zabbix_export:
               description: 'VMware virtual machine used disk space (bytes).'
               tags:
                 -
-                  tag: Application
-                  value: VMware
+                  tag: component
+                  value: filesystem
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
+      tags:
+        -
+          tag: class
+          value: software
+        -
+          tag: target
+          value: vmware
+        -
+          tag: target
+          value: vmware-guest
       macros:
         -
           macro: '{$VMWARE.PASSWORD}'
@@ -1035,8 +1110,11 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: application
+            -
+              tag: component
+              value: health
           triggers:
             -
               uuid: ab84a61566a5402db59efd40d20714a5
@@ -1045,6 +1123,10 @@ zabbix_export:
               priority: AVERAGE
               description: 'The service is unavailable or does not accept ICMP ping.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: af4d0877fda84753816c817ad76162f1
           name: 'VMware: Cluster name'
@@ -1064,8 +1146,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: cluster
         -
           uuid: c4ebd62118464e7a8d1945f80d70f8ae
           name: 'VMware: CPU usage in percents'
@@ -1079,8 +1161,8 @@ zabbix_export:
           description: 'CPU usage as a percentage during the interval.'
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: cpu
         -
           uuid: 1bff6fbd300d4455a787a273d957bba3
           name: 'VMware: CPU usage'
@@ -1093,8 +1175,8 @@ zabbix_export:
           description: 'Aggregated CPU usage across all cores on the host in Hz. This is only available if the host is connected.'
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: cpu
         -
           uuid: aad168c33cd14f76aa14ab5ca26498ec
           name: 'VMware: CPU utilization'
@@ -1108,8 +1190,8 @@ zabbix_export:
           description: 'CPU usage as a percentage during the interval depends on power management or HT.'
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: cpu
         -
           uuid: e4d27d7f9b9048d4ae6c60cbdd6c0091
           name: 'VMware: Datacenter name'
@@ -1129,8 +1211,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: datacenter
         -
           uuid: 5c29837f75f04d7f9a5786691b3dd991
           name: 'VMware: Full name'
@@ -1150,8 +1232,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: system
         -
           uuid: ad0053d57b834e6a9776c08e1c455d55
           name: 'VMware: CPU frequency'
@@ -1165,8 +1247,8 @@ zabbix_export:
           description: 'The speed of the CPU cores. This is an average value if there are multiple speeds. The product of CPU frequency and number of cores is approximately equal to the sum of the MHz for all the individual cores on the host.'
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: cpu
         -
           uuid: 3f0c35fcef9e4699ac5a1c51d80f8da4
           name: 'VMware: CPU model'
@@ -1181,8 +1263,8 @@ zabbix_export:
           description: 'The CPU model.'
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: cpu
         -
           uuid: c99a5bf2e3904f97b3d361ca20af7883
           name: 'VMware: CPU cores'
@@ -1200,8 +1282,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: cpu
         -
           uuid: 89cb0a4809e7454a862f398a0e9d6bed
           name: 'VMware: CPU threads'
@@ -1214,8 +1296,8 @@ zabbix_export:
           description: 'Number of physical CPU threads on the host.'
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: cpu
         -
           uuid: ce89c38e6e5d4338a30ee150be1b2b67
           name: 'VMware: Total memory'
@@ -1229,8 +1311,8 @@ zabbix_export:
           description: 'The physical memory size.'
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: memory
         -
           uuid: 7ed7ac26da384bcda976badf24ebbec1
           name: 'VMware: Model'
@@ -1245,8 +1327,8 @@ zabbix_export:
           description: 'The system model identification.'
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: system
         -
           uuid: 6c4aab55b3e640779a25ac90b9ca2a43
           name: 'VMware: Bios UUID'
@@ -1261,8 +1343,8 @@ zabbix_export:
           description: 'The hardware BIOS identification.'
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: system
         -
           uuid: aec06090d16d4bdd8ed3494b448f19d8
           name: 'VMware: Vendor'
@@ -1277,8 +1359,8 @@ zabbix_export:
           description: 'The hardware vendor identification.'
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: system
         -
           uuid: 21020a79436a49c38caf8941f6b68da3
           name: 'VMware: Ballooned memory'
@@ -1291,8 +1373,8 @@ zabbix_export:
           description: 'The amount of guest physical memory that is currently reclaimed through the balloon driver. Sum of all guest VMs.'
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: memory
         -
           uuid: 93d680d6886d446badbbe995ddd9ba9c
           name: 'VMware: Used memory'
@@ -1305,8 +1387,8 @@ zabbix_export:
           description: 'Physical memory usage on the host.'
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: memory
         -
           uuid: 33f78ab6ee6c4e7585a83a60cdecab6f
           name: 'VMware: Number of bytes received'
@@ -1319,8 +1401,8 @@ zabbix_export:
           description: 'VMware hypervisor network input statistics (bytes per second).'
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: network
         -
           uuid: b013afcba08b47f4a5b590a59f464a58
           name: 'VMware: Number of bytes transmitted'
@@ -1333,8 +1415,8 @@ zabbix_export:
           description: 'VMware hypervisor network output statistics (bytes per second).'
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: network
         -
           uuid: e4116d7c7e234c5ebd5784f42ade1f2e
           name: 'VMware: Power usage maximum allowed'
@@ -1352,8 +1434,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: power
         -
           uuid: 179a981cf30f4f77869e3b50dc2bc333
           name: 'VMware: Power usage'
@@ -1366,8 +1448,8 @@ zabbix_export:
           description: 'Current power usage.'
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: power
         -
           uuid: 36b28fccf6db4c49bf20157c419400d0
           name: 'VMware: Health state rollup'
@@ -1381,8 +1463,8 @@ zabbix_export:
             name: 'VMware status'
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: health
           triggers:
             -
               uuid: ffb8e14b1ea546b69f40070c628ac653
@@ -1394,6 +1476,13 @@ zabbix_export:
                 -
                   name: 'VMware: The {$VMWARE.HV.UUID} health is Red'
                   expression: 'last(/VMware Hypervisor/vmware.hv.status[{$VMWARE.URL},{$VMWARE.HV.UUID}])=3'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 4825f11dcbf74e2c8e7e2b251cbeb7d9
               expression: 'last(/VMware Hypervisor/vmware.hv.sensor.health.state[{$VMWARE.URL},{$VMWARE.HV.UUID}])=2'
@@ -1410,6 +1499,13 @@ zabbix_export:
                 -
                   name: 'VMware: The {$VMWARE.HV.UUID} health is Yellow'
                   expression: 'last(/VMware Hypervisor/vmware.hv.status[{$VMWARE.URL},{$VMWARE.HV.UUID}])=2'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 0cec294521314c5482233b5b96e90c8d
           name: 'VMware: Overall status'
@@ -1423,8 +1519,8 @@ zabbix_export:
             name: 'VMware status'
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: health
           triggers:
             -
               uuid: 378511e0f1794874a68aef1b43561ee5
@@ -1432,6 +1528,13 @@ zabbix_export:
               name: 'VMware: The {$VMWARE.HV.UUID} health is Red'
               priority: HIGH
               description: 'One or more components in the appliance might be in an unusable status and the appliance might become unresponsive soon. Security patches might be available.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: ef6ca4d7033c4c8cb963eb7d493b3c7b
               expression: 'last(/VMware Hypervisor/vmware.hv.status[{$VMWARE.URL},{$VMWARE.HV.UUID}])=2'
@@ -1442,6 +1545,13 @@ zabbix_export:
                 -
                   name: 'VMware: The {$VMWARE.HV.UUID} health is Red'
                   expression: 'last(/VMware Hypervisor/vmware.hv.status[{$VMWARE.URL},{$VMWARE.HV.UUID}])=3'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: ecad96137494476293b57a0440de3f65
           name: 'VMware: Uptime'
@@ -1454,8 +1564,8 @@ zabbix_export:
           description: 'System uptime.'
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: system
           triggers:
             -
               uuid: 01d316b0a8cf4998b344f0c4ef1daa32
@@ -1464,6 +1574,10 @@ zabbix_export:
               priority: WARNING
               description: 'Uptime is less than 10 minutes'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 222ad20887cf479b8e81a4c338078d17
           name: 'VMware: Version'
@@ -1478,8 +1592,8 @@ zabbix_export:
           description: 'Dot-separated version string.'
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: system
         -
           uuid: 2045df572e864834bd4bd97046353f4e
           name: 'VMware: Number of guest VMs'
@@ -1492,8 +1606,8 @@ zabbix_export:
           description: 'Number of guest virtual machines.'
           tags:
             -
-              tag: Application
-              value: VMware
+              tag: component
+              value: system
       discovery_rules:
         -
           uuid: fb7774df87994355baff7402d9fabcc2
@@ -1515,8 +1629,11 @@ zabbix_export:
               description: 'Number of available datastore paths.'
               tags:
                 -
-                  tag: Application
-                  value: VMware
+                  tag: component
+                  value: datastore
+                -
+                  tag: datastore
+                  value: '{#DATASTORE}'
               trigger_prototypes:
                 -
                   uuid: 8f1de4827ba446ef902ca5fa44109c6d
@@ -1526,6 +1643,10 @@ zabbix_export:
                   priority: AVERAGE
                   description: 'The number of available datastore paths less than registered ({#MULTIPATH.COUNT}).'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 259d1ff4bde143248f7ee2f7f880cb62
               name: 'VMware: Average read latency of the datastore {#DATASTORE}'
@@ -1537,8 +1658,11 @@ zabbix_export:
               description: 'Average amount of time for a read operation from the datastore (milliseconds).'
               tags:
                 -
-                  tag: Application
-                  value: VMware
+                  tag: component
+                  value: datastore
+                -
+                  tag: datastore
+                  value: '{#DATASTORE}'
             -
               uuid: f36245398cc4460a9cb4ec741612693b
               name: 'VMware: Free space on datastore {#DATASTORE} (percentage)'
@@ -1553,8 +1677,11 @@ zabbix_export:
               description: 'VMware datastore space in percentage from total.'
               tags:
                 -
-                  tag: Application
-                  value: VMware
+                  tag: component
+                  value: datastore
+                -
+                  tag: datastore
+                  value: '{#DATASTORE}'
             -
               uuid: cc83e8f5ec08483db75482706bf01aba
               name: 'VMware: Total size of datastore {#DATASTORE}'
@@ -1568,8 +1695,11 @@ zabbix_export:
               description: 'VMware datastore space in bytes.'
               tags:
                 -
-                  tag: Application
-                  value: VMware
+                  tag: component
+                  value: datastore
+                -
+                  tag: datastore
+                  value: '{#DATASTORE}'
             -
               uuid: 9db980d8f5f44af5ad11a5949d80031d
               name: 'VMware: Average write latency of the datastore {#DATASTORE}'
@@ -1581,8 +1711,21 @@ zabbix_export:
               description: 'Average amount of time for a write operation to the datastore (milliseconds).'
               tags:
                 -
-                  tag: Application
-                  value: VMware
+                  tag: component
+                  value: datastore
+                -
+                  tag: datastore
+                  value: '{#DATASTORE}'
+      tags:
+        -
+          tag: class
+          value: software
+        -
+          tag: target
+          value: vmware
+        -
+          tag: target
+          value: vmware-hypervisor
       macros:
         -
           macro: '{$VMWARE.PASSWORD}'
diff --git a/templates/app/wildfly_domain_jmx/template_app_wildfly_domain_jmx.yaml b/templates/app/wildfly_domain_jmx/template_app_wildfly_domain_jmx.yaml
index aa0a2fbf566..5d1a0d93be4 100644
--- a/templates/app/wildfly_domain_jmx/template_app_wildfly_domain_jmx.yaml
+++ b/templates/app/wildfly_domain_jmx/template_app_wildfly_domain_jmx.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-15T06:58:33Z'
+  date: '2022-01-26T10:50:14Z'
   groups:
     -
       uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
@@ -18,7 +18,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Applications
@@ -41,8 +41,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:{$WILDFLY.JMX.PROTOCOL}://{HOST.CONN}:{HOST.PORT}'
           tags:
             -
-              tag: Application
-              value: WildFly
+              tag: component
+              value: application
           triggers:
             -
               uuid: 926f1767aae74529a972c7b8b09f4442
@@ -51,6 +51,10 @@ zabbix_export:
               priority: INFO
               description: 'Uptime is less than 10 minutes'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 5c0653e99ddb4f26ae12ce4d6ce9892c
           name: 'WildFly: Launch type'
@@ -70,8 +74,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:{$WILDFLY.JMX.PROTOCOL}://{HOST.CONN}:{HOST.PORT}'
           tags:
             -
-              tag: Application
-              value: WildFly
+              tag: component
+              value: application
         -
           uuid: 5412059106e844ae89f6f84b4da42388
           name: 'WildFly: Name'
@@ -93,8 +97,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:{$WILDFLY.JMX.PROTOCOL}://{HOST.CONN}:{HOST.PORT}'
           tags:
             -
-              tag: Application
-              value: WildFly
+              tag: component
+              value: application
         -
           uuid: d5e2f5e277874567a5d46196fd032298
           name: 'WildFly: Process type'
@@ -114,8 +118,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:{$WILDFLY.JMX.PROTOCOL}://{HOST.CONN}:{HOST.PORT}'
           tags:
             -
-              tag: Application
-              value: WildFly
+              tag: component
+              value: application
         -
           uuid: f1bb15824f384e21bb9ae1224abd18e0
           name: 'WildFly: Version'
@@ -135,8 +139,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:{$WILDFLY.JMX.PROTOCOL}://{HOST.CONN}:{HOST.PORT}'
           tags:
             -
-              tag: Application
-              value: WildFly
+              tag: component
+              value: application
           triggers:
             -
               uuid: 76d500211fd9479fafbd0fb7d41ffd68
@@ -145,6 +149,10 @@ zabbix_export:
               priority: INFO
               description: 'WildFly version has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
       discovery_rules:
         -
           uuid: 3af697e56771487abee9f62e453fb0c3
@@ -191,8 +199,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:{$WILDFLY.JMX.PROTOCOL}://{HOST.CONN}:{HOST.PORT}'
               tags:
                 -
-                  tag: Application
-                  value: 'WildFly deployment [{#DEPLOYMENT}]'
+                  tag: component
+                  value: deployments
+                -
+                  tag: deployment
+                  value: '{#DEPLOYMENT}'
+                -
+                  tag: server-group
+                  value: '{#SERVER_GROUP}'
             -
               uuid: 45d729721df34ef297109b58027ca4c1
               name: 'WildFly deployment [{#DEPLOYMENT}]: Managed'
@@ -216,8 +230,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:{$WILDFLY.JMX.PROTOCOL}://{HOST.CONN}:{HOST.PORT}'
               tags:
                 -
-                  tag: Application
-                  value: 'WildFly deployment [{#DEPLOYMENT}]'
+                  tag: component
+                  value: deployments
+                -
+                  tag: deployment
+                  value: '{#DEPLOYMENT}'
+                -
+                  tag: server-group
+                  value: '{#SERVER_GROUP}'
           jmx_endpoint: 'service:jmx:{$WILDFLY.JMX.PROTOCOL}://{HOST.CONN}:{HOST.PORT}'
           lld_macro_paths:
             -
@@ -274,8 +294,11 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:{$WILDFLY.JMX.PROTOCOL}://{HOST.CONN}:{HOST.PORT}'
               tags:
                 -
-                  tag: Application
-                  value: 'WildFly domain: Server [{#SERVER}]'
+                  tag: component
+                  value: servers
+                -
+                  tag: server
+                  value: '{#SERVER}'
             -
               uuid: bd544e2d41c148f993b84ca7d1aad4a9
               name: 'WildFly domain: Server {#SERVER}: Server group'
@@ -295,8 +318,11 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:{$WILDFLY.JMX.PROTOCOL}://{HOST.CONN}:{HOST.PORT}'
               tags:
                 -
-                  tag: Application
-                  value: 'WildFly domain: Server [{#SERVER}]'
+                  tag: component
+                  value: servers
+                -
+                  tag: server
+                  value: '{#SERVER}'
               trigger_prototypes:
                 -
                   uuid: da5368f2eec040bbb05f13faa6375052
@@ -305,6 +331,10 @@ zabbix_export:
                   priority: INFO
                   description: 'Server group has changed. Ack to close.'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 64a8a71b3d254a479ce4e5ea82f566ee
               name: 'WildFly domain: Server {#SERVER}: Status'
@@ -324,8 +354,11 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:{$WILDFLY.JMX.PROTOCOL}://{HOST.CONN}:{HOST.PORT}'
               tags:
                 -
-                  tag: Application
-                  value: 'WildFly domain: Server [{#SERVER}]'
+                  tag: component
+                  value: servers
+                -
+                  tag: server
+                  value: '{#SERVER}'
               trigger_prototypes:
                 -
                   uuid: 79409a9fae6442c9ad655655a752365d
@@ -334,6 +367,10 @@ zabbix_export:
                   priority: WARNING
                   description: 'Server status has changed. Ack to close.'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
           jmx_endpoint: 'service:jmx:{$WILDFLY.JMX.PROTOCOL}://{HOST.CONN}:{HOST.PORT}'
           lld_macro_paths:
             -
@@ -342,6 +379,13 @@ zabbix_export:
             -
               lld_macro: '{#SERVER}'
               path: '$.properties.["server-config"]'
+      tags:
+        -
+          tag: class
+          value: application
+        -
+          tag: target
+          value: wildfly-domain
       macros:
         -
           macro: '{$WILDFLY.DEPLOYMENT.MATCHES}'
diff --git a/templates/app/wildfly_server_jmx/template_app_wildfly_server_jmx.yaml b/templates/app/wildfly_server_jmx/template_app_wildfly_server_jmx.yaml
index f470abe5056..f0e5fc79e15 100644
--- a/templates/app/wildfly_server_jmx/template_app_wildfly_server_jmx.yaml
+++ b/templates/app/wildfly_server_jmx/template_app_wildfly_server_jmx.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-15T06:58:37Z'
+  date: '2022-01-26T10:31:18Z'
   groups:
     -
       uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
@@ -18,7 +18,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Applications
@@ -41,8 +41,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:{$WILDFLY.JMX.PROTOCOL}://{HOST.CONN}:{HOST.PORT}'
           tags:
             -
-              tag: Application
-              value: WildFly
+              tag: component
+              value: application
           triggers:
             -
               uuid: 8a4fab49eb1e4ebbb1459d9b0f848771
@@ -50,6 +50,10 @@ zabbix_export:
               name: 'WildFly: Failed to fetch info data (or no data for 15m)'
               priority: WARNING
               description: 'Zabbix has not received data for items for the last 15 minutes'
+              tags:
+                -
+                  tag: scope
+                  value: availability
             -
               uuid: 71db189440ec4355aa06262e3200d47e
               expression: 'last(/WildFly Server by JMX/jmx["java.lang:type=Runtime","Uptime"])<10m'
@@ -57,6 +61,10 @@ zabbix_export:
               priority: INFO
               description: 'Uptime is less than 10 minutes'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: daf104c5cafe4879b79fb30fca99c838
           name: 'WildFly: Launch type'
@@ -76,8 +84,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:{$WILDFLY.JMX.PROTOCOL}://{HOST.CONN}:{HOST.PORT}'
           tags:
             -
-              tag: Application
-              value: WildFly
+              tag: component
+              value: application
         -
           uuid: b3c30ba00ac54677a944cda7ec8536af
           name: 'WildFly: Name'
@@ -99,8 +107,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:{$WILDFLY.JMX.PROTOCOL}://{HOST.CONN}:{HOST.PORT}'
           tags:
             -
-              tag: Application
-              value: WildFly
+              tag: component
+              value: application
         -
           uuid: 98dd8a8de5f240998bebaf28c8d1bbe2
           name: 'WildFly: Process type'
@@ -120,8 +128,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:{$WILDFLY.JMX.PROTOCOL}://{HOST.CONN}:{HOST.PORT}'
           tags:
             -
-              tag: Application
-              value: WildFly
+              tag: component
+              value: application
         -
           uuid: 0238c33ca0f045a7b1376cd5b3048bf0
           name: 'WildFly: Version'
@@ -141,8 +149,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:{$WILDFLY.JMX.PROTOCOL}://{HOST.CONN}:{HOST.PORT}'
           tags:
             -
-              tag: Application
-              value: WildFly
+              tag: component
+              value: application
           triggers:
             -
               uuid: 2923ab6f81d64579b6ba778bc0467042
@@ -151,6 +159,10 @@ zabbix_export:
               priority: INFO
               description: 'WildFly version has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 855c96cf1b3d4ef691f7693ba5f8357f
           name: 'WildFly: Runtime configuration state'
@@ -170,14 +182,18 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:{$WILDFLY.JMX.PROTOCOL}://{HOST.CONN}:{HOST.PORT}'
           tags:
             -
-              tag: Application
-              value: WildFly
+              tag: component
+              value: application
           triggers:
             -
               uuid: c5702304641748e4bb04be89f3a38326
               expression: 'find(/WildFly Server by JMX/jmx["jboss.as:management-root=server","runtimeConfigurationState"],,"like","ok")=0'
               name: 'WildFly: Server needs to restart for configuration change.'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: cd57068c6e18440a8e14c0b4fc5c6c78
           name: 'WildFly: Server controller state'
@@ -197,8 +213,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:{$WILDFLY.JMX.PROTOCOL}://{HOST.CONN}:{HOST.PORT}'
           tags:
             -
-              tag: Application
-              value: WildFly
+              tag: component
+              value: application
           triggers:
             -
               uuid: 81de7058e3b64f73a14e03728dcf1c9b
@@ -209,6 +225,10 @@ zabbix_export:
                 -
                   name: 'WildFly: Server needs to restart for configuration change.'
                   expression: 'find(/WildFly Server by JMX/jmx["jboss.as:management-root=server","runtimeConfigurationState"],,"like","ok")=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 2986d57975334b0bbf6bd687df457c26
           name: 'WildFly: Transactions: Aborted, rate'
@@ -227,8 +247,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:{$WILDFLY.JMX.PROTOCOL}://{HOST.CONN}:{HOST.PORT}'
           tags:
             -
-              tag: Application
-              value: WildFly
+              tag: component
+              value: transactions
         -
           uuid: 035752468405481a9e0c4c60e662eadc
           name: 'WildFly: Transactions: Application rollbacks, rate'
@@ -247,8 +267,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:{$WILDFLY.JMX.PROTOCOL}://{HOST.CONN}:{HOST.PORT}'
           tags:
             -
-              tag: Application
-              value: WildFly
+              tag: component
+              value: transactions
         -
           uuid: 2c157932072e416baed45a2350a3bd66
           name: 'WildFly: Transactions: Committed, rate'
@@ -267,8 +287,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:{$WILDFLY.JMX.PROTOCOL}://{HOST.CONN}:{HOST.PORT}'
           tags:
             -
-              tag: Application
-              value: WildFly
+              tag: component
+              value: transactions
         -
           uuid: 82958fc3169c42d2bb0c9dc29e341b8f
           name: 'WildFly: Transactions: Heuristics, rate'
@@ -287,8 +307,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:{$WILDFLY.JMX.PROTOCOL}://{HOST.CONN}:{HOST.PORT}'
           tags:
             -
-              tag: Application
-              value: WildFly
+              tag: component
+              value: transactions
         -
           uuid: 50ba79375dbf48c8b86c3d8654576186
           name: 'WildFly: Transactions: Current'
@@ -302,8 +322,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:{$WILDFLY.JMX.PROTOCOL}://{HOST.CONN}:{HOST.PORT}'
           tags:
             -
-              tag: Application
-              value: WildFly
+              tag: component
+              value: transactions
         -
           uuid: 6ca1501ec2904b7b875d2f9bfa127e10
           name: 'WildFly: Transactions: Nested, rate'
@@ -322,8 +342,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:{$WILDFLY.JMX.PROTOCOL}://{HOST.CONN}:{HOST.PORT}'
           tags:
             -
-              tag: Application
-              value: WildFly
+              tag: component
+              value: transactions
         -
           uuid: b1f782b6d71b4cc698a3f0d3b9d03a8d
           name: 'WildFly: Transactions: ResourceRollbacks, rate'
@@ -342,8 +362,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:{$WILDFLY.JMX.PROTOCOL}://{HOST.CONN}:{HOST.PORT}'
           tags:
             -
-              tag: Application
-              value: WildFly
+              tag: component
+              value: transactions
         -
           uuid: 6ca6b59da5da4d7cb6fbacd2bdd37996
           name: 'WildFly: Transactions: System rollbacks, rate'
@@ -362,8 +382,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:{$WILDFLY.JMX.PROTOCOL}://{HOST.CONN}:{HOST.PORT}'
           tags:
             -
-              tag: Application
-              value: WildFly
+              tag: component
+              value: transactions
         -
           uuid: 90f1a21c335b42928455d31635bfd11d
           name: 'WildFly: Transactions: Timed out, rate'
@@ -382,8 +402,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:{$WILDFLY.JMX.PROTOCOL}://{HOST.CONN}:{HOST.PORT}'
           tags:
             -
-              tag: Application
-              value: WildFly
+              tag: component
+              value: transactions
         -
           uuid: a0c40292c62e4d51a96db3e07967b17c
           name: 'WildFly: Transactions: Total, rate'
@@ -402,8 +422,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:{$WILDFLY.JMX.PROTOCOL}://{HOST.CONN}:{HOST.PORT}'
           tags:
             -
-              tag: Application
-              value: WildFly
+              tag: component
+              value: transactions
       discovery_rules:
         -
           uuid: 9dbbe152925245f8a1f3bf5c32ae49c0
@@ -449,8 +469,11 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:{$WILDFLY.JMX.PROTOCOL}://{HOST.CONN}:{HOST.PORT}'
               tags:
                 -
-                  tag: Application
-                  value: 'WildFly deployment [{#DEPLOYMENT}]'
+                  tag: component
+                  value: deployments
+                -
+                  tag: deployment
+                  value: '{#DEPLOYMENT}'
             -
               uuid: 8942cf5bc803401cac2f4d9ea943f1fe
               name: 'WildFly deployment [{#DEPLOYMENT}]: Enabled'
@@ -474,8 +497,11 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:{$WILDFLY.JMX.PROTOCOL}://{HOST.CONN}:{HOST.PORT}'
               tags:
                 -
-                  tag: Application
-                  value: 'WildFly deployment [{#DEPLOYMENT}]'
+                  tag: component
+                  value: deployments
+                -
+                  tag: deployment
+                  value: '{#DEPLOYMENT}'
             -
               uuid: f633e596ddcc4620a193243c80a6633b
               name: 'WildFly deployment [{#DEPLOYMENT}]: Managed'
@@ -499,8 +525,11 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:{$WILDFLY.JMX.PROTOCOL}://{HOST.CONN}:{HOST.PORT}'
               tags:
                 -
-                  tag: Application
-                  value: 'WildFly deployment [{#DEPLOYMENT}]'
+                  tag: component
+                  value: deployments
+                -
+                  tag: deployment
+                  value: '{#DEPLOYMENT}'
             -
               uuid: 498f0d31a5044b91b4aa8af621011919
               name: 'WildFly deployment [{#DEPLOYMENT}]: Persistent'
@@ -524,8 +553,11 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:{$WILDFLY.JMX.PROTOCOL}://{HOST.CONN}:{HOST.PORT}'
               tags:
                 -
-                  tag: Application
-                  value: 'WildFly deployment [{#DEPLOYMENT}]'
+                  tag: component
+                  value: deployments
+                -
+                  tag: deployment
+                  value: '{#DEPLOYMENT}'
             -
               uuid: d5dd67dc20c54ef1921da9c9a068ad29
               name: 'WildFly deployment [{#DEPLOYMENT}]: Status'
@@ -549,8 +581,11 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:{$WILDFLY.JMX.PROTOCOL}://{HOST.CONN}:{HOST.PORT}'
               tags:
                 -
-                  tag: Application
-                  value: 'WildFly deployment [{#DEPLOYMENT}]'
+                  tag: component
+                  value: deployments
+                -
+                  tag: deployment
+                  value: '{#DEPLOYMENT}'
               trigger_prototypes:
                 -
                   uuid: 6b432b25debe4277a971bc8a906e07b1
@@ -559,6 +594,10 @@ zabbix_export:
                   priority: WARNING
                   description: 'Deployment status has changed. Ack to close.'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
           jmx_endpoint: 'service:jmx:{$WILDFLY.JMX.PROTOCOL}://{HOST.CONN}:{HOST.PORT}'
           lld_macro_paths:
             -
@@ -593,8 +632,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:{$WILDFLY.JMX.PROTOCOL}://{HOST.CONN}:{HOST.PORT}'
               tags:
                 -
-                  tag: Application
-                  value: 'WildFly datasource [{#JMX_DATA_SOURCE}]'
+                  tag: component
+                  value: cache
+                -
+                  tag: component
+                  value: datasources
+                -
+                  tag: datasource
+                  value: '{#JMX_DATA_SOURCE}'
             -
               uuid: 0857fb4d2d2447a0b0dede21bb4b4bd5
               name: 'WildFly {#JMX_DATA_SOURCE}: Cache add, rate'
@@ -613,8 +658,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:{$WILDFLY.JMX.PROTOCOL}://{HOST.CONN}:{HOST.PORT}'
               tags:
                 -
-                  tag: Application
-                  value: 'WildFly datasource [{#JMX_DATA_SOURCE}]'
+                  tag: component
+                  value: cache
+                -
+                  tag: component
+                  value: datasources
+                -
+                  tag: datasource
+                  value: '{#JMX_DATA_SOURCE}'
             -
               uuid: bf368224ed444311ae1af4098c4bdb1f
               name: 'WildFly {#JMX_DATA_SOURCE}: Cache current size'
@@ -627,8 +678,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:{$WILDFLY.JMX.PROTOCOL}://{HOST.CONN}:{HOST.PORT}'
               tags:
                 -
-                  tag: Application
-                  value: 'WildFly datasource [{#JMX_DATA_SOURCE}]'
+                  tag: component
+                  value: cache
+                -
+                  tag: component
+                  value: datasources
+                -
+                  tag: datasource
+                  value: '{#JMX_DATA_SOURCE}'
             -
               uuid: 9c08f05299774a538a52be2c11e62cda
               name: 'WildFly {#JMX_DATA_SOURCE}: Cache delete, rate'
@@ -647,8 +704,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:{$WILDFLY.JMX.PROTOCOL}://{HOST.CONN}:{HOST.PORT}'
               tags:
                 -
-                  tag: Application
-                  value: 'WildFly datasource [{#JMX_DATA_SOURCE}]'
+                  tag: component
+                  value: cache
+                -
+                  tag: component
+                  value: datasources
+                -
+                  tag: datasource
+                  value: '{#JMX_DATA_SOURCE}'
             -
               uuid: dbe7bc3d9a8a46c6a84b956f0a9e33be
               name: 'WildFly {#JMX_DATA_SOURCE}: Cache hit, rate'
@@ -667,8 +730,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:{$WILDFLY.JMX.PROTOCOL}://{HOST.CONN}:{HOST.PORT}'
               tags:
                 -
-                  tag: Application
-                  value: 'WildFly datasource [{#JMX_DATA_SOURCE}]'
+                  tag: component
+                  value: cache
+                -
+                  tag: component
+                  value: datasources
+                -
+                  tag: datasource
+                  value: '{#JMX_DATA_SOURCE}'
             -
               uuid: 0e81a30b802941c4bc0e34a10a8d0573
               name: 'WildFly {#JMX_DATA_SOURCE}: Cache miss, rate'
@@ -687,8 +756,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:{$WILDFLY.JMX.PROTOCOL}://{HOST.CONN}:{HOST.PORT}'
               tags:
                 -
-                  tag: Application
-                  value: 'WildFly datasource [{#JMX_DATA_SOURCE}]'
+                  tag: component
+                  value: cache
+                -
+                  tag: component
+                  value: datasources
+                -
+                  tag: datasource
+                  value: '{#JMX_DATA_SOURCE}'
             -
               uuid: 81dbce02ad4d492ebebd1a205bea1b43
               name: 'WildFly {#JMX_DATA_SOURCE}: Statistics enabled'
@@ -712,8 +787,11 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:{$WILDFLY.JMX.PROTOCOL}://{HOST.CONN}:{HOST.PORT}'
               tags:
                 -
-                  tag: Application
-                  value: 'WildFly datasource [{#JMX_DATA_SOURCE}]'
+                  tag: component
+                  value: datasources
+                -
+                  tag: datasource
+                  value: '{#JMX_DATA_SOURCE}'
           graph_prototypes:
             -
               uuid: 322b26787ab444db90a1be3da2717dd2
@@ -778,14 +856,24 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:{$WILDFLY.JMX.PROTOCOL}://{HOST.CONN}:{HOST.PORT}'
               tags:
                 -
-                  tag: Application
-                  value: 'WildFly datasource [{#JMX_DATA_SOURCE}]'
+                  tag: component
+                  value: connections
+                -
+                  tag: component
+                  value: datasources
+                -
+                  tag: datasource
+                  value: '{#JMX_DATA_SOURCE}'
               trigger_prototypes:
                 -
                   uuid: ea551068ebd04d349eba3f45a72f2610
                   expression: 'max(/WildFly Server by JMX/jmx["{#JMXOBJ}",ActiveCount],5m)=0'
                   name: 'WildFly {#JMX_DATA_SOURCE}: There are no active connections for 5m'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
             -
               uuid: 64565b71c26b463d8ea83ee5ee18284f
               name: 'WildFly {#JMX_DATA_SOURCE}: Connections: Available'
@@ -799,8 +887,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:{$WILDFLY.JMX.PROTOCOL}://{HOST.CONN}:{HOST.PORT}'
               tags:
                 -
-                  tag: Application
-                  value: 'WildFly datasource [{#JMX_DATA_SOURCE}]'
+                  tag: component
+                  value: connections
+                -
+                  tag: component
+                  value: datasources
+                -
+                  tag: datasource
+                  value: '{#JMX_DATA_SOURCE}'
             -
               uuid: adf534b46aba4f28acea58ea46197edd
               name: 'WildFly {#JMX_DATA_SOURCE}: Blocking time, avg'
@@ -815,8 +909,11 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:{$WILDFLY.JMX.PROTOCOL}://{HOST.CONN}:{HOST.PORT}'
               tags:
                 -
-                  tag: Application
-                  value: 'WildFly datasource [{#JMX_DATA_SOURCE}]'
+                  tag: component
+                  value: datasources
+                -
+                  tag: datasource
+                  value: '{#JMX_DATA_SOURCE}'
             -
               uuid: 788691ba487e422a913d408361f99e4d
               name: 'WildFly {#JMX_DATA_SOURCE}: Connections: Creating time, avg'
@@ -831,8 +928,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:{$WILDFLY.JMX.PROTOCOL}://{HOST.CONN}:{HOST.PORT}'
               tags:
                 -
-                  tag: Application
-                  value: 'WildFly datasource [{#JMX_DATA_SOURCE}]'
+                  tag: component
+                  value: connections
+                -
+                  tag: component
+                  value: datasources
+                -
+                  tag: datasource
+                  value: '{#JMX_DATA_SOURCE}'
             -
               uuid: 52320ebbe70244e3ad52b0766cd03d8d
               name: 'WildFly {#JMX_DATA_SOURCE}: Connections: Get time, avg'
@@ -847,8 +950,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:{$WILDFLY.JMX.PROTOCOL}://{HOST.CONN}:{HOST.PORT}'
               tags:
                 -
-                  tag: Application
-                  value: 'WildFly datasource [{#JMX_DATA_SOURCE}]'
+                  tag: component
+                  value: connections
+                -
+                  tag: component
+                  value: datasources
+                -
+                  tag: datasource
+                  value: '{#JMX_DATA_SOURCE}'
             -
               uuid: c3a313b3d1c34e6b99ae73d5195e7fac
               name: 'WildFly {#JMX_DATA_SOURCE}: Connections: Pool time, avg'
@@ -863,8 +972,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:{$WILDFLY.JMX.PROTOCOL}://{HOST.CONN}:{HOST.PORT}'
               tags:
                 -
-                  tag: Application
-                  value: 'WildFly datasource [{#JMX_DATA_SOURCE}]'
+                  tag: component
+                  value: connections
+                -
+                  tag: component
+                  value: datasources
+                -
+                  tag: datasource
+                  value: '{#JMX_DATA_SOURCE}'
             -
               uuid: a76602ba784a4d40a3672a80487c878a
               name: 'WildFly {#JMX_DATA_SOURCE}: Connections: Usage time, avg'
@@ -879,8 +994,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:{$WILDFLY.JMX.PROTOCOL}://{HOST.CONN}:{HOST.PORT}'
               tags:
                 -
-                  tag: Application
-                  value: 'WildFly datasource [{#JMX_DATA_SOURCE}]'
+                  tag: component
+                  value: connections
+                -
+                  tag: component
+                  value: datasources
+                -
+                  tag: datasource
+                  value: '{#JMX_DATA_SOURCE}'
             -
               uuid: ba111d0ad76848c39c54ffc37d04e561
               name: 'WildFly {#JMX_DATA_SOURCE}: Connections: Blocking failure, rate'
@@ -899,8 +1020,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:{$WILDFLY.JMX.PROTOCOL}://{HOST.CONN}:{HOST.PORT}'
               tags:
                 -
-                  tag: Application
-                  value: 'WildFly datasource [{#JMX_DATA_SOURCE}]'
+                  tag: component
+                  value: connections
+                -
+                  tag: component
+                  value: datasources
+                -
+                  tag: datasource
+                  value: '{#JMX_DATA_SOURCE}'
             -
               uuid: c01eb89708224899a9ac8e90ee79bcca
               name: 'WildFly {#JMX_DATA_SOURCE}: Connections: Created, rate'
@@ -919,8 +1046,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:{$WILDFLY.JMX.PROTOCOL}://{HOST.CONN}:{HOST.PORT}'
               tags:
                 -
-                  tag: Application
-                  value: 'WildFly datasource [{#JMX_DATA_SOURCE}]'
+                  tag: component
+                  value: connections
+                -
+                  tag: component
+                  value: datasources
+                -
+                  tag: datasource
+                  value: '{#JMX_DATA_SOURCE}'
             -
               uuid: 606ed51ce8e549c7af20d7c1c5f78e6e
               name: 'WildFly {#JMX_DATA_SOURCE}: Connections: Destroyed, rate'
@@ -939,8 +1072,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:{$WILDFLY.JMX.PROTOCOL}://{HOST.CONN}:{HOST.PORT}'
               tags:
                 -
-                  tag: Application
-                  value: 'WildFly datasource [{#JMX_DATA_SOURCE}]'
+                  tag: component
+                  value: connections
+                -
+                  tag: component
+                  value: datasources
+                -
+                  tag: datasource
+                  value: '{#JMX_DATA_SOURCE}'
             -
               uuid: a02eb0060fbb4f598d654d93c286c543
               name: 'WildFly {#JMX_DATA_SOURCE}: Connections: Idle'
@@ -954,8 +1093,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:{$WILDFLY.JMX.PROTOCOL}://{HOST.CONN}:{HOST.PORT}'
               tags:
                 -
-                  tag: Application
-                  value: 'WildFly datasource [{#JMX_DATA_SOURCE}]'
+                  tag: component
+                  value: connections
+                -
+                  tag: component
+                  value: datasources
+                -
+                  tag: datasource
+                  value: '{#JMX_DATA_SOURCE}'
             -
               uuid: a5eed78c02274f6180eb667091087ce0
               name: 'WildFly {#JMX_DATA_SOURCE}: Connections: In use'
@@ -969,8 +1114,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:{$WILDFLY.JMX.PROTOCOL}://{HOST.CONN}:{HOST.PORT}'
               tags:
                 -
-                  tag: Application
-                  value: 'WildFly datasource [{#JMX_DATA_SOURCE}]'
+                  tag: component
+                  value: connections
+                -
+                  tag: component
+                  value: datasources
+                -
+                  tag: datasource
+                  value: '{#JMX_DATA_SOURCE}'
             -
               uuid: 2f3e82a1c2f2472f95e4a85e3b182739
               name: 'WildFly {#JMX_DATA_SOURCE}: Connections: Used, max'
@@ -984,8 +1135,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:{$WILDFLY.JMX.PROTOCOL}://{HOST.CONN}:{HOST.PORT}'
               tags:
                 -
-                  tag: Application
-                  value: 'WildFly datasource [{#JMX_DATA_SOURCE}]'
+                  tag: component
+                  value: connections
+                -
+                  tag: component
+                  value: datasources
+                -
+                  tag: datasource
+                  value: '{#JMX_DATA_SOURCE}'
             -
               uuid: fb9a55168c8a4082a19f846ca10adc85
               name: 'WildFly {#JMX_DATA_SOURCE}: Statistics enabled'
@@ -1010,20 +1167,31 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:{$WILDFLY.JMX.PROTOCOL}://{HOST.CONN}:{HOST.PORT}'
               tags:
                 -
-                  tag: Application
-                  value: 'WildFly datasource [{#JMX_DATA_SOURCE}]'
+                  tag: component
+                  value: datasources
+                -
+                  tag: datasource
+                  value: '{#JMX_DATA_SOURCE}'
               trigger_prototypes:
                 -
                   uuid: 2996a48892a640d69154de332c673755
                   expression: 'last(/WildFly Server by JMX/jmx["{#JMXOBJ}",statisticsEnabled])=0'
                   name: 'WildFly {#JMX_DATA_SOURCE}: JDBC monitoring statistic is not enabled'
                   priority: INFO
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: 4ea71ba3572647b29a60077bc511052a
                   expression: 'last(/WildFly Server by JMX/jmx["{#JMXOBJ}",statisticsEnabled])=0'
                   name: 'WildFly {#JMX_DATA_SOURCE}: Pools monitoring statistic is not enabled'
                   priority: INFO
                   description: 'Zabbix has not received data for items for the last 15 minutes'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 727ff33cec8e4223bc5054c53d0de88b
               name: 'WildFly {#JMX_DATA_SOURCE}: Connections: Timed out, rate'
@@ -1042,14 +1210,24 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:{$WILDFLY.JMX.PROTOCOL}://{HOST.CONN}:{HOST.PORT}'
               tags:
                 -
-                  tag: Application
-                  value: 'WildFly datasource [{#JMX_DATA_SOURCE}]'
+                  tag: component
+                  value: connections
+                -
+                  tag: component
+                  value: datasources
+                -
+                  tag: datasource
+                  value: '{#JMX_DATA_SOURCE}'
               trigger_prototypes:
                 -
                   uuid: d70d1703fdc64926abe602324814ea4c
                   expression: 'last(/WildFly Server by JMX/jmx["{#JMXOBJ}",TimedOut])>0'
-                  name: 'WildFly {#JMX_DATA_SOURCE}: There are timeout  connections'
+                  name: 'WildFly {#JMX_DATA_SOURCE}: There are timeout connections'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: perfomance
             -
               uuid: 4832c8d39e0d4329af6876c594a3d741
               name: 'WildFly {#JMX_DATA_SOURCE}: Connections: Wait'
@@ -1063,14 +1241,24 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:{$WILDFLY.JMX.PROTOCOL}://{HOST.CONN}:{HOST.PORT}'
               tags:
                 -
-                  tag: Application
-                  value: 'WildFly datasource [{#JMX_DATA_SOURCE}]'
+                  tag: component
+                  value: connections
+                -
+                  tag: component
+                  value: datasources
+                -
+                  tag: datasource
+                  value: '{#JMX_DATA_SOURCE}'
               trigger_prototypes:
                 -
                   uuid: 2e38504216d84f3b9fe43b0bea86e388
                   expression: 'min(/WildFly Server by JMX/jmx["{#JMXOBJ}",WaitCount],5m)>{$WILDFLY.CONN.WAIT.MAX.WARN}'
                   name: 'WildFly {#JMX_DATA_SOURCE}: Too many waiting connections (over {$WILDFLY.CONN.WAIT.MAX.WARN} for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: perfomance
             -
               uuid: c22389aa983a4cdca504e3cc41126f03
               name: 'WildFly {#JMX_DATA_SOURCE}: XA: Commit time, avg'
@@ -1085,8 +1273,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:{$WILDFLY.JMX.PROTOCOL}://{HOST.CONN}:{HOST.PORT}'
               tags:
                 -
-                  tag: Application
-                  value: 'WildFly datasource [{#JMX_DATA_SOURCE}]'
+                  tag: component
+                  value: datasources
+                -
+                  tag: component
+                  value: xa
+                -
+                  tag: datasource
+                  value: '{#JMX_DATA_SOURCE}'
             -
               uuid: 2510b507e62c4574af32bb0a283995e8
               name: 'WildFly {#JMX_DATA_SOURCE}: XA: Commit, rate'
@@ -1105,8 +1299,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:{$WILDFLY.JMX.PROTOCOL}://{HOST.CONN}:{HOST.PORT}'
               tags:
                 -
-                  tag: Application
-                  value: 'WildFly datasource [{#JMX_DATA_SOURCE}]'
+                  tag: component
+                  value: datasources
+                -
+                  tag: component
+                  value: xa
+                -
+                  tag: datasource
+                  value: '{#JMX_DATA_SOURCE}'
             -
               uuid: 6f15c885d49e4c1a89bd52b0b4ff0035
               name: 'WildFly {#JMX_DATA_SOURCE}: XA: End time, avg'
@@ -1121,8 +1321,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:{$WILDFLY.JMX.PROTOCOL}://{HOST.CONN}:{HOST.PORT}'
               tags:
                 -
-                  tag: Application
-                  value: 'WildFly datasource [{#JMX_DATA_SOURCE}]'
+                  tag: component
+                  value: datasources
+                -
+                  tag: component
+                  value: xa
+                -
+                  tag: datasource
+                  value: '{#JMX_DATA_SOURCE}'
             -
               uuid: c51dd8821ace4724ae965d7ca6f3ebdd
               name: 'WildFly {#JMX_DATA_SOURCE}: XA: End, rate'
@@ -1141,8 +1347,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:{$WILDFLY.JMX.PROTOCOL}://{HOST.CONN}:{HOST.PORT}'
               tags:
                 -
-                  tag: Application
-                  value: 'WildFly datasource [{#JMX_DATA_SOURCE}]'
+                  tag: component
+                  value: datasources
+                -
+                  tag: component
+                  value: xa
+                -
+                  tag: datasource
+                  value: '{#JMX_DATA_SOURCE}'
             -
               uuid: b5028a44fa2b4347abe11177d61567e2
               name: 'WildFly {#JMX_DATA_SOURCE}: XA: Forget time, avg'
@@ -1157,8 +1369,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:{$WILDFLY.JMX.PROTOCOL}://{HOST.CONN}:{HOST.PORT}'
               tags:
                 -
-                  tag: Application
-                  value: 'WildFly datasource [{#JMX_DATA_SOURCE}]'
+                  tag: component
+                  value: datasources
+                -
+                  tag: component
+                  value: xa
+                -
+                  tag: datasource
+                  value: '{#JMX_DATA_SOURCE}'
             -
               uuid: 685173455b424a5aa5463670c1718314
               name: 'WildFly {#JMX_DATA_SOURCE}: XA: Forget, rate'
@@ -1177,8 +1395,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:{$WILDFLY.JMX.PROTOCOL}://{HOST.CONN}:{HOST.PORT}'
               tags:
                 -
-                  tag: Application
-                  value: 'WildFly datasource [{#JMX_DATA_SOURCE}]'
+                  tag: component
+                  value: datasources
+                -
+                  tag: component
+                  value: xa
+                -
+                  tag: datasource
+                  value: '{#JMX_DATA_SOURCE}'
             -
               uuid: 4513aff93c8a404389aaf58b28aab5b1
               name: 'WildFly {#JMX_DATA_SOURCE}: XA: Prepare time, avg'
@@ -1192,8 +1416,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:{$WILDFLY.JMX.PROTOCOL}://{HOST.CONN}:{HOST.PORT}'
               tags:
                 -
-                  tag: Application
-                  value: 'WildFly datasource [{#JMX_DATA_SOURCE}]'
+                  tag: component
+                  value: datasources
+                -
+                  tag: component
+                  value: xa
+                -
+                  tag: datasource
+                  value: '{#JMX_DATA_SOURCE}'
             -
               uuid: 96c723883cfa416b9e030e5d42836de3
               name: 'WildFly {#JMX_DATA_SOURCE}: XA: Prepare, rate'
@@ -1212,8 +1442,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:{$WILDFLY.JMX.PROTOCOL}://{HOST.CONN}:{HOST.PORT}'
               tags:
                 -
-                  tag: Application
-                  value: 'WildFly datasource [{#JMX_DATA_SOURCE}]'
+                  tag: component
+                  value: datasources
+                -
+                  tag: component
+                  value: xa
+                -
+                  tag: datasource
+                  value: '{#JMX_DATA_SOURCE}'
             -
               uuid: 30f0474a666547c39e0d793decd0be57
               name: 'WildFly {#JMX_DATA_SOURCE}: XA: Recover time, avg'
@@ -1228,8 +1464,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:{$WILDFLY.JMX.PROTOCOL}://{HOST.CONN}:{HOST.PORT}'
               tags:
                 -
-                  tag: Application
-                  value: 'WildFly datasource [{#JMX_DATA_SOURCE}]'
+                  tag: component
+                  value: datasources
+                -
+                  tag: component
+                  value: xa
+                -
+                  tag: datasource
+                  value: '{#JMX_DATA_SOURCE}'
             -
               uuid: d7a3de25f6a74c75b65bc9c83decc1ac
               name: 'WildFly {#JMX_DATA_SOURCE}: XA: Recover, rate'
@@ -1248,8 +1490,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:{$WILDFLY.JMX.PROTOCOL}://{HOST.CONN}:{HOST.PORT}'
               tags:
                 -
-                  tag: Application
-                  value: 'WildFly datasource [{#JMX_DATA_SOURCE}]'
+                  tag: component
+                  value: datasources
+                -
+                  tag: component
+                  value: xa
+                -
+                  tag: datasource
+                  value: '{#JMX_DATA_SOURCE}'
             -
               uuid: bd64f91e953249e993c3c388f3382ff4
               name: 'WildFly {#JMX_DATA_SOURCE}: XA: Rollback time, avg'
@@ -1264,8 +1512,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:{$WILDFLY.JMX.PROTOCOL}://{HOST.CONN}:{HOST.PORT}'
               tags:
                 -
-                  tag: Application
-                  value: 'WildFly datasource [{#JMX_DATA_SOURCE}]'
+                  tag: component
+                  value: datasources
+                -
+                  tag: component
+                  value: xa
+                -
+                  tag: datasource
+                  value: '{#JMX_DATA_SOURCE}'
             -
               uuid: 0c0749b041124e1ebb11396344517c01
               name: 'WildFly {#JMX_DATA_SOURCE}: XA: Rollback, rate'
@@ -1284,8 +1538,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:{$WILDFLY.JMX.PROTOCOL}://{HOST.CONN}:{HOST.PORT}'
               tags:
                 -
-                  tag: Application
-                  value: 'WildFly datasource [{#JMX_DATA_SOURCE}]'
+                  tag: component
+                  value: datasources
+                -
+                  tag: component
+                  value: xa
+                -
+                  tag: datasource
+                  value: '{#JMX_DATA_SOURCE}'
             -
               uuid: ab9c32db31d84a46967c1f601f11f610
               name: 'WildFly {#JMX_DATA_SOURCE}: XA: Start time, avg'
@@ -1300,8 +1560,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:{$WILDFLY.JMX.PROTOCOL}://{HOST.CONN}:{HOST.PORT}'
               tags:
                 -
-                  tag: Application
-                  value: 'WildFly datasource [{#JMX_DATA_SOURCE}]'
+                  tag: component
+                  value: datasources
+                -
+                  tag: component
+                  value: xa
+                -
+                  tag: datasource
+                  value: '{#JMX_DATA_SOURCE}'
             -
               uuid: ef5b00e1dcab4addbc72a0c191e3728b
               name: 'WildFly {#JMX_DATA_SOURCE}: XA: Start rate'
@@ -1320,14 +1586,24 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:{$WILDFLY.JMX.PROTOCOL}://{HOST.CONN}:{HOST.PORT}'
               tags:
                 -
-                  tag: Application
-                  value: 'WildFly datasource [{#JMX_DATA_SOURCE}]'
+                  tag: component
+                  value: datasources
+                -
+                  tag: component
+                  value: xa
+                -
+                  tag: datasource
+                  value: '{#JMX_DATA_SOURCE}'
           trigger_prototypes:
             -
               uuid: 6a40b3e94cc0441abc95fe3bc94397bf
               expression: 'min(/WildFly Server by JMX/jmx["{#JMXOBJ}",InUseCount],5m)/last(/WildFly Server by JMX/jmx["{#JMXOBJ}",AvailableCount])*100>{$WILDFLY.CONN.USAGE.WARN.MAX}'
               name: 'WildFly {#JMX_DATA_SOURCE}: Connection usage is too high (over {$WILDFLY.CONN.USAGE.WARN.MAX} in 5m)'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: capacity
           graph_prototypes:
             -
               uuid: 65db851d241b4fe4b6a5d9796d475e55
@@ -1404,8 +1680,17 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:{$WILDFLY.JMX.PROTOCOL}://{HOST.CONN}:{HOST.PORT}'
               tags:
                 -
-                  tag: Application
-                  value: 'WildFly listener [{#SERVER}.{#HTTP_LISTENER}]'
+                  tag: component
+                  value: network
+                -
+                  tag: component
+                  value: undertow
+                -
+                  tag: http_listener
+                  value: '{#HTTP_LISTENER}'
+                -
+                  tag: server
+                  value: '{#SERVER}'
             -
               uuid: 36451d29d7074b8ebdb3f366eeaa84df
               name: 'WildFly listener {#HTTP_LISTENER}: Bytes sent, rate'
@@ -1425,8 +1710,17 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:{$WILDFLY.JMX.PROTOCOL}://{HOST.CONN}:{HOST.PORT}'
               tags:
                 -
-                  tag: Application
-                  value: 'WildFly listener [{#SERVER}.{#HTTP_LISTENER}]'
+                  tag: component
+                  value: network
+                -
+                  tag: component
+                  value: undertow
+                -
+                  tag: http_listener
+                  value: '{#HTTP_LISTENER}'
+                -
+                  tag: server
+                  value: '{#SERVER}'
             -
               uuid: a34cb42c703a4996ab9a4c7a08e71eeb
               name: 'WildFly listener {#HTTP_LISTENER}: Errors, rate'
@@ -1445,14 +1739,24 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:{$WILDFLY.JMX.PROTOCOL}://{HOST.CONN}:{HOST.PORT}'
               tags:
                 -
-                  tag: Application
-                  value: 'WildFly listener [{#SERVER}.{#HTTP_LISTENER}]'
+                  tag: component
+                  value: undertow
+                -
+                  tag: http_listener
+                  value: '{#HTTP_LISTENER}'
+                -
+                  tag: server
+                  value: '{#SERVER}'
               trigger_prototypes:
                 -
                   uuid: 504b88b04a204335a10f56cc3d852ba5
                   expression: 'last(/WildFly Server by JMX/jmx["{#JMXOBJ}",errorCount])>0'
                   name: 'WildFly listener {#HTTP_LISTENER}: There are 500 responses by this listener.'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 2e7a581b104a4d4a8a0d9235b899635a
               name: 'WildFly listener {#HTTP_LISTENER}: Requests, rate'
@@ -1472,8 +1776,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:{$WILDFLY.JMX.PROTOCOL}://{HOST.CONN}:{HOST.PORT}'
               tags:
                 -
-                  tag: Application
-                  value: 'WildFly listener [{#SERVER}.{#HTTP_LISTENER}]'
+                  tag: component
+                  value: undertow
+                -
+                  tag: http_listener
+                  value: '{#HTTP_LISTENER}'
+                -
+                  tag: server
+                  value: '{#SERVER}'
           graph_prototypes:
             -
               uuid: 980c07db8fc5450db560a94df1250bf5
@@ -1516,6 +1826,13 @@ zabbix_export:
             -
               lld_macro: '{#SERVER}'
               path: '$.properties.["server"]'
+      tags:
+        -
+          tag: class
+          value: application
+        -
+          tag: target
+          value: wildfly-server
       macros:
         -
           macro: '{$WILDFLY.CONN.USAGE.WARN.MAX}'
diff --git a/templates/app/zabbix_proxy/template_app_zabbix_proxy.yaml b/templates/app/zabbix_proxy/template_app_zabbix_proxy.yaml
index 4b47a0e13be..4a4fbdb6778 100644
--- a/templates/app/zabbix_proxy/template_app_zabbix_proxy.yaml
+++ b/templates/app/zabbix_proxy/template_app_zabbix_proxy.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-11T22:24:40Z'
+  date: '2022-01-26T10:03:32Z'
   groups:
     -
       uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
@@ -10,7 +10,7 @@ zabbix_export:
       uuid: dd114bf0fb2f46bc84840f1bb24e2b23
       template: 'Zabbix proxy health'
       name: 'Zabbix proxy health'
-      description: 'Template tooling version used: 0.39'
+      description: 'Template tooling version used: 0.41'
       groups:
         -
           name: Templates/Applications
@@ -24,8 +24,8 @@ zabbix_export:
           description: 'Count of values enqueued in the preprocessing queue.'
           tags:
             -
-              tag: Application
-              value: 'Zabbix proxy'
+              tag: component
+              value: system
         -
           uuid: 5131f979c17a4346a95f8ba77e7133a4
           name: 'Zabbix proxy: Utilization of availability manager internal processes, in %'
@@ -37,8 +37,8 @@ zabbix_export:
           description: 'Average percentage of time availability manager processes have been busy in the last minute.'
           tags:
             -
-              tag: Application
-              value: 'Zabbix proxy'
+              tag: component
+              value: internal-process
           triggers:
             -
               uuid: 5a8375a8eee642f2940ed813ee062336
@@ -47,6 +47,10 @@ zabbix_export:
               recovery_expression: 'avg(/Zabbix proxy health/zabbix[process,availability manager,avg,busy],10m)<{$ZABBIX.PROXY.UTIL.MIN:"availability manager"}'
               name: 'Zabbix proxy: Utilization of availability manager processes over {$ZABBIX.PROXY.UTIL.MAX:"availability manager"}%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 3d1bfa64a447427da0b463c3617b212e
           name: 'Zabbix proxy: Utilization of configuration syncer internal processes, in %'
@@ -58,8 +62,8 @@ zabbix_export:
           description: 'Average percentage of time configuration syncer processes have been busy in the last minute.'
           tags:
             -
-              tag: Application
-              value: 'Zabbix proxy'
+              tag: component
+              value: internal-process
           triggers:
             -
               uuid: 27eb861e2e6f43f69f17b8ba65bfedcc
@@ -68,6 +72,10 @@ zabbix_export:
               recovery_expression: 'avg(/Zabbix proxy health/zabbix[process,configuration syncer,avg,busy],10m)<{$ZABBIX.PROXY.UTIL.MIN:"configuration syncer"}'
               name: 'Zabbix proxy: Utilization of configuration syncer processes over {$ZABBIX.PROXY.UTIL.MAX:"configuration syncer"}%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 69eefd6aba164d71b0a2b8d2df06e9a3
           name: 'Zabbix proxy: Utilization of data sender internal processes, in %'
@@ -79,8 +87,8 @@ zabbix_export:
           description: 'Average percentage of time data sender processes have been busy in the last minute.'
           tags:
             -
-              tag: Application
-              value: 'Zabbix proxy'
+              tag: component
+              value: internal-process
           triggers:
             -
               uuid: e8fd57784b9e4289aa4515cfa7c6c4ad
@@ -89,6 +97,10 @@ zabbix_export:
               recovery_expression: 'avg(/Zabbix proxy health/zabbix[process,data sender,avg,busy],10m)<{$ZABBIX.PROXY.UTIL.MIN:"data sender"}'
               name: 'Zabbix proxy: Utilization of data sender processes over {$ZABBIX.PROXY.UTIL.MAX:"data sender"}%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 1d00c5ef345f4827a921ff3e3617d316
           name: 'Zabbix proxy: Utilization of discoverer data collector processes, in %'
@@ -100,8 +112,8 @@ zabbix_export:
           description: 'Average percentage of time discoverer processes have been busy in the last minute.'
           tags:
             -
-              tag: Application
-              value: 'Zabbix proxy'
+              tag: component
+              value: data-collector
           triggers:
             -
               uuid: 080bd8d98f204d8580cbb1088f07d57b
@@ -110,6 +122,10 @@ zabbix_export:
               recovery_expression: 'avg(/Zabbix proxy health/zabbix[process,discoverer,avg,busy],10m)<{$ZABBIX.PROXY.UTIL.MIN:"discoverer"}'
               name: 'Zabbix proxy: Utilization of discoverer processes over {$ZABBIX.PROXY.UTIL.MAX:"discoverer"}%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: a1a7b0f3c34248a0993c305cd76fea5a
           name: 'Zabbix proxy: Utilization of heartbeat sender internal processes, in %'
@@ -121,8 +137,8 @@ zabbix_export:
           description: 'Average percentage of time heartbeat sender processes have been busy in the last minute.'
           tags:
             -
-              tag: Application
-              value: 'Zabbix proxy'
+              tag: component
+              value: internal-process
           triggers:
             -
               uuid: 51e9b56f0d854808949c5c89a53edadf
@@ -131,6 +147,10 @@ zabbix_export:
               recovery_expression: 'avg(/Zabbix proxy health/zabbix[process,heartbeat sender,avg,busy],10m)<{$ZABBIX.PROXY.UTIL.MIN:"heartbeat sender"}'
               name: 'Zabbix proxy: Utilization of heartbeat sender processes over {$ZABBIX.PROXY.UTIL.MAX:"heartbeat sender"}%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: d34bb8623fff4fb99f87167534299654
           name: 'Zabbix proxy: Utilization of history poller data collector processes, in %'
@@ -142,8 +162,8 @@ zabbix_export:
           description: 'Average percentage of time history poller processes have been busy in the last minute.'
           tags:
             -
-              tag: Application
-              value: 'Zabbix proxy'
+              tag: component
+              value: data-collector
           triggers:
             -
               uuid: 7ee08ecfeafc488583e8e4719b8a1be1
@@ -152,6 +172,10 @@ zabbix_export:
               recovery_expression: 'avg(/Zabbix proxy health/zabbix[process,history poller,avg,busy],10m)<{$ZABBIX.PROXY.UTIL.MIN:"history poller"}'
               name: 'Zabbix proxy: Utilization of history poller processes over {$ZABBIX.PROXY.UTIL.MAX:"history poller"}%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 7dde8cd03e5043a2bd484f7213a5f112
           name: 'Zabbix proxy: Utilization of history syncer internal processes, in %'
@@ -163,8 +187,8 @@ zabbix_export:
           description: 'Average percentage of time history syncer processes have been busy in the last minute.'
           tags:
             -
-              tag: Application
-              value: 'Zabbix proxy'
+              tag: component
+              value: internal-process
           triggers:
             -
               uuid: 52fb303ec9164aa28821117f3a559fe3
@@ -173,6 +197,10 @@ zabbix_export:
               recovery_expression: 'avg(/Zabbix proxy health/zabbix[process,history syncer,avg,busy],10m)<{$ZABBIX.PROXY.UTIL.MIN:"history syncer"}'
               name: 'Zabbix proxy: Utilization of history syncer processes over {$ZABBIX.PROXY.UTIL.MAX:"history syncer"}%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 31f0355f4d7c4de6b0d6f206d1ca9fa3
           name: 'Zabbix proxy: Utilization of housekeeper internal processes, in %'
@@ -184,8 +212,8 @@ zabbix_export:
           description: 'Average percentage of time housekeeper processes have been busy in the last minute.'
           tags:
             -
-              tag: Application
-              value: 'Zabbix proxy'
+              tag: component
+              value: internal-process
           triggers:
             -
               uuid: b6cbede80a4847ed94a0ba818b7ca261
@@ -194,6 +222,10 @@ zabbix_export:
               recovery_expression: 'avg(/Zabbix proxy health/zabbix[process,housekeeper,avg,busy],10m)<{$ZABBIX.PROXY.UTIL.MIN:"housekeeper"}'
               name: 'Zabbix proxy: Utilization of housekeeper processes over {$ZABBIX.PROXY.UTIL.MAX:"housekeeper"}%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 782b11dbe3ce47e3b9098c43d83057ad
           name: 'Zabbix proxy: Utilization of http poller data collector processes, in %'
@@ -205,8 +237,8 @@ zabbix_export:
           description: 'Average percentage of time http poller processes have been busy in the last minute.'
           tags:
             -
-              tag: Application
-              value: 'Zabbix proxy'
+              tag: component
+              value: data-collector
           triggers:
             -
               uuid: e93e5a3dd27f4d378bbfe2c8e5b009e7
@@ -215,6 +247,10 @@ zabbix_export:
               recovery_expression: 'avg(/Zabbix proxy health/zabbix[process,http poller,avg,busy],10m)<{$ZABBIX.PROXY.UTIL.MIN:"http poller"}'
               name: 'Zabbix proxy: Utilization of http poller processes over {$ZABBIX.PROXY.UTIL.MAX:"http poller"}%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 9b899ab317b447d1a82d1136e0a2ff6f
           name: 'Zabbix proxy: Utilization of icmp pinger data collector processes, in %'
@@ -226,8 +262,8 @@ zabbix_export:
           description: 'Average percentage of time icmp pinger processes have been busy in the last minute.'
           tags:
             -
-              tag: Application
-              value: 'Zabbix proxy'
+              tag: component
+              value: data-collector
           triggers:
             -
               uuid: d514f4a08bcd4fe2b696015a74ffafcf
@@ -236,6 +272,10 @@ zabbix_export:
               recovery_expression: 'avg(/Zabbix proxy health/zabbix[process,icmp pinger,avg,busy],10m)<{$ZABBIX.PROXY.UTIL.MIN:"icmp pinger"}'
               name: 'Zabbix proxy: Utilization of icmp pinger processes over {$ZABBIX.PROXY.UTIL.MAX:"icmp pinger"}%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 52b3123dfef94d8bba1b1a13314a9d4f
           name: 'Zabbix proxy: Utilization of ipmi manager internal processes, in %'
@@ -247,8 +287,8 @@ zabbix_export:
           description: 'Average percentage of time ipmi manager processes have been busy in the last minute.'
           tags:
             -
-              tag: Application
-              value: 'Zabbix proxy'
+              tag: component
+              value: internal-process
           triggers:
             -
               uuid: 751e3000367f42d9af0d4418f3472a91
@@ -257,6 +297,10 @@ zabbix_export:
               recovery_expression: 'avg(/Zabbix proxy health/zabbix[process,ipmi manager,avg,busy],10m)<{$ZABBIX.PROXY.UTIL.MIN:"ipmi manager"}'
               name: 'Zabbix proxy: Utilization of ipmi manager processes over {$ZABBIX.PROXY.UTIL.MAX:"ipmi manager"}%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 7cfb2f1504dd4b0aaac804b132d49bc5
           name: 'Zabbix proxy: Utilization of ipmi poller data collector processes, in %'
@@ -268,8 +312,8 @@ zabbix_export:
           description: 'Average percentage of time ipmi poller processes have been busy in the last minute.'
           tags:
             -
-              tag: Application
-              value: 'Zabbix proxy'
+              tag: component
+              value: data-collector
           triggers:
             -
               uuid: 99ce9f0ed6204860b7b943e9e3a5fbc0
@@ -278,6 +322,10 @@ zabbix_export:
               recovery_expression: 'avg(/Zabbix proxy health/zabbix[process,ipmi poller,avg,busy],10m)<{$ZABBIX.PROXY.UTIL.MIN:"ipmi poller"}'
               name: 'Zabbix proxy: Utilization of ipmi poller processes over {$ZABBIX.PROXY.UTIL.MAX:"ipmi poller"}%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 02214c0c38394bef8d648369584ae30b
           name: 'Zabbix proxy: Utilization of java poller data collector processes, in %'
@@ -289,8 +337,8 @@ zabbix_export:
           description: 'Average percentage of time java poller processes have been busy in the last minute.'
           tags:
             -
-              tag: Application
-              value: 'Zabbix proxy'
+              tag: component
+              value: data-collector
           triggers:
             -
               uuid: 5b8cc59c21b145739e346479124c48f5
@@ -299,6 +347,10 @@ zabbix_export:
               recovery_expression: 'avg(/Zabbix proxy health/zabbix[process,java poller,avg,busy],10m)<{$ZABBIX.PROXY.UTIL.MIN:"java poller"}'
               name: 'Zabbix proxy: Utilization of java poller processes over {$ZABBIX.PROXY.UTIL.MAX:"java poller"}%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 06bdbdcfdbc04c24ad387b256e430801
           name: 'Zabbix proxy: Utilization of ODBC poller data collector processes, in %'
@@ -310,8 +362,8 @@ zabbix_export:
           description: 'Average percentage of time ODBC poller processes have been busy in the last minute.'
           tags:
             -
-              tag: Application
-              value: 'Zabbix proxy'
+              tag: component
+              value: data-collector
           triggers:
             -
               uuid: 3177430235ac4eeaa23b8c39987989cc
@@ -320,6 +372,10 @@ zabbix_export:
               recovery_expression: 'avg(/Zabbix proxy health/zabbix[process,odbc poller,avg,busy],10m)<{$ZABBIX.PROXY.UTIL.MIN:"ODBC poller"}'
               name: 'Zabbix proxy: Utilization of ODBC poller processes over {$ZABBIX.PROXY.UTIL.MAX:"ODBC poller"}%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 334398ad893e4146bc1b9370eef9df59
           name: 'Zabbix proxy: Utilization of poller data collector processes, in %'
@@ -331,8 +387,8 @@ zabbix_export:
           description: 'Average percentage of time poller processes have been busy in the last minute.'
           tags:
             -
-              tag: Application
-              value: 'Zabbix proxy'
+              tag: component
+              value: data-collector
           triggers:
             -
               uuid: 3f93b378367e48f89abe304ccb624047
@@ -341,6 +397,10 @@ zabbix_export:
               recovery_expression: 'avg(/Zabbix proxy health/zabbix[process,poller,avg,busy],10m)<{$ZABBIX.PROXY.UTIL.MIN:"poller"}'
               name: 'Zabbix proxy: Utilization of poller processes over {$ZABBIX.PROXY.UTIL.MAX:"poller"}%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 20705fe12d4c40a4a27306b66ec9a69d
           name: 'Zabbix proxy: Utilization of preprocessing manager internal processes, in %'
@@ -352,8 +412,8 @@ zabbix_export:
           description: 'Average percentage of time preprocessing manager processes have been busy in the last minute.'
           tags:
             -
-              tag: Application
-              value: 'Zabbix proxy'
+              tag: component
+              value: internal-process
           triggers:
             -
               uuid: 1ed29eb53708417a827adbdf4d8f145b
@@ -362,6 +422,10 @@ zabbix_export:
               recovery_expression: 'avg(/Zabbix proxy health/zabbix[process,preprocessing manager,avg,busy],10m)<{$ZABBIX.PROXY.UTIL.MIN:"preprocessing manager"}'
               name: 'Zabbix proxy: Utilization of preprocessing manager processes over {$ZABBIX.PROXY.UTIL.MAX:"preprocessing manager"}%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 9c7916375cf841fb8edaf383b93a0522
           name: 'Zabbix proxy: Utilization of preprocessing worker internal processes, in %'
@@ -373,8 +437,8 @@ zabbix_export:
           description: 'Average percentage of time preprocessing worker processes have been busy in the last minute.'
           tags:
             -
-              tag: Application
-              value: 'Zabbix proxy'
+              tag: component
+              value: internal-process
           triggers:
             -
               uuid: 22831f081149400a86cb18930de0cc20
@@ -383,6 +447,10 @@ zabbix_export:
               recovery_expression: 'avg(/Zabbix proxy health/zabbix[process,preprocessing worker,avg,busy],10m)<{$ZABBIX.PROXY.UTIL.MIN:"preprocessing worker"}'
               name: 'Zabbix proxy: Utilization of preprocessing worker processes over {$ZABBIX.PROXY.UTIL.MAX:"preprocessing worker"}%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 1fd488bbb4af450cb2b5e8c81b739f29
           name: 'Zabbix proxy: Utilization of self-monitoring internal processes, in %'
@@ -394,8 +462,8 @@ zabbix_export:
           description: 'Average percentage of time self-monitoring processes have been busy in the last minute.'
           tags:
             -
-              tag: Application
-              value: 'Zabbix proxy'
+              tag: component
+              value: internal-process
           triggers:
             -
               uuid: cc9569f75bd44b5cbce4a4c556cd2949
@@ -404,6 +472,10 @@ zabbix_export:
               recovery_expression: 'avg(/Zabbix proxy health/zabbix[process,self-monitoring,avg,busy],10m)<{$ZABBIX.PROXY.UTIL.MIN:"self-monitoring"}'
               name: 'Zabbix proxy: Utilization of self-monitoring processes over {$ZABBIX.PROXY.UTIL.MAX:"self-monitoring"}%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 77ab21500d734deea86938a1a90035e0
           name: 'Zabbix proxy: Utilization of snmp trapper data collector processes, in %'
@@ -415,8 +487,8 @@ zabbix_export:
           description: 'Average percentage of time snmp trapper processes have been busy in the last minute.'
           tags:
             -
-              tag: Application
-              value: 'Zabbix proxy'
+              tag: component
+              value: data-collector
           triggers:
             -
               uuid: bb0a46beffbc457faea9362d4325c676
@@ -425,6 +497,10 @@ zabbix_export:
               recovery_expression: 'avg(/Zabbix proxy health/zabbix[process,snmp trapper,avg,busy],10m)<{$ZABBIX.PROXY.UTIL.MIN:"snmp trapper"}'
               name: 'Zabbix proxy: Utilization of snmp trapper processes over {$ZABBIX.PROXY.UTIL.MAX:"snmp trapper"}%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 94d1aa1bff2d499f9e29dd9cafd04b9e
           name: 'Zabbix proxy: Utilization of task manager internal processes, in %'
@@ -436,8 +512,8 @@ zabbix_export:
           description: 'Average percentage of time task manager processes have been busy in the last minute.'
           tags:
             -
-              tag: Application
-              value: 'Zabbix proxy'
+              tag: component
+              value: internal-process
           triggers:
             -
               uuid: 9a42dad8cef04138944f3a1b8c797f4e
@@ -446,6 +522,10 @@ zabbix_export:
               recovery_expression: 'avg(/Zabbix proxy health/zabbix[process,task manager,avg,busy],10m)<{$ZABBIX.PROXY.UTIL.MIN:"task manager"}'
               name: 'Zabbix proxy: Utilization of task manager processes over {$ZABBIX.PROXY.UTIL.MAX:"task manager"}%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 8d99635291d14ae8a5ba7d794540bde2
           name: 'Zabbix proxy: Utilization of trapper data collector processes, in %'
@@ -457,8 +537,8 @@ zabbix_export:
           description: 'Average percentage of time trapper processes have been busy in the last minute.'
           tags:
             -
-              tag: Application
-              value: 'Zabbix proxy'
+              tag: component
+              value: data-collector
           triggers:
             -
               uuid: 95ad6d80dc9c4f46a4e255d13f1b01a3
@@ -467,6 +547,10 @@ zabbix_export:
               recovery_expression: 'avg(/Zabbix proxy health/zabbix[process,trapper,avg,busy],10m)<{$ZABBIX.PROXY.UTIL.MIN:"trapper"}'
               name: 'Zabbix proxy: Utilization of trapper processes over {$ZABBIX.PROXY.UTIL.MAX:"trapper"}%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 7b0f5b75d4854b84a7e1f51975732e25
           name: 'Zabbix proxy: Utilization of unreachable poller data collector processes, in %'
@@ -478,8 +562,8 @@ zabbix_export:
           description: 'Average percentage of time unreachable poller processes have been busy in the last minute.'
           tags:
             -
-              tag: Application
-              value: 'Zabbix proxy'
+              tag: component
+              value: data-collector
           triggers:
             -
               uuid: a28abd3f43f843af9646a1f8b1ca056a
@@ -488,6 +572,10 @@ zabbix_export:
               recovery_expression: 'avg(/Zabbix proxy health/zabbix[process,unreachable poller,avg,busy],10m)<{$ZABBIX.PROXY.UTIL.MIN:"unreachable poller"}'
               name: 'Zabbix proxy: Utilization of unreachable poller processes over {$ZABBIX.PROXY.UTIL.MAX:"unreachable poller"}%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: a5a7076a175c400f866a4d873d12e1e4
           name: 'Zabbix proxy: Utilization of vmware data collector processes, in %'
@@ -499,8 +587,8 @@ zabbix_export:
           description: 'Average percentage of time vmware collector processes have been busy in the last minute.'
           tags:
             -
-              tag: Application
-              value: 'Zabbix proxy'
+              tag: component
+              value: data-collector
           triggers:
             -
               uuid: a1051b5ac8334125a40cb36a95605284
@@ -509,6 +597,10 @@ zabbix_export:
               recovery_expression: 'avg(/Zabbix proxy health/zabbix[process,vmware collector,avg,busy],10m)<{$ZABBIX.PROXY.UTIL.MIN:"vmware collector"}'
               name: 'Zabbix proxy: Utilization of vmware collector processes over {$ZABBIX.PROXY.UTIL.MAX:"vmware collector"}%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 3b66d42ec1fa4dc7a41750aacf6e68f3
           name: 'Zabbix proxy: Values waiting to be sent'
@@ -518,8 +610,8 @@ zabbix_export:
           description: 'Number of values in the proxy history table waiting to be sent to the server.'
           tags:
             -
-              tag: Application
-              value: 'Zabbix proxy'
+              tag: component
+              value: system
         -
           uuid: 2fa1c8d8fcb94d4c83cf4e291420a690
           name: 'Zabbix proxy: Queue over 10 minutes'
@@ -529,8 +621,8 @@ zabbix_export:
           description: 'Number of monitored items in the queue which are delayed at least by 10 minutes.'
           tags:
             -
-              tag: Application
-              value: 'Zabbix proxy'
+              tag: component
+              value: system
           triggers:
             -
               uuid: f28d8231e0f2486bb68963719359789c
@@ -538,6 +630,10 @@ zabbix_export:
               name: 'Zabbix proxy: More than 100 items having missing data for more than 10 minutes'
               priority: WARNING
               description: 'zabbix[stats,{$IP},{$PORT},queue,10m] item is collecting data about how many items are missing data for more than 10 minutes.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: cfbb623cca754fd49d4f606ab52f658d
           name: 'Zabbix proxy: Queue'
@@ -547,8 +643,8 @@ zabbix_export:
           description: 'Number of monitored items in the queue which are delayed at least by 6 seconds.'
           tags:
             -
-              tag: Application
-              value: 'Zabbix proxy'
+              tag: component
+              value: system
         -
           uuid: 606d1d43812341db8260a233295a4a4e
           name: 'Zabbix proxy: Configuration cache, % used'
@@ -560,8 +656,8 @@ zabbix_export:
           description: 'Availability statistics of Zabbix configuration cache. Percentage of used buffer.'
           tags:
             -
-              tag: Application
-              value: 'Zabbix proxy'
+              tag: component
+              value: system
           triggers:
             -
               uuid: 98ae52367f69476dbeb9c50e5f28b429
@@ -569,6 +665,13 @@ zabbix_export:
               name: 'Zabbix proxy: More than {$ZABBIX.PROXY.UTIL.MAX}% used in the configuration cache'
               priority: AVERAGE
               description: 'Consider increasing CacheSize in the zabbix_proxy.conf configuration file.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: ef820395239d4a108980fe53017a89fc
           name: 'Zabbix proxy: Required performance'
@@ -579,8 +682,8 @@ zabbix_export:
           description: 'Required performance of Zabbix proxy, in new values per second expected.'
           tags:
             -
-              tag: Application
-              value: 'Zabbix proxy'
+              tag: component
+              value: system
         -
           uuid: ef920914bc00432ea4d4007d09e081df
           name: 'Zabbix proxy: Uptime'
@@ -591,8 +694,8 @@ zabbix_export:
           description: 'Uptime of Zabbix proxy process in seconds.'
           tags:
             -
-              tag: Application
-              value: 'Zabbix proxy'
+              tag: component
+              value: system
           triggers:
             -
               uuid: b505a16c50f64adb8c5528907925f798
@@ -601,6 +704,10 @@ zabbix_export:
               priority: INFO
               description: 'Uptime is less than 10 minutes'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 4d38d6d107714c96ae2ed2af44fddb60
           name: 'Zabbix proxy: Version'
@@ -617,8 +724,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: 'Zabbix proxy'
+              tag: component
+              value: system
           triggers:
             -
               uuid: bf7eef07faf14fc4b2603ae952f001da
@@ -627,6 +734,10 @@ zabbix_export:
               priority: INFO
               description: 'Zabbix proxy version has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: fc7412c1a02240b7931d3511743a2662
           name: 'Zabbix proxy: VMware cache, % used'
@@ -638,8 +749,8 @@ zabbix_export:
           description: 'Availability statistics of Zabbix vmware cache. Percentage of used buffer.'
           tags:
             -
-              tag: Application
-              value: 'Zabbix proxy'
+              tag: component
+              value: system
           triggers:
             -
               uuid: 69707cc61b7d408f8683dae435183d4f
@@ -647,6 +758,13 @@ zabbix_export:
               name: 'Zabbix proxy: More than {$ZABBIX.PROXY.UTIL.MAX}% used in the vmware cache'
               priority: AVERAGE
               description: 'Consider increasing VMwareCacheSize in the zabbix_proxy.conf configuration file.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: aec73d2a7e444702b352c75998bf636e
           name: 'Zabbix proxy: History write cache, % used'
@@ -660,8 +778,8 @@ zabbix_export:
             History cache is used to store item values. A high number indicates performance problems on the database side.
           tags:
             -
-              tag: Application
-              value: 'Zabbix proxy'
+              tag: component
+              value: system
           triggers:
             -
               uuid: dc5a87f6c62d47b08ddd4578aa5f293f
@@ -669,6 +787,13 @@ zabbix_export:
               name: 'Zabbix proxy: More than {$ZABBIX.PROXY.UTIL.MAX}% used in the history cache'
               priority: AVERAGE
               description: 'Consider increasing HistoryCacheSize in the zabbix_proxy.conf configuration file.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 8c4c7802497d4de4988278edc29f8eb1
           name: 'Zabbix proxy: History index cache, % used'
@@ -682,8 +807,8 @@ zabbix_export:
             History index cache is used to index values stored in history cache.
           tags:
             -
-              tag: Application
-              value: 'Zabbix proxy'
+              tag: component
+              value: system
           triggers:
             -
               uuid: 92b94edb126d48af9e5e959357e2107b
@@ -691,6 +816,13 @@ zabbix_export:
               name: 'Zabbix proxy: More than {$ZABBIX.PROXY.UTIL.MAX}% used in the history index cache'
               priority: AVERAGE
               description: 'Consider increasing HistoryIndexCacheSize in the zabbix_proxy.conf configuration file.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: ba5efd0ed21d4ac39e1375788b7198de
           name: 'Zabbix proxy: Number of processed numeric (float) values per second'
@@ -708,8 +840,8 @@ zabbix_export:
                 - ''
           tags:
             -
-              tag: Application
-              value: 'Zabbix proxy'
+              tag: component
+              value: system
         -
           uuid: 47cdd6ef01734ec1ab15b0ab43d147ca
           name: 'Zabbix proxy: Number of processed log values per second'
@@ -727,8 +859,8 @@ zabbix_export:
                 - ''
           tags:
             -
-              tag: Application
-              value: 'Zabbix proxy'
+              tag: component
+              value: system
         -
           uuid: 46574db1d70545f6af89e8607d22f5bb
           name: 'Zabbix proxy: Number of processed not supported values per second'
@@ -746,8 +878,8 @@ zabbix_export:
                 - ''
           tags:
             -
-              tag: Application
-              value: 'Zabbix proxy'
+              tag: component
+              value: system
         -
           uuid: 5f0c3ed0998e499aaa1e4a30726928fc
           name: 'Zabbix proxy: Number of processed character values per second'
@@ -765,8 +897,8 @@ zabbix_export:
                 - ''
           tags:
             -
-              tag: Application
-              value: 'Zabbix proxy'
+              tag: component
+              value: system
         -
           uuid: 1c259b08b3ff445f9b2f24a02c07c5db
           name: 'Zabbix proxy: Number of processed text values per second'
@@ -784,8 +916,8 @@ zabbix_export:
                 - ''
           tags:
             -
-              tag: Application
-              value: 'Zabbix proxy'
+              tag: component
+              value: system
         -
           uuid: 8e4b9641b173415c8608ee4863bcd547
           name: 'Zabbix proxy: Number of processed numeric (unsigned) values per second'
@@ -803,8 +935,8 @@ zabbix_export:
                 - ''
           tags:
             -
-              tag: Application
-              value: 'Zabbix proxy'
+              tag: component
+              value: system
         -
           uuid: 5229b786efc84f01bb31f2819c47d9f4
           name: 'Zabbix proxy: Number of processed values per second'
@@ -822,8 +954,18 @@ zabbix_export:
                 - ''
           tags:
             -
-              tag: Application
-              value: 'Zabbix proxy'
+              tag: component
+              value: system
+      tags:
+        -
+          tag: class
+          value: software
+        -
+          tag: target
+          value: proxy
+        -
+          tag: target
+          value: zabbix
       macros:
         -
           macro: '{$ZABBIX.PROXY.UTIL.MAX}'
diff --git a/templates/app/zabbix_proxy_remote/template_app_zabbix_proxy_remote.yaml b/templates/app/zabbix_proxy_remote/template_app_zabbix_proxy_remote.yaml
new file mode 100644
index 00000000000..9f0384e4105
--- /dev/null
+++ b/templates/app/zabbix_proxy_remote/template_app_zabbix_proxy_remote.yaml
@@ -0,0 +1,1613 @@
+zabbix_export:
+  version: '6.0'
+  date: '2022-01-26T10:50:25Z'
+  groups:
+    -
+      uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
+      name: Templates/Applications
+  templates:
+    -
+      uuid: 970c2342146549768e6b91a26089bcdf
+      template: 'Remote Zabbix proxy health'
+      name: 'Remote Zabbix proxy health'
+      description: 'Template tooling version used: 0.41'
+      groups:
+        -
+          name: Templates/Applications
+      items:
+        -
+          uuid: e6654e9406b74b28909dc166b2805125
+          name: 'Remote Zabbix proxy: Preprocessing queue'
+          type: DEPENDENT
+          key: preprocessing_queue
+          delay: '0'
+          history: 1w
+          description: 'Count of values enqueued in the preprocessing queue.'
+          preprocessing:
+            -
+              type: JSONPATH
+              parameters:
+                - $.data.preprocessing_queue
+          master_item:
+            key: 'zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT}]'
+          tags:
+            -
+              tag: component
+              value: system
+        -
+          uuid: 189d41565cdf4f459468c43d1b1d0961
+          name: 'Remote Zabbix proxy: Utilization of availability manager internal processes, in %'
+          type: DEPENDENT
+          key: process.availability_manager.avg.busy
+          delay: '0'
+          history: 1w
+          value_type: FLOAT
+          units: '%'
+          description: 'Average percentage of time availability manager processes have been busy in the last minute.'
+          preprocessing:
+            -
+              type: JSONPATH
+              parameters:
+                - '$.data.process[''availability manager''].busy.avg'
+              error_handler: CUSTOM_ERROR
+              error_handler_params: 'Processes availability manager not started'
+          master_item:
+            key: 'zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT}]'
+          tags:
+            -
+              tag: component
+              value: internal-process
+          triggers:
+            -
+              uuid: 77e66d2f6b0e48fa8a7ec5dd213eab35
+              expression: 'avg(/Remote Zabbix proxy health/process.availability_manager.avg.busy,10m)>{$ZABBIX.PROXY.UTIL.MAX:"availability manager"}'
+              recovery_mode: RECOVERY_EXPRESSION
+              recovery_expression: 'avg(/Remote Zabbix proxy health/process.availability_manager.avg.busy,10m)<{$ZABBIX.PROXY.UTIL.MIN:"availability manager"}'
+              name: 'Remote Zabbix proxy: Utilization of availability manager processes over {$ZABBIX.PROXY.UTIL.MAX:"availability manager"}%'
+              priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
+        -
+          uuid: 457a086236ab40eda5c9758eabacb73d
+          name: 'Remote Zabbix proxy: Utilization of configuration syncer internal processes, in %'
+          type: DEPENDENT
+          key: process.configuration_syncer.avg.busy
+          delay: '0'
+          history: 1w
+          value_type: FLOAT
+          units: '%'
+          description: 'Average percentage of time configuration syncer processes have been busy in the last minute.'
+          preprocessing:
+            -
+              type: JSONPATH
+              parameters:
+                - '$.data.process[''configuration syncer''].busy.avg'
+              error_handler: CUSTOM_ERROR
+              error_handler_params: 'Processes configuration syncer not started'
+          master_item:
+            key: 'zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT}]'
+          tags:
+            -
+              tag: component
+              value: internal-process
+          triggers:
+            -
+              uuid: 67089f59f77641c8ab487e2c44d563a2
+              expression: 'avg(/Remote Zabbix proxy health/process.configuration_syncer.avg.busy,10m)>{$ZABBIX.PROXY.UTIL.MAX:"configuration syncer"}'
+              recovery_mode: RECOVERY_EXPRESSION
+              recovery_expression: 'avg(/Remote Zabbix proxy health/process.configuration_syncer.avg.busy,10m)<{$ZABBIX.PROXY.UTIL.MIN:"configuration syncer"}'
+              name: 'Remote Zabbix proxy: Utilization of configuration syncer processes over {$ZABBIX.PROXY.UTIL.MAX:"configuration syncer"}%'
+              priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
+        -
+          uuid: ff9c1cb7fb234ad2b793c4f296b79834
+          name: 'Remote Zabbix proxy: Utilization of data sender internal processes, in %'
+          type: DEPENDENT
+          key: process.data_sender.avg.busy
+          delay: '0'
+          history: 1w
+          value_type: FLOAT
+          units: '%'
+          description: 'Average percentage of time data sender processes have been busy in the last minute.'
+          preprocessing:
+            -
+              type: JSONPATH
+              parameters:
+                - '$.data.process[''data sender''].busy.avg'
+              error_handler: CUSTOM_ERROR
+              error_handler_params: 'Processes data sender not started'
+          master_item:
+            key: 'zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT}]'
+          tags:
+            -
+              tag: component
+              value: internal-process
+          triggers:
+            -
+              uuid: f2208ef37274449fb2b61f5f55e615f1
+              expression: 'avg(/Remote Zabbix proxy health/process.data_sender.avg.busy,10m)>{$ZABBIX.PROXY.UTIL.MAX:"data sender"}'
+              recovery_mode: RECOVERY_EXPRESSION
+              recovery_expression: 'avg(/Remote Zabbix proxy health/process.data_sender.avg.busy,10m)<{$ZABBIX.PROXY.UTIL.MIN:"data sender"}'
+              name: 'Remote Zabbix proxy: Utilization of data sender processes over {$ZABBIX.PROXY.UTIL.MAX:"data sender"}%'
+              priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
+        -
+          uuid: 504c144b92d5435b91c2c0c120bd9439
+          name: 'Remote Zabbix proxy: Utilization of discoverer data collector processes, in %'
+          type: DEPENDENT
+          key: process.discoverer.avg.busy
+          delay: '0'
+          history: 1w
+          value_type: FLOAT
+          units: '%'
+          description: 'Average percentage of time discoverer processes have been busy in the last minute.'
+          preprocessing:
+            -
+              type: JSONPATH
+              parameters:
+                - '$.data.process[''discoverer''].busy.avg'
+              error_handler: CUSTOM_ERROR
+              error_handler_params: 'Processes discoverer not started'
+          master_item:
+            key: 'zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT}]'
+          tags:
+            -
+              tag: component
+              value: data-collector
+          triggers:
+            -
+              uuid: c5a739eef8cb43f099ee902c9eb23d6e
+              expression: 'avg(/Remote Zabbix proxy health/process.discoverer.avg.busy,10m)>{$ZABBIX.PROXY.UTIL.MAX:"discoverer"}'
+              recovery_mode: RECOVERY_EXPRESSION
+              recovery_expression: 'avg(/Remote Zabbix proxy health/process.discoverer.avg.busy,10m)<{$ZABBIX.PROXY.UTIL.MIN:"discoverer"}'
+              name: 'Remote Zabbix proxy: Utilization of discoverer processes over {$ZABBIX.PROXY.UTIL.MAX:"discoverer"}%'
+              priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
+        -
+          uuid: 9ca58c0a87f54733ae9794d052092944
+          name: 'Remote Zabbix proxy: Utilization of heartbeat sender internal processes, in %'
+          type: DEPENDENT
+          key: process.heartbeat_sender.avg.busy
+          delay: '0'
+          history: 1w
+          value_type: FLOAT
+          units: '%'
+          description: 'Average percentage of time heartbeat sender processes have been busy in the last minute.'
+          preprocessing:
+            -
+              type: JSONPATH
+              parameters:
+                - '$.data.process[''heartbeat sender''].busy.avg'
+              error_handler: CUSTOM_ERROR
+              error_handler_params: 'Processes heartbeat sender not started'
+          master_item:
+            key: 'zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT}]'
+          tags:
+            -
+              tag: component
+              value: internal-process
+          triggers:
+            -
+              uuid: f75e8a72ae1642999c7560387f189129
+              expression: 'avg(/Remote Zabbix proxy health/process.heartbeat_sender.avg.busy,10m)>{$ZABBIX.PROXY.UTIL.MAX:"heartbeat sender"}'
+              recovery_mode: RECOVERY_EXPRESSION
+              recovery_expression: 'avg(/Remote Zabbix proxy health/process.heartbeat_sender.avg.busy,10m)<{$ZABBIX.PROXY.UTIL.MIN:"heartbeat sender"}'
+              name: 'Remote Zabbix proxy: Utilization of heartbeat sender processes over {$ZABBIX.PROXY.UTIL.MAX:"heartbeat sender"}%'
+              priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
+        -
+          uuid: 27c6471f0b184586aad8966a44a0c20f
+          name: 'Remote Zabbix proxy: Utilization of history poller data collector processes, in %'
+          type: DEPENDENT
+          key: process.history_poller.avg.busy
+          delay: '0'
+          history: 1w
+          value_type: FLOAT
+          units: '%'
+          description: 'Average percentage of time history poller processes have been busy in the last minute.'
+          preprocessing:
+            -
+              type: JSONPATH
+              parameters:
+                - '$.data.process[''history poller''].busy.avg'
+              error_handler: CUSTOM_ERROR
+              error_handler_params: 'Processes history poller not started'
+          master_item:
+            key: 'zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT}]'
+          tags:
+            -
+              tag: component
+              value: data-collector
+          triggers:
+            -
+              uuid: afcd2486a21b42ae97f53353b3642301
+              expression: 'avg(/Remote Zabbix proxy health/process.history_poller.avg.busy,10m)>{$ZABBIX.PROXY.UTIL.MAX:"history poller"}'
+              recovery_mode: RECOVERY_EXPRESSION
+              recovery_expression: 'avg(/Remote Zabbix proxy health/process.history_poller.avg.busy,10m)<{$ZABBIX.PROXY.UTIL.MIN:"history poller"}'
+              name: 'Remote Zabbix proxy: Utilization of history poller processes over {$ZABBIX.PROXY.UTIL.MAX:"history poller"}%'
+              priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
+        -
+          uuid: c710e445710b4d98bd4ebcd5770c7d5a
+          name: 'Remote Zabbix proxy: Utilization of history syncer internal processes, in %'
+          type: DEPENDENT
+          key: process.history_syncer.avg.busy
+          delay: '0'
+          history: 1w
+          value_type: FLOAT
+          units: '%'
+          description: 'Average percentage of time history syncer processes have been busy in the last minute.'
+          preprocessing:
+            -
+              type: JSONPATH
+              parameters:
+                - '$.data.process[''history syncer''].busy.avg'
+              error_handler: CUSTOM_ERROR
+              error_handler_params: 'Processes history syncer not started'
+          master_item:
+            key: 'zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT}]'
+          tags:
+            -
+              tag: component
+              value: internal-process
+          triggers:
+            -
+              uuid: 872ca8a02ff948d0ab4f5000249bbf5b
+              expression: 'avg(/Remote Zabbix proxy health/process.history_syncer.avg.busy,10m)>{$ZABBIX.PROXY.UTIL.MAX:"history syncer"}'
+              recovery_mode: RECOVERY_EXPRESSION
+              recovery_expression: 'avg(/Remote Zabbix proxy health/process.history_syncer.avg.busy,10m)<{$ZABBIX.PROXY.UTIL.MIN:"history syncer"}'
+              name: 'Remote Zabbix proxy: Utilization of history syncer processes over {$ZABBIX.PROXY.UTIL.MAX:"history syncer"}%'
+              priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
+        -
+          uuid: 50c3587febc14c118ca2868c24e42770
+          name: 'Remote Zabbix proxy: Utilization of housekeeper internal processes, in %'
+          type: DEPENDENT
+          key: process.housekeeper.avg.busy
+          delay: '0'
+          history: 1w
+          value_type: FLOAT
+          units: '%'
+          description: 'Average percentage of time housekeeper processes have been busy in the last minute.'
+          preprocessing:
+            -
+              type: JSONPATH
+              parameters:
+                - '$.data.process[''housekeeper''].busy.avg'
+              error_handler: CUSTOM_ERROR
+              error_handler_params: 'Processes housekeeper not started'
+          master_item:
+            key: 'zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT}]'
+          tags:
+            -
+              tag: component
+              value: internal-process
+          triggers:
+            -
+              uuid: 43d8ef15170e4edd80eea85ad9990d73
+              expression: 'avg(/Remote Zabbix proxy health/process.housekeeper.avg.busy,10m)>{$ZABBIX.PROXY.UTIL.MAX:"housekeeper"}'
+              recovery_mode: RECOVERY_EXPRESSION
+              recovery_expression: 'avg(/Remote Zabbix proxy health/process.housekeeper.avg.busy,10m)<{$ZABBIX.PROXY.UTIL.MIN:"housekeeper"}'
+              name: 'Remote Zabbix proxy: Utilization of housekeeper processes over {$ZABBIX.PROXY.UTIL.MAX:"housekeeper"}%'
+              priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
+        -
+          uuid: 4f335477bd654368a7870dc5cd21e114
+          name: 'Remote Zabbix proxy: Utilization of http poller data collector processes, in %'
+          type: DEPENDENT
+          key: process.http_poller.avg.busy
+          delay: '0'
+          history: 1w
+          value_type: FLOAT
+          units: '%'
+          description: 'Average percentage of time http poller processes have been busy in the last minute.'
+          preprocessing:
+            -
+              type: JSONPATH
+              parameters:
+                - '$.data.process[''http poller''].busy.avg'
+              error_handler: CUSTOM_ERROR
+              error_handler_params: 'Processes http poller not started'
+          master_item:
+            key: 'zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT}]'
+          tags:
+            -
+              tag: component
+              value: data-collector
+          triggers:
+            -
+              uuid: 9c391ba5350d401b9ca56f7cd29cd457
+              expression: 'avg(/Remote Zabbix proxy health/process.http_poller.avg.busy,10m)>{$ZABBIX.PROXY.UTIL.MAX:"http poller"}'
+              recovery_mode: RECOVERY_EXPRESSION
+              recovery_expression: 'avg(/Remote Zabbix proxy health/process.http_poller.avg.busy,10m)<{$ZABBIX.PROXY.UTIL.MIN:"http poller"}'
+              name: 'Remote Zabbix proxy: Utilization of http poller processes over {$ZABBIX.PROXY.UTIL.MAX:"http poller"}%'
+              priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
+        -
+          uuid: f03927fd354a490e95521e5922a19ad3
+          name: 'Remote Zabbix proxy: Utilization of icmp pinger data collector processes, in %'
+          type: DEPENDENT
+          key: process.icmp_pinger.avg.busy
+          delay: '0'
+          history: 1w
+          value_type: FLOAT
+          units: '%'
+          description: 'Average percentage of time icmp pinger processes have been busy in the last minute.'
+          preprocessing:
+            -
+              type: JSONPATH
+              parameters:
+                - '$.data.process[''icmp pinger''].busy.avg'
+              error_handler: CUSTOM_ERROR
+              error_handler_params: 'Processes icmp pinger not started'
+          master_item:
+            key: 'zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT}]'
+          tags:
+            -
+              tag: component
+              value: data-collector
+          triggers:
+            -
+              uuid: 8a0abc8ff0dd42b0926b5840fe5b0e2f
+              expression: 'avg(/Remote Zabbix proxy health/process.icmp_pinger.avg.busy,10m)>{$ZABBIX.PROXY.UTIL.MAX:"icmp pinger"}'
+              recovery_mode: RECOVERY_EXPRESSION
+              recovery_expression: 'avg(/Remote Zabbix proxy health/process.icmp_pinger.avg.busy,10m)<{$ZABBIX.PROXY.UTIL.MIN:"icmp pinger"}'
+              name: 'Remote Zabbix proxy: Utilization of icmp pinger processes over {$ZABBIX.PROXY.UTIL.MAX:"icmp pinger"}%'
+              priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
+        -
+          uuid: fb560cce51714f9c8b5164f7587930e5
+          name: 'Remote Zabbix proxy: Utilization of ipmi manager internal processes, in %'
+          type: DEPENDENT
+          key: process.ipmi_manager.avg.busy
+          delay: '0'
+          history: 1w
+          value_type: FLOAT
+          units: '%'
+          description: 'Average percentage of time ipmi manager processes have been busy in the last minute.'
+          preprocessing:
+            -
+              type: JSONPATH
+              parameters:
+                - '$.data.process[''ipmi manager''].busy.avg'
+              error_handler: CUSTOM_ERROR
+              error_handler_params: 'Processes ipmi manager not started'
+          master_item:
+            key: 'zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT}]'
+          tags:
+            -
+              tag: component
+              value: internal-process
+          triggers:
+            -
+              uuid: a2aed809416b46beba8ed63554d9b7d5
+              expression: 'avg(/Remote Zabbix proxy health/process.ipmi_manager.avg.busy,10m)>{$ZABBIX.PROXY.UTIL.MAX:"ipmi manager"}'
+              recovery_mode: RECOVERY_EXPRESSION
+              recovery_expression: 'avg(/Remote Zabbix proxy health/process.ipmi_manager.avg.busy,10m)<{$ZABBIX.PROXY.UTIL.MIN:"ipmi manager"}'
+              name: 'Remote Zabbix proxy: Utilization of ipmi manager processes over {$ZABBIX.PROXY.UTIL.MAX:"ipmi manager"}%'
+              priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
+        -
+          uuid: c4ff983246e7450f96af03da274df151
+          name: 'Remote Zabbix proxy: Utilization of ipmi poller data collector processes, in %'
+          type: DEPENDENT
+          key: process.ipmi_poller.avg.busy
+          delay: '0'
+          history: 1w
+          value_type: FLOAT
+          units: '%'
+          description: 'Average percentage of time ipmi poller processes have been busy in the last minute.'
+          preprocessing:
+            -
+              type: JSONPATH
+              parameters:
+                - '$.data.process[''ipmi poller''].busy.avg'
+              error_handler: CUSTOM_ERROR
+              error_handler_params: 'Processes ipmi poller not started'
+          master_item:
+            key: 'zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT}]'
+          tags:
+            -
+              tag: component
+              value: data-collector
+          triggers:
+            -
+              uuid: e7c748c36e5740d684a5c4c68682f321
+              expression: 'avg(/Remote Zabbix proxy health/process.ipmi_poller.avg.busy,10m)>{$ZABBIX.PROXY.UTIL.MAX:"ipmi poller"}'
+              recovery_mode: RECOVERY_EXPRESSION
+              recovery_expression: 'avg(/Remote Zabbix proxy health/process.ipmi_poller.avg.busy,10m)<{$ZABBIX.PROXY.UTIL.MIN:"ipmi poller"}'
+              name: 'Remote Zabbix proxy: Utilization of ipmi poller processes over {$ZABBIX.PROXY.UTIL.MAX:"ipmi poller"}%'
+              priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
+        -
+          uuid: c37b027a671449dca92cfbf1b15e711f
+          name: 'Remote Zabbix proxy: Utilization of java poller data collector processes, in %'
+          type: DEPENDENT
+          key: process.java_poller.avg.busy
+          delay: '0'
+          history: 1w
+          value_type: FLOAT
+          units: '%'
+          description: 'Average percentage of time java poller processes have been busy in the last minute.'
+          preprocessing:
+            -
+              type: JSONPATH
+              parameters:
+                - '$.data.process[''java poller''].busy.avg'
+              error_handler: CUSTOM_ERROR
+              error_handler_params: 'Processes java poller not started'
+          master_item:
+            key: 'zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT}]'
+          tags:
+            -
+              tag: component
+              value: data-collector
+          triggers:
+            -
+              uuid: ef46070fc30b46c7be1ce3574e578449
+              expression: 'avg(/Remote Zabbix proxy health/process.java_poller.avg.busy,10m)>{$ZABBIX.PROXY.UTIL.MAX:"java poller"}'
+              recovery_mode: RECOVERY_EXPRESSION
+              recovery_expression: 'avg(/Remote Zabbix proxy health/process.java_poller.avg.busy,10m)<{$ZABBIX.PROXY.UTIL.MIN:"java poller"}'
+              name: 'Remote Zabbix proxy: Utilization of java poller processes over {$ZABBIX.PROXY.UTIL.MAX:"java poller"}%'
+              priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
+        -
+          uuid: 7c0d7d097e004d0db25eab55ceb6b87c
+          name: 'Remote Zabbix proxy: Utilization of ODBC poller data collector processes, in %'
+          type: DEPENDENT
+          key: process.odbc_poller.avg.busy
+          delay: '0'
+          history: 1w
+          value_type: FLOAT
+          units: '%'
+          description: 'Average percentage of time ODBC poller processes have been busy in the last minute.'
+          preprocessing:
+            -
+              type: JSONPATH
+              parameters:
+                - '$.data.process[''odbc poller''].busy.avg'
+          master_item:
+            key: 'zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT}]'
+          tags:
+            -
+              tag: component
+              value: data-collector
+          triggers:
+            -
+              uuid: 7f83ff01200c4862aa22057b079da6f8
+              expression: 'avg(/Remote Zabbix proxy health/process.odbc_poller.avg.busy,10m)>{$ZABBIX.PROXY.UTIL.MAX:"ODBC poller"}'
+              recovery_mode: RECOVERY_EXPRESSION
+              recovery_expression: 'avg(/Remote Zabbix proxy health/process.odbc_poller.avg.busy,10m)<{$ZABBIX.PROXY.UTIL.MIN:"ODBC poller"}'
+              name: 'Remote Zabbix proxy: Utilization of ODBC poller processes over {$ZABBIX.PROXY.UTIL.MAX:"ODBC poller"}%'
+              priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
+        -
+          uuid: e44b8cc43d5c49c5a81ed33c5cc44c82
+          name: 'Remote Zabbix proxy: Utilization of poller data collector processes, in %'
+          type: DEPENDENT
+          key: process.poller.avg.busy
+          delay: '0'
+          history: 1w
+          value_type: FLOAT
+          units: '%'
+          description: 'Average percentage of time poller processes have been busy in the last minute.'
+          preprocessing:
+            -
+              type: JSONPATH
+              parameters:
+                - '$.data.process[''poller''].busy.avg'
+              error_handler: CUSTOM_ERROR
+              error_handler_params: 'Processes poller not started'
+          master_item:
+            key: 'zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT}]'
+          tags:
+            -
+              tag: component
+              value: data-collector
+          triggers:
+            -
+              uuid: 6afb9db9e11842c28c059abd31c7a134
+              expression: 'avg(/Remote Zabbix proxy health/process.poller.avg.busy,10m)>{$ZABBIX.PROXY.UTIL.MAX:"poller"}'
+              recovery_mode: RECOVERY_EXPRESSION
+              recovery_expression: 'avg(/Remote Zabbix proxy health/process.poller.avg.busy,10m)<{$ZABBIX.PROXY.UTIL.MIN:"poller"}'
+              name: 'Remote Zabbix proxy: Utilization of poller processes over {$ZABBIX.PROXY.UTIL.MAX:"poller"}%'
+              priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
+        -
+          uuid: c4746528d75a41898a7ded21701de019
+          name: 'Remote Zabbix proxy: Utilization of preprocessing manager internal processes, in %'
+          type: DEPENDENT
+          key: process.preprocessing_manager.avg.busy
+          delay: '0'
+          history: 1w
+          value_type: FLOAT
+          units: '%'
+          description: 'Average percentage of time preprocessing manager processes have been busy in the last minute.'
+          preprocessing:
+            -
+              type: JSONPATH
+              parameters:
+                - '$.data.process[''preprocessing manager''].busy.avg'
+              error_handler: CUSTOM_ERROR
+              error_handler_params: 'Processes preprocessing manager not started'
+          master_item:
+            key: 'zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT}]'
+          tags:
+            -
+              tag: component
+              value: internal-process
+          triggers:
+            -
+              uuid: 4c681b0775b54fd79e4aba669e219967
+              expression: 'avg(/Remote Zabbix proxy health/process.preprocessing_manager.avg.busy,10m)>{$ZABBIX.PROXY.UTIL.MAX:"preprocessing manager"}'
+              recovery_mode: RECOVERY_EXPRESSION
+              recovery_expression: 'avg(/Remote Zabbix proxy health/process.preprocessing_manager.avg.busy,10m)<{$ZABBIX.PROXY.UTIL.MIN:"preprocessing manager"}'
+              name: 'Remote Zabbix proxy: Utilization of preprocessing manager processes over {$ZABBIX.PROXY.UTIL.MAX:"preprocessing manager"}%'
+              priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
+        -
+          uuid: 5b10c9859c3443459b5e993015ae68fc
+          name: 'Remote Zabbix proxy: Utilization of preprocessing worker internal processes, in %'
+          type: DEPENDENT
+          key: process.preprocessing_worker.avg.busy
+          delay: '0'
+          history: 1w
+          value_type: FLOAT
+          units: '%'
+          description: 'Average percentage of time preprocessing worker processes have been busy in the last minute.'
+          preprocessing:
+            -
+              type: JSONPATH
+              parameters:
+                - '$.data.process[''preprocessing worker''].busy.avg'
+              error_handler: CUSTOM_ERROR
+              error_handler_params: 'Processes preprocessing worker not started'
+          master_item:
+            key: 'zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT}]'
+          tags:
+            -
+              tag: component
+              value: internal-process
+          triggers:
+            -
+              uuid: f1c97c56e2d04cabaaa4c9b41e2bbad3
+              expression: 'avg(/Remote Zabbix proxy health/process.preprocessing_worker.avg.busy,10m)>{$ZABBIX.PROXY.UTIL.MAX:"preprocessing worker"}'
+              recovery_mode: RECOVERY_EXPRESSION
+              recovery_expression: 'avg(/Remote Zabbix proxy health/process.preprocessing_worker.avg.busy,10m)<{$ZABBIX.PROXY.UTIL.MIN:"preprocessing worker"}'
+              name: 'Remote Zabbix proxy: Utilization of preprocessing worker processes over {$ZABBIX.PROXY.UTIL.MAX:"preprocessing worker"}%'
+              priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
+        -
+          uuid: fbfe2a05b2914c9d8b1b39aa7320aaf3
+          name: 'Remote Zabbix proxy: Utilization of self-monitoring internal processes, in %'
+          type: DEPENDENT
+          key: process.self-monitoring.avg.busy
+          delay: '0'
+          history: 1w
+          value_type: FLOAT
+          units: '%'
+          description: 'Average percentage of time self-monitoring processes have been busy in the last minute.'
+          preprocessing:
+            -
+              type: JSONPATH
+              parameters:
+                - '$.data.process[''self-monitoring''].busy.avg'
+              error_handler: CUSTOM_ERROR
+              error_handler_params: 'Processes self-monitoring not started'
+          master_item:
+            key: 'zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT}]'
+          tags:
+            -
+              tag: component
+              value: internal-process
+          triggers:
+            -
+              uuid: fee719ea91524972897c19ce4b17bd54
+              expression: 'avg(/Remote Zabbix proxy health/process.self-monitoring.avg.busy,10m)>{$ZABBIX.PROXY.UTIL.MAX:"self-monitoring"}'
+              recovery_mode: RECOVERY_EXPRESSION
+              recovery_expression: 'avg(/Remote Zabbix proxy health/process.self-monitoring.avg.busy,10m)<{$ZABBIX.PROXY.UTIL.MIN:"self-monitoring"}'
+              name: 'Remote Zabbix proxy: Utilization of self-monitoring processes over {$ZABBIX.PROXY.UTIL.MAX:"self-monitoring"}%'
+              priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
+        -
+          uuid: 3c06aed8f9ca4790b23132498e32701f
+          name: 'Remote Zabbix proxy: Utilization of snmp trapper data collector processes, in %'
+          type: DEPENDENT
+          key: process.snmp_trapper.avg.busy
+          delay: '0'
+          history: 1w
+          value_type: FLOAT
+          units: '%'
+          description: 'Average percentage of time snmp trapper processes have been busy in the last minute.'
+          preprocessing:
+            -
+              type: JSONPATH
+              parameters:
+                - '$.data.process[''snmp trapper''].busy.avg'
+              error_handler: CUSTOM_ERROR
+              error_handler_params: 'Processes snmp trapper not started'
+          master_item:
+            key: 'zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT}]'
+          tags:
+            -
+              tag: component
+              value: data-collector
+          triggers:
+            -
+              uuid: 9ca70574386f4b968bcda64a5d267d58
+              expression: 'avg(/Remote Zabbix proxy health/process.snmp_trapper.avg.busy,10m)>{$ZABBIX.PROXY.UTIL.MAX:"snmp trapper"}'
+              recovery_mode: RECOVERY_EXPRESSION
+              recovery_expression: 'avg(/Remote Zabbix proxy health/process.snmp_trapper.avg.busy,10m)<{$ZABBIX.PROXY.UTIL.MIN:"snmp trapper"}'
+              name: 'Remote Zabbix proxy: Utilization of snmp trapper processes over {$ZABBIX.PROXY.UTIL.MAX:"snmp trapper"}%'
+              priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
+        -
+          uuid: 48ab13daaf0541bdbf317226c753472c
+          name: 'Remote Zabbix proxy: Utilization of task manager internal processes, in %'
+          type: DEPENDENT
+          key: process.task_manager.avg.busy
+          delay: '0'
+          history: 1w
+          value_type: FLOAT
+          units: '%'
+          description: 'Average percentage of time task manager processes have been busy in the last minute.'
+          preprocessing:
+            -
+              type: JSONPATH
+              parameters:
+                - '$.data.process[''task manager''].busy.avg'
+              error_handler: CUSTOM_ERROR
+              error_handler_params: 'Processes task manager not started'
+          master_item:
+            key: 'zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT}]'
+          tags:
+            -
+              tag: component
+              value: internal-process
+          triggers:
+            -
+              uuid: 9d7d15a747484530a61102175cbc4478
+              expression: 'avg(/Remote Zabbix proxy health/process.task_manager.avg.busy,10m)>{$ZABBIX.PROXY.UTIL.MAX:"task manager"}'
+              recovery_mode: RECOVERY_EXPRESSION
+              recovery_expression: 'avg(/Remote Zabbix proxy health/process.task_manager.avg.busy,10m)<{$ZABBIX.PROXY.UTIL.MIN:"task manager"}'
+              name: 'Remote Zabbix proxy: Utilization of task manager processes over {$ZABBIX.PROXY.UTIL.MAX:"task manager"}%'
+              priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
+        -
+          uuid: d37a6ebb128d4221a34c8d78736ea90b
+          name: 'Remote Zabbix proxy: Utilization of trapper data collector processes, in %'
+          type: DEPENDENT
+          key: process.trapper.avg.busy
+          delay: '0'
+          history: 1w
+          value_type: FLOAT
+          units: '%'
+          description: 'Average percentage of time trapper processes have been busy in the last minute.'
+          preprocessing:
+            -
+              type: JSONPATH
+              parameters:
+                - '$.data.process[''trapper''].busy.avg'
+              error_handler: CUSTOM_ERROR
+              error_handler_params: 'Processes trapper not started'
+          master_item:
+            key: 'zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT}]'
+          tags:
+            -
+              tag: component
+              value: data-collector
+          triggers:
+            -
+              uuid: 49a9e3e1b17146f7861daf6994956d4f
+              expression: 'avg(/Remote Zabbix proxy health/process.trapper.avg.busy,10m)>{$ZABBIX.PROXY.UTIL.MAX:"trapper"}'
+              recovery_mode: RECOVERY_EXPRESSION
+              recovery_expression: 'avg(/Remote Zabbix proxy health/process.trapper.avg.busy,10m)<{$ZABBIX.PROXY.UTIL.MIN:"trapper"}'
+              name: 'Remote Zabbix proxy: Utilization of trapper processes over {$ZABBIX.PROXY.UTIL.MAX:"trapper"}%'
+              priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
+        -
+          uuid: a0c56d8570eb4cb39e119fc61d7092d1
+          name: 'Remote Zabbix proxy: Utilization of unreachable poller data collector processes, in %'
+          type: DEPENDENT
+          key: process.unreachable_poller.avg.busy
+          delay: '0'
+          history: 1w
+          value_type: FLOAT
+          units: '%'
+          description: 'Average percentage of time unreachable poller processes have been busy in the last minute.'
+          preprocessing:
+            -
+              type: JSONPATH
+              parameters:
+                - '$.data.process[''unreachable poller''].busy.avg'
+              error_handler: CUSTOM_ERROR
+              error_handler_params: 'Processes unreachable poller not started'
+          master_item:
+            key: 'zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT}]'
+          tags:
+            -
+              tag: component
+              value: data-collector
+          triggers:
+            -
+              uuid: e446ec803eaf4ace9b7d1fdc7a89cba6
+              expression: 'avg(/Remote Zabbix proxy health/process.unreachable_poller.avg.busy,10m)>{$ZABBIX.PROXY.UTIL.MAX:"unreachable poller"}'
+              recovery_mode: RECOVERY_EXPRESSION
+              recovery_expression: 'avg(/Remote Zabbix proxy health/process.unreachable_poller.avg.busy,10m)<{$ZABBIX.PROXY.UTIL.MIN:"unreachable poller"}'
+              name: 'Remote Zabbix proxy: Utilization of unreachable poller processes over {$ZABBIX.PROXY.UTIL.MAX:"unreachable poller"}%'
+              priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
+        -
+          uuid: 54d7e2578b594022ad406b40c9dd57fe
+          name: 'Remote Zabbix proxy: Utilization of vmware data collector processes, in %'
+          type: DEPENDENT
+          key: process.vmware_collector.avg.busy
+          delay: '0'
+          history: 1w
+          value_type: FLOAT
+          units: '%'
+          description: 'Average percentage of time vmware collector processes have been busy in the last minute.'
+          preprocessing:
+            -
+              type: JSONPATH
+              parameters:
+                - '$.data.process[''vmware collector''].busy.avg'
+              error_handler: CUSTOM_ERROR
+              error_handler_params: 'Processes vmware collector not started'
+          master_item:
+            key: 'zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT}]'
+          tags:
+            -
+              tag: component
+              value: data-collector
+          triggers:
+            -
+              uuid: 30147687074f45e7ab0dce81a1b7cf07
+              expression: 'avg(/Remote Zabbix proxy health/process.vmware_collector.avg.busy,10m)>{$ZABBIX.PROXY.UTIL.MAX:"vmware collector"}'
+              recovery_mode: RECOVERY_EXPRESSION
+              recovery_expression: 'avg(/Remote Zabbix proxy health/process.vmware_collector.avg.busy,10m)<{$ZABBIX.PROXY.UTIL.MIN:"vmware collector"}'
+              name: 'Remote Zabbix proxy: Utilization of vmware collector processes over {$ZABBIX.PROXY.UTIL.MAX:"vmware collector"}%'
+              priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
+        -
+          uuid: 72dd891d7ced4cefb7de988dadf81f3b
+          name: 'Remote Zabbix proxy: Configuration cache, % used'
+          type: DEPENDENT
+          key: rcache.buffer.pused
+          delay: '0'
+          history: 1w
+          value_type: FLOAT
+          units: '%'
+          description: 'Availability statistics of Zabbix configuration cache. Percentage of used buffer.'
+          preprocessing:
+            -
+              type: JSONPATH
+              parameters:
+                - $.data.rcache.pused
+          master_item:
+            key: 'zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT}]'
+          tags:
+            -
+              tag: component
+              value: system
+          triggers:
+            -
+              uuid: 6aaad09f92f3419c9aa7164f2191a45a
+              expression: 'max(/Remote Zabbix proxy health/rcache.buffer.pused,10m)>{$ZABBIX.PROXY.UTIL.MAX}'
+              name: 'Remote Zabbix proxy: More than {$ZABBIX.PROXY.UTIL.MAX}% used in the configuration cache'
+              priority: AVERAGE
+              description: 'Consider increasing CacheSize in the zabbix_server.conf configuration file.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
+        -
+          uuid: 0df481994c454884b6be2e2132248af7
+          name: 'Remote Zabbix proxy: Required performance'
+          type: DEPENDENT
+          key: requiredperformance
+          delay: '0'
+          history: 1w
+          value_type: FLOAT
+          description: 'Required performance of Zabbix proxy, in new values per second expected.'
+          preprocessing:
+            -
+              type: JSONPATH
+              parameters:
+                - $.data.requiredperformance
+          master_item:
+            key: 'zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT}]'
+          tags:
+            -
+              tag: component
+              value: system
+        -
+          uuid: 28d87aef584644e9a3adcde33966b4e1
+          name: 'Remote Zabbix proxy: Uptime'
+          type: DEPENDENT
+          key: uptime
+          delay: '0'
+          history: 1w
+          units: uptime
+          description: 'Uptime of Zabbix proxy process in seconds.'
+          preprocessing:
+            -
+              type: JSONPATH
+              parameters:
+                - $.data.uptime
+          master_item:
+            key: 'zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT}]'
+          tags:
+            -
+              tag: component
+              value: system
+          triggers:
+            -
+              uuid: 8940efd3c68b4ded80ea1e89d55dfa7c
+              expression: 'last(/Remote Zabbix proxy health/uptime)<10m'
+              name: 'Remote Zabbix proxy: has been restarted (uptime < 10m)'
+              priority: INFO
+              description: 'Uptime is less than 10 minutes'
+              manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+        -
+          uuid: ba19f24c2e234ac89a12a4a7aceeff93
+          name: 'Remote Zabbix proxy: Version'
+          type: DEPENDENT
+          key: version
+          delay: '0'
+          history: 1w
+          trends: '0'
+          value_type: CHAR
+          description: 'Version of Zabbix proxy.'
+          preprocessing:
+            -
+              type: JSONPATH
+              parameters:
+                - $.data.version
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          master_item:
+            key: 'zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT}]'
+          tags:
+            -
+              tag: component
+              value: system
+          triggers:
+            -
+              uuid: 224ec99fda0d443cba8a6c75da5a27cb
+              expression: 'last(/Remote Zabbix proxy health/version,#1)<>last(/Remote Zabbix proxy health/version,#2) and length(last(/Remote Zabbix proxy health/version))>0'
+              name: 'Remote Zabbix proxy: Version has changed (new version: {ITEM.VALUE})'
+              priority: INFO
+              description: 'Remote Zabbix proxy version has changed. Ack to close.'
+              manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+        -
+          uuid: 7e6ffd55fe6842219f6e0d3c81ffa309
+          name: 'Remote Zabbix proxy: VMware cache, % used'
+          type: DEPENDENT
+          key: vmware.buffer.pused
+          delay: '0'
+          history: 1w
+          value_type: FLOAT
+          units: '%'
+          description: 'Availability statistics of Zabbix vmware cache. Percentage of used buffer.'
+          preprocessing:
+            -
+              type: JSONPATH
+              parameters:
+                - $.data.vmware.pused
+              error_handler: CUSTOM_ERROR
+              error_handler_params: 'No vmware collector processes started'
+          master_item:
+            key: 'zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT}]'
+          tags:
+            -
+              tag: component
+              value: system
+          triggers:
+            -
+              uuid: ac2a42046de340e1968802d92678947c
+              expression: 'max(/Remote Zabbix proxy health/vmware.buffer.pused,10m)>{$ZABBIX.PROXY.UTIL.MAX}'
+              name: 'Remote Zabbix proxy: More than {$ZABBIX.PROXY.UTIL.MAX}% used in the vmware cache'
+              priority: AVERAGE
+              description: 'Consider increasing VMwareCacheSize in the zabbix_server.conf configuration file.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
+        -
+          uuid: 2abf18f2a9c9412ca81d615f45d4ca5f
+          name: 'Remote Zabbix proxy: History write cache, % used'
+          type: DEPENDENT
+          key: wcache.history.pused
+          delay: '0'
+          history: 1w
+          value_type: FLOAT
+          units: '%'
+          description: |
+            Statistics and availability of Zabbix write cache. Percentage of used history buffer.
+            History cache is used to store item values. A high number indicates performance problems on the database side.
+          preprocessing:
+            -
+              type: JSONPATH
+              parameters:
+                - $.data.wcache.history.pused
+          master_item:
+            key: 'zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT}]'
+          tags:
+            -
+              tag: component
+              value: system
+          triggers:
+            -
+              uuid: c14095c38d17486fa8fde22bd5a9d737
+              expression: 'max(/Remote Zabbix proxy health/wcache.history.pused,10m)>{$ZABBIX.PROXY.UTIL.MAX}'
+              name: 'Remote Zabbix proxy: More than {$ZABBIX.PROXY.UTIL.MAX}% used in the history cache'
+              priority: AVERAGE
+              description: 'Consider increasing HistoryCacheSize in the zabbix_server.conf configuration file.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
+        -
+          uuid: a907ff2d6d8e4389b116eb3ec01dacfe
+          name: 'Remote Zabbix proxy: History index cache, % used'
+          type: DEPENDENT
+          key: wcache.index.pused
+          delay: '0'
+          history: 1w
+          value_type: FLOAT
+          units: '%'
+          description: |
+            Statistics and availability of Zabbix write cache. Percentage of used history index buffer.
+            History index cache is used to index values stored in history cache.
+          preprocessing:
+            -
+              type: JSONPATH
+              parameters:
+                - $.data.wcache.index.pused
+          master_item:
+            key: 'zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT}]'
+          tags:
+            -
+              tag: component
+              value: system
+          triggers:
+            -
+              uuid: 43f9a4fc049e45e5b8bbb0980b518dd0
+              expression: 'max(/Remote Zabbix proxy health/wcache.index.pused,10m)>{$ZABBIX.PROXY.UTIL.MAX}'
+              name: 'Remote Zabbix proxy: More than {$ZABBIX.PROXY.UTIL.MAX}% used in the history index cache'
+              priority: AVERAGE
+              description: 'Consider increasing HistoryIndexCacheSize in the zabbix_server.conf configuration file.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
+        -
+          uuid: 0238a93001a3438988b9b5cc4cbcc68e
+          name: 'Remote Zabbix proxy: Number of processed values per second'
+          type: DEPENDENT
+          key: wcache.values
+          delay: '0'
+          history: 1w
+          value_type: FLOAT
+          description: |
+            Statistics and availability of Zabbix write cache.
+            Total number of values processed by Zabbix server or Zabbix proxy, except unsupported items.
+          preprocessing:
+            -
+              type: JSONPATH
+              parameters:
+                - $.data.wcache.values.all
+            -
+              type: CHANGE_PER_SECOND
+              parameters:
+                - ''
+          master_item:
+            key: 'zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT}]'
+          tags:
+            -
+              tag: component
+              value: system
+        -
+          uuid: f20ff449693a479895b7f3b450b93787
+          name: 'Remote Zabbix proxy: Number of processed numeric (float) values per second'
+          type: DEPENDENT
+          key: wcache.values.float
+          delay: '0'
+          history: 1w
+          value_type: FLOAT
+          description: |
+            Statistics and availability of Zabbix write cache.
+            Number of processed float values.
+          preprocessing:
+            -
+              type: JSONPATH
+              parameters:
+                - $.data.wcache.values.float
+            -
+              type: CHANGE_PER_SECOND
+              parameters:
+                - ''
+          master_item:
+            key: 'zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT}]'
+          tags:
+            -
+              tag: component
+              value: system
+        -
+          uuid: b20b00f97a424b8e9c69ebb749a94d65
+          name: 'Remote Zabbix proxy: Number of processed log values per second'
+          type: DEPENDENT
+          key: wcache.values.log
+          delay: '0'
+          history: 1w
+          value_type: FLOAT
+          description: |
+            Statistics and availability of Zabbix write cache.
+            Number of processed log values.
+          preprocessing:
+            -
+              type: JSONPATH
+              parameters:
+                - $.data.wcache.values.log
+            -
+              type: CHANGE_PER_SECOND
+              parameters:
+                - ''
+          master_item:
+            key: 'zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT}]'
+          tags:
+            -
+              tag: component
+              value: system
+        -
+          uuid: 927b1387d969466eba000855837887c7
+          name: 'Remote Zabbix proxy: Number of processed not supported values per second'
+          type: DEPENDENT
+          key: wcache.values.not_supported
+          delay: '0'
+          history: 1w
+          value_type: FLOAT
+          description: |
+            Statistics and availability of Zabbix write cache.
+            Number of times item processing resulted in item becoming unsupported or keeping that state.
+          preprocessing:
+            -
+              type: JSONPATH
+              parameters:
+                - '$.data.wcache.values[''not supported'']'
+            -
+              type: CHANGE_PER_SECOND
+              parameters:
+                - ''
+          master_item:
+            key: 'zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT}]'
+          tags:
+            -
+              tag: component
+              value: system
+        -
+          uuid: 334584cfea704011b8ae70436e47e2ff
+          name: 'Remote Zabbix proxy: Number of processed character values per second'
+          type: DEPENDENT
+          key: wcache.values.str
+          delay: '0'
+          history: 1w
+          value_type: FLOAT
+          description: |
+            Statistics and availability of Zabbix write cache.
+            Number of processed character/string values.
+          preprocessing:
+            -
+              type: JSONPATH
+              parameters:
+                - $.data.wcache.values.str
+            -
+              type: CHANGE_PER_SECOND
+              parameters:
+                - ''
+          master_item:
+            key: 'zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT}]'
+          tags:
+            -
+              tag: component
+              value: system
+        -
+          uuid: 35b053f8ce89430b989387eb3075b582
+          name: 'Remote Zabbix proxy: Number of processed text values per second'
+          type: DEPENDENT
+          key: wcache.values.text
+          delay: '0'
+          history: 1w
+          value_type: FLOAT
+          description: |
+            Statistics and availability of Zabbix write cache.
+            Number of processed text values.
+          preprocessing:
+            -
+              type: JSONPATH
+              parameters:
+                - $.data.wcache.values.text
+            -
+              type: CHANGE_PER_SECOND
+              parameters:
+                - ''
+          master_item:
+            key: 'zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT}]'
+          tags:
+            -
+              tag: component
+              value: system
+        -
+          uuid: c53f480b861249c4a1ca12571faa4487
+          name: 'Remote Zabbix proxy: Number of processed numeric (unsigned) values per second'
+          type: DEPENDENT
+          key: wcache.values.uint
+          delay: '0'
+          history: 1w
+          value_type: FLOAT
+          description: |
+            Statistics and availability of Zabbix write cache.
+            Number of processed numeric (unsigned) values.
+          preprocessing:
+            -
+              type: JSONPATH
+              parameters:
+                - $.data.wcache.values.uint
+            -
+              type: CHANGE_PER_SECOND
+              parameters:
+                - ''
+          master_item:
+            key: 'zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT}]'
+          tags:
+            -
+              tag: component
+              value: system
+        -
+          uuid: c9b9ee0faefd4cefbac32f548539266e
+          name: 'Remote Zabbix proxy: Zabbix stats queue over 10m'
+          type: INTERNAL
+          key: 'zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT},queue,10m]'
+          history: 1w
+          description: 'Number of monitored items in the queue which are delayed at least by 10 minutes.'
+          preprocessing:
+            -
+              type: JSONPATH
+              parameters:
+                - $.queue
+          tags:
+            -
+              tag: component
+              value: system
+          triggers:
+            -
+              uuid: 71cd927153ef4b8480a8f13fc6b4def8
+              expression: 'min(/Remote Zabbix proxy health/zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT},queue,10m],10m)>100'
+              name: 'Remote Zabbix proxy: More than 100 items having missing data for more than 10 minutes'
+              priority: WARNING
+              description: 'zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT},queue,10m] item is collecting data about how many items are missing data for more than 10 minutes.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
+        -
+          uuid: 128bcd3c019946b593f3256858cf8397
+          name: 'Remote Zabbix proxy: Zabbix stats queue'
+          type: INTERNAL
+          key: 'zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT},queue]'
+          history: 1w
+          description: 'Number of monitored items in the queue which are delayed at least by 6 seconds.'
+          preprocessing:
+            -
+              type: JSONPATH
+              parameters:
+                - $.queue
+          tags:
+            -
+              tag: component
+              value: system
+        -
+          uuid: c3d4e015efe7459f8207096a04b296f0
+          name: 'Remote Zabbix proxy: Zabbix stats'
+          type: INTERNAL
+          key: 'zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT}]'
+          history: 0d
+          trends: '0'
+          value_type: TEXT
+          description: 'Zabbix server statistics master item.'
+          tags:
+            -
+              tag: component
+              value: raw
+      tags:
+        -
+          tag: class
+          value: software
+        -
+          tag: target
+          value: proxy
+        -
+          tag: target
+          value: zabbix
+      macros:
+        -
+          macro: '{$ZABBIX.PROXY.ADDRESS}'
+          value: 127.0.0.1
+          description: 'IP/DNS/network mask list of proxies to be remotely queried (default is 127.0.0.1).'
+        -
+          macro: '{$ZABBIX.PROXY.PORT}'
+          value: '10051'
+          description: 'Port of proxy to be remotely queried (default is 10051).'
+        -
+          macro: '{$ZABBIX.PROXY.UTIL.MAX}'
+          value: '75'
+          description: 'Maximum average percentage of time processes busy in the last minute (default is 75).'
+        -
+          macro: '{$ZABBIX.PROXY.UTIL.MIN}'
+          value: '65'
+          description: 'Minimum average percentage of time processes busy in the last minute (default is 65).'
+      dashboards:
+        -
+          uuid: 73c77a8555bc4a7d814d2cf54164f15f
+          name: 'Zabbix proxy health'
+          pages:
+            -
+              widgets:
+                -
+                  type: GRAPH_CLASSIC
+                  width: '12'
+                  height: '5'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: source_type
+                      value: '0'
+                    -
+                      type: GRAPH
+                      name: graphid
+                      value:
+                        name: 'Remote Zabbix proxy: Zabbix proxy performance'
+                        host: 'Remote Zabbix proxy health'
+                -
+                  type: GRAPH_CLASSIC
+                  x: '12'
+                  width: '12'
+                  height: '5'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: source_type
+                      value: '0'
+                    -
+                      type: GRAPH
+                      name: graphid
+                      value:
+                        name: 'Remote Zabbix proxy: Zabbix data gathering process busy %'
+                        host: 'Remote Zabbix proxy health'
+                -
+                  type: GRAPH_CLASSIC
+                  'y': '5'
+                  width: '12'
+                  height: '5'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: source_type
+                      value: '0'
+                    -
+                      type: GRAPH
+                      name: graphid
+                      value:
+                        name: 'Remote Zabbix proxy: Zabbix internal process busy %'
+                        host: 'Remote Zabbix proxy health'
+                -
+                  type: GRAPH_CLASSIC
+                  x: '12'
+                  'y': '5'
+                  width: '12'
+                  height: '5'
+                  fields:
+                    -
+                      type: INTEGER
+                      name: source_type
+                      value: '0'
+                    -
+                      type: GRAPH
+                      name: graphid
+                      value:
+                        name: 'Remote Zabbix proxy: Zabbix cache usage, % used'
+                        host: 'Remote Zabbix proxy health'
+  graphs:
+    -
+      uuid: 4cc55dd64cab48cc92fbde98135d7f7f
+      name: 'Remote Zabbix proxy: Zabbix cache usage, % used'
+      ymin_type_1: FIXED
+      ymax_type_1: FIXED
+      graph_items:
+        -
+          color: DD0000
+          item:
+            host: 'Remote Zabbix proxy health'
+            key: rcache.buffer.pused
+        -
+          sortorder: '1'
+          color: 00DDDD
+          item:
+            host: 'Remote Zabbix proxy health'
+            key: wcache.index.pused
+        -
+          sortorder: '2'
+          color: 3333FF
+          item:
+            host: 'Remote Zabbix proxy health'
+            key: wcache.history.pused
+        -
+          sortorder: '3'
+          color: 00FF00
+          item:
+            host: 'Remote Zabbix proxy health'
+            key: vmware.buffer.pused
+    -
+      uuid: 1daa58364c74486ba4038e56cecf1a41
+      name: 'Remote Zabbix proxy: Zabbix data gathering process busy %'
+      ymin_type_1: FIXED
+      ymax_type_1: FIXED
+      graph_items:
+        -
+          color: '990099'
+          item:
+            host: 'Remote Zabbix proxy health'
+            key: process.trapper.avg.busy
+        -
+          sortorder: '1'
+          color: '990000'
+          item:
+            host: 'Remote Zabbix proxy health'
+            key: process.poller.avg.busy
+        -
+          sortorder: '2'
+          color: 0000EE
+          item:
+            host: 'Remote Zabbix proxy health'
+            key: process.ipmi_poller.avg.busy
+        -
+          sortorder: '3'
+          color: FF33FF
+          item:
+            host: 'Remote Zabbix proxy health'
+            key: process.discoverer.avg.busy
+        -
+          sortorder: '4'
+          color: '007700'
+          item:
+            host: 'Remote Zabbix proxy health'
+            key: process.icmp_pinger.avg.busy
+        -
+          sortorder: '5'
+          color: '003300'
+          item:
+            host: 'Remote Zabbix proxy health'
+            key: process.http_poller.avg.busy
+        -
+          sortorder: '6'
+          color: 33FFFF
+          item:
+            host: 'Remote Zabbix proxy health'
+            key: process.unreachable_poller.avg.busy
+        -
+          sortorder: '7'
+          color: DD0000
+          item:
+            host: 'Remote Zabbix proxy health'
+            key: process.java_poller.avg.busy
+        -
+          sortorder: '8'
+          color: '000099'
+          item:
+            host: 'Remote Zabbix proxy health'
+            key: process.snmp_trapper.avg.busy
+        -
+          sortorder: '9'
+          color: 00FF00
+          item:
+            host: 'Remote Zabbix proxy health'
+            key: process.vmware_collector.avg.busy
+        -
+          sortorder: '10'
+          color: 5A2B57
+          item:
+            host: 'Remote Zabbix proxy health'
+            key: process.history_poller.avg.busy
+        -
+          sortorder: '11'
+          color: 9FA8DA
+          item:
+            host: 'Remote Zabbix proxy health'
+            key: process.odbc_poller.avg.busy
+    -
+      uuid: 87379405c456407ebab6e033c3cae37a
+      name: 'Remote Zabbix proxy: Zabbix internal process busy %'
+      ymin_type_1: FIXED
+      ymax_type_1: FIXED
+      graph_items:
+        -
+          color: FFAA00
+          item:
+            host: 'Remote Zabbix proxy health'
+            key: process.housekeeper.avg.busy
+        -
+          sortorder: '1'
+          color: '990099'
+          item:
+            host: 'Remote Zabbix proxy health'
+            key: process.configuration_syncer.avg.busy
+        -
+          sortorder: '2'
+          color: EE0000
+          item:
+            host: 'Remote Zabbix proxy health'
+            key: process.history_syncer.avg.busy
+        -
+          sortorder: '3'
+          color: FF66FF
+          item:
+            host: 'Remote Zabbix proxy health'
+            key: process.self-monitoring.avg.busy
+        -
+          sortorder: '4'
+          color: 0000EE
+          item:
+            host: 'Remote Zabbix proxy health'
+            key: process.heartbeat_sender.avg.busy
+        -
+          sortorder: '5'
+          color: 00EE00
+          item:
+            host: 'Remote Zabbix proxy health'
+            key: process.data_sender.avg.busy
+        -
+          sortorder: '6'
+          color: '009999'
+          item:
+            host: 'Remote Zabbix proxy health'
+            key: process.task_manager.avg.busy
+        -
+          sortorder: '7'
+          color: BBBB00
+          item:
+            host: 'Remote Zabbix proxy health'
+            key: process.ipmi_manager.avg.busy
+        -
+          sortorder: '8'
+          color: '990000'
+          item:
+            host: 'Remote Zabbix proxy health'
+            key: process.preprocessing_manager.avg.busy
+        -
+          sortorder: '9'
+          color: '008800'
+          item:
+            host: 'Remote Zabbix proxy health'
+            key: process.preprocessing_worker.avg.busy
+        -
+          sortorder: '10'
+          color: 2B5429
+          item:
+            host: 'Remote Zabbix proxy health'
+            key: process.availability_manager.avg.busy
+    -
+      uuid: 40e3574cc0ca4877b331156ff7d1a941
+      name: 'Remote Zabbix proxy: Zabbix internal queues'
+      graph_items:
+        -
+          color: '008800'
+          item:
+            host: 'Remote Zabbix proxy health'
+            key: preprocessing_queue
+    -
+      uuid: ee5c00806cad4a5bb65bd3bcd734c88f
+      name: 'Remote Zabbix proxy: Zabbix proxy performance'
+      graph_items:
+        -
+          drawtype: GRADIENT_LINE
+          color: 00C800
+          item:
+            host: 'Remote Zabbix proxy health'
+            key: wcache.values
+        -
+          sortorder: '1'
+          color: C80000
+          item:
+            host: 'Remote Zabbix proxy health'
+            key: 'zabbix[stats,{$ZABBIX.PROXY.ADDRESS},{$ZABBIX.PROXY.PORT},queue]'
diff --git a/templates/app/zabbix_server/template_app_zabbix_server.yaml b/templates/app/zabbix_server/template_app_zabbix_server.yaml
index 2222cff550d..a64af0c26ac 100644
--- a/templates/app/zabbix_server/template_app_zabbix_server.yaml
+++ b/templates/app/zabbix_server/template_app_zabbix_server.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-07T12:54:03Z'
+  date: '2022-01-26T10:49:00Z'
   groups:
     -
       uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
@@ -10,7 +10,7 @@ zabbix_export:
       uuid: e2d2b4e4ac28483996cc11fe42823d57
       template: 'Zabbix server health'
       name: 'Zabbix server health'
-      description: 'Template tooling version used: 0.40'
+      description: 'Template tooling version used: 0.41'
       groups:
         -
           name: Templates/Applications
@@ -26,8 +26,8 @@ zabbix_export:
           description: 'Zabbix cluster statistics master item.'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
         -
           uuid: d596a84dece14aa59ca53e9f53b21edb
           name: 'Zabbix server: LLD queue'
@@ -37,8 +37,8 @@ zabbix_export:
           description: 'Count of values enqueued in the low-level discovery processing queue.'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: system
         -
           uuid: 97485f6c9efb443caa54b44c15fdbfeb
           name: 'Zabbix server: Preprocessing queue'
@@ -48,8 +48,8 @@ zabbix_export:
           description: 'Count of values enqueued in the preprocessing queue.'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: system
         -
           uuid: cac7bb12993945fe848df86f7c4502ed
           name: 'Zabbix server: Utilization of alerter internal processes, in %'
@@ -61,8 +61,8 @@ zabbix_export:
           description: 'Average percentage of time alerter processes have been busy in the last minute'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: internal-process
           triggers:
             -
               uuid: 20963ffd33864196ab909b60d7acdc0a
@@ -71,6 +71,10 @@ zabbix_export:
               recovery_expression: 'avg(/Zabbix server health/zabbix[process,alerter,avg,busy],10m)<65'
               name: 'Zabbix server: Utilization of alerter processes over 75%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: d098ea71dd22428a8a8a42cf299699b7
           name: 'Zabbix server: Utilization of alert manager internal processes, in %'
@@ -82,8 +86,8 @@ zabbix_export:
           description: 'Average percentage of time alert manager processes have been busy in the last minute'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: internal-process
           triggers:
             -
               uuid: c7f8ac54e4d3409788b8a456046ee461
@@ -92,6 +96,10 @@ zabbix_export:
               recovery_expression: 'avg(/Zabbix server health/zabbix[process,alert manager,avg,busy],10m)<65'
               name: 'Zabbix server: Utilization of alert manager processes over 75%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: eea69b4541844ebbbbf634594c14a8f2
           name: 'Zabbix server: Utilization of alert syncer internal processes, in %'
@@ -103,8 +111,8 @@ zabbix_export:
           description: 'Average percentage of time alert syncer processes have been busy in the last minute'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: internal-process
           triggers:
             -
               uuid: e2a487335f2748a6b26d867290c9cfe4
@@ -113,6 +121,10 @@ zabbix_export:
               recovery_expression: 'avg(/Zabbix server health/zabbix[process,alert syncer,avg,busy],10m)<65'
               name: 'Zabbix server: Utilization of alert syncer processes over 75%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 8677812221994919a46f6cbba16ad447
           name: 'Zabbix server: Utilization of availability manager internal processes, in %'
@@ -124,8 +136,8 @@ zabbix_export:
           description: 'Average percentage of time availability manager processes have been busy in the last minute'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: internal-process
           triggers:
             -
               uuid: 048c947b3b0a440b80ad6ebfc1a43f10
@@ -134,6 +146,10 @@ zabbix_export:
               recovery_expression: 'avg(/Zabbix server health/zabbix[process,availability manager,avg,busy],10m)<65'
               name: 'Zabbix server: Utilization of availability manager processes over 75%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 301e7fe93a024444b19766e665e9d156
           name: 'Zabbix server: Utilization of configuration syncer internal processes, in %'
@@ -145,8 +161,8 @@ zabbix_export:
           description: 'Average percentage of time configuration syncer processes have been busy in the last minute'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: internal-process
           triggers:
             -
               uuid: 63d681dba0b94487886a1d9b3360d1d1
@@ -155,6 +171,10 @@ zabbix_export:
               recovery_expression: 'avg(/Zabbix server health/zabbix[process,configuration syncer,avg,busy],10m)<65'
               name: 'Zabbix server: Utilization of configuration syncer processes over 75%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: db7fee2552d5487fa608cf12f69aef41
           name: 'Zabbix server: Utilization of discoverer data collector processes, in %'
@@ -166,8 +186,8 @@ zabbix_export:
           description: 'Average percentage of time discoverer processes have been busy in the last minute'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: data-collector
           triggers:
             -
               uuid: 5c470ddbda674fe0a789447dd120c36d
@@ -176,6 +196,10 @@ zabbix_export:
               recovery_expression: 'avg(/Zabbix server health/zabbix[process,discoverer,avg,busy],10m)<65'
               name: 'Zabbix server: Utilization of discoverer processes over 75%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: d12ce718fad34644b92d98cf2096e7df
           name: 'Zabbix server: Utilization of escalator internal processes, in %'
@@ -187,8 +211,8 @@ zabbix_export:
           description: 'Average percentage of time escalator processes have been busy in the last minute'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: internal-process
           triggers:
             -
               uuid: 9895b4318f50487d9c7f25abd48bb1a1
@@ -197,6 +221,10 @@ zabbix_export:
               recovery_expression: 'avg(/Zabbix server health/zabbix[process,escalator,avg,busy],10m)<65'
               name: 'Zabbix server: Utilization of escalator processes over 75%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 8de74bea977141469cf2d594bc907968
           name: 'Zabbix server: Utilization of history poller data collector processes, in %'
@@ -208,8 +236,8 @@ zabbix_export:
           description: 'Average percentage of time history poller processes have been busy in the last minute'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: data-collector
           triggers:
             -
               uuid: 9a76cde4aaea4e8eb48f725e9653037b
@@ -218,6 +246,10 @@ zabbix_export:
               recovery_expression: 'avg(/Zabbix server health/zabbix[process,history poller,avg,busy],10m)<65'
               name: 'Zabbix server: Utilization of history poller processes over 75%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 4d92eb7b411345cfbd6e2ea2ff5c1788
           name: 'Zabbix server: Utilization of history syncer internal processes, in %'
@@ -229,8 +261,8 @@ zabbix_export:
           description: 'Average percentage of time history syncer processes have been busy in the last minute'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: internal-process
           triggers:
             -
               uuid: a99ffd43a05e40f7abee83aa8c6c3ce5
@@ -239,6 +271,10 @@ zabbix_export:
               recovery_expression: 'avg(/Zabbix server health/zabbix[process,history syncer,avg,busy],10m)<65'
               name: 'Zabbix server: Utilization of history syncer processes over 75%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 23f448b5acba472881857647ca1bb614
           name: 'Zabbix server: Utilization of housekeeper internal processes, in %'
@@ -250,8 +286,8 @@ zabbix_export:
           description: 'Average percentage of time housekeeper processes have been busy in the last minute'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: internal-process
           triggers:
             -
               uuid: faa349f84dc043658fe51294ad87f766
@@ -260,6 +296,10 @@ zabbix_export:
               recovery_expression: 'avg(/Zabbix server health/zabbix[process,housekeeper,avg,busy],10m)<65'
               name: 'Zabbix server: Utilization of housekeeper processes over 75%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 419e937c4a1d4fa09c4b50ca88cbe3e2
           name: 'Zabbix server: Utilization of http poller data collector processes, in %'
@@ -271,8 +311,8 @@ zabbix_export:
           description: 'Average percentage of time http poller processes have been busy in the last minute'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: data-collector
           triggers:
             -
               uuid: c296c1ecdba44bd5b826ab4a86bbc300
@@ -281,6 +321,10 @@ zabbix_export:
               recovery_expression: 'avg(/Zabbix server health/zabbix[process,http poller,avg,busy],10m)<65'
               name: 'Zabbix server: Utilization of http poller processes over 75%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: d5d469d5eb2e4e0ca0afc89b603d4065
           name: 'Zabbix server: Utilization of icmp pinger data collector processes, in %'
@@ -292,8 +336,8 @@ zabbix_export:
           description: 'Average percentage of time icmp pinger processes have been busy in the last minute'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: data-collector
           triggers:
             -
               uuid: d5c6ea5711594a9587ab8d7094f1f481
@@ -302,6 +346,10 @@ zabbix_export:
               recovery_expression: 'avg(/Zabbix server health/zabbix[process,icmp pinger,avg,busy],10m)<65'
               name: 'Zabbix server: Utilization of icmp pinger processes over 75%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 24b6b466929347f0a8164c89ba5624fe
           name: 'Zabbix server: Utilization of ipmi manager internal processes, in %'
@@ -313,8 +361,8 @@ zabbix_export:
           description: 'Average percentage of time ipmi manager processes have been busy in the last minute'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: internal-process
           triggers:
             -
               uuid: 9ce0c874e5924b308827e8be5a9bf0eb
@@ -323,6 +371,10 @@ zabbix_export:
               recovery_expression: 'avg(/Zabbix server health/zabbix[process,ipmi manager,avg,busy],10m)<65'
               name: 'Zabbix server: Utilization of ipmi manager processes over 75%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: c11d415de9c64fd6911f82d49db140d3
           name: 'Zabbix server: Utilization of ipmi poller data collector processes, in %'
@@ -334,8 +386,8 @@ zabbix_export:
           description: 'Average percentage of time ipmi poller processes have been busy in the last minute'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: data-collector
           triggers:
             -
               uuid: 5a4f841292fd4bb5bec2e28340c9e4c2
@@ -344,6 +396,10 @@ zabbix_export:
               recovery_expression: 'avg(/Zabbix server health/zabbix[process,ipmi poller,avg,busy],10m)<65'
               name: 'Zabbix server: Utilization of ipmi poller processes over 75%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: a8168691df3d43f1a1e106062f18ee06
           name: 'Zabbix server: Utilization of java poller data collector processes, in %'
@@ -355,8 +411,8 @@ zabbix_export:
           description: 'Average percentage of time java poller processes have been busy in the last minute'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: data-collector
           triggers:
             -
               uuid: d7705ba9c3f74554ac21c59c9a0dcc11
@@ -365,6 +421,10 @@ zabbix_export:
               recovery_expression: 'avg(/Zabbix server health/zabbix[process,java poller,avg,busy],10m)<65'
               name: 'Zabbix server: Utilization of java poller processes over 75%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 5e0ffccdaa51459c90d4868e61b1c6a8
           name: 'Zabbix server: Utilization of LLD manager internal processes, in %'
@@ -376,8 +436,8 @@ zabbix_export:
           description: 'Average percentage of time lld manager processes have been busy in the last minute'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: internal-process
           triggers:
             -
               uuid: 39109dabd9454844996864834292c0c4
@@ -386,6 +446,10 @@ zabbix_export:
               recovery_expression: 'avg(/Zabbix server health/zabbix[process,lld manager,avg,busy],10m)<65'
               name: 'Zabbix server: Utilization of lld manager processes over 75%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 0b7b36eea80448ac8d11f7f30fb355da
           name: 'Zabbix server: Utilization of LLD worker internal processes, in %'
@@ -397,8 +461,8 @@ zabbix_export:
           description: 'Average percentage of time lld worker processes have been busy in the last minute'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: internal-process
           triggers:
             -
               uuid: 8eca01d6e0e64f5795d3a5b5e4aa593d
@@ -407,6 +471,10 @@ zabbix_export:
               recovery_expression: 'avg(/Zabbix server health/zabbix[process,lld worker,avg,busy],10m)<65'
               name: 'Zabbix server: Utilization of lld worker processes over 75%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: f8d593ff5690419f8679a5b8303f3a66
           name: 'Zabbix server: Utilization of ODBC poller data collector processes, in %'
@@ -418,8 +486,8 @@ zabbix_export:
           description: 'Average percentage of time ODBC poller processes have been busy in the last minute'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: data-collector
           triggers:
             -
               uuid: f536b921e9444c6eb0ac805ab9302af9
@@ -428,6 +496,10 @@ zabbix_export:
               recovery_expression: 'avg(/Zabbix server health/zabbix[process,odbc poller,avg,busy],10m)<65'
               name: 'Zabbix server: Utilization of ODBC poller processes over 75%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: cbec202e15be49de93dc0c5f58824ae3
           name: 'Zabbix server: Utilization of poller data collector processes, in %'
@@ -439,8 +511,8 @@ zabbix_export:
           description: 'Average percentage of time poller processes have been busy in the last minute'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: data-collector
           triggers:
             -
               uuid: bb50da4052134ef1a478bface291b50a
@@ -449,6 +521,10 @@ zabbix_export:
               recovery_expression: 'avg(/Zabbix server health/zabbix[process,poller,avg,busy],10m)<65'
               name: 'Zabbix server: Utilization of poller processes over 75%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: fc7999dd8d2d41a5a80eeb4b6c4c9b13
           name: 'Zabbix server: Utilization of preprocessing manager internal processes, in %'
@@ -460,8 +536,8 @@ zabbix_export:
           description: 'Average percentage of time preprocessing manager processes have been busy in the last minute'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: internal-process
           triggers:
             -
               uuid: 6e7a117afa7e41e2a783f8afc42434fa
@@ -470,6 +546,10 @@ zabbix_export:
               recovery_expression: 'avg(/Zabbix server health/zabbix[process,preprocessing manager,avg,busy],10m)<65'
               name: 'Zabbix server: Utilization of preprocessing manager processes over 75%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 6af695693d41434a96c0c6a020580828
           name: 'Zabbix server: Utilization of preprocessing worker internal processes, in %'
@@ -481,8 +561,8 @@ zabbix_export:
           description: 'Average percentage of time preprocessing worker processes have been busy in the last minute'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: internal-process
           triggers:
             -
               uuid: e2cbdcc8b4844943a67d1f51587e599c
@@ -491,6 +571,10 @@ zabbix_export:
               recovery_expression: 'avg(/Zabbix server health/zabbix[process,preprocessing worker,avg,busy],10m)<65'
               name: 'Zabbix server: Utilization of preprocessing worker processes over 75%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: baf22e095078435d978a6c4374500db4
           name: 'Zabbix server: Utilization of proxy poller data collector processes, in %'
@@ -502,8 +586,8 @@ zabbix_export:
           description: 'Average percentage of time proxy poller processes have been busy in the last minute'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: data-collector
           triggers:
             -
               uuid: 6a884c1fbf254637bb74b68571ee2ffa
@@ -512,6 +596,10 @@ zabbix_export:
               recovery_expression: 'avg(/Zabbix server health/zabbix[process,proxy poller,avg,busy],10m)<65'
               name: 'Zabbix server: Utilization of proxy poller processes over 75%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 3db38f5d250741fd833aec23e09bc52e
           name: 'Zabbix server: Utilization of report manager internal processes, in %'
@@ -523,8 +611,8 @@ zabbix_export:
           description: 'Average percentage of time report manager processes have been busy in the last minute'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: internal-process
           triggers:
             -
               uuid: 82f774b4a47247f49db1ab0480a69eae
@@ -533,6 +621,10 @@ zabbix_export:
               recovery_expression: 'avg(/Zabbix server health/zabbix[process,report manager,avg,busy],10m)<65'
               name: 'Zabbix server: Utilization of report manager processes over 75%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 9c74858428cb4578b8a9095140b64d52
           name: 'Zabbix server: Utilization of report writer internal processes, in %'
@@ -544,8 +636,8 @@ zabbix_export:
           description: 'Average percentage of time report writer processes have been busy in the last minute'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: internal-process
           triggers:
             -
               uuid: 03158d902b854b3495aa76042f361bea
@@ -554,6 +646,10 @@ zabbix_export:
               recovery_expression: 'avg(/Zabbix server health/zabbix[process,report writer,avg,busy],10m)<65'
               name: 'Zabbix server: Utilization of report writer processes over 75%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 6fc9c055d4894c19b3b1075db106d995
           name: 'Zabbix server: Utilization of self-monitoring internal processes, in %'
@@ -565,8 +661,8 @@ zabbix_export:
           description: 'Average percentage of time self-monitoring processes have been busy in the last minute'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: internal-process
           triggers:
             -
               uuid: bf730ed3313f45248f483289c704f5e9
@@ -575,6 +671,10 @@ zabbix_export:
               recovery_expression: 'avg(/Zabbix server health/zabbix[process,self-monitoring,avg,busy],10m)<65'
               name: 'Zabbix server: Utilization of self-monitoring processes over 75%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 4f6c2b59437c4345b348d78b5d2242db
           name: 'Zabbix server: Utilization of service manager internal processes, in %'
@@ -586,8 +686,8 @@ zabbix_export:
           description: 'Average percentage of time service manager processes have been busy in the last minute'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: internal-process
           triggers:
             -
               uuid: c4cdbce205e843d6b882503961a15376
@@ -596,6 +696,10 @@ zabbix_export:
               recovery_expression: 'avg(/Zabbix server health/zabbix[process,service manager,avg,busy],10m)<65'
               name: 'Zabbix server: Utilization of service manager processes over 75%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: cb9a7c4f3373496da97f3e0b8c978366
           name: 'Zabbix server: Utilization of snmp trapper data collector processes, in %'
@@ -607,8 +711,8 @@ zabbix_export:
           description: 'Average percentage of time snmp trapper processes have been busy in the last minute'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: data-collector
           triggers:
             -
               uuid: 821611786e5e49bf941cbca370d6ed6b
@@ -617,6 +721,10 @@ zabbix_export:
               recovery_expression: 'avg(/Zabbix server health/zabbix[process,snmp trapper,avg,busy],10m)<65'
               name: 'Zabbix server: Utilization of snmp trapper processes over 75%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: caeb7ecc88cc4c14bb80f901284be9a5
           name: 'Zabbix server: Utilization of task manager internal processes, in %'
@@ -628,8 +736,8 @@ zabbix_export:
           description: 'Average percentage of time task manager processes have been busy in the last minute'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: internal-process
           triggers:
             -
               uuid: 37c1c6ec07474a8a95b06c3c28e4bf96
@@ -638,6 +746,10 @@ zabbix_export:
               recovery_expression: 'avg(/Zabbix server health/zabbix[process,task manager,avg,busy],10m)<65'
               name: 'Zabbix server: Utilization of task manager processes over 75%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 3af0ec03af6542e18aaff505e3806089
           name: 'Zabbix server: Utilization of timer internal processes, in %'
@@ -649,8 +761,8 @@ zabbix_export:
           description: 'Average percentage of time timer processes have been busy in the last minute'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: internal-process
           triggers:
             -
               uuid: 0c7715df608f4736a7077ff2f6098adc
@@ -659,6 +771,10 @@ zabbix_export:
               recovery_expression: 'avg(/Zabbix server health/zabbix[process,timer,avg,busy],10m)<65'
               name: 'Zabbix server: Utilization of timer processes over 75%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 0dd727eddfaf45a9a819a9d64c5b72c7
           name: 'Zabbix server: Utilization of trapper data collector processes, in %'
@@ -670,8 +786,8 @@ zabbix_export:
           description: 'Average percentage of time trapper processes have been busy in the last minute'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: data-collector
           triggers:
             -
               uuid: 197c04bbf5204ce7ac80630f2948b6b0
@@ -680,6 +796,10 @@ zabbix_export:
               recovery_expression: 'avg(/Zabbix server health/zabbix[process,trapper,avg,busy],10m)<65'
               name: 'Zabbix server: Utilization of trapper processes over 75%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: ad2199d0152d4deb8259699ebd1f3da5
           name: 'Zabbix server: Utilization of trigger housekeeper internal processes, in %'
@@ -691,8 +811,8 @@ zabbix_export:
           description: 'Average percentage of time trigger housekeeper processes have been busy in the last minute'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: internal-process
           triggers:
             -
               uuid: 5ffa02f393d34c49bcb9eed2b2b89704
@@ -701,6 +821,10 @@ zabbix_export:
               recovery_expression: 'avg(/Zabbix server health/zabbix[process,trigger housekeeper,avg,busy],10m)<65'
               name: 'Zabbix server: Utilization of trigger housekeeper processes over 75%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 4fd24bdb8935435e8617c9607b9c6ca1
           name: 'Zabbix server: Utilization of unreachable poller data collector processes, in %'
@@ -712,8 +836,8 @@ zabbix_export:
           description: 'Average percentage of time unreachable poller processes have been busy in the last minute'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: data-collector
           triggers:
             -
               uuid: b0168864ef6849f185deb6ef22a056fa
@@ -722,6 +846,10 @@ zabbix_export:
               recovery_expression: 'avg(/Zabbix server health/zabbix[process,unreachable poller,avg,busy],10m)<65'
               name: 'Zabbix server: Utilization of unreachable poller processes over 75%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: bad00e43cd064a0fb3a4b65b71bea926
           name: 'Zabbix server: Utilization of vmware data collector processes, in %'
@@ -733,8 +861,8 @@ zabbix_export:
           description: 'Average percentage of time vmware collector processes have been busy in the last minute'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: data-collector
           triggers:
             -
               uuid: 7e0881bb1b384deba18439ae098a7fbd
@@ -743,6 +871,10 @@ zabbix_export:
               recovery_expression: 'avg(/Zabbix server health/zabbix[process,vmware collector,avg,busy],10m)<65'
               name: 'Zabbix server: Utilization of vmware collector processes over 75%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 2b2f695ed1ef4a7a871c80df9c911e90
           name: 'Zabbix server: Queue over 10 minutes'
@@ -752,8 +884,8 @@ zabbix_export:
           description: 'Number of monitored items in the queue which are delayed at least by 10 minutes.'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: system
           triggers:
             -
               uuid: 53883a57e663421ca5fa794067a267b4
@@ -761,6 +893,10 @@ zabbix_export:
               name: 'Zabbix server: More than 100 items having missing data for more than 10 minutes'
               priority: WARNING
               description: 'zabbix[stats,{$IP},{$PORT},queue,10m] item is collecting data about how many items are missing data for more than 10 minutes.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: aaf58555c0774e848f51a351b6ae8462
           name: 'Zabbix server: Queue'
@@ -770,8 +906,8 @@ zabbix_export:
           description: 'Number of monitored items in the queue which are delayed at least by 6 seconds.'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: system
         -
           uuid: ac2aebc15b084d049538b12e9513c08d
           name: 'Zabbix server: Configuration cache, % used'
@@ -783,8 +919,8 @@ zabbix_export:
           description: 'Availability statistics of Zabbix configuration cache. Percentage of used buffer.'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: system
           triggers:
             -
               uuid: 088a0e0ac64442a29de4d86f11c87438
@@ -792,6 +928,13 @@ zabbix_export:
               name: 'Zabbix server: More than 75% used in the configuration cache'
               priority: AVERAGE
               description: 'Consider increasing CacheSize in the zabbix_server.conf configuration file.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: b14a5ba6c93f4d6c9dfd820640d34e9b
           name: 'Zabbix server: Trend function cache, % unique requests'
@@ -803,8 +946,8 @@ zabbix_export:
           description: 'Effectiveness statistics of the Zabbix trend function cache. Percentage of cached items from cached items + requests. Low percentage most likely means that the cache size can be reduced.'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: system
         -
           uuid: 6db1280cb0134e81af8e070ae2356e7b
           name: 'Zabbix server: Trend function cache, % misses'
@@ -816,8 +959,8 @@ zabbix_export:
           description: 'Effectiveness statistics of the Zabbix trend function cache. Percentage of cache misses.'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: system
         -
           uuid: 559ca5966e404c948f99cabf7a9077e8
           name: 'Zabbix server: Value cache, % used'
@@ -829,8 +972,8 @@ zabbix_export:
           description: 'Availability statistics of Zabbix value cache. Percentage of used buffer.'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: system
           triggers:
             -
               uuid: cdca16919f6648ebbe6119e7c23a98c7
@@ -838,6 +981,13 @@ zabbix_export:
               name: 'Zabbix server: More than 95% used in the value cache'
               priority: AVERAGE
               description: 'Consider increasing ValueCacheSize in the zabbix_server.conf configuration file.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 69b14487a9744dbb866f2e6ee131d0e5
           name: 'Zabbix server: Value cache hits'
@@ -854,8 +1004,8 @@ zabbix_export:
                 - ''
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: system
         -
           uuid: c78439859fd248cdb15e1eee37be2220
           name: 'Zabbix server: Value cache misses'
@@ -872,8 +1022,8 @@ zabbix_export:
                 - ''
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: system
         -
           uuid: 07379df0114445b7b06818736f011ca6
           name: 'Zabbix server: Value cache operating mode'
@@ -885,8 +1035,8 @@ zabbix_export:
             name: 'Value cache operating mode'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: system
           triggers:
             -
               uuid: ee3db7e7bc104f1598ca36e735bce53f
@@ -894,6 +1044,13 @@ zabbix_export:
               name: 'Zabbix server: Zabbix value cache working in low memory mode'
               priority: HIGH
               description: 'Once the low memory mode has been switched on, the value cache will remain in this state for 24 hours, even if the problem that triggered this mode is resolved sooner.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 140cf84640564a60bcd107bebf9ac2e3
           name: 'Zabbix server: Version'
@@ -910,8 +1067,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: system
           triggers:
             -
               uuid: 456403a2063c4e2298f9e3f60a7a3180
@@ -920,6 +1077,10 @@ zabbix_export:
               priority: INFO
               description: 'Zabbix server version has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: d273413004094604ad247c0ff9695879
           name: 'Zabbix server: VMware cache, % used'
@@ -931,8 +1092,8 @@ zabbix_export:
           description: 'Availability statistics of Zabbix vmware cache. Percentage of used buffer.'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: system
           triggers:
             -
               uuid: 2df2ed6520c44ee880f35912f869583e
@@ -940,6 +1101,13 @@ zabbix_export:
               name: 'Zabbix server: More than 75% used in the vmware cache'
               priority: AVERAGE
               description: 'Consider increasing VMwareCacheSize in the zabbix_server.conf configuration file.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 1ae8253bb4da434da3ea6bcb0352115d
           name: 'Zabbix server: History write cache, % used'
@@ -953,8 +1121,8 @@ zabbix_export:
             History cache is used to store item values. A high number indicates performance problems on the database side.
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: system
           triggers:
             -
               uuid: 5d63483588964e49b1f870dfb770bf04
@@ -962,6 +1130,13 @@ zabbix_export:
               name: 'Zabbix server: More than 75% used in the history cache'
               priority: AVERAGE
               description: 'Consider increasing HistoryCacheSize in the zabbix_server.conf configuration file.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 9fc7faf5455e4e78bdb1406f947bfa08
           name: 'Zabbix server: History index cache, % used'
@@ -975,8 +1150,8 @@ zabbix_export:
             History index cache is used to index values stored in history cache.
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: system
           triggers:
             -
               uuid: 24245fbc55b743319162dd1edb37c5a0
@@ -984,6 +1159,13 @@ zabbix_export:
               name: 'Zabbix server: More than 75% used in the history index cache'
               priority: AVERAGE
               description: 'Consider increasing HistoryIndexCacheSize in the zabbix_server.conf configuration file.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 5cca0fc9878d4e068467d5a3b8558ed5
           name: 'Zabbix server: Trend write cache, % used'
@@ -997,8 +1179,8 @@ zabbix_export:
             Trend cache stores aggregate for the current hour for all items that receive data.
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: system
           triggers:
             -
               uuid: 34426156de6b4690918117a23ccc1138
@@ -1006,6 +1188,13 @@ zabbix_export:
               name: 'Zabbix server: More than 75% used in the trends cache'
               priority: AVERAGE
               description: 'Consider increasing TrendCacheSize in the zabbix_server.conf configuration file.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: de63f78f36e74361b6c9993d12d8b7c8
           name: 'Zabbix server: Number of processed numeric (float) values per second'
@@ -1023,8 +1212,8 @@ zabbix_export:
                 - ''
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: system
         -
           uuid: dae76dc6c4ce4707be7cf9534efc0233
           name: 'Zabbix server: Number of processed log values per second'
@@ -1042,8 +1231,8 @@ zabbix_export:
                 - ''
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: system
         -
           uuid: c99a99cf7e1e44918736ab860694d3a4
           name: 'Zabbix server: Number of processed not supported values per second'
@@ -1061,8 +1250,8 @@ zabbix_export:
                 - ''
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: system
         -
           uuid: b58fdd85cd6a48489d0b983ee8ebe97b
           name: 'Zabbix server: Number of processed character values per second'
@@ -1080,8 +1269,8 @@ zabbix_export:
                 - ''
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: system
         -
           uuid: 5397d6d4dedc44c29ff25b8fd5611003
           name: 'Zabbix server: Number of processed text values per second'
@@ -1099,8 +1288,8 @@ zabbix_export:
                 - ''
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: system
         -
           uuid: 47132a8565c943c0abbd4918d6af9339
           name: 'Zabbix server: Number of processed numeric (unsigned) values per second'
@@ -1118,8 +1307,8 @@ zabbix_export:
                 - ''
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: system
         -
           uuid: db364af6bcb24881850f3979933fccb0
           name: 'Zabbix server: Number of processed values per second'
@@ -1137,8 +1326,8 @@ zabbix_export:
                 - ''
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: system
       discovery_rules:
         -
           uuid: 32bf5c3b8f1f4d10b26806ae0d2adb25
@@ -1171,8 +1360,14 @@ zabbix_export:
                 key: 'zabbix[cluster,discovery,nodes]'
               tags:
                 -
-                  tag: Application
-                  value: 'Cluster node [{#NODE.NAME}]'
+                  tag: component
+                  value: cluster
+                -
+                  tag: node-id
+                  value: '{#NODE.ID}'
+                -
+                  tag: node-name
+                  value: '{#NODE.NAME}'
             -
               uuid: f444de7cdd7a4f3bb7f4b1f2e86e16d7
               name: 'Cluster node [{#NODE.NAME}]: Last access age'
@@ -1191,8 +1386,14 @@ zabbix_export:
                 key: 'zabbix[cluster,discovery,nodes]'
               tags:
                 -
-                  tag: Application
-                  value: 'Cluster node [{#NODE.NAME}]'
+                  tag: component
+                  value: cluster
+                -
+                  tag: node-id
+                  value: '{#NODE.ID}'
+                -
+                  tag: node-name
+                  value: '{#NODE.NAME}'
             -
               uuid: 2e33f747803b45d7a9b94c171bf36f61
               name: 'Cluster node [{#NODE.NAME}]: Last access time'
@@ -1211,8 +1412,14 @@ zabbix_export:
                 key: 'zabbix[cluster,discovery,nodes]'
               tags:
                 -
-                  tag: Application
-                  value: 'Cluster node [{#NODE.NAME}]'
+                  tag: component
+                  value: cluster
+                -
+                  tag: node-id
+                  value: '{#NODE.ID}'
+                -
+                  tag: node-name
+                  value: '{#NODE.NAME}'
             -
               uuid: 1e4de6a913764a22862c0265d329b592
               name: 'Cluster node [{#NODE.NAME}]: Status'
@@ -1236,8 +1443,14 @@ zabbix_export:
                 key: 'zabbix[cluster,discovery,nodes]'
               tags:
                 -
-                  tag: Application
-                  value: 'Cluster node [{#NODE.NAME}]'
+                  tag: component
+                  value: cluster
+                -
+                  tag: node-id
+                  value: '{#NODE.ID}'
+                -
+                  tag: node-name
+                  value: '{#NODE.NAME}'
               trigger_prototypes:
                 -
                   uuid: 8d48978fb5724d19a950aa6eb8a3dd75
@@ -1247,6 +1460,10 @@ zabbix_export:
                   priority: INFO
                   description: 'The state of the node has changed. Confirm to close.'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
           master_item:
             key: 'zabbix[cluster,discovery,nodes]'
           lld_macro_paths:
@@ -1256,6 +1473,16 @@ zabbix_export:
             -
               lld_macro: '{#NODE.NAME}'
               path: $.name
+      tags:
+        -
+          tag: class
+          value: software
+        -
+          tag: target
+          value: server
+        -
+          tag: target
+          value: zabbix
       dashboards:
         -
           uuid: 6815a90fb9b745fd8f1b1f47697893d6
diff --git a/templates/app/zabbix_server_remote/template_app_zabbix_server_remote.yaml b/templates/app/zabbix_server_remote/template_app_zabbix_server_remote.yaml
index 1e04a6c9132..caadfdc5f21 100644
--- a/templates/app/zabbix_server_remote/template_app_zabbix_server_remote.yaml
+++ b/templates/app/zabbix_server_remote/template_app_zabbix_server_remote.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-07T13:02:05Z'
+  date: '2022-01-26T10:48:12Z'
   groups:
     -
       uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
@@ -10,7 +10,7 @@ zabbix_export:
       uuid: 79b16cbbe593444eae3de66de0cb566b
       template: 'Remote Zabbix server health'
       name: 'Remote Zabbix server health'
-      description: 'Template tooling version used: 0.40'
+      description: 'Template tooling version used: 0.41'
       groups:
         -
           name: Templates/Applications
@@ -32,8 +32,8 @@ zabbix_export:
             key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: system
         -
           uuid: 9881f258f69d459195b5a19c56c523a8
           name: 'Remote Zabbix server: Preprocessing queue'
@@ -51,8 +51,8 @@ zabbix_export:
             key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: system
         -
           uuid: d8071d9c280c468cb70b19be50c756a5
           name: 'Remote Zabbix server: Utilization of alerter internal processes, in %'
@@ -74,8 +74,8 @@ zabbix_export:
             key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: internal-process
           triggers:
             -
               uuid: d4aae59fe9294da5b1c724b051af1683
@@ -84,6 +84,10 @@ zabbix_export:
               recovery_expression: 'avg(/Remote Zabbix server health/process.alerter.avg.busy,10m)<65'
               name: 'Remote Zabbix server: Utilization of alerter processes over 75%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 14347f8309934849a2ac13974e4b66d1
           name: 'Remote Zabbix server: Utilization of alert manager internal processes, in %'
@@ -105,8 +109,8 @@ zabbix_export:
             key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: internal-process
           triggers:
             -
               uuid: 310f33d488ae4f5faa245c96f8dc583c
@@ -115,6 +119,10 @@ zabbix_export:
               recovery_expression: 'avg(/Remote Zabbix server health/process.alert_manager.avg.busy,10m)<65'
               name: 'Remote Zabbix server: Utilization of alert manager processes over 75%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 236699e6400c4ae3a20868c79fd35027
           name: 'Remote Zabbix server: Utilization of alert syncer internal processes, in %'
@@ -136,8 +144,8 @@ zabbix_export:
             key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: internal-process
           triggers:
             -
               uuid: 0eb23de05fac4aeab4ee4aa337545b16
@@ -146,6 +154,10 @@ zabbix_export:
               recovery_expression: 'avg(/Remote Zabbix server health/process.alert_syncer.avg.busy,10m)<65'
               name: 'Remote Zabbix server: Utilization of alert syncer processes over 75%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 44ae7bbbca5346a4926bf1208e00deb8
           name: 'Remote Zabbix server: Utilization of availability manager internal processes, in %'
@@ -167,8 +179,8 @@ zabbix_export:
             key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: internal-process
           triggers:
             -
               uuid: ae06acfebdb3452b88359f1634c53876
@@ -177,6 +189,10 @@ zabbix_export:
               recovery_expression: 'avg(/Remote Zabbix server health/process.availability_manager.avg.busy,10m)<65'
               name: 'Remote Zabbix server: Utilization of availability manager processes over 75%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 439e81aed41e4fd7ba7f2e4a97ca1a91
           name: 'Remote Zabbix server: Utilization of configuration syncer internal processes, in %'
@@ -198,8 +214,8 @@ zabbix_export:
             key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: internal-process
           triggers:
             -
               uuid: f1caa410beea429eb91daaec8f027eb3
@@ -208,6 +224,10 @@ zabbix_export:
               recovery_expression: 'avg(/Remote Zabbix server health/process.configuration_syncer.avg.busy,10m)<65'
               name: 'Remote Zabbix server: Utilization of configuration syncer processes over 75%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 396cdd296a3a4ee4a247afaa0f64e41c
           name: 'Remote Zabbix server: Utilization of discoverer data collector processes, in %'
@@ -229,8 +249,8 @@ zabbix_export:
             key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: data-collector
           triggers:
             -
               uuid: 2ed92415c6c542639a8b8d1f0a4646f4
@@ -239,6 +259,10 @@ zabbix_export:
               recovery_expression: 'avg(/Remote Zabbix server health/process.discoverer.avg.busy,10m)<65'
               name: 'Remote Zabbix server: Utilization of discoverer processes over 75%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: d8110a23217142b9b10f2eda00a96f39
           name: 'Remote Zabbix server: Utilization of escalator internal processes, in %'
@@ -260,8 +284,8 @@ zabbix_export:
             key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: internal-process
           triggers:
             -
               uuid: de07be1b10d9446abed4a387dd4980dd
@@ -270,6 +294,10 @@ zabbix_export:
               recovery_expression: 'avg(/Remote Zabbix server health/process.escalator.avg.busy,10m)<65'
               name: 'Remote Zabbix server: Utilization of escalator processes over 75%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: edefe2732df14bc3933b8e1ff65fbd21
           name: 'Remote Zabbix server: Utilization of history poller data collector processes, in %'
@@ -291,8 +319,8 @@ zabbix_export:
             key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: data-collector
           triggers:
             -
               uuid: 655c59a6151d4ce985a833d9f91efc2a
@@ -301,6 +329,10 @@ zabbix_export:
               recovery_expression: 'avg(/Remote Zabbix server health/process.history_poller.avg.busy,10m)<65'
               name: 'Remote Zabbix server: Utilization of history poller processes over 75%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 2b651866c6f04880888a770e9a08a167
           name: 'Remote Zabbix server: Utilization of history syncer internal processes, in %'
@@ -322,8 +354,8 @@ zabbix_export:
             key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: internal-process
           triggers:
             -
               uuid: b8e6a6ce3667459bad05afa850e99bc0
@@ -332,6 +364,10 @@ zabbix_export:
               recovery_expression: 'avg(/Remote Zabbix server health/process.history_syncer.avg.busy,10m)<65'
               name: 'Remote Zabbix server: Utilization of history syncer processes over 75%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 8eb5b40740a349fbb14ed39dd840fc85
           name: 'Remote Zabbix server: Utilization of housekeeper internal processes, in %'
@@ -353,8 +389,8 @@ zabbix_export:
             key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: internal-process
           triggers:
             -
               uuid: b879623a755e4b79972c2ad3189886a2
@@ -363,6 +399,10 @@ zabbix_export:
               recovery_expression: 'avg(/Remote Zabbix server health/process.housekeeper.avg.busy,10m)<65'
               name: 'Remote Zabbix server: Utilization of housekeeper processes over 75%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 02371dc53214403dbf34ff9e970408ef
           name: 'Remote Zabbix server: Utilization of http poller data collector processes, in %'
@@ -384,8 +424,8 @@ zabbix_export:
             key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: data-collector
           triggers:
             -
               uuid: f7b4217cdd4b46b1949a5e6ac5fc3d02
@@ -394,6 +434,10 @@ zabbix_export:
               recovery_expression: 'avg(/Remote Zabbix server health/process.http_poller.avg.busy,10m)<65'
               name: 'Remote Zabbix server: Utilization of http poller processes over 75%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 3a2dfedfac164b69a01105137eefd5e9
           name: 'Remote Zabbix server: Utilization of icmp pinger data collector processes, in %'
@@ -415,8 +459,8 @@ zabbix_export:
             key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: data-collector
           triggers:
             -
               uuid: 312d404ff20740f38385ebe7c3e36d8f
@@ -425,6 +469,10 @@ zabbix_export:
               recovery_expression: 'avg(/Remote Zabbix server health/process.icmp_pinger.avg.busy,10m)<65'
               name: 'Remote Zabbix server: Utilization of icmp pinger processes over 75%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 52a05106bc5e4e05b04142827f394662
           name: 'Remote Zabbix server: Utilization of ipmi manager internal processes, in %'
@@ -446,8 +494,8 @@ zabbix_export:
             key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: internal-process
           triggers:
             -
               uuid: 3fe728ab8de9447c899b2a919b885cec
@@ -456,6 +504,10 @@ zabbix_export:
               recovery_expression: 'avg(/Remote Zabbix server health/process.ipmi_manager.avg.busy,10m)<65'
               name: 'Remote Zabbix server: Utilization of ipmi manager processes over 75%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 849f8b11cc984c758c4947fe256e3310
           name: 'Remote Zabbix server: Utilization of ipmi poller data collector processes, in %'
@@ -477,8 +529,8 @@ zabbix_export:
             key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: data-collector
           triggers:
             -
               uuid: dbf27d6a629a4a2cb75e04849b93ac0f
@@ -487,6 +539,10 @@ zabbix_export:
               recovery_expression: 'avg(/Remote Zabbix server health/process.ipmi_poller.avg.busy,10m)<65'
               name: 'Remote Zabbix server: Utilization of ipmi poller processes over 75%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: e55654715f8143c597c858d7eb522e31
           name: 'Remote Zabbix server: Utilization of java poller data collector processes, in %'
@@ -508,8 +564,8 @@ zabbix_export:
             key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: data-collector
           triggers:
             -
               uuid: 304a2dcf77c8494fb18f52cc6bae73a9
@@ -518,6 +574,10 @@ zabbix_export:
               recovery_expression: 'avg(/Remote Zabbix server health/process.java_poller.avg.busy,10m)<65'
               name: 'Remote Zabbix server: Utilization of java poller processes over 75%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: b8504e03317649399dabfffc2758d77c
           name: 'Remote Zabbix server: Utilization of LLD manager internal processes, in %'
@@ -539,8 +599,8 @@ zabbix_export:
             key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: internal-process
           triggers:
             -
               uuid: 4027f813da2549cfb99e1bb5e04e1d28
@@ -549,6 +609,10 @@ zabbix_export:
               recovery_expression: 'avg(/Remote Zabbix server health/process.lld_manager.avg.busy,10m)<65'
               name: 'Remote Zabbix server: Utilization of lld manager processes over 75%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: c4d708a59d314de6814f4936ec6b0a99
           name: 'Remote Zabbix server: Utilization of LLD worker internal processes, in %'
@@ -570,8 +634,8 @@ zabbix_export:
             key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: internal-process
           triggers:
             -
               uuid: ef1e836e906e4cf79b9fc8a11818c0a6
@@ -580,6 +644,10 @@ zabbix_export:
               recovery_expression: 'avg(/Remote Zabbix server health/process.lld_worker.avg.busy,10m)<65'
               name: 'Remote Zabbix server: Utilization of lld worker processes over 75%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 8a21a0281ae24e0788edc8c9b875a421
           name: 'Remote Zabbix server: Utilization of ODBC poller data collector processes, in %'
@@ -595,14 +663,12 @@ zabbix_export:
               type: JSONPATH
               parameters:
                 - '$.data.process[''odbc poller''].busy.avg'
-              error_handler: CUSTOM_ERROR
-              error_handler_params: 'Processes odbc poller not started'
           master_item:
             key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: data-collector
           triggers:
             -
               uuid: eadd70080005430c8b11666d7e93a095
@@ -611,6 +677,10 @@ zabbix_export:
               recovery_expression: 'avg(/Remote Zabbix server health/process.odbc_poller.avg.busy,10m)<65'
               name: 'Remote Zabbix server: Utilization of ODBC poller processes over 75%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 61df12fa054b46f4b50596807dbc90c3
           name: 'Remote Zabbix server: Utilization of poller data collector processes, in %'
@@ -632,8 +702,8 @@ zabbix_export:
             key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: data-collector
           triggers:
             -
               uuid: 689ed5dd9bbd4873a825dfa675378d50
@@ -642,6 +712,10 @@ zabbix_export:
               recovery_expression: 'avg(/Remote Zabbix server health/process.poller.avg.busy,10m)<65'
               name: 'Remote Zabbix server: Utilization of poller processes over 75%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 42e9efb8e5e54b26b84372dc53e823b3
           name: 'Remote Zabbix server: Utilization of preprocessing manager internal processes, in %'
@@ -663,8 +737,8 @@ zabbix_export:
             key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: internal-process
           triggers:
             -
               uuid: b43f04a35e17415bb81bfb59357d45ac
@@ -673,6 +747,10 @@ zabbix_export:
               recovery_expression: 'avg(/Remote Zabbix server health/process.preprocessing_manager.avg.busy,10m)<65'
               name: 'Remote Zabbix server: Utilization of preprocessing manager processes over 75%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 90bd4b46d63845b98a2c430aac157ea5
           name: 'Remote Zabbix server: Utilization of preprocessing worker internal processes, in %'
@@ -694,8 +772,8 @@ zabbix_export:
             key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: internal-process
           triggers:
             -
               uuid: 1c28310eb72047449437ee94854029fa
@@ -704,6 +782,10 @@ zabbix_export:
               recovery_expression: 'avg(/Remote Zabbix server health/process.preprocessing_worker.avg.busy,10m)<65'
               name: 'Remote Zabbix server: Utilization of preprocessing worker processes over 75%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 4c5eb5acc8a447afa47d732988dafbd9
           name: 'Remote Zabbix server: Utilization of proxy poller data collector processes, in %'
@@ -725,8 +807,8 @@ zabbix_export:
             key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: data-collector
           triggers:
             -
               uuid: c0d2c7c008cb45ee8b032b7c83018ae1
@@ -735,6 +817,10 @@ zabbix_export:
               recovery_expression: 'avg(/Remote Zabbix server health/process.proxy_poller.avg.busy,10m)<65'
               name: 'Remote Zabbix server: Utilization of proxy poller processes over 75%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 032c86725d7d479e8e0a8cf0ea14b349
           name: 'Remote Zabbix server: Utilization of report manager internal processes, in %'
@@ -756,8 +842,8 @@ zabbix_export:
             key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: internal-process
           triggers:
             -
               uuid: 32d6f18edd5a45e1999f294f227c600f
@@ -766,6 +852,10 @@ zabbix_export:
               recovery_expression: 'avg(/Remote Zabbix server health/process.report_manager.avg.busy,10m)<65'
               name: 'Remote Zabbix server: Utilization of report manager processes over 75%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 0a91377a6d5a460aa716164b201db6c0
           name: 'Remote Zabbix server: Utilization of report writer internal processes, in %'
@@ -787,8 +877,8 @@ zabbix_export:
             key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: internal-process
           triggers:
             -
               uuid: 83fa871d54f74c89a7c85d429d40da53
@@ -797,6 +887,10 @@ zabbix_export:
               recovery_expression: 'avg(/Remote Zabbix server health/process.report_writer.avg.busy,10m)<65'
               name: 'Remote Zabbix server: Utilization of report writer processes over 75%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 044bb995bcae42568979fd958383fc60
           name: 'Remote Zabbix server: Utilization of self-monitoring internal processes, in %'
@@ -818,8 +912,8 @@ zabbix_export:
             key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: internal-process
           triggers:
             -
               uuid: 0d9b8d1f2d7d454ab472320ac172252c
@@ -828,6 +922,10 @@ zabbix_export:
               recovery_expression: 'avg(/Remote Zabbix server health/process.self-monitoring.avg.busy,10m)<65'
               name: 'Remote Zabbix server: Utilization of self-monitoring processes over 75%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 99da1d8bd47447d282542d40c1edea00
           name: 'Remote Zabbix server: Utilization of service manager internal processes, in %'
@@ -849,8 +947,8 @@ zabbix_export:
             key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: internal-process
           triggers:
             -
               uuid: 001c9e2027ca4e7c8f5dc5b78681c573
@@ -859,6 +957,10 @@ zabbix_export:
               recovery_expression: 'avg(/Remote Zabbix server health/process.service_manager.avg.busy,10m)<65'
               name: 'Remote Zabbix server: Utilization of service manager processes over 75%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 643036d74a10414f94dc357efbbd42b2
           name: 'Remote Zabbix server: Utilization of snmp trapper data collector processes, in %'
@@ -880,8 +982,8 @@ zabbix_export:
             key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: data-collector
           triggers:
             -
               uuid: 4726331c52284261aa3f347448c1c3c5
@@ -890,6 +992,10 @@ zabbix_export:
               recovery_expression: 'avg(/Remote Zabbix server health/process.snmp_trapper.avg.busy,10m)<65'
               name: 'Remote Zabbix server: Utilization of snmp trapper processes over 75%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 7fad0515db154228b5baabb51d647a9f
           name: 'Remote Zabbix server: Utilization of task manager internal processes, in %'
@@ -911,8 +1017,8 @@ zabbix_export:
             key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: internal-process
           triggers:
             -
               uuid: 07d29e82b74a4cc5b0d701458af302b7
@@ -921,6 +1027,10 @@ zabbix_export:
               recovery_expression: 'avg(/Remote Zabbix server health/process.task_manager.avg.busy,10m)<65'
               name: 'Remote Zabbix server: Utilization of task manager processes over 75%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 105eae2d56d34d91b540f93009a575aa
           name: 'Remote Zabbix server: Utilization of timer internal processes, in %'
@@ -942,8 +1052,8 @@ zabbix_export:
             key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: internal-process
           triggers:
             -
               uuid: 72f3b3f143a94f5a9b4b2c509425954e
@@ -952,6 +1062,10 @@ zabbix_export:
               recovery_expression: 'avg(/Remote Zabbix server health/process.timer.avg.busy,10m)<65'
               name: 'Remote Zabbix server: Utilization of timer processes over 75%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 9c90b3a087e1495caa17a00bebb70145
           name: 'Remote Zabbix server: Utilization of trapper data collector processes, in %'
@@ -973,8 +1087,8 @@ zabbix_export:
             key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: data-collector
           triggers:
             -
               uuid: d31285f177224c4cb570373f6a730019
@@ -983,6 +1097,10 @@ zabbix_export:
               recovery_expression: 'avg(/Remote Zabbix server health/process.trapper.avg.busy,10m)<65'
               name: 'Remote Zabbix server: Utilization of trapper processes over 75%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 56dca0db33264d4b9c8fd769fbdff7b5
           name: 'Remote Zabbix server: Utilization of trigger housekeeper internal processes, in %'
@@ -1004,8 +1122,8 @@ zabbix_export:
             key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: internal-process
           triggers:
             -
               uuid: 9c0daf6e85884122aa8c5b8432709c92
@@ -1014,6 +1132,10 @@ zabbix_export:
               recovery_expression: 'avg(/Remote Zabbix server health/process.trigger_housekeeper.avg.busy,10m)<65'
               name: 'Remote Zabbix server: Utilization of trigger housekeeper processes over 75%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 8d43954f6b9843009353c560a4f84157
           name: 'Remote Zabbix server: Utilization of unreachable poller data collector processes, in %'
@@ -1035,8 +1157,8 @@ zabbix_export:
             key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: data-collector
           triggers:
             -
               uuid: d254ccddc7dd4e1ebf1eaa5113270e85
@@ -1045,6 +1167,10 @@ zabbix_export:
               recovery_expression: 'avg(/Remote Zabbix server health/process.unreachable_poller.avg.busy,10m)<65'
               name: 'Remote Zabbix server: Utilization of unreachable poller processes over 75%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 9f02a181362b42b882d869353fae93ce
           name: 'Remote Zabbix server: Utilization of vmware data collector processes, in %'
@@ -1066,8 +1192,8 @@ zabbix_export:
             key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: data-collector
           triggers:
             -
               uuid: 5929cfbe23494a41a20a4c05854f9578
@@ -1076,6 +1202,10 @@ zabbix_export:
               recovery_expression: 'avg(/Remote Zabbix server health/process.vmware_collector.avg.busy,10m)<65'
               name: 'Remote Zabbix server: Utilization of vmware collector processes over 75%'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 750964513e1d44d7b138980d6cac2188
           name: 'Remote Zabbix server: Configuration cache, % used'
@@ -1095,8 +1225,8 @@ zabbix_export:
             key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: system
           triggers:
             -
               uuid: 9d5f36b486ab4781a5f58210143785e9
@@ -1104,6 +1234,13 @@ zabbix_export:
               name: 'Remote Zabbix server: More than 75% used in the configuration cache'
               priority: AVERAGE
               description: 'Consider increasing CacheSize in the zabbix_server.conf configuration file.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 1625b3470fbf4bd7aa5b7051e328b37c
           name: 'Remote Zabbix server: Trend function cache, % unique requests'
@@ -1128,8 +1265,8 @@ zabbix_export:
             key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: system
         -
           uuid: 2c8bf95e97dd48679e34591c72626c90
           name: 'Remote Zabbix server: Trend function cache, % misses'
@@ -1151,8 +1288,8 @@ zabbix_export:
             key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: system
         -
           uuid: 9f9d8d1fcd08498698e37b5889502b47
           name: 'Remote Zabbix server: Value cache, % used'
@@ -1172,8 +1309,8 @@ zabbix_export:
             key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: system
           triggers:
             -
               uuid: d35671cd02034aeba3c7c71ed618f4ee
@@ -1181,6 +1318,13 @@ zabbix_export:
               name: 'Remote Zabbix server: More than 95% used in the value cache'
               priority: AVERAGE
               description: 'Consider increasing ValueCacheSize in the zabbix_server.conf configuration file.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 9bd0079126974bf2a61f552de2cdf880
           name: 'Remote Zabbix server: Value cache hits'
@@ -1206,8 +1350,8 @@ zabbix_export:
             key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: system
         -
           uuid: e8c372778d4e434e98d3fba5ea603a50
           name: 'Remote Zabbix server: Value cache misses'
@@ -1233,8 +1377,8 @@ zabbix_export:
             key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: system
         -
           uuid: 1a1daeb7267f4ed4bf75c70699d487b6
           name: 'Remote Zabbix server: Value cache operating mode'
@@ -1254,8 +1398,8 @@ zabbix_export:
             key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: system
           triggers:
             -
               uuid: 95e8823159fc4baeb13d656be176ac16
@@ -1263,6 +1407,13 @@ zabbix_export:
               name: 'Remote Zabbix server: Zabbix value cache working in low memory mode'
               priority: HIGH
               description: 'Once the low memory mode has been switched on, the value cache will remain in this state for 24 hours, even if the problem that triggered this mode is resolved sooner.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: f0eab81aaf464b809ea4d487548e57c6
           name: 'Remote Zabbix server: Version'
@@ -1286,8 +1437,8 @@ zabbix_export:
             key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: system
           triggers:
             -
               uuid: 93a52f22c79b40539fcd3a26183daad9
@@ -1296,6 +1447,10 @@ zabbix_export:
               priority: INFO
               description: 'Remote Zabbix server version has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 9e2b2133916e4ce29ed4e9ca07c74123
           name: 'Remote Zabbix server: VMware cache, % used'
@@ -1317,8 +1472,8 @@ zabbix_export:
             key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: system
           triggers:
             -
               uuid: 08e6c62dd52b4a0694be910c4f4fa997
@@ -1326,6 +1481,13 @@ zabbix_export:
               name: 'Remote Zabbix server: More than 75% used in the vmware cache'
               priority: AVERAGE
               description: 'Consider increasing VMwareCacheSize in the zabbix_server.conf configuration file.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 98f47a07e2ba4294a9eb2aa1df2ba9f3
           name: 'Remote Zabbix server: History write cache, % used'
@@ -1347,8 +1509,8 @@ zabbix_export:
             key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: system
           triggers:
             -
               uuid: a66914bd7f2e4442a8b555deacebb4c9
@@ -1356,6 +1518,13 @@ zabbix_export:
               name: 'Remote Zabbix server: More than 75% used in the history cache'
               priority: AVERAGE
               description: 'Consider increasing HistoryCacheSize in the zabbix_server.conf configuration file.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: b1add70210a44b668f06cc3e062173ad
           name: 'Remote Zabbix server: History index cache, % used'
@@ -1377,8 +1546,8 @@ zabbix_export:
             key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: system
           triggers:
             -
               uuid: 6aedbc1768ed4f949890248af98fdaa2
@@ -1386,6 +1555,13 @@ zabbix_export:
               name: 'Remote Zabbix server: More than 75% used in the history index cache'
               priority: AVERAGE
               description: 'Consider increasing HistoryIndexCacheSize in the zabbix_server.conf configuration file.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 1f79208bb2ec4e4eb26e6e1b95c3635e
           name: 'Remote Zabbix server: Trend write cache, % used'
@@ -1407,8 +1583,8 @@ zabbix_export:
             key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: system
           triggers:
             -
               uuid: 742a4938fdd24026921b375a67cea921
@@ -1416,6 +1592,13 @@ zabbix_export:
               name: 'Remote Zabbix server: More than 75% used in the trends cache'
               priority: AVERAGE
               description: 'Consider increasing TrendCacheSize in the zabbix_server.conf configuration file.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 34fe014843974248a98a45596ce43e1a
           name: 'Remote Zabbix server: Number of processed values per second'
@@ -1440,8 +1623,8 @@ zabbix_export:
             key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: system
         -
           uuid: 206f4fcb1e6d4e468a172e330f56b8aa
           name: 'Remote Zabbix server: Number of processed numeric (float) values per second'
@@ -1466,8 +1649,8 @@ zabbix_export:
             key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: system
         -
           uuid: e2f3dc320d54446b80862eabe6fa0be5
           name: 'Remote Zabbix server: Number of processed log values per second'
@@ -1492,8 +1675,8 @@ zabbix_export:
             key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: system
         -
           uuid: 82e088caf6e14c1cab700ad7fcc96263
           name: 'Remote Zabbix server: Number of processed not supported values per second'
@@ -1518,8 +1701,8 @@ zabbix_export:
             key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: system
         -
           uuid: 99415cd1920a4e7f8b99f3c71e7eba97
           name: 'Remote Zabbix server: Number of processed character values per second'
@@ -1544,8 +1727,8 @@ zabbix_export:
             key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: system
         -
           uuid: 7172378f31a44a36a095a2c2afed763b
           name: 'Remote Zabbix server: Number of processed text values per second'
@@ -1570,8 +1753,8 @@ zabbix_export:
             key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: system
         -
           uuid: 7865ba7a928945f4a148acf623b72537
           name: 'Remote Zabbix server: Number of processed numeric (unsigned) values per second'
@@ -1596,8 +1779,8 @@ zabbix_export:
             key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: system
         -
           uuid: 95c8bab7640a4227b8ce6cac06e1a08b
           name: 'Remote Zabbix server: Zabbix stats queue over 10m'
@@ -1612,8 +1795,8 @@ zabbix_export:
                 - $.queue
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: system
           triggers:
             -
               uuid: c8eddec1bb9740bb8ca05f74bd023fcc
@@ -1623,6 +1806,10 @@ zabbix_export:
               description: |
                 zabbix[stats,{$IP},{$PORT},queue,10m] item is collecting data about
                 how many items are missing data for more than 10 minutes.
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: c140ebe6c0404ee6b17b5ada2de09f28
           name: 'Remote Zabbix server: Zabbix stats queue'
@@ -1637,8 +1824,8 @@ zabbix_export:
                 - $.queue
           tags:
             -
-              tag: Application
-              value: 'Zabbix server'
+              tag: component
+              value: system
         -
           uuid: b9a588fee45047b6b991015e7e83f3f2
           name: 'Remote Zabbix server: Zabbix stats'
@@ -1650,8 +1837,8 @@ zabbix_export:
           description: 'Zabbix server statistics master item.'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
       discovery_rules:
         -
           uuid: 0557f879881a4d558410444737ae3738
@@ -1684,8 +1871,14 @@ zabbix_export:
                 key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
               tags:
                 -
-                  tag: Application
-                  value: 'Cluster node [{#NODE.NAME}]'
+                  tag: component
+                  value: cluster
+                -
+                  tag: node-id
+                  value: '{#NODE.ID}'
+                -
+                  tag: node-name
+                  value: '{#NODE.NAME}'
             -
               uuid: a9ded61c4dba4abb9213aec9af00a604
               name: 'Cluster node [{#NODE.NAME}]: Last access age'
@@ -1704,8 +1897,14 @@ zabbix_export:
                 key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
               tags:
                 -
-                  tag: Application
-                  value: 'Cluster node [{#NODE.NAME}]'
+                  tag: component
+                  value: cluster
+                -
+                  tag: node-id
+                  value: '{#NODE.ID}'
+                -
+                  tag: node-name
+                  value: '{#NODE.NAME}'
             -
               uuid: 0968e4fe51eb4c2b98a508090014aba0
               name: 'Cluster node [{#NODE.NAME}]: Last access time'
@@ -1724,8 +1923,14 @@ zabbix_export:
                 key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
               tags:
                 -
-                  tag: Application
-                  value: 'Cluster node [{#NODE.NAME}]'
+                  tag: component
+                  value: cluster
+                -
+                  tag: node-id
+                  value: '{#NODE.ID}'
+                -
+                  tag: node-name
+                  value: '{#NODE.NAME}'
             -
               uuid: 2b629362886546cab34396352b93835a
               name: 'Cluster node [{#NODE.NAME}]: Status'
@@ -1749,8 +1954,14 @@ zabbix_export:
                 key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
               tags:
                 -
-                  tag: Application
-                  value: 'Cluster node [{#NODE.NAME}]'
+                  tag: component
+                  value: cluster
+                -
+                  tag: node-id
+                  value: '{#NODE.ID}'
+                -
+                  tag: node-name
+                  value: '{#NODE.NAME}'
               trigger_prototypes:
                 -
                   uuid: 5d68b55175924cb4adde600a019496c4
@@ -1760,6 +1971,10 @@ zabbix_export:
                   priority: INFO
                   description: 'The state of the node has changed. Confirm to close.'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
           master_item:
             key: 'zabbix[stats,{$ADDRESS},{$PORT}]'
           lld_macro_paths:
@@ -1774,6 +1989,16 @@ zabbix_export:
               type: JSONPATH
               parameters:
                 - $.data.ha
+      tags:
+        -
+          tag: class
+          value: software
+        -
+          tag: target
+          value: server
+        -
+          tag: target
+          value: zabbix
       macros:
         -
           macro: '{$ADDRESS}'
diff --git a/templates/app/zookeeper_http/template_app_zookeeper_http.yaml b/templates/app/zookeeper_http/template_app_zookeeper_http.yaml
index ed82e9d84e4..74f1d8c70d4 100644
--- a/templates/app/zookeeper_http/template_app_zookeeper_http.yaml
+++ b/templates/app/zookeeper_http/template_app_zookeeper_http.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-15T06:58:41Z'
+  date: '2022-01-26T10:01:43Z'
   groups:
     -
       uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
@@ -17,7 +17,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Applications
@@ -40,8 +40,8 @@ zabbix_export:
             key: zookeeper.get_metrics
           tags:
             -
-              tag: Application
-              value: Zookeeper
+              tag: component
+              value: disk
         -
           uuid: 260f60267bda40099f323292d7f0b8fd
           name: 'Zookeeper: Election time, avg'
@@ -67,8 +67,8 @@ zabbix_export:
             key: zookeeper.get_metrics
           tags:
             -
-              tag: Application
-              value: Zookeeper
+              tag: component
+              value: application
         -
           uuid: 28aa45a47df64503a9553a05794f512a
           name: 'Zookeeper: Fsync time, avg'
@@ -94,8 +94,8 @@ zabbix_export:
             key: zookeeper.get_metrics
           tags:
             -
-              tag: Application
-              value: Zookeeper
+              tag: component
+              value: disk
         -
           uuid: 243ea1e324d5464a88c8847e721cd38b
           name: 'Zookeeper: Latency, avg'
@@ -115,8 +115,8 @@ zabbix_export:
             key: zookeeper.get_metrics
           tags:
             -
-              tag: Application
-              value: Zookeeper
+              tag: component
+              value: requests
         -
           uuid: 6195a64eb23341f0964d8d9ffbf9e624
           name: 'Zookeeper: Snapshot write time, avg'
@@ -142,8 +142,8 @@ zabbix_export:
             key: zookeeper.get_metrics
           tags:
             -
-              tag: Application
-              value: Zookeeper
+              tag: component
+              value: disk
         -
           uuid: f227c61a498f47f6ba1862a741da3789
           name: 'Zookeeper: Bytes received per sec'
@@ -167,8 +167,8 @@ zabbix_export:
             key: zookeeper.get_metrics
           tags:
             -
-              tag: Application
-              value: Zookeeper
+              tag: component
+              value: network
         -
           uuid: b9a97ebbaf7d416998e24553cee3559c
           name: 'Zookeeper: Elections'
@@ -193,8 +193,8 @@ zabbix_export:
             key: zookeeper.get_metrics
           tags:
             -
-              tag: Application
-              value: Zookeeper
+              tag: component
+              value: application
         -
           uuid: 01d490987f954950b7ce3a107aefa200
           name: 'Zookeeper: Fsync'
@@ -214,8 +214,8 @@ zabbix_export:
             key: zookeeper.get_metrics
           tags:
             -
-              tag: Application
-              value: Zookeeper
+              tag: component
+              value: disk
         -
           uuid: 159bf1c1f29846a582e201c143239182
           name: 'Zookeeper: Snapshot writes'
@@ -235,8 +235,8 @@ zabbix_export:
             key: zookeeper.get_metrics
           tags:
             -
-              tag: Application
-              value: Zookeeper
+              tag: component
+              value: disk
         -
           uuid: 10b17f0682c44e2391b8ee191ed355c1
           name: 'Zookeeper: Commit per sec'
@@ -259,8 +259,8 @@ zabbix_export:
             key: zookeeper.get_metrics
           tags:
             -
-              tag: Application
-              value: Zookeeper
+              tag: component
+              value: operations
         -
           uuid: 1c0ff2c8d4844ed4b815f2a793dd6e7b
           name: 'Zookeeper: Drop connections per sec'
@@ -283,8 +283,8 @@ zabbix_export:
             key: zookeeper.get_metrics
           tags:
             -
-              tag: Application
-              value: Zookeeper
+              tag: component
+              value: connections
         -
           uuid: 640195274cda47ed83faa4f0c6529818
           name: 'Zookeeper: Rejected connections per sec'
@@ -307,8 +307,8 @@ zabbix_export:
             key: zookeeper.get_metrics
           tags:
             -
-              tag: Application
-              value: Zookeeper
+              tag: component
+              value: connections
         -
           uuid: 1498099b44d3424093f7cea55cb256e8
           name: 'Zookeeper: Revalidate connections per sec'
@@ -331,8 +331,8 @@ zabbix_export:
             key: zookeeper.get_metrics
           tags:
             -
-              tag: Application
-              value: Zookeeper
+              tag: component
+              value: connections
         -
           uuid: 3e8e3bc9910e4c3c898e1371790a35f0
           name: 'Zookeeper: Diff syncs per sec'
@@ -355,8 +355,8 @@ zabbix_export:
             key: zookeeper.get_metrics
           tags:
             -
-              tag: Application
-              value: Zookeeper
+              tag: component
+              value: operations
         -
           uuid: 1a581bf18a364868b6eb47bbafcaa105
           name: 'Zookeeper: Ephemeral nodes count'
@@ -374,8 +374,8 @@ zabbix_export:
             key: zookeeper.get_metrics
           tags:
             -
-              tag: Application
-              value: Zookeeper
+              tag: component
+              value: application
         -
           uuid: f682f5d6e1664f919872f309371e4079
           name: 'Zookeeper: Get connections stats'
@@ -388,8 +388,11 @@ zabbix_export:
           url: '{$ZOOKEEPER.SCHEME}://{HOST.CONN}:{$ZOOKEEPER.PORT}/{$ZOOKEEPER.COMMAND_URL}/connections'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: connections
+            -
+              tag: component
+              value: raw
         -
           uuid: cf7e83297d6343fb87dcd7848f62ce41
           name: 'Zookeeper: Get server metrics'
@@ -401,8 +404,8 @@ zabbix_export:
           url: '{$ZOOKEEPER.SCHEME}://{HOST.CONN}:{$ZOOKEEPER.PORT}/{$ZOOKEEPER.COMMAND_URL}/monitor'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
         -
           uuid: 0f8e7ac6f753483d86744b2ab6aa28dd
           name: 'Zookeeper: Global sessions'
@@ -420,8 +423,8 @@ zabbix_export:
             key: zookeeper.get_metrics
           tags:
             -
-              tag: Application
-              value: Zookeeper
+              tag: component
+              value: sessions
         -
           uuid: 72519325755b4c27931c674756313ebb
           name: 'Zookeeper: Local sessions'
@@ -439,8 +442,8 @@ zabbix_export:
             key: zookeeper.get_metrics
           tags:
             -
-              tag: Application
-              value: Zookeeper
+              tag: component
+              value: sessions
         -
           uuid: 8a784676586d4b719a0b5c1327a0645f
           name: 'Zookeeper: Looking per sec'
@@ -463,8 +466,8 @@ zabbix_export:
             key: zookeeper.get_metrics
           tags:
             -
-              tag: Application
-              value: Zookeeper
+              tag: component
+              value: operations
         -
           uuid: 350a5b566e054e8390bb43ce0b2916c6
           name: 'Zookeeper: File descriptors, max'
@@ -486,8 +489,8 @@ zabbix_export:
             key: zookeeper.get_metrics
           tags:
             -
-              tag: Application
-              value: Zookeeper
+              tag: component
+              value: fds
         -
           uuid: 185f5c3fdfde43afa55ed4c38c0878dc
           name: 'Zookeeper: Latency, max'
@@ -507,8 +510,8 @@ zabbix_export:
             key: zookeeper.get_metrics
           tags:
             -
-              tag: Application
-              value: Zookeeper
+              tag: component
+              value: requests
         -
           uuid: a4b3d6d9cfb14454b83475b89fe44e06
           name: 'Zookeeper: Latency, min'
@@ -528,8 +531,8 @@ zabbix_export:
             key: zookeeper.get_metrics
           tags:
             -
-              tag: Application
-              value: Zookeeper
+              tag: component
+              value: requests
         -
           uuid: 86ba6a7967e8462cb6ff4be126e21a44
           name: 'Zookeeper: Alive connections'
@@ -547,8 +550,8 @@ zabbix_export:
             key: zookeeper.get_metrics
           tags:
             -
-              tag: Application
-              value: Zookeeper
+              tag: component
+              value: connections
         -
           uuid: e441c926d2f947708b39d7615520405d
           name: 'Zookeeper: File descriptors, open'
@@ -566,8 +569,8 @@ zabbix_export:
             key: zookeeper.get_metrics
           tags:
             -
-              tag: Application
-              value: Zookeeper
+              tag: component
+              value: fds
         -
           uuid: 88ede9687323440183d665d38938212e
           name: 'Zookeeper: Outstanding requests'
@@ -585,8 +588,8 @@ zabbix_export:
             key: zookeeper.get_metrics
           tags:
             -
-              tag: Application
-              value: Zookeeper
+              tag: component
+              value: requests
           triggers:
             -
               uuid: ac27f2d8b34546d1bdc6d7ab858c04a1
@@ -595,6 +598,10 @@ zabbix_export:
               priority: AVERAGE
               description: 'Number of queued requests in the server. This goes up when the server receives more requests than it can process.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 3295ed3fdb504014b351eba81bf55ccf
           name: 'Zookeeper: Packets received per sec'
@@ -617,8 +624,8 @@ zabbix_export:
             key: zookeeper.get_metrics
           tags:
             -
-              tag: Application
-              value: Zookeeper
+              tag: component
+              value: network
         -
           uuid: ecef658cb34247e2838e0f7313dba0bf
           name: 'Zookeeper: Packets sent per sec'
@@ -641,8 +648,8 @@ zabbix_export:
             key: zookeeper.get_metrics
           tags:
             -
-              tag: Application
-              value: Zookeeper
+              tag: component
+              value: network
         -
           uuid: 8295b8c4c1f44ba48987f36b54b43ab8
           name: 'Zookeeper: Revalidate per sec'
@@ -665,8 +672,8 @@ zabbix_export:
             key: zookeeper.get_metrics
           tags:
             -
-              tag: Application
-              value: Zookeeper
+              tag: component
+              value: operations
         -
           uuid: 44a1f40fb3604fcda9fedc4beeb87baf
           name: 'Zookeeper: Server mode'
@@ -690,8 +697,8 @@ zabbix_export:
             key: zookeeper.get_metrics
           tags:
             -
-              tag: Application
-              value: Zookeeper
+              tag: component
+              value: application
           triggers:
             -
               uuid: 494624353875401eaf65f7eb0273ca35
@@ -700,6 +707,10 @@ zabbix_export:
               priority: INFO
               description: 'Zookeeper node state has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: d143981fdaee4c51bcbb773579be25f0
           name: 'Zookeeper: Snap syncs per sec'
@@ -722,8 +733,8 @@ zabbix_export:
             key: zookeeper.get_metrics
           tags:
             -
-              tag: Application
-              value: Zookeeper
+              tag: component
+              value: operations
         -
           uuid: cea535cfb32940f29aee3c17734e8c51
           name: 'Zookeeper: Uptime'
@@ -746,8 +757,8 @@ zabbix_export:
             key: zookeeper.get_metrics
           tags:
             -
-              tag: Application
-              value: Zookeeper
+              tag: component
+              value: application
           triggers:
             -
               uuid: db35b5c75fc543ef8ffe766a0671fd6d
@@ -756,6 +767,10 @@ zabbix_export:
               priority: WARNING
               description: 'Zabbix has not received data for items for the last 10 minutes'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
             -
               uuid: d023c72f35e441d2bf5bbc3c1f9d0dad
               expression: 'last(/Zookeeper by HTTP/zookeeper.uptime)<10m'
@@ -763,6 +778,10 @@ zabbix_export:
               priority: INFO
               description: 'Uptime is less than 10 minutes'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 86a65edd19e14fa9aea1ff40220f895c
           name: 'Zookeeper: Version'
@@ -791,8 +810,8 @@ zabbix_export:
             key: zookeeper.get_metrics
           tags:
             -
-              tag: Application
-              value: Zookeeper
+              tag: component
+              value: application
           triggers:
             -
               uuid: 2a091bcfafe84ea9aee5238ce5e25651
@@ -801,6 +820,10 @@ zabbix_export:
               priority: INFO
               description: 'Zookeeper version has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 5cbc4414c19146ff87e15f21c77808c9
           name: 'Zookeeper: Watch count'
@@ -818,8 +841,8 @@ zabbix_export:
             key: zookeeper.get_metrics
           tags:
             -
-              tag: Application
-              value: Zookeeper
+              tag: component
+              value: application
         -
           uuid: 07925b71e3fe421eac9b338fc23713d0
           name: 'Zookeeper: Znode count'
@@ -841,8 +864,8 @@ zabbix_export:
             key: zookeeper.get_metrics
           tags:
             -
-              tag: Application
-              value: Zookeeper
+              tag: component
+              value: application
       discovery_rules:
         -
           uuid: e0f576ea5ae44289866fb726079ddbf8
@@ -873,8 +896,17 @@ zabbix_export:
                 key: zookeeper.get_connections_stats
               tags:
                 -
-                  tag: Application
-                  value: 'Zookeeper {#TYPE} {#CLIENT}'
+                  tag: client
+                  value: '{#CLIENT}'
+                -
+                  tag: component
+                  value: clients
+                -
+                  tag: component
+                  value: requests
+                -
+                  tag: type
+                  value: '{#TYPE}'
             -
               uuid: 2a36ecfb56754bcb8bdc91da76316fb4
               name: 'Zookeeper client {#TYPE} [{#CLIENT}]: Latency, max'
@@ -894,8 +926,17 @@ zabbix_export:
                 key: zookeeper.get_connections_stats
               tags:
                 -
-                  tag: Application
-                  value: 'Zookeeper {#TYPE} {#CLIENT}'
+                  tag: client
+                  value: '{#CLIENT}'
+                -
+                  tag: component
+                  value: clients
+                -
+                  tag: component
+                  value: requests
+                -
+                  tag: type
+                  value: '{#TYPE}'
             -
               uuid: 6a245634ec9b4aa0b2df8360b42ac8aa
               name: 'Zookeeper client {#TYPE} [{#CLIENT}]: Latency, min'
@@ -915,8 +956,17 @@ zabbix_export:
                 key: zookeeper.get_connections_stats
               tags:
                 -
-                  tag: Application
-                  value: 'Zookeeper {#TYPE} {#CLIENT}'
+                  tag: client
+                  value: '{#CLIENT}'
+                -
+                  tag: component
+                  value: clients
+                -
+                  tag: component
+                  value: requests
+                -
+                  tag: type
+                  value: '{#TYPE}'
             -
               uuid: 89805694583b453e99f833e850b5c5dc
               name: 'Zookeeper client {#TYPE} [{#CLIENT}]: Outstanding requests'
@@ -934,8 +984,17 @@ zabbix_export:
                 key: zookeeper.get_connections_stats
               tags:
                 -
-                  tag: Application
-                  value: 'Zookeeper {#TYPE} {#CLIENT}'
+                  tag: client
+                  value: '{#CLIENT}'
+                -
+                  tag: component
+                  value: clients
+                -
+                  tag: component
+                  value: requests
+                -
+                  tag: type
+                  value: '{#TYPE}'
             -
               uuid: e68a429aa986477e894b2a4437b6ec4a
               name: 'Zookeeper client {#TYPE} [{#CLIENT}]: Packets received per sec'
@@ -958,8 +1017,17 @@ zabbix_export:
                 key: zookeeper.get_connections_stats
               tags:
                 -
-                  tag: Application
-                  value: 'Zookeeper {#TYPE} {#CLIENT}'
+                  tag: client
+                  value: '{#CLIENT}'
+                -
+                  tag: component
+                  value: clients
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: type
+                  value: '{#TYPE}'
             -
               uuid: c748207b3f3e4a7ca6bb8ff3ecc8959b
               name: 'Zookeeper client {#TYPE} [{#CLIENT}]: Packets sent per sec'
@@ -982,8 +1050,17 @@ zabbix_export:
                 key: zookeeper.get_connections_stats
               tags:
                 -
-                  tag: Application
-                  value: 'Zookeeper {#TYPE} {#CLIENT}'
+                  tag: client
+                  value: '{#CLIENT}'
+                -
+                  tag: component
+                  value: clients
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: type
+                  value: '{#TYPE}'
           graph_prototypes:
             -
               uuid: 9ea4e5af47124317ba7f4502af97bc9c
@@ -1071,8 +1148,8 @@ zabbix_export:
                 key: zookeeper.get_metrics
               tags:
                 -
-                  tag: Application
-                  value: Zookeeper
+                  tag: component
+                  value: cluster
             -
               uuid: c6ae1476b69f43108f843508a02343a7
               name: 'Zookeeper: Pending syncs{#SINGLETON}'
@@ -1090,8 +1167,8 @@ zabbix_export:
                 key: zookeeper.get_metrics
               tags:
                 -
-                  tag: Application
-                  value: Zookeeper
+                  tag: component
+                  value: operations
               trigger_prototypes:
                 -
                   uuid: 004e26cca4934d1992b3c894f36b5643
@@ -1099,6 +1176,10 @@ zabbix_export:
                   name: 'Zookeeper: Too many pending syncs (over {$ZOOKEEPER.PENDING_SYNCS.MAX.WARN}% for 5 min)'
                   priority: AVERAGE
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: d5297a5598e94ef5acb1f6affdf51eee
               name: 'Zookeeper: Quorum size{#SINGLETON}'
@@ -1115,8 +1196,8 @@ zabbix_export:
                 key: zookeeper.get_metrics
               tags:
                 -
-                  tag: Application
-                  value: Zookeeper
+                  tag: component
+                  value: cluster
             -
               uuid: 406d13a8d38a47498e939a118ec0329a
               name: 'Zookeeper: Synced followers{#SINGLETON}'
@@ -1134,8 +1215,8 @@ zabbix_export:
                 key: zookeeper.get_metrics
               tags:
                 -
-                  tag: Application
-                  value: Zookeeper
+                  tag: component
+                  value: cluster
             -
               uuid: 71c9de2ed85d4a5fb2306b24b9ca67d3
               name: 'Zookeeper: Synced non-voting follower{#SINGLETON}'
@@ -1153,8 +1234,8 @@ zabbix_export:
                 key: zookeeper.get_metrics
               tags:
                 -
-                  tag: Application
-                  value: Zookeeper
+                  tag: component
+                  value: cluster
             -
               uuid: 299da1a6343b47a4a25efe2d8581965e
               name: 'Zookeeper: Synced observers{#SINGLETON}'
@@ -1172,8 +1253,8 @@ zabbix_export:
                 key: zookeeper.get_metrics
               tags:
                 -
-                  tag: Application
-                  value: Zookeeper
+                  tag: component
+                  value: cluster
           trigger_prototypes:
             -
               uuid: 4b0df830eef84e78a04a6980b627b8d0
@@ -1181,6 +1262,10 @@ zabbix_export:
               name: 'Zookeeper: Too few active followers'
               priority: AVERAGE
               description: 'The number of followers should equal the total size of your ZooKeeper ensemble, minus 1 (the leader is not included in the follower count). If the ensemble fails to maintain quorum, all automatic failover features are suspended.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
           master_item:
             key: zookeeper.get_metrics
           preprocessing:
@@ -1192,6 +1277,13 @@ zabbix_export:
               type: JAVASCRIPT
               parameters:
                 - 'return JSON.stringify(value == ''leader'' ? [{''{#SINGLETON}'': ''''}] : []);'
+      tags:
+        -
+          tag: class
+          value: application
+        -
+          tag: target
+          value: zookeper
       macros:
         -
           macro: '{$ZOOKEEPER.COMMAND_URL}'
@@ -1224,6 +1316,10 @@ zabbix_export:
       name: 'Zookeeper: Too many file descriptors used (over {$ZOOKEEPER.FILE_DESCRIPTORS.MAX.WARN}% for 5 min)'
       priority: WARNING
       description: 'Number of file descriptors used more than {$ZOOKEEPER.FILE_DESCRIPTORS.MAX.WARN}% of the available number of file descriptors.'
+      tags:
+        -
+          tag: scope
+          value: capacity
   graphs:
     -
       uuid: 0553c91abfac4f8fb452b6b367055261
diff --git a/templates/cctv/hikvision/template_cctv_hikvision_camera.yaml b/templates/cctv/hikvision/template_cctv_hikvision_camera.yaml
index 190afeb7ec9..79652728df6 100644
--- a/templates/cctv/hikvision/template_cctv_hikvision_camera.yaml
+++ b/templates/cctv/hikvision/template_cctv_hikvision_camera.yaml
@@ -1,19 +1,19 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-08-24T06:09:11Z'
+  date: '2022-01-26T10:31:50Z'
   groups:
     -
-      uuid: d37f71c7e3f7469bab645852a69a2018
-      name: 'Templates/Video surveillance'
+      uuid: 57b7ae836ca64446ba2c296389c009b7
+      name: Templates/Modules
   templates:
     -
       uuid: 3fb4020df2984b0ab64dfd8355ff5c65
       template: 'Hikvision camera by HTTP'
       name: 'Hikvision camera by HTTP'
-      description: 'Template tooling version used: 0.38'
+      description: 'Template tooling version used: 0.41'
       groups:
         -
-          name: 'Templates/Video surveillance'
+          name: Templates/Modules
       items:
         -
           uuid: e889b3a7e6044f0284081f9d6427b416
@@ -38,8 +38,8 @@ zabbix_export:
             key: hikvision_cam.get_info
           tags:
             -
-              tag: Application
-              value: 'Hikvision camera'
+              tag: component
+              value: system
         -
           uuid: 61c6f0073e604a449d8f724d762cfb7f
           name: 'Hikvision camera: Boot loader version'
@@ -64,8 +64,8 @@ zabbix_export:
             key: hikvision_cam.get_info
           tags:
             -
-              tag: Application
-              value: 'Hikvision camera'
+              tag: component
+              value: system
         -
           uuid: 247a70ed0cc543d69183a6a793cd9978
           name: 'Hikvision camera: CPU utilization'
@@ -90,8 +90,8 @@ zabbix_export:
             key: hikvision_cam.get_status
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
           triggers:
             -
               uuid: 0ae4dbcc05544fb7b67183fcf3b9654b
@@ -100,6 +100,10 @@ zabbix_export:
               opdata: 'Current utilization: {ITEM.LASTVALUE1}'
               priority: WARNING
               description: 'CPU utilization is too high. The system might be slow to respond.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 7e65f407b515429caf415820dd633b0e
           name: 'Hikvision camera: Current device time'
@@ -119,8 +123,8 @@ zabbix_export:
             key: hikvision_cam.get_status
           tags:
             -
-              tag: Application
-              value: 'Hikvision camera'
+              tag: component
+              value: system
         -
           uuid: 42b0f3ae08cf4730a52ea2ddda6f5bae
           name: 'Hikvision camera: Device description'
@@ -145,8 +149,8 @@ zabbix_export:
             key: hikvision_cam.get_info
           tags:
             -
-              tag: Application
-              value: 'Hikvision camera'
+              tag: component
+              value: system
         -
           uuid: 4abc7dcef6ec4b97bd1350d2e93f58d4
           name: 'Hikvision camera: Device ID'
@@ -170,8 +174,8 @@ zabbix_export:
             key: hikvision_cam.get_info
           tags:
             -
-              tag: Application
-              value: 'Hikvision camera'
+              tag: component
+              value: system
         -
           uuid: f4e6f9d05fea4489a9eaa47effe66ceb
           name: 'Hikvision camera: Device location'
@@ -196,8 +200,8 @@ zabbix_export:
             key: hikvision_cam.get_info
           tags:
             -
-              tag: Application
-              value: 'Hikvision camera'
+              tag: component
+              value: system
         -
           uuid: 278a04c86c22419886aa64fad8e05c9e
           name: 'Hikvision camera: Device name'
@@ -222,8 +226,8 @@ zabbix_export:
             key: hikvision_cam.get_info
           tags:
             -
-              tag: Application
-              value: 'Hikvision camera'
+              tag: component
+              value: system
         -
           uuid: 84d86e688a31402a82798f9e2ff04ab8
           name: 'Hikvision camera: Device type'
@@ -248,8 +252,8 @@ zabbix_export:
             key: hikvision_cam.get_info
           tags:
             -
-              tag: Application
-              value: 'Hikvision camera'
+              tag: component
+              value: system
         -
           uuid: 66ee550f4838455e9500561d790a76d1
           name: 'Hikvision camera: Encoder released date'
@@ -274,8 +278,8 @@ zabbix_export:
             key: hikvision_cam.get_info
           tags:
             -
-              tag: Application
-              value: 'Hikvision camera'
+              tag: component
+              value: system
         -
           uuid: 4798d54b70ee445293c12b3a8038b8c8
           name: 'Hikvision camera: Encoder version'
@@ -300,8 +304,8 @@ zabbix_export:
             key: hikvision_cam.get_info
           tags:
             -
-              tag: Application
-              value: 'Hikvision camera'
+              tag: component
+              value: system
         -
           uuid: ac6ee4d15c584709a7bdf2b89048aacc
           name: 'Hikvision camera: Firmware released date'
@@ -326,8 +330,8 @@ zabbix_export:
             key: hikvision_cam.get_info
           tags:
             -
-              tag: Application
-              value: 'Hikvision camera'
+              tag: component
+              value: system
         -
           uuid: eafe1a75a24c479cb5bf116be2272375
           name: 'Hikvision camera: Firmware version'
@@ -352,8 +356,8 @@ zabbix_export:
             key: hikvision_cam.get_info
           tags:
             -
-              tag: Application
-              value: 'Hikvision camera'
+              tag: component
+              value: system
           triggers:
             -
               uuid: 3c0b5a0046894a54803cd984cda13fa2
@@ -362,6 +366,10 @@ zabbix_export:
               priority: INFO
               description: 'Hikvision camera version has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 0ddd3af82fb64b75821dc1fab96c16ab
           name: 'Hikvision camera: Get device info'
@@ -391,8 +399,8 @@ zabbix_export:
           status_codes: '200,401'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
         -
           uuid: d0fc2ebf4ae140b68546e2425321f797
           name: 'Hikvision camera: Get device info: Login status'
@@ -411,9 +419,9 @@ zabbix_export:
                   
                   if ("html" in data){
                       if (data.html.head.title === "Document Error: Unauthorized")
-                         {return 1}
+                          {return 1}
                       else if (data.html.head.title === "Connection error")
-                         {return 2}
+                          {return 2}
                   }
                   return 0;
             -
@@ -424,8 +432,8 @@ zabbix_export:
             key: hikvision_cam.get_info
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
         -
           uuid: 1ad3e3c9f60043a58f63addc8768c887
           name: 'Hikvision camera: Get system status'
@@ -455,8 +463,8 @@ zabbix_export:
           status_codes: '200,401'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
         -
           uuid: ebca4ac32e2e4bfd8bf3cdae155a4ee6
           name: 'Hikvision camera: Get system status: Login status'
@@ -475,9 +483,9 @@ zabbix_export:
                   
                   if ("html" in data){
                       if (data.html.head.title === "Document Error: Unauthorized")
-                         {return 1}
+                          {return 1}
                       else if (data.html.head.title === "Connection error")
-                         {return 2}
+                          {return 2}
                   }
                   return 0;
             -
@@ -488,8 +496,8 @@ zabbix_export:
             key: hikvision_cam.get_status
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
         -
           uuid: 65f89830d9f041f9a1558936dfcffc5f
           name: 'Hikvision camera: Get streaming channels'
@@ -519,8 +527,8 @@ zabbix_export:
           status_codes: '200,401'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
         -
           uuid: c90527e1a2a948b5a5f678ec0d981954
           name: 'Hikvision camera: Get streaming channels: Login status'
@@ -539,9 +547,9 @@ zabbix_export:
                   
                   if ("html" in data){
                       if (data.html.head.title === "Document Error: Unauthorized")
-                         {return 1}
+                          {return 1}
                       else if (data.html.head.title === "Connection error")
-                         {return 2}
+                          {return 2}
                   }
                   return 0;
             -
@@ -552,8 +560,8 @@ zabbix_export:
             key: hikvision_cam.get_streaming
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
         -
           uuid: 03aecf4021c2402bb415798ef339b914
           name: 'Hikvision camera: Hardware version'
@@ -577,8 +585,8 @@ zabbix_export:
             key: hikvision_cam.get_info
           tags:
             -
-              tag: Application
-              value: 'Hikvision camera'
+              tag: component
+              value: system
         -
           uuid: da9ec53ecc6b4c25b6539666eb9f6544
           name: 'Hikvision camera: MACaddress'
@@ -603,8 +611,8 @@ zabbix_export:
             key: hikvision_cam.get_info
           tags:
             -
-              tag: Application
-              value: 'Hikvision camera'
+              tag: component
+              value: network
         -
           uuid: d1d026c6240c493387374b756b04452f
           name: 'Hikvision camera: Memory utilization'
@@ -629,8 +637,8 @@ zabbix_export:
             key: hikvision_cam.get_status
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: 62cfa0b87f234f1cb67b9b5b6b2fa8f2
@@ -638,6 +646,10 @@ zabbix_export:
               name: 'Hikvision camera: High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
               priority: AVERAGE
               description: 'The system is running out of free memory.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: b295689d34934401b0eda407edaee426
           name: 'Hikvision camera: Model'
@@ -662,8 +674,8 @@ zabbix_export:
             key: hikvision_cam.get_info
           tags:
             -
-              tag: Application
-              value: 'Hikvision camera'
+              tag: component
+              value: system
         -
           uuid: b6715593c52a4255ae6a4f68c3de6b6d
           name: 'Hikvision camera: Serial number'
@@ -688,16 +700,20 @@ zabbix_export:
             key: hikvision_cam.get_info
           tags:
             -
-              tag: Application
-              value: 'Hikvision camera'
+              tag: component
+              value: system
           triggers:
             -
               uuid: 281999cbd6324aacbbb86b4945000c60
               expression: 'last(/Hikvision camera by HTTP/hikvision_cam.serial_number,#1)<>last(/Hikvision camera by HTTP/hikvision_cam.serial_number,#2) and length(last(/Hikvision camera by HTTP/hikvision_cam.serial_number))>0'
-              name: 'Hikvision camera: Camera has been replaced (new serial number received)'
+              name: 'Hikvision camera: __RESOURCE_TYPE__ has been replaced (new serial number received)'
               priority: INFO
-              description: 'Camera serial number has changed. Ack to close'
+              description: '__RESOURCE_TYPE__ serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 72ffbe3d976b437ab5df06b32a5c4b12
           name: 'Hikvision camera: Supported beep'
@@ -721,8 +737,8 @@ zabbix_export:
             key: hikvision_cam.get_info
           tags:
             -
-              tag: Application
-              value: 'Hikvision camera'
+              tag: component
+              value: system
         -
           uuid: 03d220eb782346269de6b0867ed3acd3
           name: 'Hikvision camera: Supported video loss'
@@ -746,8 +762,8 @@ zabbix_export:
             key: hikvision_cam.get_info
           tags:
             -
-              tag: Application
-              value: 'Hikvision camera'
+              tag: component
+              value: system
         -
           uuid: d29814c630f94d5cabdc350d8b161b5b
           name: 'Hikvision camera: System contact'
@@ -772,8 +788,8 @@ zabbix_export:
             key: hikvision_cam.get_info
           tags:
             -
-              tag: Application
-              value: 'Hikvision camera'
+              tag: component
+              value: system
         -
           uuid: 8678cee9999b45f1975f9639c8c197af
           name: 'Hikvision camera: Telecontrol ID'
@@ -797,8 +813,8 @@ zabbix_export:
             key: hikvision_cam.get_info
           tags:
             -
-              tag: Application
-              value: 'Hikvision camera'
+              tag: component
+              value: system
         -
           uuid: 4e680a5e347948fe8118b58c2c62d55f
           name: 'Hikvision camera: Uptime'
@@ -819,8 +835,8 @@ zabbix_export:
             key: hikvision_cam.get_status
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: f46b43fe9b354990929e7fdb80b792ec
@@ -829,6 +845,10 @@ zabbix_export:
               priority: INFO
               description: 'Uptime is less than 10 minutes'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
       discovery_rules:
         -
           uuid: 00647c38d30d44378bdcf573178063ec
@@ -858,9 +878,9 @@ zabbix_export:
                       
                       if ("html" in data){
                           if (data.html.head.title === "Document Error: Unauthorized")
-                             {return 1}
+                              {return 1}
                           else if (data.html.head.title === "Connection error")
-                             {return 2}
+                              {return 2}
                       }
                       return 0;
                 -
@@ -871,13 +891,13 @@ zabbix_export:
                 key: 'hikvision_cam.get_ptz[{#PTZ_CHANNEL_ID}]'
               tags:
                 -
-                  tag: Application
-                  value: 'Zabbix raw items'
+                  tag: component
+                  value: system
               trigger_prototypes:
                 -
                   uuid: 7ce39ff8b5f14fcbb7b575f9c44a9efd
                   expression: 'last(/Hikvision camera by HTTP/hikvision_cam.get_ptz.login_status[{#PTZ_CHANNEL_ID}])=1'
-                  name: 'Hikvision camera:Authorisation error on get PTZ channels'
+                  name: 'Hikvision camera: Authorisation error on get PTZ channels'
                   priority: WARNING
                   description: 'Check the correctness of the authorization data'
                   manual_close: 'YES'
@@ -888,6 +908,10 @@ zabbix_export:
                         last(/Hikvision camera by HTTP/hikvision_cam.get_info.login_status)=1 or
                         last(/Hikvision camera by HTTP/hikvision_cam.get_streaming.login_status)=1 or
                         last(/Hikvision camera by HTTP/hikvision_cam.get_status.login_status)=1
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: c702b7321b664f5d950b0d879bbd7371
                   expression: 'last(/Hikvision camera by HTTP/hikvision_cam.get_ptz.login_status[{#PTZ_CHANNEL_ID}])=2'
@@ -902,6 +926,10 @@ zabbix_export:
                         last(/Hikvision camera by HTTP/hikvision_cam.get_info.login_status)=2 or
                         last(/Hikvision camera by HTTP/hikvision_cam.get_streaming.login_status)=2 or
                         last(/Hikvision camera by HTTP/hikvision_cam.get_status.login_status)=2
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 6799d99ad02743a1b294b80bbed52280
               name: 'Hikvision camera: Get PTZ info'
@@ -931,8 +959,8 @@ zabbix_export:
               status_codes: '200,401'
               tags:
                 -
-                  tag: Application
-                  value: 'Zabbix raw items'
+                  tag: component
+                  value: raw
             -
               uuid: 16225fb78f414308829d035cd32f8468
               name: 'Channel "{#PTZ_CHANNEL_ID}": Absolute zoom'
@@ -961,8 +989,11 @@ zabbix_export:
                 key: 'hikvision_cam.get_ptz[{#PTZ_CHANNEL_ID}]'
               tags:
                 -
-                  tag: Application
-                  value: 'Hikvision camera: PTZ channel "{#PTZ_CHANNEL_ID}"'
+                  tag: component
+                  value: ptz
+                -
+                  tag: ptz-id
+                  value: '{#PTZ_CHANNEL_ID}'
             -
               uuid: 6282376b25a9462e84b748d011f2fbf6
               name: 'Channel "{#PTZ_CHANNEL_ID}": Azimuth'
@@ -991,8 +1022,11 @@ zabbix_export:
                 key: 'hikvision_cam.get_ptz[{#PTZ_CHANNEL_ID}]'
               tags:
                 -
-                  tag: Application
-                  value: 'Hikvision camera: PTZ channel "{#PTZ_CHANNEL_ID}"'
+                  tag: component
+                  value: ptz
+                -
+                  tag: ptz-id
+                  value: '{#PTZ_CHANNEL_ID}'
             -
               uuid: da148a9826724869a58d286a07edc036
               name: 'Channel "{#PTZ_CHANNEL_ID}": Elevation'
@@ -1021,8 +1055,11 @@ zabbix_export:
                 key: 'hikvision_cam.get_ptz[{#PTZ_CHANNEL_ID}]'
               tags:
                 -
-                  tag: Application
-                  value: 'Hikvision camera: PTZ channel "{#PTZ_CHANNEL_ID}"'
+                  tag: component
+                  value: ptz
+                -
+                  tag: ptz-id
+                  value: '{#PTZ_CHANNEL_ID}'
           trigger_prototypes:
             -
               uuid: dbf391b5e18b4e018d889e460b7acc74
@@ -1034,6 +1071,10 @@ zabbix_export:
               priority: INFO
               description: 'The direction of the camera has changed'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
           url: 'http://{HOST.CONN}:{$HIKVISION_ISAPI_PORT}/ISAPI/PTZCtrl/channels'
           status_codes: '200,401'
           preprocessing:
@@ -1099,8 +1140,11 @@ zabbix_export:
                 key: hikvision_cam.get_streaming
               tags:
                 -
-                  tag: Application
-                  value: 'Hikvision camera: Streaming channel "{#CHANNEL_ID}"'
+                  tag: component
+                  value: stream
+                -
+                  tag: stream-id
+                  value: '{#CHANNEL_ID}'
             -
               uuid: b992569a9db346ac85886fe7a5e55074
               name: 'Channel "{#CHANNEL_ID}": Fixed quality'
@@ -1128,8 +1172,11 @@ zabbix_export:
                 key: hikvision_cam.get_streaming
               tags:
                 -
-                  tag: Application
-                  value: 'Hikvision camera: Streaming channel "{#CHANNEL_ID}"'
+                  tag: component
+                  value: stream
+                -
+                  tag: stream-id
+                  value: '{#CHANNEL_ID}'
             -
               uuid: 7343f2206cfd4942976b5dca214a7558
               name: 'Channel "{#CHANNEL_ID}": GovLength'
@@ -1156,8 +1203,11 @@ zabbix_export:
                 key: hikvision_cam.get_streaming
               tags:
                 -
-                  tag: Application
-                  value: 'Hikvision camera: Streaming channel "{#CHANNEL_ID}"'
+                  tag: component
+                  value: stream
+                -
+                  tag: stream-id
+                  value: '{#CHANNEL_ID}'
             -
               uuid: ef1df8955ab84efab5ae9be340715431
               name: 'Channel "{#CHANNEL_ID}": H264Profile'
@@ -1186,8 +1236,11 @@ zabbix_export:
                 key: hikvision_cam.get_streaming
               tags:
                 -
-                  tag: Application
-                  value: 'Hikvision camera: Streaming channel "{#CHANNEL_ID}"'
+                  tag: component
+                  value: stream
+                -
+                  tag: stream-id
+                  value: '{#CHANNEL_ID}'
             -
               uuid: ce45290377cc402bacda95ea8a136946
               name: 'Channel "{#CHANNEL_ID}": Key frame interval'
@@ -1219,8 +1272,11 @@ zabbix_export:
                 key: hikvision_cam.get_streaming
               tags:
                 -
-                  tag: Application
-                  value: 'Hikvision camera: Streaming channel "{#CHANNEL_ID}"'
+                  tag: component
+                  value: stream
+                -
+                  tag: stream-id
+                  value: '{#CHANNEL_ID}'
             -
               uuid: 4d621b75e2ef432a9cab88b61718125d
               name: 'Channel "{#CHANNEL_ID}": Frame rate (max)'
@@ -1253,8 +1309,11 @@ zabbix_export:
                 key: hikvision_cam.get_streaming
               tags:
                 -
-                  tag: Application
-                  value: 'Hikvision camera: Streaming channel "{#CHANNEL_ID}"'
+                  tag: component
+                  value: stream
+                -
+                  tag: stream-id
+                  value: '{#CHANNEL_ID}'
             -
               uuid: 12f1fadb9d364e6b96ab01b468c94891
               name: 'Channel "{#CHANNEL_ID}": Smoothing'
@@ -1281,8 +1340,11 @@ zabbix_export:
                 key: hikvision_cam.get_streaming
               tags:
                 -
-                  tag: Application
-                  value: 'Hikvision camera: Streaming channel "{#CHANNEL_ID}"'
+                  tag: component
+                  value: stream
+                -
+                  tag: stream-id
+                  value: '{#CHANNEL_ID}'
             -
               uuid: 1854ab4fd6f14adf90c0ddb42712a4ef
               name: 'Channel "{#CHANNEL_ID}": Snapshot image type'
@@ -1311,8 +1373,11 @@ zabbix_export:
                 key: hikvision_cam.get_streaming
               tags:
                 -
-                  tag: Application
-                  value: 'Hikvision camera: Streaming channel "{#CHANNEL_ID}"'
+                  tag: component
+                  value: stream
+                -
+                  tag: stream-id
+                  value: '{#CHANNEL_ID}'
             -
               uuid: d1523faa362842ef9313ffc15a6d5e8c
               name: 'Channel "{#CHANNEL_ID}": VBR lower'
@@ -1340,8 +1405,11 @@ zabbix_export:
                 key: hikvision_cam.get_streaming
               tags:
                 -
-                  tag: Application
-                  value: 'Hikvision camera: Streaming channel "{#CHANNEL_ID}"'
+                  tag: component
+                  value: stream
+                -
+                  tag: stream-id
+                  value: '{#CHANNEL_ID}'
             -
               uuid: 725669dc6bfd4871a3133ab7fcd4c571
               name: 'Channel "{#CHANNEL_ID}": VBR upper'
@@ -1365,8 +1433,11 @@ zabbix_export:
                 key: hikvision_cam.get_streaming
               tags:
                 -
-                  tag: Application
-                  value: 'Hikvision camera: Streaming channel "{#CHANNEL_ID}"'
+                  tag: component
+                  value: stream
+                -
+                  tag: stream-id
+                  value: '{#CHANNEL_ID}'
             -
               uuid: 96ef96886e9244f08cf245f4253839b2
               name: 'Channel "{#CHANNEL_ID}": Video codec type'
@@ -1395,8 +1466,11 @@ zabbix_export:
                 key: hikvision_cam.get_streaming
               tags:
                 -
-                  tag: Application
-                  value: 'Hikvision camera: Streaming channel "{#CHANNEL_ID}"'
+                  tag: component
+                  value: stream
+                -
+                  tag: stream-id
+                  value: '{#CHANNEL_ID}'
             -
               uuid: 59e8f0440ec04306a0c79cc8c9a5c91f
               name: 'Channel "{#CHANNEL_ID}": Video quality control type'
@@ -1425,8 +1499,11 @@ zabbix_export:
                 key: hikvision_cam.get_streaming
               tags:
                 -
-                  tag: Application
-                  value: 'Hikvision camera: Streaming channel "{#CHANNEL_ID}"'
+                  tag: component
+                  value: stream
+                -
+                  tag: stream-id
+                  value: '{#CHANNEL_ID}'
             -
               uuid: 18f5eed445154a42828cea423db9ebec
               name: 'Channel "{#CHANNEL_ID}": Resolution height'
@@ -1454,8 +1531,11 @@ zabbix_export:
                 key: hikvision_cam.get_streaming
               tags:
                 -
-                  tag: Application
-                  value: 'Hikvision camera: Streaming channel "{#CHANNEL_ID}"'
+                  tag: component
+                  value: stream
+                -
+                  tag: stream-id
+                  value: '{#CHANNEL_ID}'
             -
               uuid: 13f343a9c3804846a31867e942602199
               name: 'Channel "{#CHANNEL_ID}": Resolution width'
@@ -1483,8 +1563,11 @@ zabbix_export:
                 key: hikvision_cam.get_streaming
               tags:
                 -
-                  tag: Application
-                  value: 'Hikvision camera: Streaming channel "{#CHANNEL_ID}"'
+                  tag: component
+                  value: stream
+                -
+                  tag: stream-id
+                  value: '{#CHANNEL_ID}'
             -
               uuid: 2ccd4b38faf046b88a0983249ca0c4f6
               name: 'Channel "{#CHANNEL_ID}": Video scan type'
@@ -1513,8 +1596,11 @@ zabbix_export:
                 key: hikvision_cam.get_streaming
               tags:
                 -
-                  tag: Application
-                  value: 'Hikvision camera: Streaming channel "{#CHANNEL_ID}"'
+                  tag: component
+                  value: stream
+                -
+                  tag: stream-id
+                  value: '{#CHANNEL_ID}'
           trigger_prototypes:
             -
               uuid: 16cf4d23b3c8410586703efca81ebe52
@@ -1527,6 +1613,10 @@ zabbix_export:
                 expected: {$HIKVISION_STREAM_WIDTH} px x {$HIKVISION_STREAM_HEIGHT} px
                 received: {ITEM.LASTVALUE2} x {ITEM.LASTVALUE1}
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 4f2a512d8f95414495dec5670e5e9680
               expression: |
@@ -1538,6 +1628,10 @@ zabbix_export:
               name: 'Channel "{#CHANNEL_ID}": Parameters of video stream are changed'
               priority: INFO
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
           url: 'http://{HOST.CONN}:{$HIKVISION_ISAPI_PORT}/ISAPI/Streaming/channels'
           status_codes: '200,401'
           preprocessing:
@@ -1579,6 +1673,16 @@ zabbix_export:
                   value: 'Invalid video stream resolution parameters'
                   status: ENABLED
                   discover: NO_DISCOVER
+      tags:
+        -
+          tag: class
+          value: device
+        -
+          tag: target
+          value: cctv
+        -
+          tag: target
+          value: hikvision
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
@@ -1633,6 +1737,10 @@ zabbix_export:
       priority: WARNING
       description: 'Check the correctness of the authorization data'
       manual_close: 'YES'
+      tags:
+        -
+          tag: scope
+          value: notice
     -
       uuid: 58b5d210fe24434b9aaa365fba764742
       expression: |
@@ -1643,6 +1751,10 @@ zabbix_export:
       priority: WARNING
       description: 'Check the availability of the HTTP port'
       manual_close: 'YES'
+      tags:
+        -
+          tag: scope
+          value: notice
   graphs:
     -
       uuid: 30cfa75b2afb490f8448a63366577144
diff --git a/templates/db/cassandra_jmx/template_db_cassandra_jmx.yaml b/templates/db/cassandra_jmx/template_db_cassandra_jmx.yaml
index 43aa51185c0..4bab718acd7 100644
--- a/templates/db/cassandra_jmx/template_db_cassandra_jmx.yaml
+++ b/templates/db/cassandra_jmx/template_db_cassandra_jmx.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-10T07:41:19Z'
+  date: '2022-01-26T10:38:15Z'
   groups:
     -
       uuid: 748ad4d098d447d492bb935c907f652f
@@ -19,7 +19,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/410057-discussion-thread-for-official-zabbix-template-apache-cassandra
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Databases
@@ -42,8 +42,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Cassandra
+              tag: component
+              value: cluster
         -
           uuid: 1bd80c1ce70045cbadf60ee06a09a989
           name: Version
@@ -62,8 +62,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Cassandra
+              tag: component
+              value: application
           triggers:
             -
               uuid: 855abdc321c74b6baf672c67f6483c1c
@@ -72,6 +72,10 @@ zabbix_export:
               priority: INFO
               description: 'Cassandra version has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: b202aa02d0b74e8da321a2a19fe33880
           name: 'Compaction: Number of completed tasks'
@@ -84,8 +88,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Cassandra
+              tag: component
+              value: compactions
         -
           uuid: 7176e7e8241648d1b7e81a0b4d2d329c
           name: 'Commitlog: Pending tasks'
@@ -98,8 +102,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Cassandra
+              tag: component
+              value: commitlog
         -
           uuid: 6e4ad2b5249c465894b87006a38b9542
           name: 'Latency: Read median'
@@ -119,8 +123,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Cassandra
+              tag: component
+              value: disk
         -
           uuid: a8b0499f15a74102b6ca486dee07e99b
           name: 'Latency: Read 75 percentile'
@@ -140,8 +144,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Cassandra
+              tag: component
+              value: disk
         -
           uuid: 5e3a95a9119149889365691d932b8407
           name: 'Latency: Read 95 percentile'
@@ -161,8 +165,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Cassandra
+              tag: component
+              value: disk
         -
           uuid: 70eebcf7274942eeae0a80911b7c9095
           name: 'Commitlog: Total size'
@@ -176,8 +180,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Cassandra
+              tag: component
+              value: commitlog
         -
           uuid: 24e44d0bf8254131a032406ffad86732
           name: 'Compaction: Total compactions completed'
@@ -190,8 +194,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Cassandra
+              tag: component
+              value: compactions
         -
           uuid: 31ccd8b50bcb412893e91accb853d755
           name: 'Latency: Write median'
@@ -211,8 +215,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Cassandra
+              tag: component
+              value: disk
         -
           uuid: 8f0aa624a54d45f5b6c8ead24694fc58
           name: 'Latency: Write 75 percentile'
@@ -232,8 +236,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Cassandra
+              tag: component
+              value: disk
         -
           uuid: cc084d0142a94262b585d6b4a7b06468
           name: 'Latency: Write 95 percentile'
@@ -253,8 +257,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Cassandra
+              tag: component
+              value: disk
         -
           uuid: 934eb483047649449bfa221e3cc610d3
           name: 'KeyCache: Capacity'
@@ -273,8 +277,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Cassandra
+              tag: component
+              value: cache
         -
           uuid: c4f8435dfef0426682781711addbf075
           name: 'KeyCache: Entries'
@@ -287,8 +291,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Cassandra
+              tag: component
+              value: cache
         -
           uuid: b3351f07502d4cb8a16d4fa730a72a6a
           name: 'KeyCache: HitRate'
@@ -308,8 +312,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Cassandra
+              tag: component
+              value: cache
         -
           uuid: 3980ae66ea1b415baa24078d26ebeaee
           name: 'KeyCache: Hits per second'
@@ -328,8 +332,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Cassandra
+              tag: component
+              value: cache
         -
           uuid: 6f6980f9267b4bef93e3a37153ef2184
           name: 'KeyCache: requests per second'
@@ -349,8 +353,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Cassandra
+              tag: component
+              value: cache
         -
           uuid: f8fed6058d4b45a7afcaf5a057622c19
           name: 'KeyCache: Size'
@@ -364,8 +368,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Cassandra
+              tag: component
+              value: cache
         -
           uuid: 574ff464fe6b43cfb1d07e4ad1383c33
           name: 'Client connections: Native'
@@ -378,8 +382,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Cassandra
+              tag: component
+              value: connections
         -
           uuid: 15d5bd0e534246a7922f8dbcc2a96a21
           name: 'Client connections: Trifts'
@@ -392,8 +396,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Cassandra
+              tag: component
+              value: connections
         -
           uuid: 6c1cf4b7835d4c66ac1e42840199594c
           name: 'Latency: Client request read median'
@@ -413,8 +417,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Cassandra
+              tag: component
+              value: requests
         -
           uuid: c0606810baad4e438f6d69508cf11581
           name: 'Latency: Client request read 75 percentile'
@@ -434,8 +438,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Cassandra
+              tag: component
+              value: requests
         -
           uuid: 4ed583b0546c4897b9ff423e36097046
           name: 'Latency: Client request read 95 percentile'
@@ -455,8 +459,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Cassandra
+              tag: component
+              value: requests
         -
           uuid: 4f68953ebaca4d089a11c78e04c9170f
           name: 'Client request: Read per second'
@@ -476,8 +480,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Cassandra
+              tag: component
+              value: requests
         -
           uuid: 72cdc0188682483d8c1d837f2c9c475b
           name: 'Latency: Client request write median'
@@ -497,8 +501,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Cassandra
+              tag: component
+              value: requests
         -
           uuid: a63545e0bf8d4c87818fe719c299b508
           name: 'Latency: Client request write 75 percentile'
@@ -518,8 +522,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Cassandra
+              tag: component
+              value: requests
         -
           uuid: 955f1f2615a14694bb20eedd07963ada
           name: 'Latency: Client request write 95 percentile'
@@ -539,8 +543,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Cassandra
+              tag: component
+              value: requests
         -
           uuid: d914d6cd66ad48d09197a30819a386f9
           name: 'Client request: Write per second'
@@ -560,8 +564,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Cassandra
+              tag: component
+              value: requests
         -
           uuid: 30b3ba5b576045dabda9b3a0914a1dc6
           name: 'Client request: Write Timeouts'
@@ -574,8 +578,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Cassandra
+              tag: component
+              value: requests
         -
           uuid: e55942a9ef3c41e8993e8c8d849ff026
           name: 'Compaction: Pending tasks'
@@ -588,8 +592,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Cassandra
+              tag: component
+              value: compactions
           triggers:
             -
               uuid: 885035b2fc804615a54bf2eaca19beee
@@ -600,11 +604,19 @@ zabbix_export:
                 -
                   name: 'Too many pending tasks (over {$CASSANDRA.PENDING_TASKS.MAX.HIGH} for 15m)'
                   expression: 'min(/Apache Cassandra by JMX/jmx["org.apache.cassandra.metrics:type=Compaction,name=PendingTasks","Value"],15m)>{$CASSANDRA.PENDING_TASKS.MAX.HIGH}'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: f6696c41e9d24144a1a95f74c94728ae
               expression: 'min(/Apache Cassandra by JMX/jmx["org.apache.cassandra.metrics:type=Compaction,name=PendingTasks","Value"],15m)>{$CASSANDRA.PENDING_TASKS.MAX.HIGH}'
               name: 'Too many pending tasks (over {$CASSANDRA.PENDING_TASKS.MAX.HIGH} for 15m)'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: f4686c81fe1b42c2bbe049ec421b4533
           name: 'Dropped messages: Write (Mutation)'
@@ -617,8 +629,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Cassandra
+              tag: component
+              value: messages
         -
           uuid: 2001c9fa67bc4ec4b693d289edc38cfa
           name: 'Dropped messages: Read'
@@ -631,8 +643,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Cassandra
+              tag: component
+              value: messages
         -
           uuid: b15aa6f290d14fd1bee094325c444e8b
           name: 'Storage: Errors'
@@ -645,14 +657,18 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Cassandra
+              tag: component
+              value: storage
           triggers:
             -
               uuid: c7980b33dc794a70a116bd12219f66c3
               expression: 'min(/Apache Cassandra by JMX/jmx["org.apache.cassandra.metrics:type=Storage,name=Exceptions","Count"],5m)>0'
               name: 'Too many storage exceptions'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 31fabd5575074957946328b0257568c6
           name: 'Storage: Used (bytes)'
@@ -666,8 +682,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Cassandra
+              tag: component
+              value: storage
           triggers:
             -
               uuid: bda8e216175044ed829670b6bd272785
@@ -675,6 +691,10 @@ zabbix_export:
               name: 'Failed to fetch info data (or no data for 15m)'
               priority: WARNING
               description: 'Zabbix has not received data for items for the last 15 minutes'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 3e0332f3770046b5b3ba4216111f3b3f
           name: 'Storage: Hints'
@@ -687,8 +707,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Cassandra
+              tag: component
+              value: storage
         -
           uuid: 6c9721f341904c5abb4d4a4637f6c80c
           name: 'Thread pool HintsDispatcher: Currently blocked task'
@@ -703,8 +723,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Cassandra
+              tag: component
+              value: thread-pools
         -
           uuid: 0efbb0ab0e3244428f5e5917fa73437c
           name: 'Thread pool HintsDispatcher: Pending tasks'
@@ -719,8 +739,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Cassandra
+              tag: component
+              value: thread-pools
         -
           uuid: 4eb4e405cc564c9c8a694f085b1905dd
           name: 'Thread pool HintsDispatcher: Total blocked tasks'
@@ -735,8 +755,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Cassandra
+              tag: component
+              value: thread-pools
         -
           uuid: 7fd397d3d09a494fb0032d97c93dc462
           name: 'Thread pool MemtableFlushWriter: Currently blocked task'
@@ -751,8 +771,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Cassandra
+              tag: component
+              value: thread-pools
         -
           uuid: c0eaf8af68114b0eb1f16e7cb456a442
           name: 'Thread pool MemtableFlushWriter: Pending tasks'
@@ -767,8 +787,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Cassandra
+              tag: component
+              value: thread-pools
         -
           uuid: 3e402261b410467cb177b3c02dd237f3
           name: 'Thread pool MemtableFlushWriter: Total blocked tasks'
@@ -783,8 +803,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Cassandra
+              tag: component
+              value: thread-pools
         -
           uuid: 868e8d31c8424607a7f0aafd4eff46cf
           name: 'Thread pool MemtablePostFlush: Currently blocked task'
@@ -799,8 +819,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Cassandra
+              tag: component
+              value: thread-pools
         -
           uuid: 9ddfd1f388ed4c3a9e81558e626f9525
           name: 'Thread pool MemtablePostFlush: Pending tasks'
@@ -815,8 +835,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Cassandra
+              tag: component
+              value: thread-pools
         -
           uuid: e00f5f7ac9904ea4981c44a506005d62
           name: 'Thread pool MemtablePostFlush: Total blocked tasks'
@@ -831,8 +851,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Cassandra
+              tag: component
+              value: thread-pools
         -
           uuid: 480f3d158c764cd3877e0b04189eb60c
           name: 'Thread pool MigrationStage: Currently blocked task'
@@ -847,8 +867,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Cassandra
+              tag: component
+              value: thread-pools
         -
           uuid: f9b504b8b9f34f70a15691a16ee69e39
           name: 'Thread pool MigrationStage: Pending tasks'
@@ -863,8 +883,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Cassandra
+              tag: component
+              value: thread-pools
         -
           uuid: 79bc07acfef846768a036243efd3d954
           name: 'Thread pool MigrationStage: Total blocked tasks'
@@ -879,8 +899,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Cassandra
+              tag: component
+              value: thread-pools
         -
           uuid: 94360cbf59cc4978ab64872f9d0a9100
           name: 'Thread pool MiscStage: Currently blocked task'
@@ -895,8 +915,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Cassandra
+              tag: component
+              value: thread-pools
         -
           uuid: 0a0ee6e0a2de4da5acfa715959dbae9f
           name: 'Thread pool MiscStage: Pending tasks'
@@ -911,8 +931,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Cassandra
+              tag: component
+              value: thread-pools
         -
           uuid: 807494ed64b54f9a95961fa7031e7d7f
           name: 'Thread pool MiscStage: Total blocked tasks'
@@ -927,8 +947,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Cassandra
+              tag: component
+              value: thread-pools
         -
           uuid: 18b83c6b48164e1f9b8f9ae6058da276
           name: 'Thread pool SecondaryIndexManagement: Currently blocked task'
@@ -943,8 +963,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Cassandra
+              tag: component
+              value: thread-pools
         -
           uuid: 622728098a35433bb00b7ab1614665bc
           name: 'Thread pool SecondaryIndexManagement: Pending tasks'
@@ -959,8 +979,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Cassandra
+              tag: component
+              value: thread-pools
         -
           uuid: 0dbd7303e9a64bc581ef8c6619876d2b
           name: 'Thread pool SecondaryIndexManagement: Total blocked tasks'
@@ -975,8 +995,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Cassandra
+              tag: component
+              value: thread-pools
         -
           uuid: 1ff2b0f1c6a04cfca0d40a68c5a39476
           name: 'Thread pool CounterMutationStage: Currently blocked task'
@@ -991,8 +1011,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Cassandra
+              tag: component
+              value: thread-pools
         -
           uuid: b0cc87b96d0e4f3c8ff2023665d90379
           name: 'Thread pool CounterMutationStage: Pending tasks'
@@ -1007,8 +1027,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Cassandra
+              tag: component
+              value: thread-pools
         -
           uuid: ab2b8d88ecf54b028b88cd757581a419
           name: 'Thread pool CounterMutationStage: Total blocked tasks'
@@ -1023,8 +1043,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Cassandra
+              tag: component
+              value: thread-pools
         -
           uuid: ef7d71b026ec4e948acf8d7469b21ee2
           name: 'Thread pool MutationStage: Currently blocked task'
@@ -1039,8 +1059,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Cassandra
+              tag: component
+              value: thread-pools
         -
           uuid: b2eb10fe498847c88b395013e4fb516c
           name: 'Thread pool.MutationStage: Pending tasks'
@@ -1055,8 +1075,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Cassandra
+              tag: component
+              value: thread-pools
         -
           uuid: c6e48ac0ece74e31803dd72310306330
           name: 'Thread pool MutationStage: Total blocked tasks'
@@ -1071,8 +1091,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Cassandra
+              tag: component
+              value: thread-pools
         -
           uuid: e588e58881b74123bfa6f2d5d948da93
           name: 'Thread pool ReadStage: Currently blocked task'
@@ -1087,8 +1107,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Cassandra
+              tag: component
+              value: thread-pools
         -
           uuid: 2770bde0ee834ddebcd773e265fa0aef
           name: 'Thread pool ReadStage: Pending tasks'
@@ -1103,8 +1123,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Cassandra
+              tag: component
+              value: thread-pools
         -
           uuid: 9d9b20c6994c40849048cb5d0fe407ad
           name: 'Thread pool ReadStage: Total blocked tasks'
@@ -1119,8 +1139,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Cassandra
+              tag: component
+              value: thread-pools
         -
           uuid: 49df0b39c6a944d5ab96a946b233c380
           name: 'Thread pool ViewMutationStage: Currently blocked task'
@@ -1135,8 +1155,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Cassandra
+              tag: component
+              value: thread-pools
         -
           uuid: 967065e24d2c44be96687cd829ea928c
           name: 'Thread pool ViewMutationStage: Pending tasks'
@@ -1151,8 +1171,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Cassandra
+              tag: component
+              value: thread-pools
         -
           uuid: 5e6719076bbd46f78d3fb9b625a0cdda
           name: 'Thread pool ViewMutationStage: Total blocked tasks'
@@ -1167,8 +1187,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Cassandra
+              tag: component
+              value: thread-pools
         -
           uuid: f131a5faad964307aa860e3932ba781d
           name: 'Cluster: Nodes down'
@@ -1185,14 +1205,18 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Cassandra
+              tag: component
+              value: cluster
           triggers:
             -
               uuid: 42b527f9cf4e444b82575f2ab48926c0
               expression: 'last(/Apache Cassandra by JMX/jmx["org.apache.cassandra.net:type=FailureDetector","DownEndpointCount"])>0'
               name: 'There are down nodes in cluster'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: fb35aef03e254d98a3d29e8180a1a5a5
           name: 'Cluster: Nodes up'
@@ -1209,8 +1233,8 @@ zabbix_export:
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           tags:
             -
-              tag: Application
-              value: Cassandra
+              tag: component
+              value: cluster
       discovery_rules:
         -
           uuid: 504e40d04a024249bfd4ac67891f8a21
@@ -1247,8 +1271,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}'
+                  tag: component
+                  value: tables
+                -
+                  tag: keyspace
+                  value: '{#JMXKEYSPACE}'
+                -
+                  tag: table
+                  value: '{#JMXSCOPE}'
             -
               uuid: 417a27c1779a4d08b5673320b1542ad8
               name: '{#JMXKEYSPACE}.{#JMXSCOPE}: Bytes flushed'
@@ -1262,8 +1292,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}'
+                  tag: component
+                  value: tables
+                -
+                  tag: keyspace
+                  value: '{#JMXKEYSPACE}'
+                -
+                  tag: table
+                  value: '{#JMXSCOPE}'
             -
               uuid: b6623ca2ba0c4dd9ad2be5fa263896f5
               name: '{#JMXKEYSPACE}.{#JMXSCOPE}: Col update time delta75 percentile'
@@ -1283,8 +1319,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}'
+                  tag: component
+                  value: tables
+                -
+                  tag: keyspace
+                  value: '{#JMXKEYSPACE}'
+                -
+                  tag: table
+                  value: '{#JMXSCOPE}'
             -
               uuid: 685e1bbe10044d9d9ae2b02357ba2934
               name: '{#JMXKEYSPACE}.{#JMXSCOPE}: Col update time delta 95 percentile'
@@ -1304,8 +1346,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}'
+                  tag: component
+                  value: tables
+                -
+                  tag: keyspace
+                  value: '{#JMXKEYSPACE}'
+                -
+                  tag: table
+                  value: '{#JMXSCOPE}'
             -
               uuid: 71b3b14f8ce7414786fa0bcd471e8842
               name: '{#JMXKEYSPACE}.{#JMXSCOPE}: Compaction bytes written'
@@ -1320,8 +1368,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}'
+                  tag: component
+                  value: tables
+                -
+                  tag: keyspace
+                  value: '{#JMXKEYSPACE}'
+                -
+                  tag: table
+                  value: '{#JMXSCOPE}'
             -
               uuid: 9721c8cd9d0f415d9d5ddfeb417cee01
               name: '{#JMXKEYSPACE}.{#JMXSCOPE}: Compression ratio'
@@ -1335,8 +1389,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}'
+                  tag: component
+                  value: tables
+                -
+                  tag: keyspace
+                  value: '{#JMXKEYSPACE}'
+                -
+                  tag: table
+                  value: '{#JMXSCOPE}'
             -
               uuid: b43134f2d2a043f2a61919467619efe2
               name: '{#JMXKEYSPACE}.{#JMXSCOPE}: KeyCache hit rate'
@@ -1350,8 +1410,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}'
+                  tag: component
+                  value: tables
+                -
+                  tag: keyspace
+                  value: '{#JMXKEYSPACE}'
+                -
+                  tag: table
+                  value: '{#JMXSCOPE}'
             -
               uuid: b69ac0bb285a4e8fa82a98f4de2645d2
               name: '{#JMXKEYSPACE}.{#JMXSCOPE}: Live disk space used'
@@ -1365,8 +1431,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}'
+                  tag: component
+                  value: tables
+                -
+                  tag: keyspace
+                  value: '{#JMXKEYSPACE}'
+                -
+                  tag: table
+                  value: '{#JMXSCOPE}'
             -
               uuid: bf733ba7ab2045d38a88c6f0650ba1f2
               name: '{#JMXKEYSPACE}.{#JMXSCOPE}: Live SS Table'
@@ -1379,8 +1451,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}'
+                  tag: component
+                  value: tables
+                -
+                  tag: keyspace
+                  value: '{#JMXKEYSPACE}'
+                -
+                  tag: table
+                  value: '{#JMXSCOPE}'
             -
               uuid: c447d219390a48f2bbbe0d19211472c8
               name: '{#JMXKEYSPACE}.{#JMXSCOPE}: Max sartition size'
@@ -1394,8 +1472,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}'
+                  tag: component
+                  value: tables
+                -
+                  tag: keyspace
+                  value: '{#JMXKEYSPACE}'
+                -
+                  tag: table
+                  value: '{#JMXSCOPE}'
             -
               uuid: bdf111fbca884f49a6cda263b8b07feb
               name: '{#JMXKEYSPACE}.{#JMXSCOPE}: Mean partition size'
@@ -1409,8 +1493,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}'
+                  tag: component
+                  value: tables
+                -
+                  tag: keyspace
+                  value: '{#JMXKEYSPACE}'
+                -
+                  tag: table
+                  value: '{#JMXSCOPE}'
             -
               uuid: 1f44ed6c453d44fc811ae310701df4bf
               name: '{#JMXKEYSPACE}.{#JMXSCOPE}: Pending compactions'
@@ -1423,8 +1513,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}'
+                  tag: component
+                  value: tables
+                -
+                  tag: keyspace
+                  value: '{#JMXKEYSPACE}'
+                -
+                  tag: table
+                  value: '{#JMXSCOPE}'
             -
               uuid: 7e287e5459644536b9420263b4096dd1
               name: '{#JMXKEYSPACE}.{#JMXSCOPE}: Pending flushes'
@@ -1437,8 +1533,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}'
+                  tag: component
+                  value: tables
+                -
+                  tag: keyspace
+                  value: '{#JMXKEYSPACE}'
+                -
+                  tag: table
+                  value: '{#JMXSCOPE}'
             -
               uuid: 1d240e1fe4b245b0b1b2b30d42e5077e
               name: '{#JMXKEYSPACE}.{#JMXSCOPE}: Read latency 75 percentile'
@@ -1458,8 +1560,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}'
+                  tag: component
+                  value: tables
+                -
+                  tag: keyspace
+                  value: '{#JMXKEYSPACE}'
+                -
+                  tag: table
+                  value: '{#JMXSCOPE}'
             -
               uuid: 38d31a8a16f04c39a64ee36940ae7eb8
               name: '{#JMXKEYSPACE}.{#JMXSCOPE}: Read latency 95 percentile'
@@ -1479,8 +1587,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}'
+                  tag: component
+                  value: tables
+                -
+                  tag: keyspace
+                  value: '{#JMXKEYSPACE}'
+                -
+                  tag: table
+                  value: '{#JMXSCOPE}'
             -
               uuid: fdec15a1f86b4943bbd72fb992dfce90
               name: '{#JMXKEYSPACE}.{#JMXSCOPE}: Read per second'
@@ -1500,8 +1614,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}'
+                  tag: component
+                  value: tables
+                -
+                  tag: keyspace
+                  value: '{#JMXKEYSPACE}'
+                -
+                  tag: table
+                  value: '{#JMXSCOPE}'
             -
               uuid: a73d2b8f38184698a3ab7a4bb3742b4a
               name: '{#JMXKEYSPACE}.{#JMXSCOPE}: Row cache hits'
@@ -1514,8 +1634,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}'
+                  tag: component
+                  value: tables
+                -
+                  tag: keyspace
+                  value: '{#JMXKEYSPACE}'
+                -
+                  tag: table
+                  value: '{#JMXSCOPE}'
             -
               uuid: 213ecd18728a40ffbdbeac07daf0e26f
               name: '{#JMXKEYSPACE}.{#JMXSCOPE}: Out of row cache hits'
@@ -1528,8 +1654,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}'
+                  tag: component
+                  value: tables
+                -
+                  tag: keyspace
+                  value: '{#JMXKEYSPACE}'
+                -
+                  tag: table
+                  value: '{#JMXSCOPE}'
             -
               uuid: 32df58c8fa3a4ad3ba2e70fc056895ad
               name: '{#JMXKEYSPACE}.{#JMXSCOPE}: Row cache misses'
@@ -1542,8 +1674,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}'
+                  tag: component
+                  value: tables
+                -
+                  tag: keyspace
+                  value: '{#JMXKEYSPACE}'
+                -
+                  tag: table
+                  value: '{#JMXSCOPE}'
             -
               uuid: 529e7683300b4fe9bb46e3f9ed8a9552
               name: '{#JMXKEYSPACE}.{#JMXSCOPE}: Snapshots size'
@@ -1557,8 +1695,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}'
+                  tag: component
+                  value: tables
+                -
+                  tag: keyspace
+                  value: '{#JMXKEYSPACE}'
+                -
+                  tag: table
+                  value: '{#JMXSCOPE}'
             -
               uuid: 53e4852850a74163ad797969d3366eb0
               name: '{#JMXKEYSPACE}.{#JMXSCOPE}: SS Tables per read 75 percentile'
@@ -1572,8 +1716,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}'
+                  tag: component
+                  value: tables
+                -
+                  tag: keyspace
+                  value: '{#JMXKEYSPACE}'
+                -
+                  tag: table
+                  value: '{#JMXSCOPE}'
             -
               uuid: 187487b9d35444da989f9e0e3814798a
               name: '{#JMXKEYSPACE}.{#JMXSCOPE}: SS Tables per read 95 percentile'
@@ -1587,8 +1737,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}'
+                  tag: component
+                  value: tables
+                -
+                  tag: keyspace
+                  value: '{#JMXKEYSPACE}'
+                -
+                  tag: table
+                  value: '{#JMXSCOPE}'
             -
               uuid: 592bde2f9eb24d7e80b45f3db965b2e0
               name: '{#JMXKEYSPACE}.{#JMXSCOPE}: Tombstone scanned 75 percentile'
@@ -1602,8 +1758,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}'
+                  tag: component
+                  value: tables
+                -
+                  tag: keyspace
+                  value: '{#JMXKEYSPACE}'
+                -
+                  tag: table
+                  value: '{#JMXSCOPE}'
             -
               uuid: 70fedfc2310e4eb19195da72c9ada63d
               name: '{#JMXKEYSPACE}.{#JMXSCOPE}: Tombstone scanned 95 percentile'
@@ -1617,8 +1779,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}'
+                  tag: component
+                  value: tables
+                -
+                  tag: keyspace
+                  value: '{#JMXKEYSPACE}'
+                -
+                  tag: table
+                  value: '{#JMXSCOPE}'
             -
               uuid: a20ace3047bd4a238644dbc55d2f8fed
               name: '{#JMXKEYSPACE}.{#JMXSCOPE}: Disk space used'
@@ -1632,8 +1800,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}'
+                  tag: component
+                  value: tables
+                -
+                  tag: keyspace
+                  value: '{#JMXKEYSPACE}'
+                -
+                  tag: table
+                  value: '{#JMXSCOPE}'
             -
               uuid: b599e354a5ee417cb056dea424a5792d
               name: '{#JMXKEYSPACE}.{#JMXSCOPE}: Waiting on free memtable space 75 percentile'
@@ -1653,8 +1827,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}'
+                  tag: component
+                  value: tables
+                -
+                  tag: keyspace
+                  value: '{#JMXKEYSPACE}'
+                -
+                  tag: table
+                  value: '{#JMXSCOPE}'
             -
               uuid: af19509867e54f19a64a4b66d054e0cf
               name: '{#JMXKEYSPACE}.{#JMXSCOPE}: Waiting on free memtable space95 percentile'
@@ -1674,8 +1854,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}'
+                  tag: component
+                  value: tables
+                -
+                  tag: keyspace
+                  value: '{#JMXKEYSPACE}'
+                -
+                  tag: table
+                  value: '{#JMXSCOPE}'
             -
               uuid: 141b38b299e14068abc0c175ae4023e6
               name: '{#JMXKEYSPACE}.{#JMXSCOPE}: Write latency 75 percentile'
@@ -1695,8 +1881,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}'
+                  tag: component
+                  value: tables
+                -
+                  tag: keyspace
+                  value: '{#JMXKEYSPACE}'
+                -
+                  tag: table
+                  value: '{#JMXSCOPE}'
             -
               uuid: 8d79071ab7ad49c483efbb7503a4b308
               name: '{#JMXKEYSPACE}.{#JMXSCOPE}: Write latency 95 percentile'
@@ -1716,8 +1908,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}'
+                  tag: component
+                  value: tables
+                -
+                  tag: keyspace
+                  value: '{#JMXKEYSPACE}'
+                -
+                  tag: table
+                  value: '{#JMXSCOPE}'
             -
               uuid: c1a9748ab9824626b9a59c323aff9a3d
               name: '{#JMXKEYSPACE}.{#JMXSCOPE}: Write per second'
@@ -1737,8 +1935,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}'
+                  tag: component
+                  value: tables
+                -
+                  tag: keyspace
+                  value: '{#JMXKEYSPACE}'
+                -
+                  tag: table
+                  value: '{#JMXSCOPE}'
           graph_prototypes:
             -
               uuid: 5e293f31be1e46e2ac406afda9ba4d95
@@ -1783,6 +1987,13 @@ zabbix_export:
                     host: 'Apache Cassandra by JMX'
                     key: 'jmx["org.apache.cassandra.metrics:type=Table,keyspace={#JMXKEYSPACE},scope={#JMXSCOPE},name=ReadLatency","Count"]'
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
+      tags:
+        -
+          tag: class
+          value: database
+        -
+          tag: target
+          value: apache-cassandra
       macros:
         -
           macro: '{$CASSANDRA.KEY_SPACE.MATCHES}'
diff --git a/templates/db/clickhouse_http/template_db_clickhouse_http.yaml b/templates/db/clickhouse_http/template_db_clickhouse_http.yaml
index 86b7dcbdcf1..d02520da3a9 100644
--- a/templates/db/clickhouse_http/template_db_clickhouse_http.yaml
+++ b/templates/db/clickhouse_http/template_db_clickhouse_http.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-10T07:41:26Z'
+  date: '2022-01-26T10:36:36Z'
   groups:
     -
       uuid: 748ad4d098d447d492bb935c907f652f
@@ -13,7 +13,7 @@ zabbix_export:
       description: |
         Get node metrics from ClickHouse HTTP interface using HTTP agent.
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Databases
@@ -35,8 +35,8 @@ zabbix_export:
             key: clickhouse.system.metrics
           tags:
             -
-              tag: Application
-              value: ClickHouse
+              tag: component
+              value: connections
         -
           uuid: d2d72a607672442b957228f0bea8dcca
           name: 'ClickHouse: Current HTTP connections'
@@ -54,8 +54,8 @@ zabbix_export:
             key: clickhouse.system.metrics
           tags:
             -
-              tag: Application
-              value: ClickHouse
+              tag: component
+              value: connections
         -
           uuid: 0829591332244c75a219f3b811ebf9ce
           name: 'ClickHouse: Current Interserver connections'
@@ -73,8 +73,8 @@ zabbix_export:
             key: clickhouse.system.metrics
           tags:
             -
-              tag: Application
-              value: ClickHouse
+              tag: component
+              value: connections
         -
           uuid: 88d4855d22604d79927d40c0d3b106c5
           name: 'ClickHouse: Current MySQL connections'
@@ -94,8 +94,8 @@ zabbix_export:
             key: clickhouse.system.metrics
           tags:
             -
-              tag: Application
-              value: ClickHouse
+              tag: component
+              value: connections
         -
           uuid: 11786fff830d4d79b914a22c5f85da7f
           name: 'ClickHouse: Current TCP connections'
@@ -113,8 +113,8 @@ zabbix_export:
             key: clickhouse.system.metrics
           tags:
             -
-              tag: Application
-              value: ClickHouse
+              tag: component
+              value: connections
         -
           uuid: 46d8ed7374274d71a06119f50463f26c
           name: 'ClickHouse: Get dictionaries info'
@@ -161,8 +161,8 @@ zabbix_export:
             key: clickhouse.system.metrics
           tags:
             -
-              tag: Application
-              value: ClickHouse
+              tag: component
+              value: system
           triggers:
             -
               uuid: 4ecadb993aa74126a807df3af4b892ed
@@ -173,6 +173,10 @@ zabbix_export:
                 "Clickhouse servers and <remote_servers> in config.xml
                 https://clickhouse.tech/docs/en/operations/table_engines/distributed/"
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
         -
           uuid: e056f8519dec4c8dace036bf993a6d47
           name: 'ClickHouse: Distributed connection fail with retry per second'
@@ -197,8 +201,8 @@ zabbix_export:
             key: clickhouse.system.events
           tags:
             -
-              tag: Application
-              value: ClickHouse
+              tag: component
+              value: connections
         -
           uuid: 3859c5ee6f25419f9da7e7899c9a71af
           name: 'ClickHouse: Distributed connection fail with retry per second'
@@ -223,8 +227,8 @@ zabbix_export:
             key: clickhouse.system.events
           tags:
             -
-              tag: Application
-              value: ClickHouse
+              tag: component
+              value: connections
         -
           uuid: 81130b88e0b04b9ea677a80b6fd6ce22
           name: 'ClickHouse: Delayed insert queries'
@@ -243,8 +247,8 @@ zabbix_export:
             key: clickhouse.system.metrics
           tags:
             -
-              tag: Application
-              value: ClickHouse
+              tag: component
+              value: queries
           triggers:
             -
               uuid: 164dc9841cdd4b77a650792cf1bac701
@@ -253,6 +257,10 @@ zabbix_export:
               priority: WARNING
               description: 'Clickhouse have INSERT queries that are throttled due to high number of active data parts for partition in a MergeTree, please decrease INSERT frequency'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: e2477dd38510489c8ea7509e9a37cb50
           name: 'ClickHouse: Inserted bytes per second'
@@ -278,8 +286,8 @@ zabbix_export:
             key: clickhouse.system.events
           tags:
             -
-              tag: Application
-              value: ClickHouse
+              tag: component
+              value: network
         -
           uuid: e09cfd7db8be48a485bda8c5f033d210
           name: 'ClickHouse: Inserted rows per second'
@@ -304,8 +312,8 @@ zabbix_export:
             key: clickhouse.system.events
           tags:
             -
-              tag: Application
-              value: ClickHouse
+              tag: component
+              value: system
         -
           uuid: 410f7ee66ee84e3eb27940312ddf23d2
           name: 'ClickHouse: New INSERT queries per second'
@@ -330,8 +338,8 @@ zabbix_export:
             key: clickhouse.system.events
           tags:
             -
-              tag: Application
-              value: ClickHouse
+              tag: component
+              value: queries
         -
           uuid: 04c970694a6f40c89e4d3b53f27b7530
           name: 'ClickHouse: Allocated bytes'
@@ -350,8 +358,8 @@ zabbix_export:
             key: clickhouse.system.asynchronous_metrics
           tags:
             -
-              tag: Application
-              value: ClickHouse
+              tag: component
+              value: memory
         -
           uuid: 7aa71031aec74fbb9a2ec126076705a2
           name: 'ClickHouse: Mapped memory'
@@ -370,8 +378,8 @@ zabbix_export:
             key: clickhouse.system.asynchronous_metrics
           tags:
             -
-              tag: Application
-              value: ClickHouse
+              tag: component
+              value: memory
         -
           uuid: 32cc450854e94c6a9adbdde3c76b94d7
           name: 'ClickHouse: Resident memory'
@@ -393,8 +401,8 @@ zabbix_export:
             key: clickhouse.system.asynchronous_metrics
           tags:
             -
-              tag: Application
-              value: ClickHouse
+              tag: component
+              value: memory
         -
           uuid: c99265c296f14189aaf65bf68b7d5037
           name: 'ClickHouse: Max count of parts per partition across all tables'
@@ -414,8 +422,8 @@ zabbix_export:
             key: clickhouse.system.asynchronous_metrics
           tags:
             -
-              tag: Application
-              value: ClickHouse
+              tag: component
+              value: system
           triggers:
             -
               uuid: 21e6d3c6047145c59cbd00032699ee99
@@ -429,6 +437,10 @@ zabbix_export:
                 after that background merge process run, and when you have too much unmerged parts inside partition,
                 SELECT queries performance can significate degrade, so clickhouse try delay insert, or abort it.
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: a4344162643142c9be3b09439b466a5d
           name: 'ClickHouse: Memory used for queries'
@@ -448,8 +460,8 @@ zabbix_export:
             key: clickhouse.system.metrics
           tags:
             -
-              tag: Application
-              value: ClickHouse
+              tag: component
+              value: memory
         -
           uuid: 921670c46d9a4e5b85f2049d64298ab4
           name: 'ClickHouse: Memory used for background merges'
@@ -471,8 +483,8 @@ zabbix_export:
             key: clickhouse.system.metrics
           tags:
             -
-              tag: Application
-              value: ClickHouse
+              tag: component
+              value: memory
         -
           uuid: f881ea3cb2a2434d9cfac0d0896279f5
           name: 'ClickHouse: Memory used for background moves'
@@ -496,8 +508,8 @@ zabbix_export:
             key: clickhouse.system.metrics
           tags:
             -
-              tag: Application
-              value: ClickHouse
+              tag: component
+              value: memory
         -
           uuid: 3cd23448136c4ea8892483b1fbacec82
           name: 'ClickHouse: Memory used for merges'
@@ -519,8 +531,8 @@ zabbix_export:
             key: clickhouse.system.metrics
           tags:
             -
-              tag: Application
-              value: ClickHouse
+              tag: component
+              value: memory
         -
           uuid: 1f4641ef040546e0afcccc818f4d3471
           name: 'ClickHouse: Memory used for background schedule pool'
@@ -540,8 +552,8 @@ zabbix_export:
             key: clickhouse.system.metrics
           tags:
             -
-              tag: Application
-              value: ClickHouse
+              tag: component
+              value: memory
         -
           uuid: 5e98b9c4f1ee42238f363d76354ef537
           name: 'ClickHouse: Current running merges'
@@ -559,8 +571,8 @@ zabbix_export:
             key: clickhouse.system.metrics
           tags:
             -
-              tag: Application
-              value: ClickHouse
+              tag: component
+              value: queries
         -
           uuid: 50e33e8fc1904870bdc6d7f13d16943d
           name: 'ClickHouse: Uncompressed bytes merged per second'
@@ -586,8 +598,8 @@ zabbix_export:
             key: clickhouse.system.events
           tags:
             -
-              tag: Application
-              value: ClickHouse
+              tag: component
+              value: system
         -
           uuid: a2afbf66601344bdb5ab72a7374bbe8b
           name: 'ClickHouse: Merged rows per second'
@@ -612,8 +624,8 @@ zabbix_export:
             key: clickhouse.system.events
           tags:
             -
-              tag: Application
-              value: ClickHouse
+              tag: component
+              value: system
         -
           uuid: 83061f56dce24364906cae761419b148
           name: 'ClickHouse: Network errors per second'
@@ -638,8 +650,8 @@ zabbix_export:
             key: clickhouse.system.events
           tags:
             -
-              tag: Application
-              value: ClickHouse
+              tag: component
+              value: network
           triggers:
             -
               uuid: d49b9e8978bd416f81ea01b935879d81
@@ -647,6 +659,10 @@ zabbix_export:
               name: 'ClickHouse: Too many network errors (over {$CLICKHOUSE.NETWORK.ERRORS.MAX.WARN} in 5m)'
               priority: WARNING
               description: 'Number of errors (timeouts and connection failures) during query execution, background pool tasks and DNS cache update is too high.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: cb40b0cf1296436d9a4e41062d1b3fa9
           name: 'ClickHouse: Ping'
@@ -670,8 +686,11 @@ zabbix_export:
           url: '{$CLICKHOUSE.SCHEME}://{HOST.CONN}:{$CLICKHOUSE.PORT}/ping'
           tags:
             -
-              tag: Application
-              value: ClickHouse
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
         -
           uuid: 4fb14efc757542c1b50605bdfb2e23cb
           name: 'ClickHouse: Longest currently running query time'
@@ -695,8 +714,8 @@ zabbix_export:
               value: '{$CLICKHOUSE.PASSWORD}'
           tags:
             -
-              tag: Application
-              value: ClickHouse
+              tag: component
+              value: queries
           triggers:
             -
               uuid: 2410e7b63c8340b6b08ec729d7093be6
@@ -704,6 +723,10 @@ zabbix_export:
               name: 'ClickHouse: There are queries running more than {$CLICKHOUSE.QUERY_TIME.MAX.WARN} seconds'
               priority: AVERAGE
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 071ae233708b417b97cfeced5021c139
           name: 'ClickHouse: Current running queries'
@@ -721,8 +744,8 @@ zabbix_export:
             key: clickhouse.system.metrics
           tags:
             -
-              tag: Application
-              value: ClickHouse
+              tag: component
+              value: queries
         -
           uuid: 0fb342f6a494443c8389f79439e94791
           name: 'ClickHouse: New queries per second'
@@ -747,8 +770,8 @@ zabbix_export:
             key: clickhouse.system.events
           tags:
             -
-              tag: Application
-              value: ClickHouse
+              tag: component
+              value: queries
         -
           uuid: fb671accbbaa4bd58a107dc3661419af
           name: 'ClickHouse: Read syscalls in fly'
@@ -766,8 +789,8 @@ zabbix_export:
             key: clickhouse.system.metrics
           tags:
             -
-              tag: Application
-              value: ClickHouse
+              tag: component
+              value: system
         -
           uuid: eb4c47501d9c4cdf9e55347ccc9a38bd
           name: 'ClickHouse: Read bytes per second'
@@ -793,8 +816,8 @@ zabbix_export:
             key: clickhouse.system.events
           tags:
             -
-              tag: Application
-              value: ClickHouse
+              tag: component
+              value: network
         -
           uuid: 3793962be3494772832796c932947e1d
           name: 'ClickHouse: Get replicas info'
@@ -842,8 +865,8 @@ zabbix_export:
             key: clickhouse.system.asynchronous_metrics
           tags:
             -
-              tag: Application
-              value: ClickHouse
+              tag: component
+              value: replication
           triggers:
             -
               uuid: fc47a407b15744e79b70088ec249951a
@@ -854,6 +877,10 @@ zabbix_export:
                 When replica have too much lag, it can be skipped from Distributed SELECT Queries without errors
                 and you will have wrong query results.
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: dd61675348374d2ea06cdde144fe4e26
           name: 'ClickHouse: Total number read-only Replicas'
@@ -874,8 +901,8 @@ zabbix_export:
             key: clickhouse.system.metrics
           tags:
             -
-              tag: Application
-              value: ClickHouse
+              tag: component
+              value: replication
         -
           uuid: 5d2a35daf81a49888e3dfab916fab8be
           name: 'ClickHouse: Total replication tasks in queue'
@@ -892,8 +919,8 @@ zabbix_export:
             key: clickhouse.system.asynchronous_metrics
           tags:
             -
-              tag: Application
-              value: ClickHouse
+              tag: component
+              value: replication
         -
           uuid: 572036e5b2c74197bd61afc753f6e759
           name: 'ClickHouse: Revision'
@@ -911,8 +938,8 @@ zabbix_export:
             key: clickhouse.system.metrics
           tags:
             -
-              tag: Application
-              value: ClickHouse
+              tag: component
+              value: application
         -
           uuid: f89f3e27ca4f4e109ae6fe6b74dcc2ca
           name: 'ClickHouse: New SELECT queries per second'
@@ -937,8 +964,8 @@ zabbix_export:
             key: clickhouse.system.events
           tags:
             -
-              tag: Application
-              value: ClickHouse
+              tag: component
+              value: queries
         -
           uuid: 6c84e0abd186467882d2d3842749f937
           name: 'ClickHouse: Get system.asynchronous_metrics'
@@ -967,8 +994,11 @@ zabbix_export:
               value: '{$CLICKHOUSE.PASSWORD}'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: asynchronous-metrics
+            -
+              tag: component
+              value: raw
         -
           uuid: 8aa612d27547446e9457aeaf6e94e320
           name: 'ClickHouse: Get system.events'
@@ -997,8 +1027,11 @@ zabbix_export:
               value: '{$CLICKHOUSE.PASSWORD}'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
+            -
+              tag: component
+              value: system-events
         -
           uuid: 2193464b67724392905deef21f2f7c20
           name: 'ClickHouse: Get system.metrics'
@@ -1027,8 +1060,11 @@ zabbix_export:
               value: '{$CLICKHOUSE.PASSWORD}'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
+            -
+              tag: component
+              value: system-metrics
         -
           uuid: 88c843c6d4fd43c794d1447109146312
           name: 'ClickHouse: Get system.settings'
@@ -1061,8 +1097,11 @@ zabbix_export:
               value: '{$CLICKHOUSE.PASSWORD}'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
+            -
+              tag: component
+              value: system-settings
           triggers:
             -
               uuid: dfd9500636824ebf9d51d93650d62613
@@ -1071,6 +1110,10 @@ zabbix_export:
               priority: INFO
               description: 'ClickHouse configuration has been changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 042f4b688cfe488fbd0e80f40f51ce78
           name: 'ClickHouse: Get tables info'
@@ -1118,8 +1161,8 @@ zabbix_export:
             key: clickhouse.system.asynchronous_metrics
           tags:
             -
-              tag: Application
-              value: ClickHouse
+              tag: component
+              value: application
           triggers:
             -
               uuid: 975cebc1b4324f83b5a8853fd666a179
@@ -1132,6 +1175,10 @@ zabbix_export:
                 -
                   name: 'ClickHouse: Service is down'
                   expression: 'last(/ClickHouse by HTTP/clickhouse.ping)=0 or last(/ClickHouse by HTTP/net.tcp.service[{$CLICKHOUSE.SCHEME},"{HOST.CONN}","{$CLICKHOUSE.PORT}"]) = 0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: e1316d3a83174cc49ab96ad90c46150b
               expression: 'last(/ClickHouse by HTTP/clickhouse.uptime)<10m'
@@ -1139,6 +1186,10 @@ zabbix_export:
               priority: INFO
               description: 'Uptime is less than 10 minutes'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: d09b77c25dfd45249df05fc3f6d45b7b
           name: 'ClickHouse: Version'
@@ -1167,8 +1218,8 @@ zabbix_export:
               value: '{$CLICKHOUSE.PASSWORD}'
           tags:
             -
-              tag: Application
-              value: ClickHouse
+              tag: component
+              value: application
           triggers:
             -
               uuid: 244dcf8dc8584e1686585160c261ef85
@@ -1177,6 +1228,10 @@ zabbix_export:
               priority: INFO
               description: 'ClickHouse version has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 5bac794c8c7e438c924cd16b708dc281
           name: 'ClickHouse: Write syscalls in fly'
@@ -1194,8 +1249,8 @@ zabbix_export:
             key: clickhouse.system.metrics
           tags:
             -
-              tag: Application
-              value: ClickHouse
+              tag: component
+              value: system
         -
           uuid: 381805a8145a48c2a1f2586996b66a94
           name: 'ClickHouse: ZooKeeper exceptions per second'
@@ -1220,8 +1275,8 @@ zabbix_export:
             key: clickhouse.system.events
           tags:
             -
-              tag: Application
-              value: 'ClickHouse ZooKeeper'
+              tag: component
+              value: zookeper
         -
           uuid: f8e6a866d8c745d39ed124f19afe8041
           name: 'ClickHouse: ZooKeeper hardware exceptions per second'
@@ -1246,8 +1301,8 @@ zabbix_export:
             key: clickhouse.system.events
           tags:
             -
-              tag: Application
-              value: 'ClickHouse ZooKeeper'
+              tag: component
+              value: zookeper
         -
           uuid: 071fb0471b8e40c3a5bb79c694cecce0
           name: 'ClickHouse: ZooKeeper requests'
@@ -1265,8 +1320,8 @@ zabbix_export:
             key: clickhouse.system.metrics
           tags:
             -
-              tag: Application
-              value: 'ClickHouse ZooKeeper'
+              tag: component
+              value: zookeper
         -
           uuid: 3e344ea728a54bc38b4098e7f6e2d087
           name: 'ClickHouse: ZooKeeper sessions'
@@ -1284,8 +1339,8 @@ zabbix_export:
             key: clickhouse.system.metrics
           tags:
             -
-              tag: Application
-              value: 'ClickHouse ZooKeeper'
+              tag: component
+              value: zookeper
           triggers:
             -
               uuid: 655622aa6c5c48c8b38d5a519602ef05
@@ -1295,6 +1350,10 @@ zabbix_export:
               description: |
                 Number of sessions (connections) to ZooKeeper.
                 Should be no more than one, because using more than one connection to ZooKeeper may lead to bugs due to lack of linearizability (stale reads) that ZooKeeper consistency model allows.
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 4931797c1034488fb9a2fc01e22b599c
           name: 'ClickHouse: ZooKeeper user exceptions per second'
@@ -1319,8 +1378,8 @@ zabbix_export:
             key: clickhouse.system.events
           tags:
             -
-              tag: Application
-              value: 'ClickHouse ZooKeeper'
+              tag: component
+              value: zookeper
         -
           uuid: b9fbc2f76b9c4de3b196ffc82ec10209
           name: 'ClickHouse: ZooKeeper wait time'
@@ -1350,8 +1409,8 @@ zabbix_export:
             key: clickhouse.system.events
           tags:
             -
-              tag: Application
-              value: 'ClickHouse ZooKeeper'
+              tag: component
+              value: zookeper
         -
           uuid: 696aa071a9b24b29acbce2f1b5c49da3
           name: 'ClickHouse: ZooKeeper watches'
@@ -1359,7 +1418,7 @@ zabbix_export:
           key: clickhouse.zookeper.watch
           delay: '0'
           history: 7d
-          description: 'Number of watches (e.g., event subscriptions) in ZooKeeperr.'
+          description: 'Number of watches (e.g., event subscriptions) in ZooKeeper.'
           preprocessing:
             -
               type: JSONPATH
@@ -1369,8 +1428,8 @@ zabbix_export:
             key: clickhouse.system.metrics
           tags:
             -
-              tag: Application
-              value: 'ClickHouse ZooKeeper'
+              tag: component
+              value: zookeper
         -
           uuid: 68d1e19a6ec2401ba0dd509de7df2812
           name: 'ClickHouse: Check port availability'
@@ -1386,8 +1445,11 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: ClickHouse
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 1d4b9842b66b4da9ab3750944b2fa050
@@ -1395,6 +1457,10 @@ zabbix_export:
               name: 'ClickHouse: Port {$CLICKHOUSE.PORT} is unavailable'
               priority: AVERAGE
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: add428c918e34dc9aeb58f946f16cbd2
@@ -1434,8 +1500,11 @@ zabbix_export:
                 key: clickhouse.dictionaries
               tags:
                 -
-                  tag: Application
-                  value: 'ClickHouse: Dictionary "{#NAME}"'
+                  tag: component
+                  value: dictionaries
+                -
+                  tag: dictionary
+                  value: '{#NAME}'
             -
               uuid: fa4efa26e3f64fc89c9d7dad39a610ca
               name: 'ClickHouse: Dictionary {#NAME}: Element count'
@@ -1453,8 +1522,11 @@ zabbix_export:
                 key: clickhouse.dictionaries
               tags:
                 -
-                  tag: Application
-                  value: 'ClickHouse: Dictionary "{#NAME}"'
+                  tag: component
+                  value: dictionaries
+                -
+                  tag: dictionary
+                  value: '{#NAME}'
             -
               uuid: d9e333b7c1694ef482683679275dcd8d
               name: 'ClickHouse: Dictionary {#NAME}: Load factor'
@@ -1477,8 +1549,11 @@ zabbix_export:
                 key: clickhouse.dictionaries
               tags:
                 -
-                  tag: Application
-                  value: 'ClickHouse: Dictionary "{#NAME}"'
+                  tag: component
+                  value: dictionaries
+                -
+                  tag: dictionary
+                  value: '{#NAME}'
           master_item:
             key: clickhouse.dictionaries
           lld_macro_paths:
@@ -1522,8 +1597,14 @@ zabbix_export:
                 key: clickhouse.replicas
               tags:
                 -
-                  tag: Application
-                  value: 'ClickHouse: "{#DB}.{#TABLE}" replica status'
+                  tag: component
+                  value: replication
+                -
+                  tag: database
+                  value: '{#DB}'
+                -
+                  tag: table
+                  value: '{#TABLE}'
             -
               uuid: 0a84f6788b3f447d958e031df0e2301c
               name: 'ClickHouse: {#DB}.{#TABLE}: Replica future parts'
@@ -1541,8 +1622,14 @@ zabbix_export:
                 key: clickhouse.replicas
               tags:
                 -
-                  tag: Application
-                  value: 'ClickHouse: "{#DB}.{#TABLE}" replica status'
+                  tag: component
+                  value: replication
+                -
+                  tag: database
+                  value: '{#DB}'
+                -
+                  tag: table
+                  value: '{#TABLE}'
             -
               uuid: 6b49a71fcf244b8cb88e21423ac92ae2
               name: 'ClickHouse: {#DB}.{#TABLE}: Replica queue inserts size'
@@ -1560,8 +1647,14 @@ zabbix_export:
                 key: clickhouse.replicas
               tags:
                 -
-                  tag: Application
-                  value: 'ClickHouse: "{#DB}.{#TABLE}" replica status'
+                  tag: component
+                  value: replication
+                -
+                  tag: database
+                  value: '{#DB}'
+                -
+                  tag: table
+                  value: '{#TABLE}'
             -
               uuid: 29977fdd52c64c4ca0b3565187365a0c
               name: 'ClickHouse: {#DB}.{#TABLE}: Replica readonly'
@@ -1583,8 +1676,14 @@ zabbix_export:
                 key: clickhouse.replicas
               tags:
                 -
-                  tag: Application
-                  value: 'ClickHouse: "{#DB}.{#TABLE}" replica status'
+                  tag: component
+                  value: replication
+                -
+                  tag: database
+                  value: '{#DB}'
+                -
+                  tag: table
+                  value: '{#TABLE}'
               trigger_prototypes:
                 -
                   uuid: 7cfd2342d3654407a941cb56fde5c6bf
@@ -1592,6 +1691,10 @@ zabbix_export:
                   name: 'ClickHouse: {#DB}.{#TABLE} Replica is readonly'
                   priority: WARNING
                   description: 'This mode is turned on if the config doesn''t have sections with ZooKeeper, if an unknown error occurred when re-initializing sessions in ZooKeeper, and during session re-initialization in ZooKeeper.'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: a889475b8ddf48109af3dd2b7ed58627
               name: 'ClickHouse: {#DB}.{#TABLE}: Replica session expired'
@@ -1611,8 +1714,14 @@ zabbix_export:
                 key: clickhouse.replicas
               tags:
                 -
-                  tag: Application
-                  value: 'ClickHouse: "{#DB}.{#TABLE}" replica status'
+                  tag: component
+                  value: replication
+                -
+                  tag: database
+                  value: '{#DB}'
+                -
+                  tag: table
+                  value: '{#TABLE}'
               trigger_prototypes:
                 -
                   uuid: 765475cc0be84ce1b85d1f026d08c326
@@ -1620,6 +1729,10 @@ zabbix_export:
                   name: 'ClickHouse: {#DB}.{#TABLE} Replica session is expired'
                   priority: WARNING
                   description: 'This mode is turned on if the config doesn''t have sections with ZooKeeper, if an unknown error occurred when re-initializing sessions in ZooKeeper, and during session re-initialization in ZooKeeper.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 8acd6e2195064708886d9944af264c32
               name: 'ClickHouse: {#DB}.{#TABLE}: Replica lag'
@@ -1638,14 +1751,24 @@ zabbix_export:
                 key: clickhouse.replicas
               tags:
                 -
-                  tag: Application
-                  value: 'ClickHouse: "{#DB}.{#TABLE}" replica status'
+                  tag: component
+                  value: replication
+                -
+                  tag: database
+                  value: '{#DB}'
+                -
+                  tag: table
+                  value: '{#TABLE}'
               trigger_prototypes:
                 -
                   uuid: 0b06b448c0ad433c94c2a3788ca53e1a
                   expression: 'min(/ClickHouse by HTTP/clickhouse.replica.lag["{#DB}.{#TABLE}"],5m) > {$CLICKHOUSE.LOG_POSITION.DIFF.MAX.WARN}'
                   name: 'ClickHouse: {#DB}.{#TABLE}: Difference between log_max_index and log_pointer is too high (More than {$CLICKHOUSE.LOG_POSITION.DIFF.MAX.WARN} for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 267603d761864e4cbf764558520ed83c
               name: 'ClickHouse: {#DB}.{#TABLE}: Replica log max index'
@@ -1663,8 +1786,14 @@ zabbix_export:
                 key: clickhouse.replicas
               tags:
                 -
-                  tag: Application
-                  value: 'ClickHouse: "{#DB}.{#TABLE}" replica status'
+                  tag: component
+                  value: replication
+                -
+                  tag: database
+                  value: '{#DB}'
+                -
+                  tag: table
+                  value: '{#TABLE}'
             -
               uuid: 93bf89b0befa4c238f2143c1841ef629
               name: 'ClickHouse: {#DB}.{#TABLE}: Replica log pointer'
@@ -1682,8 +1811,14 @@ zabbix_export:
                 key: clickhouse.replicas
               tags:
                 -
-                  tag: Application
-                  value: 'ClickHouse: "{#DB}.{#TABLE}" replica status'
+                  tag: component
+                  value: replication
+                -
+                  tag: database
+                  value: '{#DB}'
+                -
+                  tag: table
+                  value: '{#TABLE}'
             -
               uuid: 7b0da84f1e3f4705a209c6be025fc738
               name: 'ClickHouse: {#DB}.{#TABLE}: Replica queue merges size'
@@ -1701,8 +1836,14 @@ zabbix_export:
                 key: clickhouse.replicas
               tags:
                 -
-                  tag: Application
-                  value: 'ClickHouse: "{#DB}.{#TABLE}" replica status'
+                  tag: component
+                  value: replication
+                -
+                  tag: database
+                  value: '{#DB}'
+                -
+                  tag: table
+                  value: '{#TABLE}'
             -
               uuid: 51a83465b90e4c82835030fec4f79b6f
               name: 'ClickHouse: {#DB}.{#TABLE}: Replica parts to check'
@@ -1720,8 +1861,14 @@ zabbix_export:
                 key: clickhouse.replicas
               tags:
                 -
-                  tag: Application
-                  value: 'ClickHouse: "{#DB}.{#TABLE}" replica status'
+                  tag: component
+                  value: replication
+                -
+                  tag: database
+                  value: '{#DB}'
+                -
+                  tag: table
+                  value: '{#TABLE}'
             -
               uuid: 52ef1c26f14842868424f0c5bf81b35b
               name: 'ClickHouse: {#DB}.{#TABLE}: Replica queue size'
@@ -1739,14 +1886,24 @@ zabbix_export:
                 key: clickhouse.replicas
               tags:
                 -
-                  tag: Application
-                  value: 'ClickHouse: "{#DB}.{#TABLE}" replica status'
+                  tag: component
+                  value: replication
+                -
+                  tag: database
+                  value: '{#DB}'
+                -
+                  tag: table
+                  value: '{#TABLE}'
               trigger_prototypes:
                 -
                   uuid: 6fe0a15168db4abfa1cd2a2ee45d62ad
                   expression: 'min(/ClickHouse by HTTP/clickhouse.replica.queue_size["{#DB}.{#TABLE}"],5m)>{$CLICKHOUSE.QUEUE.SIZE.MAX.WARN:"{#TABLE}"}'
                   name: 'ClickHouse: {#DB}.{#TABLE}: Too many operations in queue (over {$CLICKHOUSE.QUEUE.SIZE.MAX.WARN} for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 0fc2781f4be44f0e85176e5ed05dc05e
               name: 'ClickHouse: {#DB}.{#TABLE}: Total replicas'
@@ -1764,14 +1921,24 @@ zabbix_export:
                 key: clickhouse.replicas
               tags:
                 -
-                  tag: Application
-                  value: 'ClickHouse: "{#DB}.{#TABLE}" replica status'
+                  tag: component
+                  value: replication
+                -
+                  tag: database
+                  value: '{#DB}'
+                -
+                  tag: table
+                  value: '{#TABLE}'
           trigger_prototypes:
             -
               uuid: f46f1b8d75c54129b6e2ff9ede2501b5
               expression: 'max(/ClickHouse by HTTP/clickhouse.replica.active_replicas["{#DB}.{#TABLE}"],5m) < last(/ClickHouse by HTTP/clickhouse.replica.total_replicas["{#DB}.{#TABLE}"])'
               name: 'ClickHouse: {#DB}.{#TABLE}: Number of active replicas less than number of total replicas'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: availability
           graph_prototypes:
             -
               uuid: 131e0d19c35f4d87aa62b7766e6e1db3
@@ -1868,8 +2035,14 @@ zabbix_export:
                 key: clickhouse.tables
               tags:
                 -
-                  tag: Application
-                  value: 'ClickHouse: DB "{#DB}"'
+                  tag: component
+                  value: tables
+                -
+                  tag: database
+                  value: '{#DB}'
+                -
+                  tag: table
+                  value: '{#TABLE}'
             -
               uuid: 3075954290af4f35b1620a5f15d2947d
               name: 'ClickHouse: {#DB}.{#TABLE}: Bytes'
@@ -1888,8 +2061,14 @@ zabbix_export:
                 key: clickhouse.tables
               tags:
                 -
-                  tag: Application
-                  value: 'ClickHouse: Table "{#DB}.{#TABLE}"'
+                  tag: component
+                  value: tables
+                -
+                  tag: database
+                  value: '{#DB}'
+                -
+                  tag: table
+                  value: '{#TABLE}'
             -
               uuid: e50e12adb7ef47e6ba40db01e7ae01e4
               name: 'ClickHouse: {#DB}.{#TABLE}: Parts'
@@ -1907,8 +2086,14 @@ zabbix_export:
                 key: clickhouse.tables
               tags:
                 -
-                  tag: Application
-                  value: 'ClickHouse: Table "{#DB}.{#TABLE}"'
+                  tag: component
+                  value: tables
+                -
+                  tag: database
+                  value: '{#DB}'
+                -
+                  tag: table
+                  value: '{#TABLE}'
             -
               uuid: 0ba557c544854f47bcd9cc65d33f14e7
               name: 'ClickHouse: {#DB}.{#TABLE}: Rows'
@@ -1926,8 +2111,14 @@ zabbix_export:
                 key: clickhouse.tables
               tags:
                 -
-                  tag: Application
-                  value: 'ClickHouse: Table "{#DB}.{#TABLE}"'
+                  tag: component
+                  value: tables
+                -
+                  tag: database
+                  value: '{#DB}'
+                -
+                  tag: table
+                  value: '{#TABLE}'
           master_item:
             key: clickhouse.tables
           lld_macro_paths:
@@ -1937,6 +2128,13 @@ zabbix_export:
             -
               lld_macro: '{#TABLE}'
               path: $.table
+      tags:
+        -
+          tag: class
+          value: database
+        -
+          tag: target
+          value: clickhouse
       macros:
         -
           macro: '{$CLICKHOUSE.DELAYED.FILES.DISTRIBUTED.COUNT.MAX.WARN}'
@@ -2032,6 +2230,10 @@ zabbix_export:
         -
           name: 'ClickHouse: Port {$CLICKHOUSE.PORT} is unavailable'
           expression: 'last(/ClickHouse by HTTP/net.tcp.service[{$CLICKHOUSE.SCHEME},"{HOST.CONN}","{$CLICKHOUSE.PORT}"])=0'
+      tags:
+        -
+          tag: scope
+          value: availability
   graphs:
     -
       uuid: fc2f8de59c874876addb08ec633338d4
diff --git a/templates/db/gridgain_jmx/README.md b/templates/db/gridgain_jmx/README.md
index 777f1b93c51..e53f97b2b0a 100644
--- a/templates/db/gridgain_jmx/README.md
+++ b/templates/db/gridgain_jmx/README.md
@@ -55,16 +55,16 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|GridGain kernal metrics |<p>-</p> |JMX |jmx.discovery[beans,"org.apache:group=Kernal,name=IgniteKernal,*"]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
+|Cache groups |<p>-</p> |JMX |jmx.discovery[beans,"org.apache:group=\"Cache groups\",*"]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p><p>**Filter**:</p>AND <p>- {#JMXNAME} MATCHES_REGEX `{$GRIDGAIN.LLD.FILTER.CACHE.MATCHES}`</p><p>- {#JMXNAME} NOT_MATCHES_REGEX `{$GRIDGAIN.LLD.FILTER.CACHE.NOT_MATCHES}`</p> |
+|Cache metrics |<p>-</p> |JMX |jmx.discovery[beans,"org.apache:name=\"org.apache.gridgain.internal.processors.cache.CacheLocalMetricsMXBeanImpl\",*"]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p><p>**Filter**:</p>AND <p>- {#JMXGROUP} MATCHES_REGEX `{$GRIDGAIN.LLD.FILTER.CACHE.MATCHES}`</p><p>- {#JMXGROUP} NOT_MATCHES_REGEX `{$GRIDGAIN.LLD.FILTER.CACHE.NOT_MATCHES}`</p> |
 |Cluster metrics |<p>-</p> |JMX |jmx.discovery[beans,"org.apache:group=Kernal,name=ClusterMetricsMXBeanImpl,*"]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
+|Data region metrics |<p>-</p> |JMX |jmx.discovery[beans,"org.apache:group=DataRegionMetrics,*"]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p><p>**Filter**:</p>AND <p>- {#JMXNAME} MATCHES_REGEX `{$GRIDGAIN.LLD.FILTER.DATA.REGION.MATCHES}`</p><p>- {#JMXNAME} NOT_MATCHES_REGEX `{$GRIDGAIN.LLD.FILTER.DATA.REGION.NOT_MATCHES}`</p> |
+|GridGain kernal metrics |<p>-</p> |JMX |jmx.discovery[beans,"org.apache:group=Kernal,name=IgniteKernal,*"]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
 |Local node metrics |<p>-</p> |JMX |jmx.discovery[beans,"org.apache:group=Kernal,name=ClusterLocalNodeMetricsMXBeanImpl,*"]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
-|TCP discovery SPI |<p>-</p> |JMX |jmx.discovery[beans,"org.apache:group=SPIs,name=TcpDiscoverySpi,*"]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
 |TCP Communication SPI metrics |<p>-</p> |JMX |jmx.discovery[beans,"org.apache:group=SPIs,name=TcpCommunicationSpi,*"]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
-|Transaction metrics |<p>-</p> |JMX |jmx.discovery[beans,"org.apache:group=TransactionMetrics,name=TransactionMetricsMxBeanImpl,*"]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
-|Cache metrics |<p>-</p> |JMX |jmx.discovery[beans,"org.apache:name=\"org.apache.gridgain.internal.processors.cache.CacheLocalMetricsMXBeanImpl\",*"]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p><p>**Filter**:</p>AND <p>- {#JMXGROUP} MATCHES_REGEX `{$GRIDGAIN.LLD.FILTER.CACHE.MATCHES}`</p><p>- {#JMXGROUP} NOT_MATCHES_REGEX `{$GRIDGAIN.LLD.FILTER.CACHE.NOT_MATCHES}`</p> |
-|Data region metrics |<p>-</p> |JMX |jmx.discovery[beans,"org.apache:group=DataRegionMetrics,*"]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p><p>**Filter**:</p>AND <p>- {#JMXNAME} MATCHES_REGEX `{$GRIDGAIN.LLD.FILTER.DATA.REGION.MATCHES}`</p><p>- {#JMXNAME} NOT_MATCHES_REGEX `{$GRIDGAIN.LLD.FILTER.DATA.REGION.NOT_MATCHES}`</p> |
-|Cache groups |<p>-</p> |JMX |jmx.discovery[beans,"org.apache:group=\"Cache groups\",*"]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p><p>**Filter**:</p>AND <p>- {#JMXNAME} MATCHES_REGEX `{$GRIDGAIN.LLD.FILTER.CACHE.MATCHES}`</p><p>- {#JMXNAME} NOT_MATCHES_REGEX `{$GRIDGAIN.LLD.FILTER.CACHE.NOT_MATCHES}`</p> |
+|TCP discovery SPI |<p>-</p> |JMX |jmx.discovery[beans,"org.apache:group=SPIs,name=TcpDiscoverySpi,*"]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
 |Thread pool metrics |<p>-</p> |JMX |jmx.discovery[beans,"org.apache:group=\"Thread Pools\",*"]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p><p>**Filter**:</p>AND <p>- {#JMXNAME} MATCHES_REGEX `{$GRIDGAIN.LLD.FILTER.THREAD.POOL.MATCHES}`</p><p>- {#JMXNAME} NOT_MATCHES_REGEX `{$GRIDGAIN.LLD.FILTER.THREAD.POOL.NOT_MATCHES}`</p> |
+|Transaction metrics |<p>-</p> |JMX |jmx.discovery[beans,"org.apache:group=TransactionMetrics,name=TransactionMetricsMxBeanImpl,*"]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
 
 ## Items collected
 
@@ -173,5 +173,5 @@ There are no template links in this template.
 
 Please report any issues with the template at https://support.zabbix.com
 
-You can also provide a feedback, discuss the template or ask for help with it at [ZABBIX forums](https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/).
+You can also provide feedback, discuss the template or ask for help with it at [ZABBIX forums](https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/).
 
diff --git a/templates/db/gridgain_jmx/template_db_gridgain_jmx.yaml b/templates/db/gridgain_jmx/template_db_gridgain_jmx.yaml
index 95007c5b32b..0cdef58cb6f 100644
--- a/templates/db/gridgain_jmx/template_db_gridgain_jmx.yaml
+++ b/templates/db/gridgain_jmx/template_db_gridgain_jmx.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-10T07:41:30Z'
+  date: '2022-01-26T10:39:30Z'
   groups:
     -
       uuid: 748ad4d098d447d492bb935c907f652f
@@ -19,7 +19,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Databases
@@ -59,8 +59,8 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'GridGain [{#JMXIGNITEINSTANCENAME}]: Data region [{#JMXNAME}]'
+                  tag: component
+                  value: data_region
             -
               uuid: 3425f6775e9e4a979d876becddec46d2
               name: 'Data region {#JMXNAME}: Checkpoint buffer size'
@@ -75,8 +75,8 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'GridGain [{#JMXIGNITEINSTANCENAME}]: Data region [{#JMXNAME}]'
+                  tag: component
+                  value: data_region
             -
               uuid: 6e44ce63725a46b486175e34697776ee
               name: 'Data region {#JMXNAME}: Dirty pages'
@@ -90,8 +90,8 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'GridGain [{#JMXIGNITEINSTANCENAME}]: Data region [{#JMXNAME}]'
+                  tag: component
+                  value: data_region
             -
               uuid: 5396db6809ca44c480f123e1e63430b4
               name: 'Data region {#JMXNAME}: Eviction, rate'
@@ -106,8 +106,8 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'GridGain [{#JMXIGNITEINSTANCENAME}]: Data region [{#JMXNAME}]'
+                  tag: component
+                  value: data_region
               trigger_prototypes:
                 -
                   uuid: 7e2fc41d632240b3869080d41ef5e639
@@ -116,6 +116,10 @@ zabbix_export:
                   priority: INFO
                   description: 'You store more data than region can accommodate. Data started to move to disk it can make requests work slower. Ack to close.'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 9f7d683cf3ca47c681eef43e4dd9a471
               name: 'Data region {#JMXNAME}: Size, max'
@@ -130,8 +134,8 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'GridGain [{#JMXIGNITEINSTANCENAME}]: Data region [{#JMXNAME}]'
+                  tag: component
+                  value: data_region
             -
               uuid: 16170e6c8007492984c367892a7393aa
               name: 'Data region {#JMXNAME}: Offheap size'
@@ -146,8 +150,8 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'GridGain [{#JMXIGNITEINSTANCENAME}]: Data region [{#JMXNAME}]'
+                  tag: component
+                  value: data_region
             -
               uuid: 982c738bdd4f4802917d3f5d63cc489f
               name: 'Data region {#JMXNAME}: Offheap used size'
@@ -162,8 +166,8 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'GridGain [{#JMXIGNITEINSTANCENAME}]: Data region [{#JMXNAME}]'
+                  tag: component
+                  value: data_region
             -
               uuid: 03c923d00e5a486faece1f37b3a2863d
               name: 'Data region {#JMXNAME}: Pages fill factor'
@@ -178,8 +182,8 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'GridGain [{#JMXIGNITEINSTANCENAME}]: Data region [{#JMXNAME}]'
+                  tag: component
+                  value: data_region
             -
               uuid: 9094f5992c514be6abaee490b211774e
               name: 'Data region {#JMXNAME}: Pages replace, rate'
@@ -194,8 +198,8 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'GridGain [{#JMXIGNITEINSTANCENAME}]: Data region [{#JMXNAME}]'
+                  tag: component
+                  value: data_region
               trigger_prototypes:
                 -
                   uuid: d2b012fdfe634526bb583d4ad18abe4d
@@ -203,6 +207,10 @@ zabbix_export:
                   name: 'Data region {#JMXNAME}: Pages replace rate more than 0'
                   priority: WARNING
                   description: 'There is more data than DataRegionMaxSize. Cluster started to replace pages in memory. Page replacement can slow down operations.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 390107f411e24581a61043000b42152f
               name: 'Data region {#JMXNAME}: Allocated, bytes'
@@ -217,8 +225,8 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'GridGain [{#JMXIGNITEINSTANCENAME}]: Data region [{#JMXNAME}]'
+                  tag: component
+                  value: data_region
             -
               uuid: 8e0e7a96f0a6424b88829fab78cce2ba
               name: 'Data region {#JMXNAME}: Used checkpoint buffer size'
@@ -233,8 +241,8 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'GridGain [{#JMXIGNITEINSTANCENAME}]: Data region [{#JMXNAME}]'
+                  tag: component
+                  value: data_region
           trigger_prototypes:
             -
               uuid: 9a7d7c745faa4f1fa4ffd1ca8c1ac602
@@ -242,6 +250,10 @@ zabbix_export:
               name: 'Data region {#JMXNAME}: Checkpoint buffer utilization is too high (over {$GRIDGAIN.CHECKPOINT.PUSED.MAX.HIGH} in 5m)'
               priority: HIGH
               description: 'Checkpoint buffer utilization is high. Threads will be throttled to avoid buffer overflow. It can be caused by high disk utilization.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 02ce52a2067147238969a4fd24f85bdc
               expression: 'min(/GridGain by JMX/jmx["{#JMXOBJ}",UsedCheckpointBufferSize],5m)/last(/GridGain by JMX/jmx["{#JMXOBJ}",CheckpointBufferSize])*100>{$GRIDGAIN.CHECKPOINT.PUSED.MAX.WARN}'
@@ -252,12 +264,20 @@ zabbix_export:
                 -
                   name: 'Data region {#JMXNAME}: Checkpoint buffer utilization is too high (over {$GRIDGAIN.CHECKPOINT.PUSED.MAX.HIGH} in 5m)'
                   expression: 'min(/GridGain by JMX/jmx["{#JMXOBJ}",UsedCheckpointBufferSize],5m)/last(/GridGain by JMX/jmx["{#JMXOBJ}",CheckpointBufferSize])*100>{$GRIDGAIN.CHECKPOINT.PUSED.MAX.HIGH}'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 92c2772aa8d7425e8bee5d760ba5b607
               expression: 'min(/GridGain by JMX/jmx["{#JMXOBJ}",OffheapUsedSize],5m)/last(/GridGain by JMX/jmx["{#JMXOBJ}",OffHeapSize])*100>{$GRIDGAIN.DATA.REGION.PUSED.MAX.HIGH}'
               name: 'Data region {#JMXNAME}: Data region utilization is too high (over {$GRIDGAIN.DATA.REGION.PUSED.MAX.HIGH} in 5m)'
               priority: HIGH
               description: 'Data region utilization is high. Increase data region size or delete any data.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 3694e6d813b04b51a77c842de617503c
               expression: 'min(/GridGain by JMX/jmx["{#JMXOBJ}",OffheapUsedSize],5m)/last(/GridGain by JMX/jmx["{#JMXOBJ}",OffHeapSize])*100>{$GRIDGAIN.DATA.REGION.PUSED.MAX.WARN}'
@@ -268,6 +288,10 @@ zabbix_export:
                 -
                   name: 'Data region {#JMXNAME}: Data region utilization is too high (over {$GRIDGAIN.DATA.REGION.PUSED.MAX.HIGH} in 5m)'
                   expression: 'min(/GridGain by JMX/jmx["{#JMXOBJ}",OffheapUsedSize],5m)/last(/GridGain by JMX/jmx["{#JMXOBJ}",OffHeapSize])*100>{$GRIDGAIN.DATA.REGION.PUSED.MAX.HIGH}'
+              tags:
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: f9410067b582451aa0b2675391504a65
@@ -343,8 +367,11 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'GridGain instance [{#JMXIGNITEINSTANCENAME}]'
+                  tag: component
+                  value: job
+                -
+                  tag: component
+                  value: node
             -
               uuid: c254bc19bccb44de821c51b0882b78b4
               name: 'GridGain [{#JMXIGNITEINSTANCENAME}]: Jobs cancelled, current'
@@ -357,8 +384,11 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'GridGain instance [{#JMXIGNITEINSTANCENAME}]'
+                  tag: component
+                  value: job
+                -
+                  tag: component
+                  value: node
             -
               uuid: 63916bbee7604c3e9610f5989bc5bb7a
               name: 'GridGain [{#JMXIGNITEINSTANCENAME}]: PME duration, current'
@@ -372,8 +402,8 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'GridGain instance [{#JMXIGNITEINSTANCENAME}]'
+                  tag: component
+                  value: node
               trigger_prototypes:
                 -
                   uuid: a2672171fa374810b95b72f6014f3998
@@ -381,6 +411,10 @@ zabbix_export:
                   name: 'GridGain [{#JMXIGNITEINSTANCENAME}]: PME duration is too long (over {$GRIDGAIN.PME.DURATION.MAX.HIGH} for 5 min)'
                   priority: HIGH
                   description: 'PME duration is over {$GRIDGAIN.PME.DURATION.MAX.HIGH}ms. Looks like PME is hung.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: f21e1cee28354fcd945d58955831641b
                   expression: 'min(/GridGain by JMX/jmx["{#JMXOBJ}",CurrentPmeDuration],5m) > {$GRIDGAIN.PME.DURATION.MAX.WARN}'
@@ -391,6 +425,10 @@ zabbix_export:
                     -
                       name: 'GridGain [{#JMXIGNITEINSTANCENAME}]: PME duration is too long (over {$GRIDGAIN.PME.DURATION.MAX.HIGH} for 5 min)'
                       expression: 'min(/GridGain by JMX/jmx["{#JMXOBJ}",CurrentPmeDuration],5m) > {$GRIDGAIN.PME.DURATION.MAX.HIGH}'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 790e8c300f7c4c82b640fb6025bb9eef
               name: 'GridGain [{#JMXIGNITEINSTANCENAME}]: Jobs rejected, current'
@@ -403,8 +441,11 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'GridGain instance [{#JMXIGNITEINSTANCENAME}]'
+                  tag: component
+                  value: job
+                -
+                  tag: component
+                  value: node
             -
               uuid: a5c1ece74c914620b9ce70c00c7d5377
               name: 'GridGain [{#JMXIGNITEINSTANCENAME}]: Threads count, current'
@@ -417,8 +458,11 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'GridGain instance [{#JMXIGNITEINSTANCENAME}]'
+                  tag: component
+                  value: node
+                -
+                  tag: component
+                  value: threads
               trigger_prototypes:
                 -
                   uuid: 124c9738a384481fb39f5e8078cca0e4
@@ -430,6 +474,10 @@ zabbix_export:
                     -
                       name: 'GridGain [{#JMXIGNITEINSTANCENAME}]: PME duration is too long (over {$GRIDGAIN.PME.DURATION.MAX.HIGH} for 5 min)'
                       expression: 'min(/GridGain by JMX/jmx["{#JMXOBJ}",CurrentPmeDuration],5m) > {$GRIDGAIN.PME.DURATION.MAX.HIGH}'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: df386b29e8f74ec9a8f1825cb3094c0e
               name: 'GridGain [{#JMXIGNITEINSTANCENAME}]: Jobs waiting, current'
@@ -442,8 +490,11 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'GridGain instance [{#JMXIGNITEINSTANCENAME}]'
+                  tag: component
+                  value: job
+                -
+                  tag: component
+                  value: node
               trigger_prototypes:
                 -
                   uuid: 71d259fbdcd74888a4bedc646fc4bc54
@@ -451,6 +502,10 @@ zabbix_export:
                   name: 'GridGain [{#JMXIGNITEINSTANCENAME}]: Number of queued jobs is too high (over {$GRIDGAIN.JOBS.QUEUE.MAX.WARN} for 15 min)'
                   priority: WARNING
                   description: 'Number of queued jobs is over {$GRIDGAIN.JOBS.QUEUE.MAX.WARN}.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: ec0c25c202ff4b1ea47422b51c24d3b4
               name: 'GridGain [{#JMXIGNITEINSTANCENAME}]: Heap memory used'
@@ -464,8 +519,11 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'GridGain instance [{#JMXIGNITEINSTANCENAME}]'
+                  tag: component
+                  value: memory
+                -
+                  tag: component
+                  value: node
             -
               uuid: a698da07a1794c479db9948a5ffb4123
               name: 'GridGain [{#JMXIGNITEINSTANCENAME}]: Jobs cancelled, rate'
@@ -484,8 +542,11 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'GridGain instance [{#JMXIGNITEINSTANCENAME}]'
+                  tag: component
+                  value: job
+                -
+                  tag: component
+                  value: node
             -
               uuid: 5a60a71ecd2d40af8ca2ca81712c287e
               name: 'GridGain [{#JMXIGNITEINSTANCENAME}]: Jobs executed, rate'
@@ -504,8 +565,11 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'GridGain instance [{#JMXIGNITEINSTANCENAME}]'
+                  tag: component
+                  value: job
+                -
+                  tag: component
+                  value: node
             -
               uuid: 7673741944094af9a6bc05bd630fd055
               name: 'GridGain [{#JMXIGNITEINSTANCENAME}]: Jobs rejects, rate'
@@ -524,8 +588,11 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'GridGain instance [{#JMXIGNITEINSTANCENAME}]'
+                  tag: component
+                  value: job
+                -
+                  tag: component
+                  value: node
           graph_prototypes:
             -
               uuid: ca84e5c7fc76473392a30a3073e9cb25
@@ -618,8 +685,8 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'GridGain instance [{#JMXIGNITEINSTANCENAME}]'
+                  tag: component
+                  value: node
             -
               uuid: 16ca4ca8efa04874902a619bce1f0071
               name: 'GridGain [{#JMXIGNITEINSTANCENAME}]: Nodes, Baseline'
@@ -637,8 +704,8 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'GridGain instance [{#JMXIGNITEINSTANCENAME}]'
+                  tag: component
+                  value: node
             -
               uuid: cf66620eeb6b4c9d88c2bd69ed05685a
               name: 'GridGain [{#JMXIGNITEINSTANCENAME}]: Nodes, Client'
@@ -656,8 +723,8 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'GridGain instance [{#JMXIGNITEINSTANCENAME}]'
+                  tag: component
+                  value: node
             -
               uuid: d74b4324fb5a446a92e6fcf89162eff5
               name: 'GridGain [{#JMXIGNITEINSTANCENAME}]: Nodes, total'
@@ -675,8 +742,8 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'GridGain instance [{#JMXIGNITEINSTANCENAME}]'
+                  tag: component
+                  value: node
             -
               uuid: b64a4ce1266b4806a554967d2fd24fa5
               name: 'GridGain [{#JMXIGNITEINSTANCENAME}]: Nodes, Server'
@@ -694,8 +761,8 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'GridGain instance [{#JMXIGNITEINSTANCENAME}]'
+                  tag: component
+                  value: node
               trigger_prototypes:
                 -
                   uuid: bf1fbe1ea3754da59bd8a510fbcc6f54
@@ -704,6 +771,10 @@ zabbix_export:
                   priority: INFO
                   description: 'One or more server node added to the topology. Ack to close.'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
                 -
                   uuid: db4cd7173ead4e878b79d55067d81300
                   expression: 'change(/GridGain by JMX/jmx["{#JMXOBJ}",TotalServerNodes])<0'
@@ -711,6 +782,10 @@ zabbix_export:
                   priority: WARNING
                   description: 'One or more server node left the topology. Ack to close.'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
           trigger_prototypes:
             -
               uuid: ea93cb34b6434f2e94095c28087fc18e
@@ -719,6 +794,10 @@ zabbix_export:
               priority: INFO
               description: 'One or more server node left the topology. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           preprocessing:
             -
@@ -769,8 +848,8 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'GridGain instance [{#JMXIGNITEINSTANCENAME}]'
+                  tag: component
+                  value: kernal
               trigger_prototypes:
                 -
                   uuid: 4cc201fb67664fc49d36bbec95b574ce
@@ -779,6 +858,10 @@ zabbix_export:
                   priority: INFO
                   description: 'GridGain [{#JMXIGNITEINSTANCENAME}] version has changed. Ack to close.'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 18f518b41e804f7cb3eeaaf92fef40e7
               name: 'GridGain [{#JMXIGNITEINSTANCENAME}]: Local node ID'
@@ -798,8 +881,8 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'GridGain instance [{#JMXIGNITEINSTANCENAME}]'
+                  tag: component
+                  value: kernal
             -
               uuid: 4b3c99a88fbf4485a3dbf5efa2723ca7
               name: 'GridGain [{#JMXIGNITEINSTANCENAME}]: Uptime'
@@ -818,8 +901,8 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'GridGain instance [{#JMXIGNITEINSTANCENAME}]'
+                  tag: component
+                  value: kernal
               trigger_prototypes:
                 -
                   uuid: d7b2be3a707f49d2897e7cce356cafa5
@@ -828,6 +911,10 @@ zabbix_export:
                   priority: WARNING
                   description: 'Zabbix has not received data for items for the last 10 minutes.'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
                 -
                   uuid: 23cd9dbb498f4bb095ec8be1693fccf0
                   expression: 'last(/GridGain by JMX/jmx["{#JMXOBJ}",UpTime])<10m'
@@ -835,6 +922,10 @@ zabbix_export:
                   priority: INFO
                   description: 'Uptime is less than 10 minutes'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           preprocessing:
             -
@@ -873,8 +964,11 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'GridGain instance [{#JMXIGNITEINSTANCENAME}]'
+                  tag: component
+                  value: messages
+                -
+                  tag: component
+                  value: network
             -
               uuid: 2a01c4dc23b34df6801be0901bf10ab0
               name: 'GridGain [{#JMXIGNITEINSTANCENAME}]: Communication messages received, rate'
@@ -894,8 +988,11 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'GridGain instance [{#JMXIGNITEINSTANCENAME}]'
+                  tag: component
+                  value: messages
+                -
+                  tag: component
+                  value: network
             -
               uuid: 613114b7abb94bd5bbabc2d1d19975b7
               name: 'GridGain [{#JMXIGNITEINSTANCENAME}]: Communication reconnect rate'
@@ -914,8 +1011,8 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'GridGain instance [{#JMXIGNITEINSTANCENAME}]'
+                  tag: component
+                  value: network
             -
               uuid: e015293ddbb540e4b6b59ba6e28ed91e
               name: 'GridGain [{#JMXIGNITEINSTANCENAME}]: Communication messages sent, rate'
@@ -935,8 +1032,11 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'GridGain instance [{#JMXIGNITEINSTANCENAME}]'
+                  tag: component
+                  value: messages
+                -
+                  tag: component
+                  value: network
           graph_prototypes:
             -
               uuid: ca090aa6d7e449e880b43cdbbd80d991
@@ -998,8 +1098,8 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'GridGain instance [{#JMXIGNITEINSTANCENAME}]'
+                  tag: component
+                  value: network
               trigger_prototypes:
                 -
                   uuid: 40641263a3d840e89e46ba6f57076a0a
@@ -1008,6 +1108,10 @@ zabbix_export:
                   priority: WARNING
                   description: 'GridGain [{#JMXIGNITEINSTANCENAME}] version has changed. Ack to close.'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 29d85d09951346c1a7c30acc83f404fc
               name: 'GridGain [{#JMXIGNITEINSTANCENAME}]: Discovery message worker queue'
@@ -1020,8 +1124,11 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'GridGain instance [{#JMXIGNITEINSTANCENAME}]'
+                  tag: component
+                  value: messages
+                -
+                  tag: component
+                  value: network
             -
               uuid: 0aed9a4269ff4718aa443d1b053fa31b
               name: 'GridGain [{#JMXIGNITEINSTANCENAME}]: Nodes failed'
@@ -1034,8 +1141,11 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'GridGain instance [{#JMXIGNITEINSTANCENAME}]'
+                  tag: component
+                  value: network
+                -
+                  tag: component
+                  value: nodes
             -
               uuid: 43ea840b621e4f2a8643ca38479eb73e
               name: 'GridGain [{#JMXIGNITEINSTANCENAME}]: Nodes joined'
@@ -1048,8 +1158,11 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'GridGain instance [{#JMXIGNITEINSTANCENAME}]'
+                  tag: component
+                  value: network
+                -
+                  tag: component
+                  value: nodes
             -
               uuid: 0164664362e446209b4399081d807ca7
               name: 'GridGain [{#JMXIGNITEINSTANCENAME}]: Nodes left'
@@ -1062,8 +1175,11 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'GridGain instance [{#JMXIGNITEINSTANCENAME}]'
+                  tag: component
+                  value: network
+                -
+                  tag: component
+                  value: nodes
             -
               uuid: e03329689c674ea997d55d11e1a0c2be
               name: 'GridGain [{#JMXIGNITEINSTANCENAME}]: Discovery reconnect, rate'
@@ -1082,8 +1198,11 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'GridGain instance [{#JMXIGNITEINSTANCENAME}]'
+                  tag: component
+                  value: network
+                -
+                  tag: component
+                  value: nodes
             -
               uuid: e344575b799a4f69b79b45ef6590a649
               name: 'GridGain [{#JMXIGNITEINSTANCENAME}]: TotalProcessedMessages'
@@ -1103,8 +1222,11 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'GridGain instance [{#JMXIGNITEINSTANCENAME}]'
+                  tag: component
+                  value: messages
+                -
+                  tag: component
+                  value: network
             -
               uuid: adcf2c5981004c8da658122cc50a6518
               name: 'GridGain [{#JMXIGNITEINSTANCENAME}]: Discovery messages received, rate'
@@ -1124,8 +1246,11 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'GridGain instance [{#JMXIGNITEINSTANCENAME}]'
+                  tag: component
+                  value: messages
+                -
+                  tag: component
+                  value: network
           graph_prototypes:
             -
               uuid: a44983a855934d3ea5d2eaa1421df147
@@ -1180,8 +1305,8 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'GridGain instance [{#JMXIGNITEINSTANCENAME}]'
+                  tag: component
+                  value: transactions
             -
               uuid: 446cbb708d354b2a9282e973d562527f
               name: 'GridGain [{#JMXIGNITEINSTANCENAME}]: Transactions owner, current'
@@ -1194,8 +1319,8 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'GridGain instance [{#JMXIGNITEINSTANCENAME}]'
+                  tag: component
+                  value: transactions
             -
               uuid: 21971cbf540c48df93fde079ce917a26
               name: 'GridGain [{#JMXIGNITEINSTANCENAME}]: Transactions committed, rate'
@@ -1209,8 +1334,8 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'GridGain instance [{#JMXIGNITEINSTANCENAME}]'
+                  tag: component
+                  value: transactions
             -
               uuid: d8d3e05c6e7e4874b3149edb74774e6d
               name: 'GridGain [{#JMXIGNITEINSTANCENAME}]: Transactions holding lock, current'
@@ -1223,8 +1348,8 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'GridGain instance [{#JMXIGNITEINSTANCENAME}]'
+                  tag: component
+                  value: transactions
             -
               uuid: 2d1def1d4f414ce992cf5a6ff1bc4204
               name: 'GridGain [{#JMXIGNITEINSTANCENAME}]: Transactions rolledback, rate'
@@ -1238,8 +1363,8 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'GridGain instance [{#JMXIGNITEINSTANCENAME}]'
+                  tag: component
+                  value: transactions
           graph_prototypes:
             -
               uuid: 82d772972cec4454b95d69343040b2b5
@@ -1321,8 +1446,8 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'GridGain [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXNAME}]'
+                  tag: component
+                  value: cache_group
             -
               uuid: a535d161527b4821b717f114aaeb8b0b
               name: 'Cache group [{#JMXNAME}]: Caches'
@@ -1342,8 +1467,8 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'GridGain [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXNAME}]'
+                  tag: component
+                  value: cache_group
               trigger_prototypes:
                 -
                   uuid: 94d82f9db4f449e491782e14f6973f9b
@@ -1352,6 +1477,10 @@ zabbix_export:
                   priority: INFO
                   description: 'List of caches has changed. Significant changes have occurred in the cluster. Ack to close.'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 0a09c18adfd5477098684c47927f967b
               name: 'Cache group [{#JMXNAME}]: Local node partitions, moving'
@@ -1364,8 +1493,8 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'GridGain [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXNAME}]'
+                  tag: component
+                  value: cache_group
               trigger_prototypes:
                 -
                   uuid: 84e1402b3ae64960ad997d2610137927
@@ -1374,6 +1503,10 @@ zabbix_export:
                   priority: INFO
                   description: 'Ack to close.'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: c2a38de3743549e0850e678d1f91e2de
               name: 'Cache group [{#JMXNAME}]: Local node partitions, owning'
@@ -1386,8 +1519,8 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'GridGain [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXNAME}]'
+                  tag: component
+                  value: cache_group
             -
               uuid: be9b2cbf210e4e27a5887d77f2dafaad
               name: 'Cache group [{#JMXNAME}]: Local node entries, renting'
@@ -1400,8 +1533,8 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'GridGain [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXNAME}]'
+                  tag: component
+                  value: cache_group
             -
               uuid: 582acb454ffa4b129f5786e814df234f
               name: 'Cache group [{#JMXNAME}]: Local node partitions, renting'
@@ -1414,8 +1547,8 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'GridGain [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXNAME}]'
+                  tag: component
+                  value: cache_group
             -
               uuid: e026169754954bbe85afcef2534b4d0e
               name: 'Cache group [{#JMXNAME}]: Partition copies, max'
@@ -1428,8 +1561,8 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'GridGain [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXNAME}]'
+                  tag: component
+                  value: cache_group
             -
               uuid: b93a9ff86a2048bfbf8743b7a1c5ec06
               name: 'Cache group [{#JMXNAME}]: Partition copies, min'
@@ -1442,14 +1575,18 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'GridGain [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXNAME}]'
+                  tag: component
+                  value: cache_group
               trigger_prototypes:
                 -
                   uuid: 63c244c02ace4ac4a8d6f60e5c533890
                   expression: 'max(/GridGain by JMX/jmx["{#JMXOBJ}",MinimumNumberOfPartitionCopies],30m)=0'
                   name: 'Cache group [{#JMXNAME}]: There is no copy for partitions'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
             -
               uuid: 8dac4ccaad0f4736b2065e2f1200e3ff
               name: 'Cache group [{#JMXNAME}]: Partitions'
@@ -1462,14 +1599,18 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'GridGain [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXNAME}]'
+                  tag: component
+                  value: cache_group
           trigger_prototypes:
             -
               uuid: 3ded54fcdad74c83b47543410a7d9b3c
               expression: 'min(/GridGain by JMX/jmx["{#JMXOBJ}",Backups],5m)>=max(/GridGain by JMX/jmx["{#JMXOBJ}",MinimumNumberOfPartitionCopies],5m)'
               name: 'Cache group [{#JMXNAME}]: One or more backups are unavailable'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: capacity
           graph_prototypes:
             -
               uuid: da32480debef4e2baec58a7cf1131357
@@ -1553,8 +1694,8 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'GridGain [{#JMXIGNITEINSTANCENAME}]: Thread pool [{#JMXNAME}]'
+                  tag: component
+                  value: thread_pool
             -
               uuid: 3ffebf40ed154a7eb7050e16d30f9f53
               name: 'Thread pool [{#JMXNAME}]: Pool size, max'
@@ -1568,8 +1709,8 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'GridGain [{#JMXIGNITEINSTANCENAME}]: Thread pool [{#JMXNAME}]'
+                  tag: component
+                  value: thread_pool
             -
               uuid: 1f7f5e0d19f6400fa8803eba2fb14f85
               name: 'Thread pool [{#JMXNAME}]: Pool size'
@@ -1583,8 +1724,8 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'GridGain [{#JMXIGNITEINSTANCENAME}]: Thread pool [{#JMXNAME}]'
+                  tag: component
+                  value: thread_pool
             -
               uuid: c4a5e348590341b29af96b57bf92240b
               name: 'Thread pool [{#JMXNAME}]: Queue size'
@@ -1598,8 +1739,8 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'GridGain [{#JMXIGNITEINSTANCENAME}]: Thread pool [{#JMXNAME}]'
+                  tag: component
+                  value: thread_pool
               trigger_prototypes:
                 -
                   uuid: f2a7aa098ed245f48b455ed747ee42c3
@@ -1607,6 +1748,10 @@ zabbix_export:
                   name: 'Thread pool [{#JMXNAME}]: Too many messages in queue (over {$GRIDGAIN.THREAD.QUEUE.MAX.WARN:"{#JMXNAME}"} for 5 min)'
                   priority: AVERAGE
                   description: 'Number of messages in queue more than {$GRIDGAIN.THREAD.QUEUE.MAX.WARN:"{#JMXNAME}"}.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: d3db21cd80664dc4b6847456e15b2b3e
@@ -1690,8 +1835,8 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'GridGain [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXGROUP}]'
+                  tag: component
+                  value: cache
             -
               uuid: 632a331fe886428fa7b2c8845a02b57a
               name: 'Cache group [{#JMXGROUP}]: Cache hits, pct'
@@ -1706,8 +1851,8 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'GridGain [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXGROUP}]'
+                  tag: component
+                  value: cache
             -
               uuid: 843b31df2e4d430082731b44e2653f13
               name: 'Cache group [{#JMXGROUP}]: Cache misses, pct'
@@ -1722,8 +1867,8 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'GridGain [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXGROUP}]'
+                  tag: component
+                  value: cache
             -
               uuid: 96616d8c2b9c46b0bbd7350679476c36
               name: 'Cache group [{#JMXGROUP}]: Cache puts, rate'
@@ -1743,8 +1888,8 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'GridGain [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXGROUP}]'
+                  tag: component
+                  value: cache
             -
               uuid: 308b3e27d35b439bbb2c1cf96f6d92fe
               name: 'Cache group [{#JMXGROUP}]: Cache removals, rate'
@@ -1764,8 +1909,8 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'GridGain [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXGROUP}]'
+                  tag: component
+                  value: cache
             -
               uuid: e4886d5b699e432c8e6bb47b23b9c314
               name: 'Cache group [{#JMXGROUP}]: Cache size'
@@ -1779,8 +1924,8 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'GridGain [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXGROUP}]'
+                  tag: component
+                  value: cache
             -
               uuid: 304ff6af92c0473aab8216d16509d28f
               name: 'Cache group [{#JMXGROUP}]: Cache transaction commits, rate'
@@ -1800,8 +1945,8 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'GridGain [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXGROUP}]'
+                  tag: component
+                  value: cache
             -
               uuid: bd5b517d5a384c70a070658bc41734bf
               name: 'Cache group [{#JMXGROUP}]: Cache transaction rollbacks, rate'
@@ -1821,8 +1966,8 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'GridGain [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXGROUP}]'
+                  tag: component
+                  value: cache
             -
               uuid: a0d3a73939564dc39267ccdca06d524b
               name: 'Cache group [{#JMXGROUP}]: Cache heap entries'
@@ -1841,8 +1986,8 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'GridGain [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXGROUP}]'
+                  tag: component
+                  value: cache
           trigger_prototypes:
             -
               uuid: cfe03901890a4377ad8d5dcc7be3e0c5
@@ -1851,6 +1996,10 @@ zabbix_export:
               priority: INFO
               description: 'All entries are in heap. Possibly you use eager queries it may cause out of memory exceptions for big caches. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 1c990b38154340a3aab678ac1365cf7e
               expression: 'min(/GridGain by JMX/jmx["{#JMXOBJ}",CacheTxRollbacks],5m) > max(/GridGain by JMX/jmx["{#JMXOBJ}",CacheTxCommits],5m)'
@@ -1860,11 +2009,19 @@ zabbix_export:
                 -
                   name: 'Cache group [{#JMXGROUP}]: There are no success transactions for cache for 5m'
                   expression: 'min(/GridGain by JMX/jmx["{#JMXOBJ}",CacheTxRollbacks],5m)>0 and max(/GridGain by JMX/jmx["{#JMXOBJ}",CacheTxCommits],5m)=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 2caa406da4cf4d089705e5506fd589f1
               expression: 'min(/GridGain by JMX/jmx["{#JMXOBJ}",CacheTxRollbacks],5m)>0 and max(/GridGain by JMX/jmx["{#JMXOBJ}",CacheTxCommits],5m)=0'
               name: 'Cache group [{#JMXGROUP}]: There are no success transactions for cache for 5m'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: 8c453a6631b34c96b39375aff2e51ac3
@@ -1938,6 +2095,13 @@ zabbix_export:
               type: DISCARD_UNCHANGED_HEARTBEAT
               parameters:
                 - 3h
+      tags:
+        -
+          tag: class
+          value: software
+        -
+          tag: target
+          value: gridgain
       macros:
         -
           macro: '{$GRIDGAIN.CHECKPOINT.PUSED.MAX.HIGH}'
diff --git a/templates/db/ignite_jmx/template_db_ignite_jmx.yaml b/templates/db/ignite_jmx/template_db_ignite_jmx.yaml
index 5f7b40ec93b..35a76e6bb40 100644
--- a/templates/db/ignite_jmx/template_db_ignite_jmx.yaml
+++ b/templates/db/ignite_jmx/template_db_ignite_jmx.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-10T07:41:32Z'
+  date: '2022-01-26T10:39:15Z'
   groups:
     -
       uuid: 748ad4d098d447d492bb935c907f652f
@@ -19,7 +19,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Databases
@@ -59,8 +59,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Ignite [{#JMXIGNITEINSTANCENAME}]: Data region [{#JMXNAME}]'
+                  tag: component
+                  value: ignite
+                -
+                  tag: data-region
+                  value: '{#JMXNAME}'
+                -
+                  tag: instance-name
+                  value: '{#JMXIGNITEINSTANCENAME}'
             -
               uuid: 9b3528eb623c4fdda10228671268bcdb
               name: 'Data region {#JMXNAME}: Checkpoint buffer size'
@@ -75,8 +81,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Ignite [{#JMXIGNITEINSTANCENAME}]: Data region [{#JMXNAME}]'
+                  tag: component
+                  value: ignite
+                -
+                  tag: data-region
+                  value: '{#JMXNAME}'
+                -
+                  tag: instance-name
+                  value: '{#JMXIGNITEINSTANCENAME}'
             -
               uuid: 21f8fc17522d40cc8723053e8ed8716f
               name: 'Data region {#JMXNAME}: Dirty pages'
@@ -90,8 +102,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Ignite [{#JMXIGNITEINSTANCENAME}]: Data region [{#JMXNAME}]'
+                  tag: component
+                  value: ignite
+                -
+                  tag: data-region
+                  value: '{#JMXNAME}'
+                -
+                  tag: instance-name
+                  value: '{#JMXIGNITEINSTANCENAME}'
             -
               uuid: 8bcc78ee4e984f9c8c07b60e5dd35c42
               name: 'Data region {#JMXNAME}: Eviction, rate'
@@ -106,8 +124,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Ignite [{#JMXIGNITEINSTANCENAME}]: Data region [{#JMXNAME}]'
+                  tag: component
+                  value: ignite
+                -
+                  tag: data-region
+                  value: '{#JMXNAME}'
+                -
+                  tag: instance-name
+                  value: '{#JMXIGNITEINSTANCENAME}'
               trigger_prototypes:
                 -
                   uuid: e210c54ba16f4d879d8a4fb88c365c53
@@ -116,6 +140,10 @@ zabbix_export:
                   priority: INFO
                   description: 'You store more data than region can accommodate. Data started to move to disk it can make requests work slower. Ack to close.'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
             -
               uuid: 7fa689749cd64474af294976e4bc7762
               name: 'Data region {#JMXNAME}: Size, max'
@@ -130,8 +158,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Ignite [{#JMXIGNITEINSTANCENAME}]: Data region [{#JMXNAME}]'
+                  tag: component
+                  value: ignite
+                -
+                  tag: data-region
+                  value: '{#JMXNAME}'
+                -
+                  tag: instance-name
+                  value: '{#JMXIGNITEINSTANCENAME}'
             -
               uuid: bb0dd42c5a3c400f95a7084792e7522e
               name: 'Data region {#JMXNAME}: Offheap size'
@@ -146,8 +180,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Ignite [{#JMXIGNITEINSTANCENAME}]: Data region [{#JMXNAME}]'
+                  tag: component
+                  value: ignite
+                -
+                  tag: data-region
+                  value: '{#JMXNAME}'
+                -
+                  tag: instance-name
+                  value: '{#JMXIGNITEINSTANCENAME}'
             -
               uuid: a793c5e41891467fb3ee53722f9fae13
               name: 'Data region {#JMXNAME}: Offheap used size'
@@ -162,8 +202,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Ignite [{#JMXIGNITEINSTANCENAME}]: Data region [{#JMXNAME}]'
+                  tag: component
+                  value: ignite
+                -
+                  tag: data-region
+                  value: '{#JMXNAME}'
+                -
+                  tag: instance-name
+                  value: '{#JMXIGNITEINSTANCENAME}'
             -
               uuid: b4fb229defdb434b8307d91e2f17f5db
               name: 'Data region {#JMXNAME}: Pages fill factor'
@@ -178,8 +224,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Ignite [{#JMXIGNITEINSTANCENAME}]: Data region [{#JMXNAME}]'
+                  tag: component
+                  value: ignite
+                -
+                  tag: data-region
+                  value: '{#JMXNAME}'
+                -
+                  tag: instance-name
+                  value: '{#JMXIGNITEINSTANCENAME}'
             -
               uuid: 4ca77d42a8f44e278b44417d33094535
               name: 'Data region {#JMXNAME}: Pages replace, rate'
@@ -194,8 +246,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Ignite [{#JMXIGNITEINSTANCENAME}]: Data region [{#JMXNAME}]'
+                  tag: component
+                  value: ignite
+                -
+                  tag: data-region
+                  value: '{#JMXNAME}'
+                -
+                  tag: instance-name
+                  value: '{#JMXIGNITEINSTANCENAME}'
               trigger_prototypes:
                 -
                   uuid: 70ef41de47b2463a9c580e790754a49c
@@ -203,6 +261,13 @@ zabbix_export:
                   name: 'Data region {#JMXNAME}: Pages replace rate more than 0'
                   priority: WARNING
                   description: 'There is more data than DataRegionMaxSize. Cluster started to replace pages in memory. Page replacement can slow down operations.'
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: b62d56147b3d43aebd1f3c9eb13a8e05
               name: 'Data region {#JMXNAME}: Allocated, bytes'
@@ -217,8 +282,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Ignite [{#JMXIGNITEINSTANCENAME}]: Data region [{#JMXNAME}]'
+                  tag: component
+                  value: ignite
+                -
+                  tag: data-region
+                  value: '{#JMXNAME}'
+                -
+                  tag: instance-name
+                  value: '{#JMXIGNITEINSTANCENAME}'
             -
               uuid: 14b02d5526c44f2599e1893b815b1d2b
               name: 'Data region {#JMXNAME}: Used checkpoint buffer size'
@@ -233,8 +304,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Ignite [{#JMXIGNITEINSTANCENAME}]: Data region [{#JMXNAME}]'
+                  tag: component
+                  value: ignite
+                -
+                  tag: data-region
+                  value: '{#JMXNAME}'
+                -
+                  tag: instance-name
+                  value: '{#JMXIGNITEINSTANCENAME}'
           trigger_prototypes:
             -
               uuid: 480b7cc1a967436b8620f9552f8ac4f6
@@ -242,6 +319,10 @@ zabbix_export:
               name: 'Data region {#JMXNAME}: Checkpoint buffer utilization is too high (over {$IGNITE.CHECKPOINT.PUSED.MAX.HIGH} in 5m)'
               priority: HIGH
               description: 'Checkpoint buffer utilization is high. Threads will be throttled to avoid buffer overflow. It can be caused by high disk utilization.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
             -
               uuid: 67eddf17affd49b7844cd0846bc56f7d
               expression: 'min(/Ignite by JMX/jmx["{#JMXOBJ}",UsedCheckpointBufferSize],5m)/last(/Ignite by JMX/jmx["{#JMXOBJ}",CheckpointBufferSize])*100>{$IGNITE.CHECKPOINT.PUSED.MAX.WARN}'
@@ -252,12 +333,20 @@ zabbix_export:
                 -
                   name: 'Data region {#JMXNAME}: Checkpoint buffer utilization is too high (over {$IGNITE.CHECKPOINT.PUSED.MAX.HIGH} in 5m)'
                   expression: 'min(/Ignite by JMX/jmx["{#JMXOBJ}",UsedCheckpointBufferSize],5m)/last(/Ignite by JMX/jmx["{#JMXOBJ}",CheckpointBufferSize])*100>{$IGNITE.CHECKPOINT.PUSED.MAX.HIGH}'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
             -
               uuid: 736fbc965aa448309d022de34354decf
               expression: 'min(/Ignite by JMX/jmx["{#JMXOBJ}",OffheapUsedSize],5m)/last(/Ignite by JMX/jmx["{#JMXOBJ}",OffHeapSize])*100>{$IGNITE.DATA.REGION.PUSED.MAX.HIGH}'
               name: 'Data region {#JMXNAME}: Data region utilization is too high (over {$IGNITE.DATA.REGION.PUSED.MAX.HIGH} in 5m)'
               priority: HIGH
               description: 'Data region utilization is high. Increase data region size or delete any data.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
             -
               uuid: 6ded19e7616b45f08e37e716d8256c5e
               expression: 'min(/Ignite by JMX/jmx["{#JMXOBJ}",OffheapUsedSize],5m)/last(/Ignite by JMX/jmx["{#JMXOBJ}",OffHeapSize])*100>{$IGNITE.DATA.REGION.PUSED.MAX.WARN}'
@@ -268,6 +357,10 @@ zabbix_export:
                 -
                   name: 'Data region {#JMXNAME}: Data region utilization is too high (over {$IGNITE.DATA.REGION.PUSED.MAX.HIGH} in 5m)'
                   expression: 'min(/Ignite by JMX/jmx["{#JMXOBJ}",OffheapUsedSize],5m)/last(/Ignite by JMX/jmx["{#JMXOBJ}",OffHeapSize])*100>{$IGNITE.DATA.REGION.PUSED.MAX.HIGH}'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
           graph_prototypes:
             -
               uuid: 0ac5a59cc5a64e2ea6bc6e266919ecca
@@ -343,8 +436,11 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Ignite instance [{#JMXIGNITEINSTANCENAME}]'
+                  tag: component
+                  value: ignite
+                -
+                  tag: instance-name
+                  value: '{#JMXIGNITEINSTANCENAME}'
             -
               uuid: 13b1867082c340d0a6f317c94376a055
               name: 'Ignite [{#JMXIGNITEINSTANCENAME}]: Jobs cancelled, current'
@@ -357,8 +453,11 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Ignite instance [{#JMXIGNITEINSTANCENAME}]'
+                  tag: component
+                  value: ignite
+                -
+                  tag: instance-name
+                  value: '{#JMXIGNITEINSTANCENAME}'
             -
               uuid: 832c3683406c460c826522f8b2e3aafa
               name: 'Ignite [{#JMXIGNITEINSTANCENAME}]: PME duration, current'
@@ -372,8 +471,11 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Ignite instance [{#JMXIGNITEINSTANCENAME}]'
+                  tag: component
+                  value: ignite
+                -
+                  tag: instance-name
+                  value: '{#JMXIGNITEINSTANCENAME}'
               trigger_prototypes:
                 -
                   uuid: 81587d91606348a6b5385d4b59331adf
@@ -381,6 +483,10 @@ zabbix_export:
                   name: 'Ignite [{#JMXIGNITEINSTANCENAME}]: PME duration is too long (over {$IGNITE.PME.DURATION.MAX.HIGH} for 5 min)'
                   priority: HIGH
                   description: 'PME duration is over {$IGNITE.PME.DURATION.MAX.HIGH}ms. Looks like PME is hung.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 0de7ca62c7044e48a8931cf0dfe8ce34
                   expression: 'min(/Ignite by JMX/jmx["{#JMXOBJ}",CurrentPmeDuration],5m) > {$IGNITE.PME.DURATION.MAX.WARN}'
@@ -391,6 +497,10 @@ zabbix_export:
                     -
                       name: 'Ignite [{#JMXIGNITEINSTANCENAME}]: PME duration is too long (over {$IGNITE.PME.DURATION.MAX.HIGH} for 5 min)'
                       expression: 'min(/Ignite by JMX/jmx["{#JMXOBJ}",CurrentPmeDuration],5m) > {$IGNITE.PME.DURATION.MAX.HIGH}'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 6b68ba90e40b4fa0a798dfde64ba8f01
               name: 'Ignite [{#JMXIGNITEINSTANCENAME}]: Jobs rejected, current'
@@ -403,8 +513,11 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Ignite instance [{#JMXIGNITEINSTANCENAME}]'
+                  tag: component
+                  value: ignite
+                -
+                  tag: instance-name
+                  value: '{#JMXIGNITEINSTANCENAME}'
             -
               uuid: c459658bf32f4ca5aac6cfe1f8a8cc5b
               name: 'Ignite [{#JMXIGNITEINSTANCENAME}]: Threads count, current'
@@ -417,8 +530,11 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Ignite instance [{#JMXIGNITEINSTANCENAME}]'
+                  tag: component
+                  value: ignite
+                -
+                  tag: instance-name
+                  value: '{#JMXIGNITEINSTANCENAME}'
               trigger_prototypes:
                 -
                   uuid: 8c4ddb0485464c409077f86241956a56
@@ -430,6 +546,10 @@ zabbix_export:
                     -
                       name: 'Ignite [{#JMXIGNITEINSTANCENAME}]: PME duration is too long (over {$IGNITE.PME.DURATION.MAX.HIGH} for 5 min)'
                       expression: 'min(/Ignite by JMX/jmx["{#JMXOBJ}",CurrentPmeDuration],5m) > {$IGNITE.PME.DURATION.MAX.HIGH}'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: e29b01d139bd4d7e8248ccddb2a19baa
               name: 'Ignite [{#JMXIGNITEINSTANCENAME}]: Jobs waiting, current'
@@ -442,8 +562,11 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Ignite instance [{#JMXIGNITEINSTANCENAME}]'
+                  tag: component
+                  value: ignite
+                -
+                  tag: instance-name
+                  value: '{#JMXIGNITEINSTANCENAME}'
               trigger_prototypes:
                 -
                   uuid: a723fdecd1b34609b92bb351b1b44a46
@@ -451,6 +574,10 @@ zabbix_export:
                   name: 'Ignite [{#JMXIGNITEINSTANCENAME}]: Number of queued jobs is too high (over {$IGNITE.JOBS.QUEUE.MAX.WARN} for 15 min)'
                   priority: WARNING
                   description: 'Number of queued jobs is over {$IGNITE.JOBS.QUEUE.MAX.WARN}.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 5f61ae253e4f459ebc403ca69d85a617
               name: 'Ignite [{#JMXIGNITEINSTANCENAME}]: Heap memory used'
@@ -464,8 +591,11 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Ignite instance [{#JMXIGNITEINSTANCENAME}]'
+                  tag: component
+                  value: ignite
+                -
+                  tag: instance-name
+                  value: '{#JMXIGNITEINSTANCENAME}'
             -
               uuid: 923c561a1a504ce399bf6b1892e29a3e
               name: 'Ignite [{#JMXIGNITEINSTANCENAME}]: Jobs cancelled, rate'
@@ -484,8 +614,11 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Ignite instance [{#JMXIGNITEINSTANCENAME}]'
+                  tag: component
+                  value: ignite
+                -
+                  tag: instance-name
+                  value: '{#JMXIGNITEINSTANCENAME}'
             -
               uuid: d6044f18b5e741818ca299ce8b19ccdb
               name: 'Ignite [{#JMXIGNITEINSTANCENAME}]: Jobs executed, rate'
@@ -504,8 +637,11 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Ignite instance [{#JMXIGNITEINSTANCENAME}]'
+                  tag: component
+                  value: ignite
+                -
+                  tag: instance-name
+                  value: '{#JMXIGNITEINSTANCENAME}'
             -
               uuid: 15135ffe1ec74e8c920ee4c70b986904
               name: 'Ignite [{#JMXIGNITEINSTANCENAME}]: Jobs rejects, rate'
@@ -524,8 +660,11 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Ignite instance [{#JMXIGNITEINSTANCENAME}]'
+                  tag: component
+                  value: ignite
+                -
+                  tag: instance-name
+                  value: '{#JMXIGNITEINSTANCENAME}'
           graph_prototypes:
             -
               uuid: 40e5feb97990445da11d8d8f49643882
@@ -618,8 +757,11 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Ignite instance [{#JMXIGNITEINSTANCENAME}]'
+                  tag: component
+                  value: ignite
+                -
+                  tag: instance-name
+                  value: '{#JMXIGNITEINSTANCENAME}'
             -
               uuid: 4edffa6b8f294d959797a5c6ca4ccc5a
               name: 'Ignite [{#JMXIGNITEINSTANCENAME}]: Nodes, Baseline'
@@ -637,8 +779,11 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Ignite instance [{#JMXIGNITEINSTANCENAME}]'
+                  tag: component
+                  value: ignite
+                -
+                  tag: instance-name
+                  value: '{#JMXIGNITEINSTANCENAME}'
             -
               uuid: a4116287c8a34359a46eff1217f7418d
               name: 'Ignite [{#JMXIGNITEINSTANCENAME}]: Nodes, Client'
@@ -656,8 +801,11 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Ignite instance [{#JMXIGNITEINSTANCENAME}]'
+                  tag: component
+                  value: ignite
+                -
+                  tag: instance-name
+                  value: '{#JMXIGNITEINSTANCENAME}'
             -
               uuid: 517a320bd6964ec7906bf6b0408d834b
               name: 'Ignite [{#JMXIGNITEINSTANCENAME}]: Nodes, total'
@@ -675,8 +823,11 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Ignite instance [{#JMXIGNITEINSTANCENAME}]'
+                  tag: component
+                  value: ignite
+                -
+                  tag: instance-name
+                  value: '{#JMXIGNITEINSTANCENAME}'
             -
               uuid: 9cfa72ba360840d9b87de9c59b780529
               name: 'Ignite [{#JMXIGNITEINSTANCENAME}]: Nodes, Server'
@@ -694,8 +845,11 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Ignite instance [{#JMXIGNITEINSTANCENAME}]'
+                  tag: component
+                  value: ignite
+                -
+                  tag: instance-name
+                  value: '{#JMXIGNITEINSTANCENAME}'
               trigger_prototypes:
                 -
                   uuid: e2c38e56189d4ed79bac6bd4ca8e477c
@@ -704,6 +858,13 @@ zabbix_export:
                   priority: INFO
                   description: 'One or more server node added to the topology. Ack to close.'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: 81efb2805dbc49719a316d1992aaac3a
                   expression: 'change(/Ignite by JMX/jmx["{#JMXOBJ}",TotalServerNodes])<0'
@@ -711,6 +872,13 @@ zabbix_export:
                   priority: WARNING
                   description: 'One or more server node left the topology. Ack to close.'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: notice
           trigger_prototypes:
             -
               uuid: 17f9fd03d3144812bf776c0f8ca836e4
@@ -719,6 +887,13 @@ zabbix_export:
               priority: INFO
               description: 'One or more server node left the topology. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: notice
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           preprocessing:
             -
@@ -769,8 +944,11 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Ignite instance [{#JMXIGNITEINSTANCENAME}]'
+                  tag: component
+                  value: ignite
+                -
+                  tag: instance-name
+                  value: '{#JMXIGNITEINSTANCENAME}'
               trigger_prototypes:
                 -
                   uuid: 08a1f4bd227e4f96b501a4681bf9fc8f
@@ -779,6 +957,10 @@ zabbix_export:
                   priority: INFO
                   description: 'Ignite [{#JMXIGNITEINSTANCENAME}] version has changed. Ack to close.'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: cfa6cb5b02634c9d803b7c3a0774a7ce
               name: 'Ignite [{#JMXIGNITEINSTANCENAME}]: Local node ID'
@@ -798,8 +980,11 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Ignite instance [{#JMXIGNITEINSTANCENAME}]'
+                  tag: component
+                  value: ignite
+                -
+                  tag: instance-name
+                  value: '{#JMXIGNITEINSTANCENAME}'
             -
               uuid: d48d3694467e4153af369475672e4811
               name: 'Ignite [{#JMXIGNITEINSTANCENAME}]: Uptime'
@@ -818,8 +1003,11 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Ignite instance [{#JMXIGNITEINSTANCENAME}]'
+                  tag: component
+                  value: ignite
+                -
+                  tag: instance-name
+                  value: '{#JMXIGNITEINSTANCENAME}'
               trigger_prototypes:
                 -
                   uuid: d90f8b10d32240d882317bf9fb628eae
@@ -828,6 +1016,10 @@ zabbix_export:
                   priority: WARNING
                   description: 'Zabbix has not received data for items for the last 10 minutes.'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
                 -
                   uuid: f3415dd32a3b450f80b29b83bd54fdef
                   expression: 'last(/Ignite by JMX/jmx["{#JMXOBJ}",UpTime])<10m'
@@ -835,6 +1027,10 @@ zabbix_export:
                   priority: INFO
                   description: 'Uptime is less than 10 minutes'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
           jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
           preprocessing:
             -
@@ -873,8 +1069,11 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Ignite instance [{#JMXIGNITEINSTANCENAME}]'
+                  tag: component
+                  value: ignite
+                -
+                  tag: instance-name
+                  value: '{#JMXIGNITEINSTANCENAME}'
             -
               uuid: 8a25c98dd3374e78ba26cebea1eaaebc
               name: 'Ignite [{#JMXIGNITEINSTANCENAME}]: Communication messages received, rate'
@@ -894,8 +1093,11 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Ignite instance [{#JMXIGNITEINSTANCENAME}]'
+                  tag: component
+                  value: ignite
+                -
+                  tag: instance-name
+                  value: '{#JMXIGNITEINSTANCENAME}'
             -
               uuid: 6eacaf2c8e9e4f53991d547f81731780
               name: 'Ignite [{#JMXIGNITEINSTANCENAME}]: Communication messages sent, rate'
@@ -915,8 +1117,11 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Ignite instance [{#JMXIGNITEINSTANCENAME}]'
+                  tag: component
+                  value: ignite
+                -
+                  tag: instance-name
+                  value: '{#JMXIGNITEINSTANCENAME}'
           graph_prototypes:
             -
               uuid: 9a116cfc05bc46d1bab248048f125a78
@@ -978,8 +1183,11 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Ignite instance [{#JMXIGNITEINSTANCENAME}]'
+                  tag: component
+                  value: ignite
+                -
+                  tag: instance-name
+                  value: '{#JMXIGNITEINSTANCENAME}'
               trigger_prototypes:
                 -
                   uuid: 82e24abcc7874382a2af0018a4a001e1
@@ -988,6 +1196,10 @@ zabbix_export:
                   priority: WARNING
                   description: 'Ignite [{#JMXIGNITEINSTANCENAME}] version has changed. Ack to close.'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 7b7a7edb2602436c8b53d6f9f4ea2236
               name: 'Ignite [{#JMXIGNITEINSTANCENAME}]: Discovery message worker queue'
@@ -1000,8 +1212,11 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Ignite instance [{#JMXIGNITEINSTANCENAME}]'
+                  tag: component
+                  value: ignite
+                -
+                  tag: instance-name
+                  value: '{#JMXIGNITEINSTANCENAME}'
             -
               uuid: d933d5036b1f41358130c512af1161c6
               name: 'Ignite [{#JMXIGNITEINSTANCENAME}]: Nodes failed'
@@ -1014,8 +1229,11 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Ignite instance [{#JMXIGNITEINSTANCENAME}]'
+                  tag: component
+                  value: ignite
+                -
+                  tag: instance-name
+                  value: '{#JMXIGNITEINSTANCENAME}'
             -
               uuid: 4464386c72704016a790371e8117896c
               name: 'Ignite [{#JMXIGNITEINSTANCENAME}]: Nodes joined'
@@ -1028,8 +1246,11 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Ignite instance [{#JMXIGNITEINSTANCENAME}]'
+                  tag: component
+                  value: ignite
+                -
+                  tag: instance-name
+                  value: '{#JMXIGNITEINSTANCENAME}'
             -
               uuid: fda81af6a86948b394b53f1ec505993a
               name: 'Ignite [{#JMXIGNITEINSTANCENAME}]: Nodes left'
@@ -1042,8 +1263,11 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Ignite instance [{#JMXIGNITEINSTANCENAME}]'
+                  tag: component
+                  value: ignite
+                -
+                  tag: instance-name
+                  value: '{#JMXIGNITEINSTANCENAME}'
             -
               uuid: 57aeab81263f45fba8189347d5446045
               name: 'Ignite [{#JMXIGNITEINSTANCENAME}]: Discovery reconnect, rate'
@@ -1062,8 +1286,11 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Ignite instance [{#JMXIGNITEINSTANCENAME}]'
+                  tag: component
+                  value: ignite
+                -
+                  tag: instance-name
+                  value: '{#JMXIGNITEINSTANCENAME}'
             -
               uuid: 615e7eb22a2d46ab863628d40bff4d7d
               name: 'Ignite [{#JMXIGNITEINSTANCENAME}]: TotalProcessedMessages'
@@ -1083,8 +1310,11 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Ignite instance [{#JMXIGNITEINSTANCENAME}]'
+                  tag: component
+                  value: ignite
+                -
+                  tag: instance-name
+                  value: '{#JMXIGNITEINSTANCENAME}'
             -
               uuid: b896207c7fda48ea9265cebfee12f6df
               name: 'Ignite [{#JMXIGNITEINSTANCENAME}]: Discovery messages received, rate'
@@ -1104,8 +1334,11 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Ignite instance [{#JMXIGNITEINSTANCENAME}]'
+                  tag: component
+                  value: ignite
+                -
+                  tag: instance-name
+                  value: '{#JMXIGNITEINSTANCENAME}'
           graph_prototypes:
             -
               uuid: 348631d78d0644209001b054f18b2dc9
@@ -1160,8 +1393,11 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Ignite instance [{#JMXIGNITEINSTANCENAME}]'
+                  tag: component
+                  value: ignite
+                -
+                  tag: instance-name
+                  value: '{#JMXIGNITEINSTANCENAME}'
             -
               uuid: ac461a17802440a8906ea7471659935a
               name: 'Ignite [{#JMXIGNITEINSTANCENAME}]: Transactions owner, current'
@@ -1174,8 +1410,11 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Ignite instance [{#JMXIGNITEINSTANCENAME}]'
+                  tag: component
+                  value: ignite
+                -
+                  tag: instance-name
+                  value: '{#JMXIGNITEINSTANCENAME}'
             -
               uuid: 3754810fbb1f47fe858880ada9f40921
               name: 'Ignite [{#JMXIGNITEINSTANCENAME}]: Transactions committed, rate'
@@ -1189,8 +1428,11 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Ignite instance [{#JMXIGNITEINSTANCENAME}]'
+                  tag: component
+                  value: ignite
+                -
+                  tag: instance-name
+                  value: '{#JMXIGNITEINSTANCENAME}'
             -
               uuid: ff5a1a7f579c430c8f1860d241bd8b2f
               name: 'Ignite [{#JMXIGNITEINSTANCENAME}]: Transactions holding lock, current'
@@ -1203,8 +1445,11 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Ignite instance [{#JMXIGNITEINSTANCENAME}]'
+                  tag: component
+                  value: ignite
+                -
+                  tag: instance-name
+                  value: '{#JMXIGNITEINSTANCENAME}'
             -
               uuid: 3de3a27adea84e9cbb2cae812a3bc9c6
               name: 'Ignite [{#JMXIGNITEINSTANCENAME}]: Transactions rolledback, rate'
@@ -1218,8 +1463,11 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Ignite instance [{#JMXIGNITEINSTANCENAME}]'
+                  tag: component
+                  value: ignite
+                -
+                  tag: instance-name
+                  value: '{#JMXIGNITEINSTANCENAME}'
           graph_prototypes:
             -
               uuid: a10ff3fbfd92437ca24cddd82afe3572
@@ -1301,8 +1549,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Ignite [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXNAME}]'
+                  tag: component
+                  value: ignite
+                -
+                  tag: instance-name
+                  value: '{#JMXIGNITEINSTANCENAME}'
+                -
+                  tag: jmx-name
+                  value: '{#JMXNAME}'
             -
               uuid: 8b5acfc3a3c64714b57381fc0ae6b1a6
               name: 'Cache group [{#JMXNAME}]: Caches'
@@ -1322,8 +1576,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Ignite [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXNAME}]'
+                  tag: component
+                  value: ignite
+                -
+                  tag: instance-name
+                  value: '{#JMXIGNITEINSTANCENAME}'
+                -
+                  tag: jmx-name
+                  value: '{#JMXNAME}'
               trigger_prototypes:
                 -
                   uuid: b500b51a688d4b55942ce7311e82c54f
@@ -1332,6 +1592,10 @@ zabbix_export:
                   priority: INFO
                   description: 'List of caches has changed. Significant changes have occurred in the cluster. Ack to close.'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 253059e09010451f94ad0e6b10be7cc5
               name: 'Cache group [{#JMXNAME}]: Local node partitions, moving'
@@ -1344,8 +1608,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Ignite [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXNAME}]'
+                  tag: component
+                  value: ignite
+                -
+                  tag: instance-name
+                  value: '{#JMXIGNITEINSTANCENAME}'
+                -
+                  tag: jmx-name
+                  value: '{#JMXNAME}'
               trigger_prototypes:
                 -
                   uuid: 32a4aa1043b44c6198f01951d9ac32b4
@@ -1354,6 +1624,10 @@ zabbix_export:
                   priority: INFO
                   description: 'Ack to close.'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 84edf5609ef94d0185a15a606384e609
               name: 'Cache group [{#JMXNAME}]: Local node partitions, owning'
@@ -1366,8 +1640,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Ignite [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXNAME}]'
+                  tag: component
+                  value: ignite
+                -
+                  tag: instance-name
+                  value: '{#JMXIGNITEINSTANCENAME}'
+                -
+                  tag: jmx-name
+                  value: '{#JMXNAME}'
             -
               uuid: 314499dd6d214bdcbc524f83c6cbaa2b
               name: 'Cache group [{#JMXNAME}]: Local node entries, renting'
@@ -1380,8 +1660,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Ignite [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXNAME}]'
+                  tag: component
+                  value: ignite
+                -
+                  tag: instance-name
+                  value: '{#JMXIGNITEINSTANCENAME}'
+                -
+                  tag: jmx-name
+                  value: '{#JMXNAME}'
             -
               uuid: 06aff67a70624af899b2f111d7e6c34b
               name: 'Cache group [{#JMXNAME}]: Local node partitions, renting'
@@ -1394,8 +1680,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Ignite [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXNAME}]'
+                  tag: component
+                  value: ignite
+                -
+                  tag: instance-name
+                  value: '{#JMXIGNITEINSTANCENAME}'
+                -
+                  tag: jmx-name
+                  value: '{#JMXNAME}'
             -
               uuid: 6888861452b64b9e90ece1d1ab97ab4d
               name: 'Cache group [{#JMXNAME}]: Partition copies, max'
@@ -1408,8 +1700,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Ignite [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXNAME}]'
+                  tag: component
+                  value: ignite
+                -
+                  tag: instance-name
+                  value: '{#JMXIGNITEINSTANCENAME}'
+                -
+                  tag: jmx-name
+                  value: '{#JMXNAME}'
             -
               uuid: 9910268fcb3a46aca2eeaf581420ca31
               name: 'Cache group [{#JMXNAME}]: Partition copies, min'
@@ -1422,14 +1720,24 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Ignite [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXNAME}]'
+                  tag: component
+                  value: ignite
+                -
+                  tag: instance-name
+                  value: '{#JMXIGNITEINSTANCENAME}'
+                -
+                  tag: jmx-name
+                  value: '{#JMXNAME}'
               trigger_prototypes:
                 -
                   uuid: 8755dd8b09e347659aee2450bcdd5c28
                   expression: 'max(/Ignite by JMX/jmx["{#JMXOBJ}",MinimumNumberOfPartitionCopies],30m)=0'
                   name: 'Cache group [{#JMXNAME}]: There is no copy for partitions'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: edc59b661b004f9a8687b6a6b0e1dc09
               name: 'Cache group [{#JMXNAME}]: Partitions'
@@ -1442,14 +1750,24 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Ignite [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXNAME}]'
+                  tag: component
+                  value: ignite
+                -
+                  tag: instance-name
+                  value: '{#JMXIGNITEINSTANCENAME}'
+                -
+                  tag: jmx-name
+                  value: '{#JMXNAME}'
           trigger_prototypes:
             -
               uuid: 1b85d75607294d6a8fded5b85f7f9a4a
               expression: 'min(/Ignite by JMX/jmx["{#JMXOBJ}",Backups],5m)>=max(/Ignite by JMX/jmx["{#JMXOBJ}",MinimumNumberOfPartitionCopies],5m)'
               name: 'Cache group [{#JMXNAME}]: One or more backups are unavailable'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: availability
           graph_prototypes:
             -
               uuid: ffb5efed84144196a631b0bdef33a13e
@@ -1533,8 +1851,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Ignite [{#JMXIGNITEINSTANCENAME}]: Thread pool [{#JMXNAME}]'
+                  tag: component
+                  value: ignite
+                -
+                  tag: instance-name
+                  value: '{#JMXIGNITEINSTANCENAME}'
+                -
+                  tag: thread-pool
+                  value: '{#JMXNAME}'
             -
               uuid: 959cfe87996b4d6886bb90db2265deef
               name: 'Thread pool [{#JMXNAME}]: Pool size, max'
@@ -1548,8 +1872,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Ignite [{#JMXIGNITEINSTANCENAME}]: Thread pool [{#JMXNAME}]'
+                  tag: component
+                  value: ignite
+                -
+                  tag: instance-name
+                  value: '{#JMXIGNITEINSTANCENAME}'
+                -
+                  tag: thread-pool
+                  value: '{#JMXNAME}'
             -
               uuid: 6c7897c2f2c842988a1e6802eb11adde
               name: 'Thread pool [{#JMXNAME}]: Pool size'
@@ -1563,8 +1893,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Ignite [{#JMXIGNITEINSTANCENAME}]: Thread pool [{#JMXNAME}]'
+                  tag: component
+                  value: ignite
+                -
+                  tag: instance-name
+                  value: '{#JMXIGNITEINSTANCENAME}'
+                -
+                  tag: thread-pool
+                  value: '{#JMXNAME}'
             -
               uuid: 0b4b22918f374603a2f14efc95c217da
               name: 'Thread pool [{#JMXNAME}]: Queue size'
@@ -1578,8 +1914,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Ignite [{#JMXIGNITEINSTANCENAME}]: Thread pool [{#JMXNAME}]'
+                  tag: component
+                  value: ignite
+                -
+                  tag: instance-name
+                  value: '{#JMXIGNITEINSTANCENAME}'
+                -
+                  tag: thread-pool
+                  value: '{#JMXNAME}'
               trigger_prototypes:
                 -
                   uuid: 1d29e40969d54e9090724c8a774eaf4d
@@ -1587,6 +1929,10 @@ zabbix_export:
                   name: 'Thread pool [{#JMXNAME}]: Too many messages in queue (over {$IGNITE.THREAD.QUEUE.MAX.WARN:"{#JMXNAME}"} for 5 min)'
                   priority: AVERAGE
                   description: 'Number of messages in queue more than {$IGNITE.THREAD.QUEUE.MAX.WARN:"{#JMXNAME}"}.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 112c375ee9264c1996ea8c35e467f4a4
@@ -1670,8 +2016,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Ignite [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXGROUP}]'
+                  tag: component
+                  value: ignite
+                -
+                  tag: instance-name
+                  value: '{#JMXIGNITEINSTANCENAME}'
+                -
+                  tag: jmx-group
+                  value: '{#JMXGROUP}'
             -
               uuid: 5e633d192b3a472e9a29b4e0a0013ab1
               name: 'Cache group [{#JMXGROUP}]: Cache hits, pct'
@@ -1686,8 +2038,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Ignite [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXGROUP}]'
+                  tag: component
+                  value: ignite
+                -
+                  tag: instance-name
+                  value: '{#JMXIGNITEINSTANCENAME}'
+                -
+                  tag: jmx-group
+                  value: '{#JMXGROUP}'
             -
               uuid: 0d79c416c12748f9a3471003ce4d88fb
               name: 'Cache group [{#JMXGROUP}]: Cache misses, pct'
@@ -1702,8 +2060,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Ignite [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXGROUP}]'
+                  tag: component
+                  value: ignite
+                -
+                  tag: instance-name
+                  value: '{#JMXIGNITEINSTANCENAME}'
+                -
+                  tag: jmx-group
+                  value: '{#JMXGROUP}'
             -
               uuid: fb324608d65545c79e71df0978d0d053
               name: 'Cache group [{#JMXGROUP}]: Cache puts, rate'
@@ -1723,8 +2087,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Ignite [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXGROUP}]'
+                  tag: component
+                  value: ignite
+                -
+                  tag: instance-name
+                  value: '{#JMXIGNITEINSTANCENAME}'
+                -
+                  tag: jmx-group
+                  value: '{#JMXGROUP}'
             -
               uuid: 503f39545fa04af79e8dc85f0550ed6b
               name: 'Cache group [{#JMXGROUP}]: Cache removals, rate'
@@ -1744,8 +2114,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Ignite [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXGROUP}]'
+                  tag: component
+                  value: ignite
+                -
+                  tag: instance-name
+                  value: '{#JMXIGNITEINSTANCENAME}'
+                -
+                  tag: jmx-group
+                  value: '{#JMXGROUP}'
             -
               uuid: 182dea03e7d64425aea8c64e1d5714ba
               name: 'Cache group [{#JMXGROUP}]: Cache size'
@@ -1759,8 +2135,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Ignite [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXGROUP}]'
+                  tag: component
+                  value: ignite
+                -
+                  tag: instance-name
+                  value: '{#JMXIGNITEINSTANCENAME}'
+                -
+                  tag: jmx-group
+                  value: '{#JMXGROUP}'
             -
               uuid: 74119c1570c24155b450db6e5c1126cd
               name: 'Cache group [{#JMXGROUP}]: Cache transaction commits, rate'
@@ -1780,8 +2162,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Ignite [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXGROUP}]'
+                  tag: component
+                  value: ignite
+                -
+                  tag: instance-name
+                  value: '{#JMXIGNITEINSTANCENAME}'
+                -
+                  tag: jmx-group
+                  value: '{#JMXGROUP}'
             -
               uuid: 34d8a8ac772a48c486bfb101e7129fd8
               name: 'Cache group [{#JMXGROUP}]: Cache transaction rollbacks, rate'
@@ -1801,8 +2189,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Ignite [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXGROUP}]'
+                  tag: component
+                  value: ignite
+                -
+                  tag: instance-name
+                  value: '{#JMXIGNITEINSTANCENAME}'
+                -
+                  tag: jmx-group
+                  value: '{#JMXGROUP}'
             -
               uuid: cb6b9006d41c46f29ff902a76a27c6f5
               name: 'Cache group [{#JMXGROUP}]: Cache heap entries'
@@ -1821,8 +2215,14 @@ zabbix_export:
               jmx_endpoint: 'service:jmx:rmi:///jndi/rmi://{HOST.CONN}:{HOST.PORT}/jmxrmi'
               tags:
                 -
-                  tag: Application
-                  value: 'Ignite [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXGROUP}]'
+                  tag: component
+                  value: ignite
+                -
+                  tag: instance-name
+                  value: '{#JMXIGNITEINSTANCENAME}'
+                -
+                  tag: jmx-group
+                  value: '{#JMXGROUP}'
           trigger_prototypes:
             -
               uuid: 97aa5e21a05743b9bb6714d7d5d28a67
@@ -1831,6 +2231,10 @@ zabbix_export:
               priority: INFO
               description: 'All entries are in heap. Possibly you use eager queries it may cause out of memory exceptions for big caches. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: bfc948858de94088a96c9eddb14b893d
               expression: 'min(/Ignite by JMX/jmx["{#JMXOBJ}",CacheTxRollbacks],5m) > max(/Ignite by JMX/jmx["{#JMXOBJ}",CacheTxCommits],5m)'
@@ -1840,11 +2244,19 @@ zabbix_export:
                 -
                   name: 'Cache group [{#JMXGROUP}]: There are no success transactions for cache for 5m'
                   expression: 'min(/Ignite by JMX/jmx["{#JMXOBJ}",CacheTxRollbacks],5m)>0 and max(/Ignite by JMX/jmx["{#JMXOBJ}",CacheTxCommits],5m)=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 1d80fe9b052444359eca04629e45e799
               expression: 'min(/Ignite by JMX/jmx["{#JMXOBJ}",CacheTxRollbacks],5m)>0 and max(/Ignite by JMX/jmx["{#JMXOBJ}",CacheTxCommits],5m)=0'
               name: 'Cache group [{#JMXGROUP}]: There are no success transactions for cache for 5m'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
           graph_prototypes:
             -
               uuid: 50482d45d20a42e581cfdb0a40a9a9dc
@@ -1918,6 +2330,13 @@ zabbix_export:
               type: DISCARD_UNCHANGED_HEARTBEAT
               parameters:
                 - 3h
+      tags:
+        -
+          tag: class
+          value: database
+        -
+          tag: target
+          value: ignite
       macros:
         -
           macro: '{$IGNITE.CHECKPOINT.PUSED.MAX.HIGH}'
diff --git a/templates/db/mongodb/template_db_mongodb.yaml b/templates/db/mongodb/template_db_mongodb.yaml
index cf960710a4f..48062ee436b 100644
--- a/templates/db/mongodb/template_db_mongodb.yaml
+++ b/templates/db/mongodb/template_db_mongodb.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-10T07:41:44Z'
+  date: '2022-01-26T10:38:27Z'
   groups:
     -
       uuid: 748ad4d098d447d492bb935c907f652f
@@ -18,7 +18,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/420659-discussion-thread-for-official-zabbix-template-db-mongodb
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Databases
@@ -45,8 +45,8 @@ zabbix_export:
             key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: MongoDB
+              tag: component
+              value: documents
         -
           uuid: 5ecc078aeda04e3ca34ed42d966cdf40
           name: 'MongoDB: Document: inserted, rate'
@@ -69,8 +69,8 @@ zabbix_export:
             key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: MongoDB
+              tag: component
+              value: documents
         -
           uuid: 56fc9870503645069a9d937ac21ab7c2
           name: 'MongoDB: Document: returned, rate'
@@ -93,8 +93,8 @@ zabbix_export:
             key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: MongoDB
+              tag: component
+              value: documents
         -
           uuid: d21a95f1862b4c17b5a4ed83a67ffb1b
           name: 'MongoDB: Document: updated, rate'
@@ -117,8 +117,8 @@ zabbix_export:
             key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: MongoDB
+              tag: component
+              value: documents
         -
           uuid: d5ec0427c5ca49119f6e94211b0297bf
           name: 'MongoDB: Active clients: readers'
@@ -136,8 +136,8 @@ zabbix_export:
             key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: MongoDB
+              tag: component
+              value: clients
         -
           uuid: 1c2dc0b60eb44d259e02accf2531b389
           name: 'MongoDB: Active clients: total'
@@ -155,8 +155,8 @@ zabbix_export:
             key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: MongoDB
+              tag: component
+              value: clients
         -
           uuid: 9c5512c83e1844c5b4fdb675336edbf6
           name: 'MongoDB: Active clients: writers'
@@ -174,8 +174,8 @@ zabbix_export:
             key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: MongoDB
+              tag: component
+              value: clients
         -
           uuid: 5e6fa5d1c9fc48ada6c0bc5c8d1d3ec4
           name: 'MongoDB: Asserts: message, rate'
@@ -200,8 +200,8 @@ zabbix_export:
             key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: MongoDB
+              tag: component
+              value: asserts
         -
           uuid: 32d5177badac49eda8ce1f47c851ebf2
           name: 'MongoDB: Asserts: regular, rate'
@@ -226,8 +226,8 @@ zabbix_export:
             key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: MongoDB
+              tag: component
+              value: asserts
         -
           uuid: 67f2ef15386a47b6b88fc95dd7fe1be6
           name: 'MongoDB: Asserts: rollovers, rate'
@@ -252,8 +252,8 @@ zabbix_export:
             key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: MongoDB
+              tag: component
+              value: asserts
         -
           uuid: a7dfd56310d44d7dac1f3c02fa5fbc79
           name: 'MongoDB: Asserts: user, rate'
@@ -278,8 +278,8 @@ zabbix_export:
             key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: MongoDB
+              tag: component
+              value: asserts
         -
           uuid: 41638aa2b3374e56ad00ef9113e1ea61
           name: 'MongoDB: Asserts: warning, rate'
@@ -302,8 +302,8 @@ zabbix_export:
             key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: MongoDB
+              tag: component
+              value: asserts
         -
           uuid: 46f0a53612de4448ab8e98098375656b
           name: 'MongoDB: Get collections usage stats'
@@ -314,8 +314,11 @@ zabbix_export:
           description: 'Returns usage statistics for each collection.'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: collections
+            -
+              tag: component
+              value: raw
         -
           uuid: 6ce4b63c962646ef91e4a705a42f36de
           name: 'MongoDB: Connections, active'
@@ -337,8 +340,8 @@ zabbix_export:
             key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: MongoDB
+              tag: component
+              value: connections
         -
           uuid: 3b53fa8cf9cb4d1a9ff364cd5d8ae724
           name: 'MongoDB: Connections, available'
@@ -356,8 +359,8 @@ zabbix_export:
             key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: MongoDB
+              tag: component
+              value: connections
         -
           uuid: c4d86707cd124d9db195ca6afd636e71
           name: 'MongoDB: Connections, current'
@@ -377,8 +380,8 @@ zabbix_export:
             key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: MongoDB
+              tag: component
+              value: connections
         -
           uuid: 37fd836b53fa4db88aeb0faeeccc2856
           name: 'MongoDB: New connections, rate'
@@ -402,8 +405,8 @@ zabbix_export:
             key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: MongoDB
+              tag: component
+              value: connections
         -
           uuid: 0f04a5b3b0e5415185e01ecf75f426ec
           name: 'MongoDB: Current queue: readers'
@@ -423,8 +426,8 @@ zabbix_export:
             key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: MongoDB
+              tag: component
+              value: global-lock
         -
           uuid: 47ecaffb9638429eb308572b7d7beb5a
           name: 'MongoDB: Current queue: total'
@@ -442,8 +445,8 @@ zabbix_export:
             key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: MongoDB
+              tag: component
+              value: global-lock
         -
           uuid: e68ff1592a5648fc8b5475054c327ac6
           name: 'MongoDB: Current queue: writers'
@@ -463,8 +466,8 @@ zabbix_export:
             key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: MongoDB
+              tag: component
+              value: global-lock
         -
           uuid: 1d2c068feba240d6b934b65249d1b5ea
           name: 'MongoDB: Cursor: open pinned'
@@ -482,8 +485,8 @@ zabbix_export:
             key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: MongoDB
+              tag: component
+              value: documents
         -
           uuid: f23bf716eced4ba5948b06c24c780904
           name: 'MongoDB: Cursor: open total'
@@ -501,14 +504,18 @@ zabbix_export:
             key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: MongoDB
+              tag: component
+              value: cursors
           triggers:
             -
               uuid: ed4a0c66c76d4ca699d0f2188cc8e71f
               expression: 'min(/MongoDB node by Zabbix agent 2/mongodb.cursor.open.total,5m)>{$MONGODB.CURSOR.OPEN.MAX.WARN}'
               name: 'MongoDB: Too many cursors opened by MongoDB for clients (over {$MONGODB.CURSOR.OPEN.MAX.WARN} in 5m)'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: capacity
         -
           uuid: b30b4c7b6d88467bbde22db411660d6b
           name: 'MongoDB: Cursor: timed out, rate'
@@ -531,14 +538,18 @@ zabbix_export:
             key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: MongoDB
+              tag: component
+              value: cursors
           triggers:
             -
               uuid: 41d37791111b461d94da779e4b2c7e46
               expression: 'min(/MongoDB node by Zabbix agent 2/mongodb.cursor.timed_out.rate,5m)>{$MONGODB.CURSOR.TIMEOUT.MAX.WARN}'
               name: 'MongoDB: Too many cursors are timing out (over {$MONGODB.CURSOR.TIMEOUT.MAX.WARN} per second in 5m)'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 4d0b20f4eeca4418bb08e7e2905cc68c
           name: 'MongoDB: Architecture'
@@ -561,8 +572,8 @@ zabbix_export:
             key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: MongoDB
+              tag: component
+              value: application
         -
           uuid: c88392536a334f9a9c907be28090424c
           name: 'MongoDB: Memory: mapped'
@@ -586,8 +597,8 @@ zabbix_export:
             key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: MongoDB
+              tag: component
+              value: memory
         -
           uuid: 7a10ad84604246679104111e83fa762e
           name: 'MongoDB: Memory: mapped with journal'
@@ -611,8 +622,8 @@ zabbix_export:
             key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: MongoDB
+              tag: component
+              value: memory
         -
           uuid: 2248b869cfca42bd95140451c0974f8c
           name: 'MongoDB: Memory: resident'
@@ -635,8 +646,8 @@ zabbix_export:
             key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: MongoDB
+              tag: component
+              value: memory
         -
           uuid: 561ea7508e44443cb692b7dfe8ed3bdc
           name: 'MongoDB: Memory: virtual'
@@ -659,8 +670,8 @@ zabbix_export:
             key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: MongoDB
+              tag: component
+              value: memory
         -
           uuid: 9c79163da0b44e39a704969ab1d6280b
           name: 'MongoDB: Cursor: open no timeout'
@@ -678,8 +689,8 @@ zabbix_export:
             key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: MongoDB
+              tag: component
+              value: documents
         -
           uuid: ba0502f80a044670993bdb63587cd282
           name: 'MongoDB: Bytes in, rate'
@@ -703,8 +714,8 @@ zabbix_export:
             key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: MongoDB
+              tag: component
+              value: network
         -
           uuid: 0545114b39a649ef9a4b75da500031fb
           name: 'MongoDB: Bytes out, rate'
@@ -728,8 +739,8 @@ zabbix_export:
             key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: MongoDB
+              tag: component
+              value: network
         -
           uuid: 73aba89f9012437eb3ed843ccbe63c06
           name: 'MongoDB: Requests, rate'
@@ -753,8 +764,8 @@ zabbix_export:
             key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: MongoDB
+              tag: component
+              value: network
         -
           uuid: 532a1f4a64624434986f54b9ac2d2e3a
           name: 'MongoDB: Operations: command, rate'
@@ -779,8 +790,8 @@ zabbix_export:
             key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: MongoDB
+              tag: component
+              value: operations
         -
           uuid: 540f30705ced49da89a16f80828e8775
           name: 'MongoDB: Operations: delete, rate'
@@ -803,8 +814,8 @@ zabbix_export:
             key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: MongoDB
+              tag: component
+              value: operations
         -
           uuid: 229345df70c240b5ab113b358fb738d9
           name: 'MongoDB: Operations: getmore, rate'
@@ -829,8 +840,8 @@ zabbix_export:
             key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: MongoDB
+              tag: component
+              value: operations
         -
           uuid: 4236ad60fcef48f793ac6da4cccdb029
           name: 'MongoDB: Operations: insert, rate'
@@ -853,8 +864,8 @@ zabbix_export:
             key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: MongoDB
+              tag: component
+              value: operations
         -
           uuid: b0f7def2c62047bba0db77d18f1df920
           name: 'MongoDB: Operations: query, rate'
@@ -877,8 +888,8 @@ zabbix_export:
             key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: MongoDB
+              tag: component
+              value: operations
         -
           uuid: 019ed179e4e1407db799e01920280e02
           name: 'MongoDB: Operations: update, rate'
@@ -901,8 +912,8 @@ zabbix_export:
             key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: MongoDB
+              tag: component
+              value: operations
         -
           uuid: 8e7406e64edd4fe5ba87d4018011c958
           name: 'MongoDB: Get oplog stats'
@@ -913,8 +924,11 @@ zabbix_export:
           description: 'Returns status of the replica set, using data polled from the oplog.'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: oplog
+            -
+              tag: component
+              value: replicaset
         -
           uuid: 350da28ce7ab42f9b96728ec730d4bd6
           name: 'MongoDB: Ping'
@@ -931,8 +945,8 @@ zabbix_export:
                 - 30m
           tags:
             -
-              tag: Application
-              value: MongoDB
+              tag: component
+              value: health
           triggers:
             -
               uuid: c4ab9bfdd6d14634870f8ebb44081655
@@ -940,6 +954,10 @@ zabbix_export:
               name: 'MongoDB: Connection to MongoDB is unavailable'
               priority: HIGH
               description: 'Connection to MongoDB instance is currently unavailable.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 3b448eff509240faba344f7b325f3e28
           name: 'MongoDB: Get Replica Set status'
@@ -950,8 +968,11 @@ zabbix_export:
           description: 'Returns the replica set status from the point of view of the member where the method is run.'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
+            -
+              tag: component
+              value: replicaset
         -
           uuid: fb0cc7d44559406cada9d90a51bc999c
           name: 'MongoDB: Get server status'
@@ -962,8 +983,8 @@ zabbix_export:
           description: 'Returns a database''s state.'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
         -
           uuid: 2d1bf92792014ed8a3f8d8b13907fc7d
           name: 'MongoDB: Uptime'
@@ -983,8 +1004,8 @@ zabbix_export:
             key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: MongoDB
+              tag: component
+              value: application
           triggers:
             -
               uuid: 166444342def4adc954aa35f3dc22dba
@@ -997,6 +1018,10 @@ zabbix_export:
                 -
                   name: 'MongoDB: Connection to MongoDB is unavailable'
                   expression: 'last(/MongoDB node by Zabbix agent 2/mongodb.ping["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"])=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
             -
               uuid: 992590e47a7f42dda0e074c2f7a3e5ba
               expression: 'last(/MongoDB node by Zabbix agent 2/mongodb.uptime)<10m'
@@ -1004,6 +1029,10 @@ zabbix_export:
               priority: INFO
               description: 'Uptime is less than 10 minutes'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: c5679875dc254ddd833ee40ef4a2b3cf
           name: 'MongoDB: MongoDB version'
@@ -1027,8 +1056,8 @@ zabbix_export:
             key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: MongoDB
+              tag: component
+              value: application
           triggers:
             -
               uuid: 0856e13b7e7644c5b353fcfa577acb51
@@ -1037,6 +1066,10 @@ zabbix_export:
               priority: INFO
               description: 'MongoDB version has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
       discovery_rules:
         -
           uuid: a6398a8ae4fe4891a03bb6041bf71f53
@@ -1088,8 +1121,14 @@ zabbix_export:
                 key: 'mongodb.collection.stats["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}","{#DBNAME}","{#COLLECTION}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MongoDB: {#DBNAME}.{#COLLECTION}'
+                  tag: collection
+                  value: '{#COLLECTION}'
+                -
+                  tag: component
+                  value: objects
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: ee5d3cefe6584900b400a4f598c84c1b
               name: 'MongoDB {#DBNAME}.{#COLLECTION}: Capped'
@@ -1117,8 +1156,14 @@ zabbix_export:
                 key: 'mongodb.collection.stats["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}","{#DBNAME}","{#COLLECTION}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MongoDB: {#DBNAME}.{#COLLECTION}'
+                  tag: collection
+                  value: '{#COLLECTION}'
+                -
+                  tag: component
+                  value: application
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: 5fc5b90792054b09a651b5d41328ca56
               name: 'MongoDB {#DBNAME}.{#COLLECTION}: Objects, count'
@@ -1136,8 +1181,14 @@ zabbix_export:
                 key: 'mongodb.collection.stats["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}","{#DBNAME}","{#COLLECTION}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MongoDB: {#DBNAME}.{#COLLECTION}'
+                  tag: collection
+                  value: '{#COLLECTION}'
+                -
+                  tag: component
+                  value: objects
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: 0ab52dbdcb424d759f6f717d8197cb30
               name: 'MongoDB {#DBNAME}.{#COLLECTION}: Capped: max number'
@@ -1157,8 +1208,14 @@ zabbix_export:
                 key: 'mongodb.collection.stats["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}","{#DBNAME}","{#COLLECTION}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MongoDB: {#DBNAME}.{#COLLECTION}'
+                  tag: collection
+                  value: '{#COLLECTION}'
+                -
+                  tag: component
+                  value: application
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: 8c0fe89cfa9f40e3bb04c92c417757df
               name: 'MongoDB {#DBNAME}.{#COLLECTION}: Capped: max size'
@@ -1178,8 +1235,14 @@ zabbix_export:
                 key: 'mongodb.collection.stats["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}","{#DBNAME}","{#COLLECTION}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MongoDB: {#DBNAME}.{#COLLECTION}'
+                  tag: collection
+                  value: '{#COLLECTION}'
+                -
+                  tag: component
+                  value: disk
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: b8ebe075b01248179d93c5d174286d2f
               name: 'MongoDB {#DBNAME}.{#COLLECTION}: Indexes'
@@ -1197,8 +1260,14 @@ zabbix_export:
                 key: 'mongodb.collection.stats["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}","{#DBNAME}","{#COLLECTION}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MongoDB: {#DBNAME}.{#COLLECTION}'
+                  tag: collection
+                  value: '{#COLLECTION}'
+                -
+                  tag: component
+                  value: application
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: a4d05a4ee48b4ce2aa4fbebd240b8c4c
               name: 'MongoDB {#DBNAME}.{#COLLECTION}: Operations: commands, ms/s'
@@ -1222,8 +1291,14 @@ zabbix_export:
                 key: 'mongodb.collections.usage["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MongoDB: {#DBNAME}.{#COLLECTION}'
+                  tag: collection
+                  value: '{#COLLECTION}'
+                -
+                  tag: component
+                  value: operations
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: b6d89c096fec4194bbe834e026f33178
               name: 'MongoDB {#DBNAME}.{#COLLECTION}: Operations: commands, rate'
@@ -1246,8 +1321,14 @@ zabbix_export:
                 key: 'mongodb.collections.usage["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MongoDB: {#DBNAME}.{#COLLECTION}'
+                  tag: collection
+                  value: '{#COLLECTION}'
+                -
+                  tag: component
+                  value: operations
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: 6375b055efe84cdaa0a42c4b9981dde7
               name: 'MongoDB {#DBNAME}.{#COLLECTION}: Operations: getmore, ms/s'
@@ -1271,8 +1352,14 @@ zabbix_export:
                 key: 'mongodb.collections.usage["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MongoDB: {#DBNAME}.{#COLLECTION}'
+                  tag: collection
+                  value: '{#COLLECTION}'
+                -
+                  tag: component
+                  value: operations
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: 760a0a70a2674ad7acd9d551865693ef
               name: 'MongoDB {#DBNAME}.{#COLLECTION}: Operations: getmore, rate'
@@ -1295,8 +1382,14 @@ zabbix_export:
                 key: 'mongodb.collections.usage["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MongoDB: {#DBNAME}.{#COLLECTION}'
+                  tag: collection
+                  value: '{#COLLECTION}'
+                -
+                  tag: component
+                  value: operations
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: 812f76c720fe47ba9fd8764c349c4a36
               name: 'MongoDB {#DBNAME}.{#COLLECTION}: Operations: insert, ms/s'
@@ -1320,8 +1413,14 @@ zabbix_export:
                 key: 'mongodb.collections.usage["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MongoDB: {#DBNAME}.{#COLLECTION}'
+                  tag: collection
+                  value: '{#COLLECTION}'
+                -
+                  tag: component
+                  value: operations
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: c824a6a997ef4308b47cdc4118799f33
               name: 'MongoDB {#DBNAME}.{#COLLECTION}: Operations: insert, rate'
@@ -1344,8 +1443,14 @@ zabbix_export:
                 key: 'mongodb.collections.usage["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MongoDB: {#DBNAME}.{#COLLECTION}'
+                  tag: collection
+                  value: '{#COLLECTION}'
+                -
+                  tag: component
+                  value: operations
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: 77de05da93b34432a7c2442fc01ca624
               name: 'MongoDB {#DBNAME}.{#COLLECTION}: Operations: queries, ms/s'
@@ -1369,8 +1474,14 @@ zabbix_export:
                 key: 'mongodb.collections.usage["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MongoDB: {#DBNAME}.{#COLLECTION}'
+                  tag: collection
+                  value: '{#COLLECTION}'
+                -
+                  tag: component
+                  value: operations
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: 41b1f661ceab494f81e7a4b943a07020
               name: 'MongoDB {#DBNAME}.{#COLLECTION}: Operations: queries, rate'
@@ -1393,8 +1504,14 @@ zabbix_export:
                 key: 'mongodb.collections.usage["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MongoDB: {#DBNAME}.{#COLLECTION}'
+                  tag: collection
+                  value: '{#COLLECTION}'
+                -
+                  tag: component
+                  value: operations
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: a46f2c1c973d4eef8d9a7b1150702c74
               name: 'MongoDB {#DBNAME}.{#COLLECTION}: Operations: remove, ms/s'
@@ -1418,8 +1535,14 @@ zabbix_export:
                 key: 'mongodb.collections.usage["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MongoDB: {#DBNAME}.{#COLLECTION}'
+                  tag: collection
+                  value: '{#COLLECTION}'
+                -
+                  tag: component
+                  value: operations
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: 89b74a8511b84f4bb8cab94fc5471632
               name: 'MongoDB {#DBNAME}.{#COLLECTION}: Operations: remove, rate'
@@ -1442,8 +1565,14 @@ zabbix_export:
                 key: 'mongodb.collections.usage["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MongoDB: {#DBNAME}.{#COLLECTION}'
+                  tag: collection
+                  value: '{#COLLECTION}'
+                -
+                  tag: component
+                  value: operations
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: 67eaf64e851a45afbd69303ad0256077
               name: 'MongoDB {#DBNAME}.{#COLLECTION}: Operations: total, ms/s'
@@ -1467,8 +1596,14 @@ zabbix_export:
                 key: 'mongodb.collections.usage["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MongoDB: {#DBNAME}.{#COLLECTION}'
+                  tag: collection
+                  value: '{#COLLECTION}'
+                -
+                  tag: component
+                  value: operations
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: 1ca4ae9dcf494efdbf85d635d49d4de8
               name: 'MongoDB {#DBNAME}.{#COLLECTION}: Operations: total, rate'
@@ -1491,8 +1626,14 @@ zabbix_export:
                 key: 'mongodb.collections.usage["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MongoDB: {#DBNAME}.{#COLLECTION}'
+                  tag: collection
+                  value: '{#COLLECTION}'
+                -
+                  tag: component
+                  value: operations
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: 89b6f13894d64bdcbe0d0ec41568051a
               name: 'MongoDB {#DBNAME}.{#COLLECTION}: Operations: update, ms/s'
@@ -1516,8 +1657,14 @@ zabbix_export:
                 key: 'mongodb.collections.usage["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MongoDB: {#DBNAME}.{#COLLECTION}'
+                  tag: collection
+                  value: '{#COLLECTION}'
+                -
+                  tag: component
+                  value: operations
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: 8d75aa686d0d4f3f93089b8b089f1d3c
               name: 'MongoDB {#DBNAME}.{#COLLECTION}: Operations: update, rate'
@@ -1540,8 +1687,14 @@ zabbix_export:
                 key: 'mongodb.collections.usage["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MongoDB: {#DBNAME}.{#COLLECTION}'
+                  tag: collection
+                  value: '{#COLLECTION}'
+                -
+                  tag: component
+                  value: operations
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: 4d575525f749436ea4ea9098c3b164ba
               name: 'MongoDB {#DBNAME}.{#COLLECTION}: Read lock, ms/s'
@@ -1565,8 +1718,14 @@ zabbix_export:
                 key: 'mongodb.collections.usage["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MongoDB: {#DBNAME}.{#COLLECTION}'
+                  tag: collection
+                  value: '{#COLLECTION}'
+                -
+                  tag: component
+                  value: operations
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: 9d2d62a252054e428d9b8863a2128ad8
               name: 'MongoDB {#DBNAME}.{#COLLECTION}: Read lock, rate'
@@ -1589,8 +1748,14 @@ zabbix_export:
                 key: 'mongodb.collections.usage["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MongoDB: {#DBNAME}.{#COLLECTION}'
+                  tag: collection
+                  value: '{#COLLECTION}'
+                -
+                  tag: component
+                  value: operations
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: e5e471e100834da5a2e9dddaaa453227
               name: 'MongoDB {#DBNAME}.{#COLLECTION}: Size'
@@ -1609,8 +1774,14 @@ zabbix_export:
                 key: 'mongodb.collection.stats["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}","{#DBNAME}","{#COLLECTION}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MongoDB: {#DBNAME}.{#COLLECTION}'
+                  tag: collection
+                  value: '{#COLLECTION}'
+                -
+                  tag: component
+                  value: disk
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: d43709c548b84ea9b2c3c1b159bf28a3
               name: 'MongoDB {#DBNAME}.{#COLLECTION}: Get collection stats {#DBNAME}.{#COLLECTION}'
@@ -1621,8 +1792,14 @@ zabbix_export:
               description: 'Returns a variety of storage statistics for a given collection.'
               tags:
                 -
-                  tag: Application
-                  value: 'Zabbix raw items'
+                  tag: collection
+                  value: '{#COLLECTION}'
+                -
+                  tag: component
+                  value: raw
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: a2f095952fa44ed3a199b098c5fbee7a
               name: 'MongoDB {#DBNAME}.{#COLLECTION}: Storage size'
@@ -1641,8 +1818,14 @@ zabbix_export:
                 key: 'mongodb.collection.stats["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}","{#DBNAME}","{#COLLECTION}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MongoDB: {#DBNAME}.{#COLLECTION}'
+                  tag: collection
+                  value: '{#COLLECTION}'
+                -
+                  tag: component
+                  value: disk
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: a4c46912b5e643be8565f2b0d32c62a9
               name: 'MongoDB {#DBNAME}.{#COLLECTION}: Write lock, ms/s'
@@ -1666,8 +1849,14 @@ zabbix_export:
                 key: 'mongodb.collections.usage["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MongoDB: {#DBNAME}.{#COLLECTION}'
+                  tag: collection
+                  value: '{#COLLECTION}'
+                -
+                  tag: component
+                  value: operations
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: ef83d379681241eaadd8be8de755a2bd
               name: 'MongoDB {#DBNAME}.{#COLLECTION}: Write lock, rate'
@@ -1690,8 +1879,14 @@ zabbix_export:
                 key: 'mongodb.collections.usage["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MongoDB: {#DBNAME}.{#COLLECTION}'
+                  tag: collection
+                  value: '{#COLLECTION}'
+                -
+                  tag: component
+                  value: operations
+                -
+                  tag: database
+                  value: '{#DBNAME}'
           graph_prototypes:
             -
               uuid: 76e921eae63a49b99102d880d5844a46
@@ -1853,8 +2048,11 @@ zabbix_export:
                 key: 'mongodb.db.stats["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}","{#DBNAME}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MongoDB: {#DBNAME}'
+                  tag: component
+                  value: collections
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: a9d502096d664f6da44a6ab82f8b7d36
               name: 'MongoDB {#DBNAME}: Size, data'
@@ -1873,8 +2071,11 @@ zabbix_export:
                 key: 'mongodb.db.stats["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}","{#DBNAME}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MongoDB: {#DBNAME}'
+                  tag: component
+                  value: disk
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: c5f4ae6a260e4c10aae0d51441fcbbf7
               name: 'MongoDB {#DBNAME}: Extents'
@@ -1893,8 +2094,11 @@ zabbix_export:
                 key: 'mongodb.db.stats["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}","{#DBNAME}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MongoDB: {#DBNAME}'
+                  tag: component
+                  value: collections
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: cecffb75221440ac957fda5d676d7714
               name: 'MongoDB {#DBNAME}: Size, file'
@@ -1914,8 +2118,11 @@ zabbix_export:
                 key: 'mongodb.db.stats["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}","{#DBNAME}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MongoDB: {#DBNAME}'
+                  tag: component
+                  value: disk
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: 9567515baf7b46a0a685717839f4a48f
               name: 'MongoDB {#DBNAME}: Size, index'
@@ -1934,8 +2141,11 @@ zabbix_export:
                 key: 'mongodb.db.stats["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}","{#DBNAME}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MongoDB: {#DBNAME}'
+                  tag: component
+                  value: disk
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: cd5ecd2eafc640319aa2f049db2cf582
               name: 'MongoDB {#DBNAME}: Objects, count'
@@ -1953,8 +2163,11 @@ zabbix_export:
                 key: 'mongodb.db.stats["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}","{#DBNAME}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MongoDB: {#DBNAME}'
+                  tag: component
+                  value: objects
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: cadce6df66ec4872bd6b517233f77bfc
               name: 'MongoDB {#DBNAME}: Objects, avg size'
@@ -1974,8 +2187,11 @@ zabbix_export:
                 key: 'mongodb.db.stats["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}","{#DBNAME}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MongoDB: {#DBNAME}'
+                  tag: component
+                  value: objects
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: 829536cb5dd448d8a05a30cf6eff8599
               name: 'MongoDB {#DBNAME}: Get db stats {#DBNAME}'
@@ -1986,8 +2202,14 @@ zabbix_export:
               description: 'Returns statistics reflecting the database system''s state.'
               tags:
                 -
-                  tag: Application
-                  value: 'Zabbix raw items'
+                  tag: component
+                  value: database
+                -
+                  tag: component
+                  value: raw
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: 197a1d1f5d14413da8fe6c93bfdcf4f3
               name: 'MongoDB {#DBNAME}: Size, storage'
@@ -2006,8 +2228,11 @@ zabbix_export:
                 key: 'mongodb.db.stats["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}","{#DBNAME}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MongoDB: {#DBNAME}'
+                  tag: component
+                  value: disk
+                -
+                  tag: database
+                  value: '{#DBNAME}'
           graph_prototypes:
             -
               uuid: e65fcfed4eca4d518b5e6b5b6085ede8
@@ -2082,8 +2307,11 @@ zabbix_export:
                 key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MongoDB Replica Set: {#RS_NAME}'
+                  tag: component
+                  value: replication
+                -
+                  tag: replicaset
+                  value: '{#RS_NAME}'
             -
               uuid: a460d4356895439d9cf9143b38a18213
               name: 'MongoDB: Apply batches, rate'
@@ -2106,8 +2334,11 @@ zabbix_export:
                 key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MongoDB Replica Set: {#RS_NAME}'
+                  tag: component
+                  value: replication
+                -
+                  tag: replicaset
+                  value: '{#RS_NAME}'
             -
               uuid: 48970eb366f144b4b9ed3f72fbd983a7
               name: 'MongoDB: Apply ops, rate'
@@ -2130,8 +2361,11 @@ zabbix_export:
                 key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MongoDB Replica Set: {#RS_NAME}'
+                  tag: component
+                  value: replication
+                -
+                  tag: replicaset
+                  value: '{#RS_NAME}'
             -
               uuid: 8d8b0046f9fd409891d3d225f8a462ff
               name: 'MongoDB: Buffer'
@@ -2149,8 +2383,11 @@ zabbix_export:
                 key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MongoDB Replica Set: {#RS_NAME}'
+                  tag: component
+                  value: replication
+                -
+                  tag: replicaset
+                  value: '{#RS_NAME}'
             -
               uuid: 0a7522edb2a647989627de85f7e61319
               name: 'MongoDB: Buffer, max size'
@@ -2169,8 +2406,11 @@ zabbix_export:
                 key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MongoDB Replica Set: {#RS_NAME}'
+                  tag: component
+                  value: replication
+                -
+                  tag: replicaset
+                  value: '{#RS_NAME}'
             -
               uuid: fd9b7ea20e1e4e91b7a3c75d5416efe8
               name: 'MongoDB: Buffer, size'
@@ -2189,8 +2429,11 @@ zabbix_export:
                 key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MongoDB Replica Set: {#RS_NAME}'
+                  tag: component
+                  value: replication
+                -
+                  tag: replicaset
+                  value: '{#RS_NAME}'
             -
               uuid: 6f07d080d01d45dfa5383640c76175c5
               name: 'MongoDB: Replication lag'
@@ -2210,14 +2453,21 @@ zabbix_export:
                 key: 'mongodb.rs.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MongoDB Replica Set: {#RS_NAME}'
+                  tag: component
+                  value: replication
+                -
+                  tag: replicaset
+                  value: '{#RS_NAME}'
               trigger_prototypes:
                 -
                   uuid: 778d0b15affe4867b3e7f3e396c2a700
                   expression: 'min(/MongoDB node by Zabbix agent 2/mongodb.rs.lag[{#RS_NAME}],5m)>{$MONGODB.REPL.LAG.MAX.WARN}'
                   name: 'MongoDB: Replication lag with primary is too high (over {$MONGODB.REPL.LAG.MAX.WARN} in 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: be060c8d3fec46d5832f8047d3512903
               name: 'MongoDB: Network bytes, rate'
@@ -2241,8 +2491,14 @@ zabbix_export:
                 key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MongoDB Replica Set: {#RS_NAME}'
+                  tag: component
+                  value: network
+                -
+                  tag: component
+                  value: replication
+                -
+                  tag: replicaset
+                  value: '{#RS_NAME}'
             -
               uuid: 68b7ac3fee984352bab02b07e0823f51
               name: 'MongoDB: Network getmores, ms/s'
@@ -2266,8 +2522,14 @@ zabbix_export:
                 key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MongoDB Replica Set: {#RS_NAME}'
+                  tag: component
+                  value: operations
+                -
+                  tag: component
+                  value: replication
+                -
+                  tag: replicaset
+                  value: '{#RS_NAME}'
             -
               uuid: 86d9ddbfc35447c7889bef826bab016f
               name: 'MongoDB: Network getmores, rate'
@@ -2290,8 +2552,14 @@ zabbix_export:
                 key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MongoDB Replica Set: {#RS_NAME}'
+                  tag: component
+                  value: operations
+                -
+                  tag: component
+                  value: replication
+                -
+                  tag: replicaset
+                  value: '{#RS_NAME}'
             -
               uuid: d2b3075c9728473a9dc8a0585ce43cfd
               name: 'MongoDB: Network ops, rate'
@@ -2314,8 +2582,14 @@ zabbix_export:
                 key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MongoDB Replica Set: {#RS_NAME}'
+                  tag: component
+                  value: operations
+                -
+                  tag: component
+                  value: replication
+                -
+                  tag: replicaset
+                  value: '{#RS_NAME}'
             -
               uuid: 7f9d03a683764e32a35b9c1d4da5ddab
               name: 'MongoDB: Network readers created, rate'
@@ -2338,8 +2612,14 @@ zabbix_export:
                 key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MongoDB Replica Set: {#RS_NAME}'
+                  tag: component
+                  value: network
+                -
+                  tag: component
+                  value: replication
+                -
+                  tag: replicaset
+                  value: '{#RS_NAME}'
             -
               uuid: 341410549bfd46058a9cb289b3254639
               name: 'MongoDB {#RS_NAME}: Oplog time diff'
@@ -2358,8 +2638,11 @@ zabbix_export:
                 key: 'mongodb.oplog.stats["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MongoDB Replica Set: {#RS_NAME}'
+                  tag: component
+                  value: replication
+                -
+                  tag: replicaset
+                  value: '{#RS_NAME}'
             -
               uuid: f759273556f5427196c86e822dc7aa95
               name: 'MongoDB: Preload docs, ms/s'
@@ -2384,8 +2667,11 @@ zabbix_export:
                 key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MongoDB Replica Set: {#RS_NAME}'
+                  tag: component
+                  value: replication
+                -
+                  tag: replicaset
+                  value: '{#RS_NAME}'
             -
               uuid: a364941cb8da416a84c0ca897a04c8f9
               name: 'MongoDB: Preload docs, rate'
@@ -2409,8 +2695,11 @@ zabbix_export:
                 key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MongoDB Replica Set: {#RS_NAME}'
+                  tag: component
+                  value: replication
+                -
+                  tag: replicaset
+                  value: '{#RS_NAME}'
             -
               uuid: c78b8e62a12b466ea6f1de84d0e9080a
               name: 'MongoDB: Preload indexes, ms/s'
@@ -2435,8 +2724,11 @@ zabbix_export:
                 key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MongoDB Replica Set: {#RS_NAME}'
+                  tag: component
+                  value: replication
+                -
+                  tag: replicaset
+                  value: '{#RS_NAME}'
             -
               uuid: ce37bf73939041ab869e4b2faaaedae3
               name: 'MongoDB: Preload indexes, rate'
@@ -2460,8 +2752,11 @@ zabbix_export:
                 key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MongoDB Replica Set: {#RS_NAME}'
+                  tag: component
+                  value: replication
+                -
+                  tag: replicaset
+                  value: '{#RS_NAME}'
             -
               uuid: 49e786da687a4b36a17bf617026e3c83
               name: 'MongoDB: Node state'
@@ -2485,8 +2780,11 @@ zabbix_export:
                 key: 'mongodb.rs.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MongoDB Replica Set: {#RS_NAME}'
+                  tag: component
+                  value: replication
+                -
+                  tag: replicaset
+                  value: '{#RS_NAME}'
               trigger_prototypes:
                 -
                   uuid: f9f29647a3db426c9c303fc47cfc48eb
@@ -2496,6 +2794,10 @@ zabbix_export:
                   priority: WARNING
                   description: 'Node in ReplicaSet  changed the state. Ack to close.'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 211d5f6768c044f8ac959724160d3ddc
               name: 'MongoDB: Number of replicas'
@@ -2518,8 +2820,11 @@ zabbix_export:
                 key: 'mongodb.rs.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MongoDB Replica Set: {#RS_NAME}'
+                  tag: component
+                  value: replication
+                -
+                  tag: replicaset
+                  value: '{#RS_NAME}'
             -
               uuid: 4b81b6e4ce1644689e5d8a4490650e6b
               name: 'MongoDB: Unhealthy replicas'
@@ -2550,8 +2855,11 @@ zabbix_export:
                 key: 'mongodb.rs.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MongoDB Replica Set: {#RS_NAME}'
+                  tag: component
+                  value: replication
+                -
+                  tag: replicaset
+                  value: '{#RS_NAME}'
             -
               uuid: b8d4a32cfa9f4b4fb5177e3389d15a5a
               name: 'MongoDB: Number of unhealthy replicas'
@@ -2574,14 +2882,21 @@ zabbix_export:
                 key: 'mongodb.rs.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MongoDB Replica Set: {#RS_NAME}'
+                  tag: component
+                  value: replication
+                -
+                  tag: replicaset
+                  value: '{#RS_NAME}'
           trigger_prototypes:
             -
               uuid: 975c5e5817b148ba8a8d551ac42053d0
               expression: 'last(/MongoDB node by Zabbix agent 2/mongodb.rs.unhealthy_count[{#RS_NAME}])>0 and length(last(/MongoDB node by Zabbix agent 2/mongodb.rs.unhealthy[{#RS_NAME}]))>0'
               name: 'MongoDB: There are unhealthy replicas in ReplicaSet'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: availability
           graph_prototypes:
             -
               uuid: 52724c49dd544470916eab1301be30da
@@ -2685,8 +3000,11 @@ zabbix_export:
                 key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: MongoDB
+                  tag: component
+                  value: cache
+                -
+                  tag: component
+                  value: wired-tiger
             -
               uuid: 20edd994c8b04e35bea96e6eacd33611
               name: 'MongoDB: WiredTiger cache: bytes, max'
@@ -2705,8 +3023,11 @@ zabbix_export:
                 key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: MongoDB
+                  tag: component
+                  value: cache
+                -
+                  tag: component
+                  value: wired-tiger
             -
               uuid: 4e07f3e517bf41c1b42661d3bbd5237e
               name: 'MongoDB: WiredTiger cache: max page size at eviction'
@@ -2725,8 +3046,11 @@ zabbix_export:
                 key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: MongoDB
+                  tag: component
+                  value: cache
+                -
+                  tag: component
+                  value: wired-tiger
             -
               uuid: 692685a9f3d9461daa88fdfcb0771e05
               name: 'MongoDB: WiredTiger cache: modified pages evicted'
@@ -2744,8 +3068,11 @@ zabbix_export:
                 key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: MongoDB
+                  tag: component
+                  value: cache
+                -
+                  tag: component
+                  value: wired-tiger
             -
               uuid: 634060250f474f269aed1df61f709ca7
               name: 'MongoDB: WiredTiger cache: pages evicted by application threads, rate'
@@ -2764,8 +3091,11 @@ zabbix_export:
                 key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: MongoDB
+                  tag: component
+                  value: cache
+                -
+                  tag: component
+                  value: wired-tiger
             -
               uuid: 547ccf6f4c7f4629831e39f72cbcfb70
               name: 'MongoDB: WiredTiger cache: pages held in cache'
@@ -2783,8 +3113,11 @@ zabbix_export:
                 key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: MongoDB
+                  tag: component
+                  value: cache
+                -
+                  tag: component
+                  value: wired-tiger
             -
               uuid: c01890f434b14e998e2aea7d61d600e5
               name: 'MongoDB: WiredTiger cache: pages read into cache'
@@ -2802,8 +3135,11 @@ zabbix_export:
                 key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: MongoDB
+                  tag: component
+                  value: cache
+                -
+                  tag: component
+                  value: wired-tiger
             -
               uuid: 0aa52db6d7684a2496fb0599139cd142
               name: 'MongoDB: WiredTiger cache: pages written from cache'
@@ -2821,8 +3157,11 @@ zabbix_export:
                 key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: MongoDB
+                  tag: component
+                  value: cache
+                -
+                  tag: component
+                  value: wired-tiger
             -
               uuid: 851100dc722b4e74883fa469e062a2e2
               name: 'MongoDB: WiredTiger cache: in-memory page splits'
@@ -2840,8 +3179,11 @@ zabbix_export:
                 key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: MongoDB
+                  tag: component
+                  value: cache
+                -
+                  tag: component
+                  value: wired-tiger
             -
               uuid: 85706ecdaa0e4c789a6542cbde35e80a
               name: 'MongoDB: WiredTiger cache: tracked dirty bytes in the cache'
@@ -2860,8 +3202,11 @@ zabbix_export:
                 key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: MongoDB
+                  tag: component
+                  value: cache
+                -
+                  tag: component
+                  value: wired-tiger
             -
               uuid: 7993e04be54b4dc0b663a105b7b9a3c4
               name: 'MongoDB: WiredTiger cache: unmodified pages evicted'
@@ -2879,8 +3224,11 @@ zabbix_export:
                 key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: MongoDB
+                  tag: component
+                  value: cache
+                -
+                  tag: component
+                  value: wired-tiger
             -
               uuid: b1a9800865db4ac8959bbdc4b2ab39ee
               name: 'MongoDB: WiredTiger concurrent transactions: read, available'
@@ -2898,8 +3246,11 @@ zabbix_export:
                 key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: MongoDB
+                  tag: component
+                  value: transactions
+                -
+                  tag: component
+                  value: wired-tiger
               trigger_prototypes:
                 -
                   uuid: 967928b915f64623b4416ed0dbf6ba98
@@ -2909,6 +3260,10 @@ zabbix_export:
                   description: |
                     "Too few available read tickets.
                     When the number of available read tickets remaining reaches zero, new read requests will be queued until a new read ticket is available."
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
             -
               uuid: b9415bf5203840209e149a6be4b110a1
               name: 'MongoDB: WiredTiger concurrent transactions: read, out'
@@ -2926,8 +3281,11 @@ zabbix_export:
                 key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: MongoDB
+                  tag: component
+                  value: transactions
+                -
+                  tag: component
+                  value: wired-tiger
             -
               uuid: 46c67d017c5040f691695fcd7645c224
               name: 'MongoDB: WiredTiger concurrent transactions: read, total tickets'
@@ -2945,8 +3303,11 @@ zabbix_export:
                 key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: MongoDB
+                  tag: component
+                  value: transactions
+                -
+                  tag: component
+                  value: wired-tiger
             -
               uuid: cb36bdd5ce0442cca03e46436f82c6a2
               name: 'MongoDB: WiredTiger concurrent transactions: write, available'
@@ -2964,8 +3325,11 @@ zabbix_export:
                 key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: MongoDB
+                  tag: component
+                  value: transactions
+                -
+                  tag: component
+                  value: wired-tiger
               trigger_prototypes:
                 -
                   uuid: 485e6e846f274b528902b3ffd08f2fc4
@@ -2975,6 +3339,10 @@ zabbix_export:
                   description: |
                     "Too few available write tickets.
                     When the number of available write tickets remaining reaches zero, new write requests will be queued until a new write ticket is available."
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
             -
               uuid: b997757256e441dca58758192126ac44
               name: 'MongoDB: WiredTiger concurrent transactions: write, out'
@@ -2992,8 +3360,11 @@ zabbix_export:
                 key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: MongoDB
+                  tag: component
+                  value: transactions
+                -
+                  tag: component
+                  value: wired-tiger
             -
               uuid: e9eb61954ab6462d9dbcf9206467b076
               name: 'MongoDB: WiredTiger concurrent transactions: write, total tickets'
@@ -3011,8 +3382,11 @@ zabbix_export:
                 key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: MongoDB
+                  tag: component
+                  value: transactions
+                -
+                  tag: component
+                  value: wired-tiger
           master_item:
             key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
           preprocessing:
@@ -3026,6 +3400,13 @@ zabbix_export:
               type: DISCARD_UNCHANGED_HEARTBEAT
               parameters:
                 - 6h
+      tags:
+        -
+          tag: class
+          value: database
+        -
+          tag: target
+          value: mongodb-node
       macros:
         -
           macro: '{$MONGODB.CONNS.PCT.USED.MAX.WARN}'
@@ -3135,6 +3516,10 @@ zabbix_export:
       name: 'MongoDB: Total number of open connections is too high (over {$MONGODB.CONNS.PCT.USED.MAX.WARN%} in 5m)'
       priority: WARNING
       description: 'Too few available connections. If MongoDB runs low on connections, in may not be able to handle incoming requests in a timely manner.'
+      tags:
+        -
+          tag: scope
+          value: capacity
   graphs:
     -
       uuid: b018e24581464b0282df09fb9d6fc129
diff --git a/templates/db/mongodb_cluster/template_db_mongodb_cluster.yaml b/templates/db/mongodb_cluster/template_db_mongodb_cluster.yaml
index 13e1c09aae8..2c2218ca0f2 100644
--- a/templates/db/mongodb_cluster/template_db_mongodb_cluster.yaml
+++ b/templates/db/mongodb_cluster/template_db_mongodb_cluster.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-16T07:08:28Z'
+  date: '2022-01-26T10:51:51Z'
   groups:
     -
       uuid: 748ad4d098d447d492bb935c907f652f
@@ -20,7 +20,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/420659-discussion-thread-for-official-zabbix-template-db-mongodb
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Databases
@@ -45,8 +45,8 @@ zabbix_export:
             key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: 'MongoDB sharded cluster'
+              tag: component
+              value: configserver
         -
           uuid: fccb23cdee01483cabe6ef14a532664b
           name: 'MongoDB cluster: Connections, active'
@@ -69,8 +69,8 @@ zabbix_export:
             key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: 'MongoDB sharded cluster'
+              tag: component
+              value: connections
         -
           uuid: 1f881cbd515d462eb5839fe4e1e21ee1
           name: 'MongoDB cluster: Connections, available'
@@ -88,8 +88,8 @@ zabbix_export:
             key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: 'MongoDB sharded cluster'
+              tag: component
+              value: connections
           triggers:
             -
               uuid: eae86b6f98db49099259a466b78d1c59
@@ -99,6 +99,10 @@ zabbix_export:
               description: |
                 "Too few available connections.
                 Consider this value in combination with the value of connections current to understand the connection load on the database"
+              tags:
+                -
+                  tag: scope
+                  value: capacity
         -
           uuid: 087d1a405b7a456692a52b0d20c43eb3
           name: 'MongoDB cluster: Connections, current'
@@ -118,8 +122,8 @@ zabbix_export:
             key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: 'MongoDB sharded cluster'
+              tag: component
+              value: connections
         -
           uuid: 18ed07f0efb54f55970483d15613d320
           name: 'MongoDB cluster: New connections, rate'
@@ -142,8 +146,8 @@ zabbix_export:
             key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: 'MongoDB sharded cluster'
+              tag: component
+              value: connections
         -
           uuid: 281e5a1a19dc402a992331252b27ee63
           name: 'MongoDB cluster: Connection pool: available'
@@ -161,8 +165,8 @@ zabbix_export:
             key: 'mongodb.connpool.stats["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: 'MongoDB sharded cluster'
+              tag: component
+              value: connections
         -
           uuid: 58522550e8bc4f479681d961ba789b92
           name: 'MongoDB cluster: Connection pool: client connections'
@@ -180,8 +184,8 @@ zabbix_export:
             key: 'mongodb.connpool.stats["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: 'MongoDB sharded cluster'
+              tag: component
+              value: connections
         -
           uuid: 9b9d601d2d5c4d8da5d97c2785d8e0fa
           name: 'MongoDB cluster: Connection pool: created, rate'
@@ -204,8 +208,8 @@ zabbix_export:
             key: 'mongodb.connpool.stats["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: 'MongoDB sharded cluster'
+              tag: component
+              value: connections
         -
           uuid: 9394a15a25e342688335b7d83db25b2d
           name: 'MongoDB cluster: Connection pool: in use'
@@ -223,8 +227,8 @@ zabbix_export:
             key: 'mongodb.connpool.stats["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: 'MongoDB sharded cluster'
+              tag: component
+              value: connections
         -
           uuid: 22c66363ffae4ae2b436a26b8ecca3ab
           name: 'MongoDB cluster: Connection pool: refreshing'
@@ -242,8 +246,8 @@ zabbix_export:
             key: 'mongodb.connpool.stats["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: 'MongoDB sharded cluster'
+              tag: component
+              value: connections
         -
           uuid: 55dbfe5d52c44954b9e5669a043f10b4
           name: 'MongoDB cluster: Connection pool: scoped'
@@ -261,8 +265,8 @@ zabbix_export:
             key: 'mongodb.connpool.stats["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: 'MongoDB sharded cluster'
+              tag: component
+              value: connections
         -
           uuid: f34fcc3866b446748b7a8d11311edd82
           name: 'MongoDB cluster: Get mongodb.connpool.stats'
@@ -273,8 +277,11 @@ zabbix_export:
           description: 'Returns current info about connpool.stats.'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: connections
+            -
+              tag: component
+              value: raw
         -
           uuid: 22ca0c06006b49009f25fcd829f1b5bf
           name: 'MongoDB cluster: Cursor: open pinned'
@@ -292,8 +299,8 @@ zabbix_export:
             key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: 'MongoDB sharded cluster'
+              tag: component
+              value: cursors
         -
           uuid: 45bfa997dab9498e8e3851de750e21a2
           name: 'MongoDB cluster: Cursor: open total'
@@ -311,14 +318,18 @@ zabbix_export:
             key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: 'MongoDB sharded cluster'
+              tag: component
+              value: cursors
           triggers:
             -
               uuid: 67db1f543818476ca0b07e2cc1709452
               expression: 'min(/MongoDB cluster by Zabbix agent 2/mongodb.cursor.open.total,5m)>{$MONGODB.CURSOR.OPEN.MAX.WARN}'
               name: 'MongoDB cluster: Too many cursors opened by MongoDB for clients (over {$MONGODB.CURSOR.OPEN.MAX.WARN} in 5m)'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: capacity
         -
           uuid: 5d3a3c724a6a45fb99a0af5330bf9cf2
           name: 'MongoDB cluster: Cursor: timed out, rate'
@@ -341,14 +352,18 @@ zabbix_export:
             key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: 'MongoDB sharded cluster'
+              tag: component
+              value: cursors
           triggers:
             -
               uuid: 5ea8cf9c955940a6a580cd6f4bb2cc78
               expression: 'min(/MongoDB cluster by Zabbix agent 2/mongodb.cursor.timed_out.rate,5m)>{$MONGODB.CURSOR.TIMEOUT.MAX.WARN}'
               name: 'MongoDB cluster: Too many cursors are timing out (over {$MONGODB.CURSOR.TIMEOUT.MAX.WARN} per second in 5m)'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: perfomance
         -
           uuid: 110685e463e141ca800b2638e3532d51
           name: 'MongoDB cluster: Jumbo chunks'
@@ -357,8 +372,8 @@ zabbix_export:
           description: 'Total number of ''jumbo'' chunks in the mongo cluster.'
           tags:
             -
-              tag: Application
-              value: 'MongoDB sharded cluster'
+              tag: component
+              value: application
         -
           uuid: fa28a98992e74cdf8c54b4faa01de89a
           name: 'MongoDB cluster: Last seen configserver'
@@ -379,8 +394,8 @@ zabbix_export:
             key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: 'MongoDB sharded cluster'
+              tag: component
+              value: configserver
         -
           uuid: df2423ff36e24357809c7a7211144898
           name: 'MongoDB cluster: Architecture'
@@ -403,8 +418,8 @@ zabbix_export:
             key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: 'MongoDB sharded cluster'
+              tag: component
+              value: application
         -
           uuid: f6a06e0d7cf84cc1a40d8d2dcde7b01a
           name: 'MongoDB cluster: Memory: resident'
@@ -427,8 +442,8 @@ zabbix_export:
             key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: 'MongoDB sharded cluster'
+              tag: component
+              value: memory
         -
           uuid: 2c5548ae9c614efb81e58a2e4ec3d3e4
           name: 'MongoDB cluster: Memory: virtual'
@@ -451,8 +466,8 @@ zabbix_export:
             key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: 'MongoDB sharded cluster'
+              tag: component
+              value: memory
         -
           uuid: 16925e0ca40747d1818e512962d31a83
           name: 'MongoDB cluster: Cursor: open no timeout'
@@ -470,8 +485,8 @@ zabbix_export:
             key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: 'MongoDB sharded cluster'
+              tag: component
+              value: cursors
         -
           uuid: 59481dcb9b5a487985297e2f41f72dd1
           name: 'MongoDB cluster: Bytes in, rate'
@@ -494,8 +509,8 @@ zabbix_export:
             key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: 'MongoDB sharded cluster'
+              tag: component
+              value: network
         -
           uuid: 13cba18ba344440bba4371585fd8e4c0
           name: 'MongoDB cluster: Bytes out, rate'
@@ -519,8 +534,8 @@ zabbix_export:
             key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: 'MongoDB sharded cluster'
+              tag: component
+              value: network
         -
           uuid: eb821875b59c4bf8bc98f9afec146e88
           name: 'MongoDB cluster: Requests, rate'
@@ -544,8 +559,8 @@ zabbix_export:
             key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: 'MongoDB sharded cluster'
+              tag: component
+              value: network
         -
           uuid: b98fb6d98b9a4282ba0b2d9770722035
           name: 'MongoDB cluster: Operations: command'
@@ -570,8 +585,8 @@ zabbix_export:
             key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: 'MongoDB sharded cluster'
+              tag: component
+              value: operations
         -
           uuid: f4e917e9cdd3439abbe6ea7b9a9034b7
           name: 'MongoDB cluster: Operations: delete'
@@ -580,7 +595,7 @@ zabbix_export:
           delay: '0'
           history: 7d
           value_type: FLOAT
-          description: '"The number of delete operations the mongos instance per second."'
+          description: 'The number of delete operations the mongos instance per second.'
           preprocessing:
             -
               type: JSONPATH
@@ -594,8 +609,8 @@ zabbix_export:
             key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: 'MongoDB sharded cluster'
+              tag: component
+              value: operations
         -
           uuid: 165d5a180ed541ba9a19916134962368
           name: 'MongoDB cluster: Operations: getmore, rate'
@@ -620,8 +635,8 @@ zabbix_export:
             key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: 'MongoDB sharded cluster'
+              tag: component
+              value: operations
         -
           uuid: 021a00004efe434a9b2f316c0d25c175
           name: 'MongoDB cluster: Operations: insert, rate'
@@ -630,7 +645,7 @@ zabbix_export:
           delay: '0'
           history: 7d
           value_type: FLOAT
-          description: '"The number of insert operations received the mongos instance per second."'
+          description: 'The number of insert operations received the mongos instance per second.'
           preprocessing:
             -
               type: JSONPATH
@@ -644,8 +659,8 @@ zabbix_export:
             key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: 'MongoDB sharded cluster'
+              tag: component
+              value: operations
         -
           uuid: 0866b3b6bc1748a98e8bfd9308152304
           name: 'MongoDB cluster: Operations: query, rate'
@@ -654,7 +669,7 @@ zabbix_export:
           delay: '0'
           history: 7d
           value_type: FLOAT
-          description: '"The number of queries received the mongos instance per second."'
+          description: 'The number of queries received the mongos instance per second.'
           preprocessing:
             -
               type: JSONPATH
@@ -668,8 +683,8 @@ zabbix_export:
             key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: 'MongoDB sharded cluster'
+              tag: component
+              value: operations
         -
           uuid: 329e6d41de1c47dba8f3f9d287c93eda
           name: 'MongoDB cluster: Operations: update, rate'
@@ -678,7 +693,7 @@ zabbix_export:
           delay: '0'
           history: 7d
           value_type: FLOAT
-          description: '"The number of update operations the mongos instance per second."'
+          description: 'The number of update operations the mongos instance per second.'
           preprocessing:
             -
               type: JSONPATH
@@ -692,8 +707,8 @@ zabbix_export:
             key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: 'MongoDB sharded cluster'
+              tag: component
+              value: operations
         -
           uuid: ff979eb9ba4a4420a753913df5431219
           name: 'MongoDB cluster: Ping'
@@ -710,8 +725,8 @@ zabbix_export:
                 - 30m
           tags:
             -
-              tag: Application
-              value: 'MongoDB sharded cluster'
+              tag: component
+              value: health
           triggers:
             -
               uuid: cd74289970204ca281c5bc7d5c695e95
@@ -719,6 +734,10 @@ zabbix_export:
               name: 'MongoDB cluster: Connection to mongos proxy is unavailable'
               priority: HIGH
               description: 'Connection to mongos proxy instance is currently unavailable.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: b8c6dadff060447e9718b49fdc796d8d
           name: 'MongoDB cluster: Get server status'
@@ -729,8 +748,8 @@ zabbix_export:
           description: 'The mongos statistic'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
         -
           uuid: e88da2ca6ccc4fdfa256fa51e050792d
           name: 'MongoDB cluster: Uptime'
@@ -749,8 +768,8 @@ zabbix_export:
             key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: 'MongoDB sharded cluster'
+              tag: component
+              value: application
           triggers:
             -
               uuid: ee70d6da232a4068b574c9c147c622c9
@@ -763,6 +782,10 @@ zabbix_export:
                 -
                   name: 'MongoDB cluster: Connection to mongos proxy is unavailable'
                   expression: 'last(/MongoDB cluster by Zabbix agent 2/mongodb.ping["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"])=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 99ff438a7e3e4b0a8190b2ab9f41f076
               expression: 'last(/MongoDB cluster by Zabbix agent 2/mongodb.uptime)<10m'
@@ -770,6 +793,10 @@ zabbix_export:
               priority: INFO
               description: 'Uptime is less than 10 minutes'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: dda1722d6e6b4189978fd44ace0f8f86
           name: 'MongoDB cluster: Mongos version'
@@ -793,8 +820,8 @@ zabbix_export:
             key: 'mongodb.server.status["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: 'MongoDB sharded cluster'
+              tag: component
+              value: application
           triggers:
             -
               uuid: 921ee489887943838d69558f103ad646
@@ -803,6 +830,10 @@ zabbix_export:
               priority: INFO
               description: 'MongoDB cluster version has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
       discovery_rules:
         -
           uuid: eb57a506cc5640a79e6df51179321ba0
@@ -880,8 +911,14 @@ zabbix_export:
                 key: 'mongodb.collection.stats["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}","{#DBNAME}","{#COLLECTION}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MongoDB sharded cluster: {#DBNAME}.{#COLLECTION}'
+                  tag: collection
+                  value: '{#COLLECTION}'
+                -
+                  tag: component
+                  value: objects
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: 59465dc6e9384c7baf1a6239a6c66f0e
               name: 'MongoDB {#DBNAME}.{#COLLECTION}: Capped'
@@ -911,8 +948,14 @@ zabbix_export:
                 key: 'mongodb.collection.stats["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}","{#DBNAME}","{#COLLECTION}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MongoDB sharded cluster: {#DBNAME}.{#COLLECTION}'
+                  tag: collection
+                  value: '{#COLLECTION}'
+                -
+                  tag: component
+                  value: application
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: 03b8eb71502a4805902f7a5856e7c7b6
               name: 'MongoDB {#DBNAME}.{#COLLECTION}: Objects, count'
@@ -930,8 +973,14 @@ zabbix_export:
                 key: 'mongodb.collection.stats["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}","{#DBNAME}","{#COLLECTION}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MongoDB sharded cluster: {#DBNAME}.{#COLLECTION}'
+                  tag: collection
+                  value: '{#COLLECTION}'
+                -
+                  tag: component
+                  value: objects
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: 2a78fa441bef4523bd0fee4934fc7b55
               name: 'MongoDB {#DBNAME}.{#COLLECTION}: Capped, max number'
@@ -951,8 +1000,14 @@ zabbix_export:
                 key: 'mongodb.collection.stats["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}","{#DBNAME}","{#COLLECTION}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MongoDB sharded cluster: {#DBNAME}.{#COLLECTION}'
+                  tag: collection
+                  value: '{#COLLECTION}'
+                -
+                  tag: component
+                  value: application
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: 294985df777b42e0a56a229366bbac5d
               name: 'MongoDB {#DBNAME}.{#COLLECTION}: Capped, max size'
@@ -972,8 +1027,14 @@ zabbix_export:
                 key: 'mongodb.collection.stats["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}","{#DBNAME}","{#COLLECTION}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MongoDB sharded cluster: {#DBNAME}.{#COLLECTION}'
+                  tag: collection
+                  value: '{#COLLECTION}'
+                -
+                  tag: component
+                  value: disk
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: 8da7cc960e8d42ccb3efe065fff5f0e9
               name: 'MongoDB {#DBNAME}.{#COLLECTION}: Indexes'
@@ -991,8 +1052,14 @@ zabbix_export:
                 key: 'mongodb.collection.stats["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}","{#DBNAME}","{#COLLECTION}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MongoDB sharded cluster: {#DBNAME}.{#COLLECTION}'
+                  tag: collection
+                  value: '{#COLLECTION}'
+                -
+                  tag: component
+                  value: application
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: 191a21d9a1b94b238009e31433dbaa38
               name: 'MongoDB {#DBNAME}.{#COLLECTION}: Size'
@@ -1011,8 +1078,14 @@ zabbix_export:
                 key: 'mongodb.collection.stats["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}","{#DBNAME}","{#COLLECTION}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MongoDB sharded cluster: {#DBNAME}.{#COLLECTION}'
+                  tag: collection
+                  value: '{#COLLECTION}'
+                -
+                  tag: component
+                  value: disk
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: aa964be0bc5c4318bc92c3192c269d8e
               name: 'MongoDB {#DBNAME}.{#COLLECTION}: Get collection stats {#DBNAME}.{#COLLECTION}'
@@ -1023,8 +1096,14 @@ zabbix_export:
               description: 'Returns a variety of storage statistics for a given collection.'
               tags:
                 -
-                  tag: Application
-                  value: 'Zabbix raw items'
+                  tag: collection
+                  value: '{#COLLECTION}'
+                -
+                  tag: component
+                  value: raw
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: ef82b9f814cd4917b3714e73d7ac87ac
               name: 'MongoDB {#DBNAME}.{#COLLECTION}: Storage size'
@@ -1043,8 +1122,14 @@ zabbix_export:
                 key: 'mongodb.collection.stats["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}","{#DBNAME}","{#COLLECTION}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MongoDB sharded cluster: {#DBNAME}.{#COLLECTION}'
+                  tag: collection
+                  value: '{#COLLECTION}'
+                -
+                  tag: component
+                  value: disk
+                -
+                  tag: database
+                  value: '{#DBNAME}'
         -
           uuid: 25ece32c5f764461913f605ba3d7736a
           name: 'Database discovery'
@@ -1084,8 +1169,11 @@ zabbix_export:
                 key: 'mongodb.db.stats["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}","{#DBNAME}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MongoDB sharded cluster: {#DBNAME}'
+                  tag: component
+                  value: disk
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: 98c9e25c24b146aeaec4953913bb720a
               name: 'MongoDB {#DBNAME}: Extents'
@@ -1104,8 +1192,11 @@ zabbix_export:
                 key: 'mongodb.db.stats["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}","{#DBNAME}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MongoDB sharded cluster: {#DBNAME}'
+                  tag: component
+                  value: collections
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: cfb3598af7f14911965d548ea815cb33
               name: 'MongoDB {#DBNAME}: Size, file'
@@ -1125,8 +1216,11 @@ zabbix_export:
                 key: 'mongodb.db.stats["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}","{#DBNAME}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MongoDB sharded cluster: {#DBNAME}'
+                  tag: component
+                  value: disk
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: 1716a51105f2415eb179a43022656e4a
               name: 'MongoDB {#DBNAME}: Size, index'
@@ -1145,8 +1239,11 @@ zabbix_export:
                 key: 'mongodb.db.stats["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}","{#DBNAME}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MongoDB sharded cluster: {#DBNAME}'
+                  tag: component
+                  value: disk
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: f28f2df7b1e64aea99b20ca8deda2a25
               name: 'MongoDB {#DBNAME}: Objects, count'
@@ -1164,8 +1261,11 @@ zabbix_export:
                 key: 'mongodb.db.stats["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}","{#DBNAME}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MongoDB sharded cluster: {#DBNAME}'
+                  tag: component
+                  value: objects
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: ed3076f82f494b6e953a9a5a3199df06
               name: 'MongoDB {#DBNAME}: Objects, avg size'
@@ -1185,8 +1285,11 @@ zabbix_export:
                 key: 'mongodb.db.stats["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}","{#DBNAME}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MongoDB sharded cluster: {#DBNAME}'
+                  tag: component
+                  value: objects
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: 7fbc424bca06451d9ed1fe689ea81bf9
               name: 'MongoDB {#DBNAME}: Get db stats {#DBNAME}'
@@ -1197,8 +1300,14 @@ zabbix_export:
               description: 'Returns statistics reflecting the database system''s state.'
               tags:
                 -
-                  tag: Application
-                  value: 'Zabbix raw items'
+                  tag: component
+                  value: database
+                -
+                  tag: component
+                  value: raw
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: ae54fbae851b4b5a949611420fbc8ce0
               name: 'MongoDB {#DBNAME}: Size, storage'
@@ -1217,8 +1326,11 @@ zabbix_export:
                 key: 'mongodb.db.stats["{$MONGODB.CONNSTRING}","{$MONGODB.USER}","{$MONGODB.PASSWORD}","{#DBNAME}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MongoDB sharded cluster: {#DBNAME}'
+                  tag: component
+                  value: disk
+                -
+                  tag: database
+                  value: '{#DBNAME}'
           graph_prototypes:
             -
               uuid: 44e0e02d1e9a420b9dc917d8cf4bf983
@@ -1273,6 +1385,13 @@ zabbix_export:
                   macro: '{$MONGODB.CONNSTRING}'
                   value: '{#MONGOD_URI}'
                   description: 'Connection string in the URI format (password is not used).'
+      tags:
+        -
+          tag: class
+          value: database
+        -
+          tag: target
+          value: mongodb-cluster
       macros:
         -
           macro: '{$MONGODB.CONNS.AVAILABLE.MIN.WARN}'
diff --git a/templates/db/mssql_odbc/README.md b/templates/db/mssql_odbc/README.md
index f8459593b56..488b58d9288 100644
--- a/templates/db/mssql_odbc/README.md
+++ b/templates/db/mssql_odbc/README.md
@@ -91,13 +91,13 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|Database discovery |<p>Scanning databases in DBMS.</p> |ODBC |db.odbc.discovery[dbname,"{$MSSQL.DSN}"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p><p>**Filter**:</p>AND <p>- {#DBNAME} MATCHES_REGEX `{$MSSQL.DBNAME.MATCHES}`</p><p>- {#DBNAME} NOT_MATCHES_REGEX `{$MSSQL.DBNAME.NOT_MATCHES}`</p> |
 |Availability groups discovery |<p>Discovery of the existing availability groups.</p> |ODBC |db.odbc.discovery[availability_groups,"{$MSSQL.DSN}"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Database discovery |<p>Scanning databases in DBMS.</p> |ODBC |db.odbc.discovery[dbname,"{$MSSQL.DSN}"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p><p>**Filter**:</p>AND <p>- {#DBNAME} MATCHES_REGEX `{$MSSQL.DBNAME.MATCHES}`</p><p>- {#DBNAME} NOT_MATCHES_REGEX `{$MSSQL.DBNAME.NOT_MATCHES}`</p> |
+|Job discovery |<p>Scanning jobs in DBMS.</p> |ODBC |db.odbc.discovery[jobname,"{$MSSQL.DSN}"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p><p>**Filter**:</p>AND_OR <p>- {#JOBNAME} MATCHES_REGEX `{$MSSQL.JOB.MATCHES}`</p><p>- {#JOBNAME} NOT_MATCHES_REGEX `{$MSSQL.JOB.NOT_MATCHES}`</p> |
 |Local database discovery |<p>Discovery of the local availability databases.</p> |ODBC |db.odbc.discovery[local_db,"{$MSSQL.DSN}"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Mirroring discovery |<p>To see the row for a database other than master or tempdb, you must</p><p>either be the database owner or have at least ALTER ANY DATABASE or VIEW ANY</p><p>DATABASE server-level permission or CREATE DATABASE permission in the master</p><p>database. To see non-NULL values on a mirror database, you must be a member</p><p>of the sysadmin fixed server role.</p> |ODBC |db.odbc.discovery[mirrors,"{$MSSQL.DSN}"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
 |Non-local database discovery |<p>Discovery of the non-local (not local to the SQL Server instance) availability databases.</p> |ODBC |db.odbc.discovery[non-local_db,"{$MSSQL.DSN}"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
 |Replication discovery |<p>Discovery of the database replicas.</p> |ODBC |db.odbc.discovery[replicas,"{$MSSQL.DSN}"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
-|Mirroring discovery |<p>To see the row for a database other than master or tempdb, you must</p><p>either be the database owner or have at least ALTER ANY DATABASE or VIEW ANY</p><p>DATABASE server-level permission or CREATE DATABASE permission in the master</p><p>database. To see non-NULL values on a mirror database, you must be a member</p><p>of the sysadmin fixed server role.</p> |ODBC |db.odbc.discovery[mirrors,"{$MSSQL.DSN}"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
-|Job discovery |<p>Scanning jobs in DBMS.</p> |ODBC |db.odbc.discovery[jobname,"{$MSSQL.DSN}"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p><p>**Filter**:</p>AND_OR <p>- {#JOBNAME} MATCHES_REGEX `{$MSSQL.JOB.MATCHES}`</p><p>- {#JOBNAME} NOT_MATCHES_REGEX `{$MSSQL.JOB.NOT_MATCHES}`</p> |
 
 ## Items collected
 
@@ -214,18 +214,18 @@ There are no template links in this template.
 |MSSQL |MSSQL Job '{#JOBNAME}': Last run status message |<p>The informational message about the last run of the job.</p> |DEPENDENT |mssql.job.lastrunstatusmessage["{#JOBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.JobName=='{#JOBNAME}')].LastRunStatusMessage.first()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
 |MSSQL |MSSQL Job '{#JOBNAME}': Run status |<p>The job status possible values:</p><p>0 ⇒ Failed</p><p>1 ⇒ Succeeded</p><p>2 ⇒ Retry</p><p>3 ⇒ Canceled</p><p>4 ⇒ Running</p> |DEPENDENT |mssql.job.runstatus["{#JOBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.JobName=='{#JOBNAME}')].RunStatus.first()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
 |MSSQL |MSSQL Job '{#JOBNAME}': Run duration |<p>Duration of the last run job.</p> |DEPENDENT |mssql.job.run_duration["{#JOBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.JobName=='{#JOBNAME}')].RunDuration.first()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
-|Zabbix_raw_items |MSSQL: Get last backup |<p>The item gets information about backup processes.</p> |ODBC |db.odbc.get[get_last_backup,"{$MSSQL.DSN}"]<p>**Expression**:</p>`The text is too long. Please see the template.` |
-|Zabbix_raw_items |MSSQL: Get job status |<p>The item gets sql agent job status.</p> |ODBC |db.odbc.get[get_job_status,"{$MSSQL.DSN}"]<p>**Expression**:</p>`The text is too long. Please see the template.` |
-|Zabbix_raw_items |MSSQL: Get performance counters |<p>The item gets server global status information.</p> |ODBC |db.odbc.get[get_status_variables,"{$MSSQL.DSN}"]<p>**Expression**:</p>`The text is too long. Please see the template.` |
-|Zabbix_raw_items |MSSQL: Average latch wait time raw |<p>Average latch wait time (in milliseconds) for latch requests that had to wait.</p> |DEPENDENT |mssql.average_latch_wait_time_raw<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Latches' && @.counter_name=='Average Latch Wait Time (ms)')].cntr_value.first()`</p> |
-|Zabbix_raw_items |MSSQL: Average latch wait time base |<p>For internal use only.</p> |DEPENDENT |mssql.average_latch_wait_time_base<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Latches' && @.counter_name=='Average Latch Wait Time Base')].cntr_value.first()`</p> |
-|Zabbix_raw_items |MSSQL: Total average wait time raw |<p>Average amount of wait time (in milliseconds) for each lock request that resulted in a wait. Information for all locks.</p> |DEPENDENT |mssql.average_wait_time_raw<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Locks' && @.counter_name=='Average Wait Time (ms)' && @.instance_name=='_Total')].cntr_value.first()`</p> |
-|Zabbix_raw_items |MSSQL: Total average wait time base |<p>For internal use only.</p> |DEPENDENT |mssql.average_wait_time_base<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Locks' && @.counter_name=='Average Wait Time Base' && @.instance_name=='_Total')].cntr_value.first()`</p> |
-|Zabbix_raw_items |MSSQL AG '{#GROUP_NAME}': Get replica states |<p>Getting replica states - name, primary and secondary health, synchronization health.</p> |ODBC |db.odbc.get[{#GROUP_NAME}_replica_states,"{$MSSQL.DSN}"]<p>**Expression**:</p>`The text is too long. Please see the template.` |
-|Zabbix_raw_items |MSSQL AG '{#GROUP_NAME}' Local DB '{#DBNAME}': Get local DB states |<p>Getting the states of the local availability database.</p> |ODBC |db.odbc.get["{#GROUP_NAME}_{#DBNAME}_local_db.states","{$MSSQL.DSN}"]<p>**Expression**:</p>`The text is too long. Please see the template.` |
-|Zabbix_raw_items |MSSQL AG '{#GROUP_NAME}' Non-Local DB '*{#REPLICA_NAME}*{#DBNAME}': Get non-local DB states |<p>Getting the states of the non-local availability database.</p> |ODBC |db.odbc.get["{#GROUP_NAME}*{#REPLICA_NAME}*{#DBNAME}_non-local_db.states","{$MSSQL.DSN}"]<p>**Expression**:</p>`The text is too long. Please see the template.` |
-|Zabbix_raw_items |MSSQL AG '{#GROUP_NAME}' Replica '{#REPLICA_NAME}': Get the replica state |<p>Getting the database replica states.</p> |ODBC |db.odbc.get["{#GROUP_NAME}_{#REPLICA_NAME}_replica.state","{$MSSQL.DSN}"]<p>**Expression**:</p>`The text is too long. Please see the template.` |
-|Zabbix_raw_items |MSSQL Mirroring '{#DBNAME}': Get the mirror state |<p>Getting mirrors state</p> |ODBC |db.odbc.get["{#DBNAME}_mirroring_state","{$MSSQL.DSN}"]<p>**Expression**:</p>`The text is too long. Please see the template.` |
+|Zabbix raw items |MSSQL: Get last backup |<p>The item gets information about backup processes.</p> |ODBC |db.odbc.get[get_last_backup,"{$MSSQL.DSN}"]<p>**Expression**:</p>`The text is too long. Please see the template.` |
+|Zabbix raw items |MSSQL: Get job status |<p>The item gets sql agent job status.</p> |ODBC |db.odbc.get[get_job_status,"{$MSSQL.DSN}"]<p>**Expression**:</p>`The text is too long. Please see the template.` |
+|Zabbix raw items |MSSQL: Get performance counters |<p>The item gets server global status information.</p> |ODBC |db.odbc.get[get_status_variables,"{$MSSQL.DSN}"]<p>**Expression**:</p>`The text is too long. Please see the template.` |
+|Zabbix raw items |MSSQL: Average latch wait time raw |<p>Average latch wait time (in milliseconds) for latch requests that had to wait.</p> |DEPENDENT |mssql.average_latch_wait_time_raw<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Latches' && @.counter_name=='Average Latch Wait Time (ms)')].cntr_value.first()`</p> |
+|Zabbix raw items |MSSQL: Average latch wait time base |<p>For internal use only.</p> |DEPENDENT |mssql.average_latch_wait_time_base<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Latches' && @.counter_name=='Average Latch Wait Time Base')].cntr_value.first()`</p> |
+|Zabbix raw items |MSSQL: Total average wait time raw |<p>Average amount of wait time (in milliseconds) for each lock request that resulted in a wait. Information for all locks.</p> |DEPENDENT |mssql.average_wait_time_raw<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Locks' && @.counter_name=='Average Wait Time (ms)' && @.instance_name=='_Total')].cntr_value.first()`</p> |
+|Zabbix raw items |MSSQL: Total average wait time base |<p>For internal use only.</p> |DEPENDENT |mssql.average_wait_time_base<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.object_name=='{$MSSQL.INSTANCE}:Locks' && @.counter_name=='Average Wait Time Base' && @.instance_name=='_Total')].cntr_value.first()`</p> |
+|Zabbix raw items |MSSQL AG '{#GROUP_NAME}': Get replica states |<p>Getting replica states - name, primary and secondary health, synchronization health.</p> |ODBC |db.odbc.get[{#GROUP_NAME}_replica_states,"{$MSSQL.DSN}"]<p>**Expression**:</p>`The text is too long. Please see the template.` |
+|Zabbix raw items |MSSQL AG '{#GROUP_NAME}' Local DB '{#DBNAME}': Get local DB states |<p>Getting the states of the local availability database.</p> |ODBC |db.odbc.get["{#GROUP_NAME}_{#DBNAME}_local_db.states","{$MSSQL.DSN}"]<p>**Expression**:</p>`The text is too long. Please see the template.` |
+|Zabbix raw items |MSSQL AG '{#GROUP_NAME}' Non-Local DB '*{#REPLICA_NAME}*{#DBNAME}': Get non-local DB states |<p>Getting the states of the non-local availability database.</p> |ODBC |db.odbc.get["{#GROUP_NAME}*{#REPLICA_NAME}*{#DBNAME}_non-local_db.states","{$MSSQL.DSN}"]<p>**Expression**:</p>`The text is too long. Please see the template.` |
+|Zabbix raw items |MSSQL AG '{#GROUP_NAME}' Replica '{#REPLICA_NAME}': Get the replica state |<p>Getting the database replica states.</p> |ODBC |db.odbc.get["{#GROUP_NAME}_{#REPLICA_NAME}_replica.state","{$MSSQL.DSN}"]<p>**Expression**:</p>`The text is too long. Please see the template.` |
+|Zabbix raw items |MSSQL Mirroring '{#DBNAME}': Get the mirror state |<p>Getting mirrors state</p> |ODBC |db.odbc.get["{#DBNAME}_mirroring_state","{$MSSQL.DSN}"]<p>**Expression**:</p>`The text is too long. Please see the template.` |
 
 ## Triggers
 
@@ -292,7 +292,7 @@ There are no template links in this template.
 
 Please report any issues with the template at https://support.zabbix.com
 
-You can also provide a feedback, discuss the template or ask for help with it at [ZABBIX forums](https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/).
+You can also provide feedback, discuss the template or ask for help with it at [ZABBIX forums](https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/).
 
 
 ## References
diff --git a/templates/db/mssql_odbc/template_db_mssql_odbc.yaml b/templates/db/mssql_odbc/template_db_mssql_odbc.yaml
index 2ffdc97007c..9cee77ecff3 100644
--- a/templates/db/mssql_odbc/template_db_mssql_odbc.yaml
+++ b/templates/db/mssql_odbc/template_db_mssql_odbc.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-10T13:23:24Z'
+  date: '2022-01-26T10:37:54Z'
   groups:
     -
       uuid: 748ad4d098d447d492bb935c907f652f
@@ -25,7 +25,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Databases
@@ -64,8 +64,8 @@ zabbix_export:
           description: 'The item gets sql agent job status.'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
         -
           uuid: 9b106ca122fb4b75a761e80f4239f906
           name: 'MSSQL: Get last backup'
@@ -93,8 +93,8 @@ zabbix_export:
           description: 'The item gets information about backup processes.'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
         -
           uuid: ff07b83d161c4e0fbddf8c2e2c282258
           name: 'MSSQL: Get performance counters'
@@ -144,8 +144,8 @@ zabbix_export:
           description: 'The item gets server global status information.'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
         -
           uuid: 9a83826b50ac4928b9a716cf94ed6b61
           name: 'MSSQL: Auto-param attempts per second'
@@ -168,8 +168,8 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MSSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MSSQL
+              tag: component
+              value: performance
         -
           uuid: 1d49af2907d541719e4482439de3ef40
           name: 'MSSQL: Average latch wait time'
@@ -186,8 +186,8 @@ zabbix_export:
           description: 'Average latch wait time (in milliseconds) for latch requests that had to wait.'
           tags:
             -
-              tag: Application
-              value: MSSQL
+              tag: component
+              value: wait-time
         -
           uuid: f9d78cd9c941471287a24ca94005e9ac
           name: 'MSSQL: Average latch wait time base'
@@ -205,8 +205,8 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MSSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: wait-time
         -
           uuid: 7248e70669674ef5a7a85deb20b1fe8e
           name: 'MSSQL: Average latch wait time raw'
@@ -225,8 +225,8 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MSSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: wait-time
         -
           uuid: 2915866b5891480aafd73463aca88a21
           name: 'MSSQL: Total average wait time'
@@ -243,8 +243,8 @@ zabbix_export:
           description: 'The average wait time, in milliseconds, for each lock request that had to wait.'
           tags:
             -
-              tag: Application
-              value: MSSQL
+              tag: component
+              value: wait-time
           triggers:
             -
               uuid: fad2c1e9d0ba45bcbb47ccbb327f0b98
@@ -252,6 +252,10 @@ zabbix_export:
               name: 'MSSQL: Total average wait time for locks is high (over {$MSSQL.AVERAGE_WAIT_TIME.MAX}ms for 5m)'
               priority: WARNING
               description: 'An average wait time longer than 500ms may indicate excessive blocking. This value should generally correlate to ''Lock Waits/sec'' and move up or down with it accordingly.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 2a63096aa40a4374bdd7426b9fe0767e
           name: 'MSSQL: Total average wait time base'
@@ -269,8 +273,8 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MSSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: wait-time
         -
           uuid: f0cd7858dabf4b7da93314dc9a8ddeaa
           name: 'MSSQL: Total average wait time raw'
@@ -289,8 +293,8 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MSSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: wait-time
         -
           uuid: 00b6e46811fd43a396e2a38dd976d220
           name: 'MSSQL: Batch requests per second'
@@ -314,8 +318,8 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MSSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MSSQL
+              tag: component
+              value: performance
         -
           uuid: ed950d204a1f40a6925856828c7807aa
           name: 'MSSQL: Buffer cache hit ratio'
@@ -335,8 +339,8 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MSSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MSSQL
+              tag: component
+              value: cache
           triggers:
             -
               uuid: f84fa297023a4aee903e4d32bbad9360
@@ -344,6 +348,10 @@ zabbix_export:
               name: 'MSSQL: Percentage of the buffer cache efficiency is low (below {$MSSQL.BUFFER_CACHE_RATIO.MIN.CRIT}% for 5m)'
               priority: HIGH
               description: 'Too low buffer cache hit ratio.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 42e5bf05da06425282134d3cf806d023
               expression: 'max(/MSSQL by ODBC/mssql.buffer_cache_hit_ratio,5m)<{$MSSQL.BUFFER_CACHE_RATIO.MIN.WARN}'
@@ -354,6 +362,10 @@ zabbix_export:
                 -
                   name: 'MSSQL: Percentage of the buffer cache efficiency is low (below {$MSSQL.BUFFER_CACHE_RATIO.MIN.CRIT}% for 5m)'
                   expression: 'max(/MSSQL by ODBC/mssql.buffer_cache_hit_ratio,5m)<{$MSSQL.BUFFER_CACHE_RATIO.MIN.CRIT}'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 1900fc83a4d74c599f5f3438450b5d8b
           name: 'MSSQL: Cache hit ratio'
@@ -373,8 +385,8 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MSSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MSSQL
+              tag: component
+              value: cache
         -
           uuid: 064e1279ae0a4260ab02c08cd3c3f77d
           name: 'MSSQL: Cache objects in use'
@@ -392,8 +404,8 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MSSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MSSQL
+              tag: component
+              value: cache
         -
           uuid: de8c0d7f9c0b42438560dc28e47fdd19
           name: 'MSSQL: Cache object counts'
@@ -411,8 +423,8 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MSSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MSSQL
+              tag: component
+              value: cache
         -
           uuid: ae2d22cd04ed452dbdb04ae3f71b8586
           name: 'MSSQL: Cache pages'
@@ -430,8 +442,11 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MSSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MSSQL
+              tag: component
+              value: cache
+            -
+              tag: component
+              value: page
         -
           uuid: d72b6aadab0c4d6d83bc72da0ce661c3
           name: 'MSSQL: Checkpoint pages per second'
@@ -454,8 +469,11 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MSSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MSSQL
+              tag: component
+              value: page
+            -
+              tag: component
+              value: performance
         -
           uuid: 9c1ca822375644669821fe1bea4c5f2a
           name: 'MSSQL: Database pages'
@@ -473,8 +491,8 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MSSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MSSQL
+              tag: component
+              value: page
         -
           uuid: 871e3520aac84c18bcaf2f3a0d565b79
           name: 'MSSQL: Total data file size'
@@ -497,8 +515,8 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MSSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MSSQL
+              tag: component
+              value: application
         -
           uuid: 4cdecc74a6e44b57b17f44988d3ffa21
           name: 'MSSQL: Total errors per second'
@@ -521,8 +539,11 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MSSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MSSQL
+              tag: component
+              value: error
+            -
+              tag: component
+              value: performance
         -
           uuid: 5ed7f6931c42424f8ec3dbe2e6c46f03
           name: 'MSSQL: Failed auto-params per second'
@@ -545,8 +566,8 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MSSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MSSQL
+              tag: component
+              value: performance
         -
           uuid: cee8f4d47d41463299c50b5c7925a650
           name: 'MSSQL: Forwarded records per second'
@@ -569,8 +590,8 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MSSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MSSQL
+              tag: component
+              value: performance
         -
           uuid: 22d1a41352c4477ba3db5d1a9e038597
           name: 'MSSQL: Free list stalls per second'
@@ -594,8 +615,8 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MSSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MSSQL
+              tag: component
+              value: performance
           triggers:
             -
               uuid: f055a294ef3b43dd8958e77c303a5fee
@@ -603,6 +624,10 @@ zabbix_export:
               name: 'MSSQL: Number of rps waiting for a free page is high (over {$MSSQL.FREE_LIST_STALLS.MAX} for 5m)'
               priority: WARNING
               description: 'Some requests have to wait for a free page.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: ace67686bb93456c80b40be1f33c173f
           name: 'MSSQL: Full scans per second'
@@ -625,8 +650,8 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MSSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MSSQL
+              tag: component
+              value: performance
         -
           uuid: f2539791f65a40569bcf6b1c89647904
           name: 'MSSQL: Granted Workspace Memory'
@@ -649,8 +674,8 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MSSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MSSQL
+              tag: component
+              value: memory
         -
           uuid: 585f1a22108143d8b39337900da8860c
           name: 'MSSQL: Index searches per second'
@@ -673,8 +698,8 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MSSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MSSQL
+              tag: component
+              value: performance
         -
           uuid: eafdabca35bd40a58432dd36a210a4e4
           name: 'MSSQL: Errors per second (Info errors)'
@@ -697,8 +722,11 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MSSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MSSQL
+              tag: component
+              value: error
+            -
+              tag: component
+              value: performance
         -
           uuid: b68d1f8108d7494b9d4d891911708c72
           name: 'MSSQL: Errors per second (Kill connection errors)'
@@ -721,8 +749,11 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MSSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MSSQL
+              tag: component
+              value: error
+            -
+              tag: component
+              value: performance
         -
           uuid: c1242c5530654057bca59cb9ad12c319
           name: 'MSSQL: Latch waits per second'
@@ -746,8 +777,11 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MSSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MSSQL
+              tag: component
+              value: performance
+            -
+              tag: component
+              value: wait-time
         -
           uuid: 66cc84326bd146ac89f91ddeaa61f63a
           name: 'MSSQL: Lazy writes per second'
@@ -770,8 +804,8 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MSSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MSSQL
+              tag: component
+              value: performance
           triggers:
             -
               uuid: 8aa547cda82f4dfcaef5ca0467590f64
@@ -779,6 +813,10 @@ zabbix_export:
               name: 'MSSQL: Number of buffers written per second by the lazy writer is high (over {$MSSQL.LAZY_WRITES.MAX} for 5m)'
               priority: WARNING
               description: 'The number of buffers written per second by the buffer manager''s lazy writer exceeds the threshold.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 1b4c71c016504eb08b1a49146095c231
           name: 'MSSQL: Total lock requests per second'
@@ -802,8 +840,11 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MSSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MSSQL
+              tag: component
+              value: lock
+            -
+              tag: component
+              value: performance
           triggers:
             -
               uuid: be4e0b1aec8d494b984be248424d69cf
@@ -811,6 +852,10 @@ zabbix_export:
               name: 'MSSQL: Total number of locks per second is high (over {$MSSQL.LOCK_REQUESTS.MAX} for 5m)'
               priority: WARNING
               description: 'Number of new locks and lock conversions per second requested from the lock manager is high.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 0ac1aab7013249c6a0beb89217bf52c6
           name: 'MSSQL: Total lock requests per second that timed out'
@@ -834,8 +879,11 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MSSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MSSQL
+              tag: component
+              value: lock
+            -
+              tag: component
+              value: performance
           triggers:
             -
               uuid: 9b62d84b8d9c4209b894151f59c42b27
@@ -843,6 +891,10 @@ zabbix_export:
               name: 'MSSQL: Total lock requests per second that timed out is high (over {$MSSQL.LOCK_TIMEOUTS.MAX} for 5m)'
               priority: WARNING
               description: 'The total number of timed out lock requests per second, including requests for NOWAIT locks, is high.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 77be28b4732d4665a4e880f2ea309245
           name: 'MSSQL: Total lock requests per second that required waiting'
@@ -866,8 +918,11 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MSSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MSSQL
+              tag: component
+              value: lock
+            -
+              tag: component
+              value: performance
           triggers:
             -
               uuid: 879748a03c89495398b41fc1dbeba9ed
@@ -875,6 +930,10 @@ zabbix_export:
               name: 'MSSQL: Some blocking is occurring for 5m'
               priority: AVERAGE
               description: 'Values greater than zero indicate at least some blocking is occurring, while a value of zero can quickly eliminate blocking as a potential root-cause problem.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: bf4ef99559f94147b9b64144f6b795c0
           name: 'MSSQL: Lock wait time'
@@ -898,8 +957,8 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MSSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MSSQL
+              tag: component
+              value: lock
         -
           uuid: c7856bdb5285421cb79cec0782fa1188
           name: 'MSSQL: Logins per second'
@@ -922,8 +981,8 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MSSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MSSQL
+              tag: component
+              value: performance
         -
           uuid: cf4af2cbeaff42b2a71c91544286998f
           name: 'MSSQL: Logouts per second'
@@ -946,8 +1005,8 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MSSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MSSQL
+              tag: component
+              value: performance
         -
           uuid: e0620ce52e6d4269b9d12e82c749a146
           name: 'MSSQL: Total log file size'
@@ -970,8 +1029,8 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MSSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MSSQL
+              tag: component
+              value: log
         -
           uuid: 636e7c85a79947a39f7b176e8e3c5b82
           name: 'MSSQL: Total log file used size'
@@ -994,8 +1053,8 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MSSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MSSQL
+              tag: component
+              value: log
         -
           uuid: 28c1045fb77249aea23f55f48dd89c69
           name: 'MSSQL: Maximum workspace memory'
@@ -1018,8 +1077,8 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MSSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MSSQL
+              tag: component
+              value: memory
         -
           uuid: d39c5f2b89de4bc88c7724a8e2b270d7
           name: 'MSSQL: Memory grants outstanding'
@@ -1037,8 +1096,8 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MSSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MSSQL
+              tag: component
+              value: memory
         -
           uuid: cb468e25c20f43f08fcefd45354ff882
           name: 'MSSQL: Memory grants pending'
@@ -1056,8 +1115,8 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MSSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MSSQL
+              tag: component
+              value: memory
         -
           uuid: 18c0d77ded2b4533a559643006a93406
           name: 'MSSQL: Total lock requests per second that have deadlocks'
@@ -1081,8 +1140,11 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MSSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MSSQL
+              tag: component
+              value: deadlock
+            -
+              tag: component
+              value: performance
           triggers:
             -
               uuid: a8f77c32a7194af9b2674f0931c25212
@@ -1090,6 +1152,10 @@ zabbix_export:
               name: 'MSSQL: Number of deadlock is high (over {$MSSQL.DEADLOCKS.MAX} for 5m)'
               priority: AVERAGE
               description: 'Too many deadlocks are occurring currently.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: bbb7fcac41b2403ab0b0c76f3437e81f
           name: 'MSSQL: Errors per second (DB offline errors)'
@@ -1112,8 +1178,11 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MSSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MSSQL
+              tag: component
+              value: error
+            -
+              tag: component
+              value: performance
         -
           uuid: 94a869db684046d9b65db9ee022a9c9e
           name: 'MSSQL: Page life expectancy'
@@ -1133,8 +1202,8 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MSSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MSSQL
+              tag: component
+              value: page
           triggers:
             -
               uuid: 4eb155a86f8b4441a6707e8a3816a068
@@ -1142,6 +1211,10 @@ zabbix_export:
               name: 'MSSQL: Page life expectancy is low (less {$MSSQL.PAGE_LIFE_EXPECTANCY.MIN}min for 15m)'
               priority: HIGH
               description: 'The page stays in the buffer pool without references of less time than the threshold value.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 628f787578e04b83882aca052a7f976a
           name: 'MSSQL: Page lookups per second'
@@ -1165,8 +1238,8 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MSSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MSSQL
+              tag: component
+              value: performance
         -
           uuid: 433257a5dfe4488c8073db03bfb05315
           name: 'MSSQL: Page reads per second'
@@ -1189,8 +1262,11 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MSSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MSSQL
+              tag: component
+              value: page
+            -
+              tag: component
+              value: performance
           triggers:
             -
               uuid: c0b765b22b264d7c9086edc5cda35592
@@ -1198,6 +1274,10 @@ zabbix_export:
               name: 'MSSQL: Number of physical database page reads per second is high (over {$MSSQL.PAGE_READS.MAX} for 5m)'
               priority: WARNING
               description: 'The physical database page reads are issued too frequently.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: fc3dd6a1bf1242769e2b58f25421a19d
           name: 'MSSQL: Page splits per second'
@@ -1220,8 +1300,11 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MSSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MSSQL
+              tag: component
+              value: page
+            -
+              tag: component
+              value: performance
         -
           uuid: a8b3639fe7b44d88a75e724c083518b5
           name: 'MSSQL: Page writes per second'
@@ -1244,8 +1327,11 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MSSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MSSQL
+              tag: component
+              value: page
+            -
+              tag: component
+              value: performance
           triggers:
             -
               uuid: 548941f4a7cc4cadba64d8efd46655da
@@ -1253,6 +1339,10 @@ zabbix_export:
               name: 'MSSQL: Number of physical database page writes per second is high (over {$MSSQL.PAGE_WRITES.MAX} for 5m)'
               priority: WARNING
               description: 'The physical database page writes are issued too frequently.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 76918163a16e4ad786bed2040acc8061
           name: 'MSSQL: Percent of Adhoc queries running'
@@ -1268,8 +1358,8 @@ zabbix_export:
           description: 'The ratio of SQL compilations per second to Batch requests per second in percentage.'
           tags:
             -
-              tag: Application
-              value: MSSQL
+              tag: component
+              value: application
           triggers:
             -
               uuid: c5c1840220cd44fcaa7b47e0d52309bb
@@ -1277,6 +1367,10 @@ zabbix_export:
               name: 'MSSQL: Percent of adhoc queries running is over {$MSSQL.PERCENT_COMPILATIONS.MAX}% for 15m'
               priority: WARNING
               description: 'The lower this value is the better. High values often indicate excessive adhoc querying and should be as low as possible. If excessive adhoc querying is happening, try rewriting the queries as procedures or invoke the queries using sp_executeSQL. When rewriting isn''t possible, consider using a plan guide or setting the database to parameterization forced mode.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: ceab0472883f47b0a18b04fc6f7438ab
           name: 'MSSQL: Percent of Recompiled Transact-SQL Objects'
@@ -1292,8 +1386,8 @@ zabbix_export:
           description: 'The ratio of SQL re-compilations per second to SQL compilations per second in percentage.'
           tags:
             -
-              tag: Application
-              value: MSSQL
+              tag: component
+              value: application
           triggers:
             -
               uuid: d5bad8ead8704e00bf332032e22ebfdd
@@ -1301,6 +1395,10 @@ zabbix_export:
               name: 'MSSQL: Percent of times statement recompiles is over {$MSSQL.PERCENT_RECOMPILATIONS.MAX}% for 15m'
               priority: WARNING
               description: 'This number should be at or near zero, since recompiles can cause deadlocks and exclusive compile locks. This counter''s value should follow in proportion to “Batch Requests/sec” and “SQL Compilations/sec”.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 5c0bee24f9494bb49860171ff875caf7
           name: 'MSSQL: Number of blocked processes'
@@ -1318,8 +1416,8 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MSSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MSSQL
+              tag: component
+              value: application
         -
           uuid: fc14b0c814234b12a3943eb0435cd28c
           name: 'MSSQL: Read-ahead pages per second'
@@ -1342,8 +1440,11 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MSSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MSSQL
+              tag: component
+              value: page
+            -
+              tag: component
+              value: performance
         -
           uuid: be47be0cbb924982aaf9573c5a233144
           name: 'MSSQL: Safe auto-params per second'
@@ -1366,8 +1467,8 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MSSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MSSQL
+              tag: component
+              value: performance
         -
           uuid: 9ce27df57ebc4ecca1a4741e66c9fba0
           name: 'MSSQL: Full scans to Index searches ratio'
@@ -1380,8 +1481,8 @@ zabbix_export:
           description: 'The ratio of Full scans per second to Index searches per second. The threshold recommendation is strictly for OLTP workloads.'
           tags:
             -
-              tag: Application
-              value: MSSQL
+              tag: component
+              value: application
           triggers:
             -
               uuid: 3c22a74a94d641389b57a6013ddd10cb
@@ -1389,6 +1490,10 @@ zabbix_export:
               name: 'MSSQL: Number of index and table scans exceeds index searches in the last 15m'
               priority: WARNING
               description: 'Index searches are preferable to index and table scans. For OLTP applications, optimize for more index searches and less scans (preferably, 1 full scan for every 1000 index searches). Index and table scans are expensive I/O operations.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: e9ea451a38424f6b9da59b8bbb068b51
           name: 'MSSQL: SQL compilations per second'
@@ -1411,8 +1516,8 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MSSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MSSQL
+              tag: component
+              value: performance
         -
           uuid: a72415acabda46309c4dbc692e026cc2
           name: 'MSSQL: SQL re-compilations per second'
@@ -1435,8 +1540,8 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MSSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MSSQL
+              tag: component
+              value: performance
         -
           uuid: 595aa3989b4e41cc8649827525adc0a0
           name: 'MSSQL: Table lock escalations per second'
@@ -1459,8 +1564,11 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MSSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MSSQL
+              tag: component
+              value: lock
+            -
+              tag: component
+              value: performance
         -
           uuid: 37269b33e05349a1bfd05e4e493da6d4
           name: 'MSSQL: Target pages'
@@ -1478,8 +1586,8 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MSSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MSSQL
+              tag: component
+              value: page
         -
           uuid: 2679f7e843e549ce9468f6cab05a71d5
           name: 'MSSQL: Target server memory'
@@ -1502,8 +1610,8 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MSSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MSSQL
+              tag: component
+              value: memory
         -
           uuid: 8c7d63f3689f464394a6035a3cad4009
           name: 'MSSQL: Total latch wait Time'
@@ -1527,8 +1635,8 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MSSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MSSQL
+              tag: component
+              value: wait-time
         -
           uuid: 9112ed9b9d3741018d40f2dc892fa0f6
           name: 'MSSQL: Total server memory'
@@ -1551,8 +1659,8 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MSSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MSSQL
+              tag: component
+              value: memory
         -
           uuid: 273b373d8b41411fafcfd1e93bb8ce2c
           name: 'MSSQL: Total transactions number'
@@ -1570,8 +1678,8 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MSSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MSSQL
+              tag: component
+              value: transaction
         -
           uuid: 127e1f73ce414eeb87d2cbfef46ccdef
           name: 'MSSQL: Total transactions per second'
@@ -1594,8 +1702,11 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MSSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MSSQL
+              tag: component
+              value: performance
+            -
+              tag: component
+              value: transaction
         -
           uuid: ef6450dfcb9a476ca1bf97524e05d43d
           name: 'MSSQL: Unsafe auto-params per second'
@@ -1618,8 +1729,8 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MSSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MSSQL
+              tag: component
+              value: performance
         -
           uuid: 27449e795c0a4e4e90c9ee6b6bf3df90
           name: 'MSSQL: Uptime'
@@ -1639,8 +1750,8 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MSSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MSSQL
+              tag: component
+              value: application
           triggers:
             -
               uuid: 0321c9f671394cb180fdce53b4033cf4
@@ -1652,6 +1763,10 @@ zabbix_export:
                 -
                   name: 'MSSQL: Service is unavailable'
                   expression: 'last(/MSSQL by ODBC/net.tcp.service[tcp,{HOST.CONN},{$MSSQL.PORT}])=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
             -
               uuid: aa10f863608a494281f41e12f0d2b1a5
               expression: 'last(/MSSQL by ODBC/mssql.uptime)<10m'
@@ -1659,6 +1774,10 @@ zabbix_export:
               priority: INFO
               description: 'Uptime is less than 10 minutes'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 4e13bfc5927a421fb2996eec7e013448
           name: 'MSSQL: Number users connected'
@@ -1676,8 +1795,8 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MSSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MSSQL
+              tag: component
+              value: application
         -
           uuid: 5942cad838e8430a9ff71293dec52af8
           name: 'MSSQL: Errors per second (User errors)'
@@ -1700,8 +1819,11 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MSSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MSSQL
+              tag: component
+              value: error
+            -
+              tag: component
+              value: performance
         -
           uuid: 7013504d4a6c4b40a0aab11dab15d107
           name: 'MSSQL: Version'
@@ -1725,8 +1847,8 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MSSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MSSQL
+              tag: component
+              value: application
           triggers:
             -
               uuid: 4ece2c9172714c68b8345834cc37d927
@@ -1735,6 +1857,10 @@ zabbix_export:
               priority: INFO
               description: 'MSSQL version has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: ea84affd97864dfaad7edf31e16e1300
           name: 'MSSQL: Work files created per second'
@@ -1757,8 +1883,8 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MSSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MSSQL
+              tag: component
+              value: performance
           triggers:
             -
               uuid: 2f7e2dd4a94e4e92b468f4e2e2364f71
@@ -1766,6 +1892,10 @@ zabbix_export:
               name: 'MSSQL: Number of work files created per second is high (over {$MSSQL.WORK_FILES.MAX} for 5m)'
               priority: AVERAGE
               description: 'Too many work files created per second to store temporary results for hash joins and hash aggregates.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: a38e7fdf994842558227dfad03e9943b
           name: 'MSSQL: Work tables created per second'
@@ -1788,8 +1918,8 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MSSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MSSQL
+              tag: component
+              value: performance
           triggers:
             -
               uuid: 0214004de3084ce6b35d5bba53a66947
@@ -1797,6 +1927,10 @@ zabbix_export:
               name: 'MSSQL: Number of work tables created per second is high (over {$MSSQL.WORK_TABLES.MAX} for 5m)'
               priority: AVERAGE
               description: 'Too many work tables created per second to store temporary results for query spool, lob variables, XML variables, and cursors.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: d93779b26c1a4784be31d32130eebf92
           name: 'MSSQL: Worktables from cache ratio'
@@ -1816,8 +1950,8 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MSSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MSSQL
+              tag: component
+              value: cache
           triggers:
             -
               uuid: 98dee2bc42484988b208e100cc25ae05
@@ -1825,6 +1959,10 @@ zabbix_export:
               name: 'MSSQL: Percentage of work tables available from the work table cache is low (below {$MSSQL.WORKTABLES_FROM_CACHE_RATIO.MIN.CRIT}% for 5m)'
               priority: HIGH
               description: 'A value less than 90% may indicate insufficient memory, since execution plans are being dropped, or on 32-bit systems, may indicate the need for an upgrade to a 64-bit system'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: c0302965c2574b43955a1d37a8fce9eb
           name: 'MSSQL: Service''s TCP port state'
@@ -1842,8 +1980,8 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: MSSQL
+              tag: component
+              value: network
           triggers:
             -
               uuid: 152af5cc3ce04d4aa8ab255c37aed6c6
@@ -1851,6 +1989,10 @@ zabbix_export:
               name: 'MSSQL: Service is unavailable'
               priority: DISASTER
               description: 'The TCP port of the MS SQL Server service is currently unavailable.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: 2a5ddb4df6e14ebd94517cbd2a1f8295
@@ -1885,8 +2027,11 @@ zabbix_export:
               description: 'Getting replica states - name, primary and secondary health, synchronization health.'
               tags:
                 -
-                  tag: Application
-                  value: 'Zabbix raw items'
+                  tag: availability-group
+                  value: '{#GROUP_NAME}'
+                -
+                  tag: component
+                  value: raw
             -
               uuid: 381c88cf5b0c47319b036e79265b0a20
               name: 'MSSQL AG ''{#GROUP_NAME}'': Primary replica recovery health'
@@ -1914,8 +2059,11 @@ zabbix_export:
                 key: 'db.odbc.get[{#GROUP_NAME}_replica_states,"{$MSSQL.DSN}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MSSQL Availability Group ''{#GROUP_NAME}'''
+                  tag: availability-group
+                  value: '{#GROUP_NAME}'
+                -
+                  tag: component
+                  value: availability-group
               trigger_prototypes:
                 -
                   uuid: c472a4f8400e451db529d5e12b863216
@@ -1923,6 +2071,13 @@ zabbix_export:
                   name: 'MSSQL AG ''{#GROUP_NAME}'': Primary replica recovery health in progress'
                   priority: WARNING
                   description: 'The primary replica is in the synchronization process.'
+                  tags:
+                    -
+                      tag: availability-group
+                      value: '{#GROUP_NAME}'
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: df51dcd0ef864705bc542e1233c1135b
               name: 'MSSQL AG ''{#GROUP_NAME}'': Primary replica name'
@@ -1946,8 +2101,11 @@ zabbix_export:
                 key: 'db.odbc.get[{#GROUP_NAME}_replica_states,"{$MSSQL.DSN}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MSSQL Availability Group ''{#GROUP_NAME}'''
+                  tag: availability-group
+                  value: '{#GROUP_NAME}'
+                -
+                  tag: component
+                  value: availability-group
             -
               uuid: d2e76a734bd84484b6bd59b33c921f34
               name: 'MSSQL AG ''{#GROUP_NAME}'': Secondary replica recovery health'
@@ -1975,8 +2133,11 @@ zabbix_export:
                 key: 'db.odbc.get[{#GROUP_NAME}_replica_states,"{$MSSQL.DSN}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MSSQL Availability Group ''{#GROUP_NAME}'''
+                  tag: availability-group
+                  value: '{#GROUP_NAME}'
+                -
+                  tag: component
+                  value: availability-group
               trigger_prototypes:
                 -
                   uuid: 1fbf51eb9f8b432c8e0d9ec3af1cab44
@@ -1984,6 +2145,13 @@ zabbix_export:
                   name: 'MSSQL AG ''{#GROUP_NAME}'': Secondary replica recovery health in progress'
                   priority: WARNING
                   description: 'The secondary replica is in the synchronization process.'
+                  tags:
+                    -
+                      tag: availability-group
+                      value: '{#GROUP_NAME}'
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: fe59d23d0ba44777b0abf1a35b2c014e
               name: 'MSSQL AG ''{#GROUP_NAME}'': Synchronization health'
@@ -2011,8 +2179,11 @@ zabbix_export:
                 key: 'db.odbc.get[{#GROUP_NAME}_replica_states,"{$MSSQL.DSN}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MSSQL Availability Group ''{#GROUP_NAME}'''
+                  tag: availability-group
+                  value: '{#GROUP_NAME}'
+                -
+                  tag: component
+                  value: availability-group
               trigger_prototypes:
                 -
                   uuid: 2ee92e5ea41744ac9e27ffaa4313bdec
@@ -2020,12 +2191,26 @@ zabbix_export:
                   name: 'MSSQL AG ''{#GROUP_NAME}'': All replicas unhealthy'
                   priority: DISASTER
                   description: 'None of the availability replicas have a healthy synchronization.'
+                  tags:
+                    -
+                      tag: availability-group
+                      value: '{#GROUP_NAME}'
+                    -
+                      tag: scope
+                      value: availability
                 -
                   uuid: fd24c78f1db24186932d17d1145b6e92
                   expression: 'last(/MSSQL by ODBC/mssql.synchronization_health["{#GROUP_NAME}"])=1'
                   name: 'MSSQL AG ''{#GROUP_NAME}'': Some replicas unhealthy'
                   priority: HIGH
                   description: 'The synchronization health of some, but not all, availability replicas is healthy.'
+                  tags:
+                    -
+                      tag: availability-group
+                      value: '{#GROUP_NAME}'
+                    -
+                      tag: scope
+                      value: availability
           preprocessing:
             -
               type: DISCARD_UNCHANGED_HEARTBEAT
@@ -2076,8 +2261,11 @@ zabbix_export:
                 key: 'db.odbc.get[get_last_backup,"{$MSSQL.DSN}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MSSQL Database ''{#DBNAME}'''
+                  tag: component
+                  value: database
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: bd663e1e9b40469cb4ca430186b049db
               name: 'MSSQL DB ''{#DBNAME}'': Last diff backup (time ago)'
@@ -2098,8 +2286,11 @@ zabbix_export:
                 key: 'db.odbc.get[get_last_backup,"{$MSSQL.DSN}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MSSQL Database ''{#DBNAME}'''
+                  tag: component
+                  value: database
+                -
+                  tag: database
+                  value: '{#DBNAME}'
               trigger_prototypes:
                 -
                   uuid: 036892c6b9de41c698a4e9acd5457e6a
@@ -2109,6 +2300,13 @@ zabbix_export:
                   priority: HIGH
                   description: 'The differential backup has not been executed for a long time.'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: database
+                      value: '{#DBNAME}'
+                    -
+                      tag: scope
+                      value: availability
                 -
                   uuid: 9a294163ee034fc6a58f5534a7d79aac
                   expression: 'last(/MSSQL by ODBC/mssql.backup.diff["{#DBNAME}"])>{$MSSQL.BACKUP_DIFF.WARN:"{#DBNAME}"}'
@@ -2121,6 +2319,13 @@ zabbix_export:
                     -
                       name: 'MSSQL DB ''{#DBNAME}'': Diff backup older than {$MSSQL.BACKUP_DIFF.CRIT:"{#DBNAME}"}'
                       expression: 'last(/MSSQL by ODBC/mssql.backup.diff["{#DBNAME}"])>{$MSSQL.BACKUP_DIFF.CRIT:"{#DBNAME}"}'
+                  tags:
+                    -
+                      tag: database
+                      value: '{#DBNAME}'
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 52929d988ad34aac945ff2ce9e448261
               name: 'MSSQL DB ''{#DBNAME}'': Last full backup duration'
@@ -2141,8 +2346,11 @@ zabbix_export:
                 key: 'db.odbc.get[get_last_backup,"{$MSSQL.DSN}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MSSQL Database ''{#DBNAME}'''
+                  tag: component
+                  value: database
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: 06d0ac1eeca843a289defa1cf1d728a3
               name: 'MSSQL DB ''{#DBNAME}'': Last full backup (time ago)'
@@ -2163,8 +2371,11 @@ zabbix_export:
                 key: 'db.odbc.get[get_last_backup,"{$MSSQL.DSN}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MSSQL Database ''{#DBNAME}'''
+                  tag: component
+                  value: database
+                -
+                  tag: database
+                  value: '{#DBNAME}'
               trigger_prototypes:
                 -
                   uuid: 09c8e059ffa44d0eb1be626b5d820dc9
@@ -2174,6 +2385,13 @@ zabbix_export:
                   priority: HIGH
                   description: 'The full backup has not been executed for a long time.'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: database
+                      value: '{#DBNAME}'
+                    -
+                      tag: scope
+                      value: availability
                 -
                   uuid: b380d76b1055482ca8cd69c90611f1a5
                   expression: 'last(/MSSQL by ODBC/mssql.backup.full["{#DBNAME}"])>{$MSSQL.BACKUP_FULL.WARN:"{#DBNAME}"}'
@@ -2186,6 +2404,10 @@ zabbix_export:
                     -
                       name: 'MSSQL DB ''{#DBNAME}'': Full backup older than {$MSSQL.BACKUP_FULL.CRIT:"{#DBNAME}"}'
                       expression: 'last(/MSSQL by ODBC/mssql.backup.full["{#DBNAME}"])>{$MSSQL.BACKUP_FULL.CRIT:"{#DBNAME}"}'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 218241c7c5a648a59021999f97516349
               name: 'MSSQL DB ''{#DBNAME}'': Last log backup duration'
@@ -2206,8 +2428,11 @@ zabbix_export:
                 key: 'db.odbc.get[get_last_backup,"{$MSSQL.DSN}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MSSQL Database ''{#DBNAME}'''
+                  tag: component
+                  value: database
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: c5e796bc904848efb2557c8a9a07b828
               name: 'MSSQL DB ''{#DBNAME}'': Last log backup'
@@ -2228,8 +2453,11 @@ zabbix_export:
                 key: 'db.odbc.get[get_last_backup,"{$MSSQL.DSN}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MSSQL Database ''{#DBNAME}'''
+                  tag: component
+                  value: database
+                -
+                  tag: database
+                  value: '{#DBNAME}'
               trigger_prototypes:
                 -
                   uuid: 4a6e76dc9a5148649d07e35e962b5893
@@ -2239,6 +2467,13 @@ zabbix_export:
                   priority: HIGH
                   description: 'The log backup has not been executed for a long time.'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: database
+                      value: '{#DBNAME}'
+                    -
+                      tag: scope
+                      value: availability
                 -
                   uuid: 6000420450cf453bae3652c7f7d05e2b
                   expression: 'last(/MSSQL by ODBC/mssql.backup.log["{#DBNAME}"])>{$MSSQL.BACKUP_LOG.WARN:"{#DBNAME}"}'
@@ -2251,6 +2486,13 @@ zabbix_export:
                     -
                       name: 'MSSQL DB ''{#DBNAME}'': Log backup older than {$MSSQL.BACKUP_LOG.CRIT:"{#DBNAME}"}'
                       expression: 'last(/MSSQL by ODBC/mssql.backup.log["{#DBNAME}"])>{$MSSQL.BACKUP_LOG.CRIT:"{#DBNAME}"}'
+                  tags:
+                    -
+                      tag: database
+                      value: '{#DBNAME}'
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: f4f218f22d6d48419260003880b38abd
               name: 'MSSQL DB ''{#DBNAME}'': Active transactions'
@@ -2268,8 +2510,11 @@ zabbix_export:
                 key: 'db.odbc.get[get_status_variables,"{$MSSQL.DSN}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MSSQL Database ''{#DBNAME}'''
+                  tag: component
+                  value: database
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: ff3916f807784639a1821229d4d722d8
               name: 'MSSQL DB ''{#DBNAME}'': Data file size'
@@ -2292,8 +2537,11 @@ zabbix_export:
                 key: 'db.odbc.get[get_status_variables,"{$MSSQL.DSN}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MSSQL Database ''{#DBNAME}'''
+                  tag: component
+                  value: database
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: 0d7bdf4c18fa49e79926e6f6d078d50f
               name: 'MSSQL DB ''{#DBNAME}'': Log bytes flushed per second'
@@ -2317,8 +2565,11 @@ zabbix_export:
                 key: 'db.odbc.get[get_status_variables,"{$MSSQL.DSN}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MSSQL Database ''{#DBNAME}'''
+                  tag: component
+                  value: database
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: 85536311e68047a6a8bf13c51c8d0647
               name: 'MSSQL DB ''{#DBNAME}'': Log file size'
@@ -2341,8 +2592,11 @@ zabbix_export:
                 key: 'db.odbc.get[get_status_variables,"{$MSSQL.DSN}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MSSQL Database ''{#DBNAME}'''
+                  tag: component
+                  value: database
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: 75fd2f42e274471c97cb23dc740863b8
               name: 'MSSQL DB ''{#DBNAME}'': Log file used size'
@@ -2365,8 +2619,11 @@ zabbix_export:
                 key: 'db.odbc.get[get_status_variables,"{$MSSQL.DSN}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MSSQL Database ''{#DBNAME}'''
+                  tag: component
+                  value: database
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: c10b6f364aa547d8b4abe431ae27d70b
               name: 'MSSQL DB ''{#DBNAME}'': Log flushes per second'
@@ -2389,8 +2646,11 @@ zabbix_export:
                 key: 'db.odbc.get[get_status_variables,"{$MSSQL.DSN}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MSSQL Database ''{#DBNAME}'''
+                  tag: component
+                  value: database
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: 5404c8682b294a06a3027dc10d0b43fc
               name: 'MSSQL DB ''{#DBNAME}'': Log flush waits per second'
@@ -2413,8 +2673,11 @@ zabbix_export:
                 key: 'db.odbc.get[get_status_variables,"{$MSSQL.DSN}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MSSQL Database ''{#DBNAME}'''
+                  tag: component
+                  value: database
+                -
+                  tag: database
+                  value: '{#DBNAME}'
               trigger_prototypes:
                 -
                   uuid: b351fc1128c24faf88d36717d0a0d1a5
@@ -2422,6 +2685,13 @@ zabbix_export:
                   name: 'MSSQL DB ''{#DBNAME}'': Number of commits waiting for the log flush is high (over {$MSSQL.LOG_FLUSH_WAITS.MAX:"{#DBNAME}"}/sec for 5m)'
                   priority: WARNING
                   description: 'Too many commits are waiting for the log flush.'
+                  tags:
+                    -
+                      tag: database
+                      value: '{#DBNAME}'
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: f1abdb0800534f6bbf9f1403e7dea9e4
               name: 'MSSQL DB ''{#DBNAME}'': Log flush wait time'
@@ -2445,8 +2715,11 @@ zabbix_export:
                 key: 'db.odbc.get[get_status_variables,"{$MSSQL.DSN}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MSSQL Database ''{#DBNAME}'''
+                  tag: component
+                  value: database
+                -
+                  tag: database
+                  value: '{#DBNAME}'
               trigger_prototypes:
                 -
                   uuid: 80351c56215148b8ab75d95dc81ff0d0
@@ -2454,6 +2727,13 @@ zabbix_export:
                   name: 'MSSQL DB ''{#DBNAME}'': Total wait time to flush the log is high (over {$MSSQL.LOG_FLUSH_WAIT_TIME.MAX:"{#DBNAME}"}ms for 5m)'
                   priority: WARNING
                   description: 'The wait time to flush the log is too long.'
+                  tags:
+                    -
+                      tag: database
+                      value: '{#DBNAME}'
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: fdb24058e54243e8b5a888ec40d506e9
               name: 'MSSQL DB ''{#DBNAME}'': Log growths'
@@ -2471,8 +2751,11 @@ zabbix_export:
                 key: 'db.odbc.get[get_status_variables,"{$MSSQL.DSN}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MSSQL Database ''{#DBNAME}'''
+                  tag: component
+                  value: database
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: a1a96d8bfef740ec9c8eadd9704ab605
               name: 'MSSQL DB ''{#DBNAME}'': Log shrinks'
@@ -2490,8 +2773,11 @@ zabbix_export:
                 key: 'db.odbc.get[get_status_variables,"{$MSSQL.DSN}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MSSQL Database ''{#DBNAME}'''
+                  tag: component
+                  value: database
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: 26d1515df1be450e861e4f7a9f76b03d
               name: 'MSSQL DB ''{#DBNAME}'': Log truncations'
@@ -2509,8 +2795,11 @@ zabbix_export:
                 key: 'db.odbc.get[get_status_variables,"{$MSSQL.DSN}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MSSQL Database ''{#DBNAME}'''
+                  tag: component
+                  value: database
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: 9f9cda56992841408ab8307b7019b76f
               name: 'MSSQL DB ''{#DBNAME}'': Percent log used'
@@ -2530,8 +2819,11 @@ zabbix_export:
                 key: 'db.odbc.get[get_status_variables,"{$MSSQL.DSN}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MSSQL Database ''{#DBNAME}'''
+                  tag: component
+                  value: database
+                -
+                  tag: database
+                  value: '{#DBNAME}'
               trigger_prototypes:
                 -
                   uuid: f02958e3ee174c6dbe900e3dd92cacdc
@@ -2539,6 +2831,13 @@ zabbix_export:
                   name: 'MSSQL DB ''{#DBNAME}'': Percent of log using is high (over {$MSSQL.PERCENT_LOG_USED.MAX:"{#DBNAME}"}% for 5m)'
                   priority: WARNING
                   description: 'There''s not enough space left in the log.'
+                  tags:
+                    -
+                      tag: database
+                      value: '{#DBNAME}'
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: fe7d7c3e0aab43d79c00eaceb39c8c6c
               name: 'MSSQL DB ''{#DBNAME}'': State'
@@ -2571,8 +2870,11 @@ zabbix_export:
                 key: 'db.odbc.get[get_status_variables,"{$MSSQL.DSN}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MSSQL Database ''{#DBNAME}'''
+                  tag: component
+                  value: database
+                -
+                  tag: database
+                  value: '{#DBNAME}'
               trigger_prototypes:
                 -
                   uuid: 6b8c8cf8e0d24b7f8d9aa7469a0facd4
@@ -2580,6 +2882,13 @@ zabbix_export:
                   name: 'MSSQL DB ''{#DBNAME}'': State is {ITEM.VALUE}'
                   priority: HIGH
                   description: 'The DB has a non-working state.'
+                  tags:
+                    -
+                      tag: database
+                      value: '{#DBNAME}'
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 267b1d54c40641f5aeb4e3e7adfa4680
               name: 'MSSQL DB ''{#DBNAME}'': Transactions per second'
@@ -2602,8 +2911,11 @@ zabbix_export:
                 key: 'db.odbc.get[get_status_variables,"{$MSSQL.DSN}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MSSQL Database ''{#DBNAME}'''
+                  tag: component
+                  value: database
+                -
+                  tag: database
+                  value: '{#DBNAME}'
           graph_prototypes:
             -
               uuid: ac52c952ba954065bbbb5c722630cd0b
@@ -2701,8 +3013,11 @@ zabbix_export:
                 key: 'db.odbc.get[get_job_status,"{$MSSQL.DSN}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MSSQL Job ''{#JOBNAME}'''
+                  tag: component
+                  value: mssql-job
+                -
+                  tag: mssql-job
+                  value: '{#JOBNAME}'
             -
               uuid: b9984c1238554a559b444853e9f66653
               name: 'MSSQL Job ''{#JOBNAME}'': Last run status message'
@@ -2727,8 +3042,11 @@ zabbix_export:
                 key: 'db.odbc.get[get_job_status,"{$MSSQL.DSN}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MSSQL Job ''{#JOBNAME}'''
+                  tag: component
+                  value: mssql-job
+                -
+                  tag: mssql-job
+                  value: '{#JOBNAME}'
             -
               uuid: 1c725adad98f44158b43127d4c5fb0f3
               name: 'MSSQL Job ''{#JOBNAME}'': Next run date-time'
@@ -2753,8 +3071,11 @@ zabbix_export:
                 key: 'db.odbc.get[get_job_status,"{$MSSQL.DSN}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MSSQL Job ''{#JOBNAME}'''
+                  tag: component
+                  value: mssql-job
+                -
+                  tag: mssql-job
+                  value: '{#JOBNAME}'
             -
               uuid: eaa43a261e114979af236698ea7ae32c
               name: 'MSSQL Job ''{#JOBNAME}'': Run status'
@@ -2785,8 +3106,11 @@ zabbix_export:
                 key: 'db.odbc.get[get_job_status,"{$MSSQL.DSN}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MSSQL Job ''{#JOBNAME}'''
+                  tag: component
+                  value: mssql-job
+                -
+                  tag: mssql-job
+                  value: '{#JOBNAME}'
               trigger_prototypes:
                 -
                   uuid: 304f468605164fd2baa1905cedf2c897
@@ -2795,6 +3119,13 @@ zabbix_export:
                   priority: WARNING
                   description: 'The last run of the job has failed.'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: mssql-job
+                      value: '{#JOBNAME}'
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 69da58fe4c7e42028fa96388df526103
               name: 'MSSQL Job ''{#JOBNAME}'': Run duration'
@@ -2818,8 +3149,11 @@ zabbix_export:
                 key: 'db.odbc.get[get_job_status,"{$MSSQL.DSN}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MSSQL Job ''{#JOBNAME}'''
+                  tag: component
+                  value: mssql-job
+                -
+                  tag: mssql-job
+                  value: '{#JOBNAME}'
               trigger_prototypes:
                 -
                   uuid: 7e45cb8f41114388ac8772006d929da2
@@ -2829,6 +3163,13 @@ zabbix_export:
                   priority: WARNING
                   description: 'The job is taking too long.'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: mssql-job
+                      value: '{#JOBNAME}'
+                    -
+                      tag: scope
+                      value: performance
           preprocessing:
             -
               type: DISCARD_UNCHANGED_HEARTBEAT
@@ -2876,8 +3217,14 @@ zabbix_export:
               description: 'Getting the states of the local availability database.'
               tags:
                 -
-                  tag: Application
-                  value: 'Zabbix raw items'
+                  tag: availability-group
+                  value: '{#GROUP_NAME}'
+                -
+                  tag: component
+                  value: raw
+                -
+                  tag: local-db
+                  value: '{#DBNAME}'
             -
               uuid: 7e4baf2802394b93bf5770f4f72d7f05
               name: 'MSSQL AG ''{#GROUP_NAME}'' Local DB ''{#DBNAME}'': Suspended'
@@ -2902,8 +3249,14 @@ zabbix_export:
                 key: 'db.odbc.get["{#GROUP_NAME}_{#DBNAME}_local_db.states","{$MSSQL.DSN}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MSSQL Available Group ''{#GROUP_NAME}'' Local DB ''{#DBNAME}'''
+                  tag: availability-group
+                  value: '{#GROUP_NAME}'
+                -
+                  tag: component
+                  value: local-db
+                -
+                  tag: local-db
+                  value: '{#DBNAME}'
             -
               uuid: f8111429599e49bd947a12b9771d1a3d
               name: 'MSSQL AG ''{#GROUP_NAME}'' Local DB ''{#DBNAME}'': State'
@@ -2934,8 +3287,14 @@ zabbix_export:
                 key: 'db.odbc.get["{#GROUP_NAME}_{#DBNAME}_local_db.states","{$MSSQL.DSN}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MSSQL Available Group ''{#GROUP_NAME}'' Local DB ''{#DBNAME}'''
+                  tag: availability-group
+                  value: '{#GROUP_NAME}'
+                -
+                  tag: component
+                  value: local-db
+                -
+                  tag: local-db
+                  value: '{#DBNAME}'
               trigger_prototypes:
                 -
                   uuid: 78923c9c52e74c80a77d418afe9e438d
@@ -2943,6 +3302,16 @@ zabbix_export:
                   name: 'MSSQL AG ''{#GROUP_NAME}'' Local DB ''{#DBNAME}'': "{#DBNAME}" is {ITEM.VALUE}'
                   priority: WARNING
                   description: 'The local availability database has a non-working state.'
+                  tags:
+                    -
+                      tag: availability-group
+                      value: '{#GROUP_NAME}'
+                    -
+                      tag: local-db
+                      value: '{#DBNAME}'
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: e7d7fbac95e94c45b6515c8e1b7baf1a
               name: 'MSSQL AG ''{#GROUP_NAME}'' Local DB ''{#DBNAME}'': Synchronization health'
@@ -2971,8 +3340,14 @@ zabbix_export:
                 key: 'db.odbc.get["{#GROUP_NAME}_{#DBNAME}_local_db.states","{$MSSQL.DSN}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MSSQL Available Group ''{#GROUP_NAME}'' Local DB ''{#DBNAME}'''
+                  tag: availability-group
+                  value: '{#GROUP_NAME}'
+                -
+                  tag: component
+                  value: local-db
+                -
+                  tag: local-db
+                  value: '{#DBNAME}'
               trigger_prototypes:
                 -
                   uuid: e51c10f9d86d458da9fdb7e21b4e0102
@@ -2980,12 +3355,32 @@ zabbix_export:
                   name: 'MSSQL AG ''{#GROUP_NAME}'' Local DB ''{#DBNAME}'': "{#DBNAME}" is Not healthy'
                   priority: HIGH
                   description: 'The synchronization state of the local availability database is NOT SYNCHRONIZING.'
+                  tags:
+                    -
+                      tag: availability-group
+                      value: '{#GROUP_NAME}'
+                    -
+                      tag: local-db
+                      value: '{#DBNAME}'
+                    -
+                      tag: scope
+                      value: availability
                 -
                   uuid: dc636f10f12c4f1ead597eca778561ec
                   expression: 'last(/MSSQL by ODBC/mssql.local_db.synchronization_health["{#DBNAME}"])=1'
                   name: 'MSSQL AG ''{#GROUP_NAME}'' Local DB ''{#DBNAME}'': "{#DBNAME}" is Partially healthy'
                   priority: AVERAGE
                   description: 'A database on a synchronous-commit availability replica is considered partially healthy if synchronization state is SYNCHRONIZING.'
+                  tags:
+                    -
+                      tag: availability-group
+                      value: '{#GROUP_NAME}'
+                    -
+                      tag: local-db
+                      value: '{#DBNAME}'
+                    -
+                      tag: scope
+                      value: availability
           preprocessing:
             -
               type: DISCARD_UNCHANGED_HEARTBEAT
@@ -3032,8 +3427,11 @@ zabbix_export:
               description: 'Getting mirrors state'
               tags:
                 -
-                  tag: Application
-                  value: 'Zabbix raw items'
+                  tag: component
+                  value: mssql-mirroring
+                -
+                  tag: mssql-mirroring
+                  value: '{#DBNAME}'
             -
               uuid: faccb61c8215482ab375c03444a0e8fd
               name: 'MSSQL Mirroring ''{#DBNAME}'': Role'
@@ -3060,8 +3458,11 @@ zabbix_export:
                 key: 'db.odbc.get["{#DBNAME}_mirroring_state","{$MSSQL.DSN}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MSSQL Mirroring ''{#DBNAME}'''
+                  tag: component
+                  value: mssql-mirroring
+                -
+                  tag: mssql-mirroring
+                  value: '{#DBNAME}'
             -
               uuid: 19cdd945ced447d28b7480c07c1f61bc
               name: 'MSSQL Mirroring ''{#DBNAME}'': Role sequence'
@@ -3083,8 +3484,11 @@ zabbix_export:
                 key: 'db.odbc.get["{#DBNAME}_mirroring_state","{$MSSQL.DSN}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MSSQL Mirroring ''{#DBNAME}'''
+                  tag: component
+                  value: mssql-mirroring
+                -
+                  tag: mssql-mirroring
+                  value: '{#DBNAME}'
             -
               uuid: bedb23d788074424afdb2751c8a7e2b7
               name: 'MSSQL Mirroring ''{#DBNAME}'': Safety level'
@@ -3112,8 +3516,11 @@ zabbix_export:
                 key: 'db.odbc.get["{#DBNAME}_mirroring_state","{$MSSQL.DSN}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MSSQL Mirroring ''{#DBNAME}'''
+                  tag: component
+                  value: mssql-mirroring
+                -
+                  tag: mssql-mirroring
+                  value: '{#DBNAME}'
             -
               uuid: 5df06f00a6194242af45ff5cccf43988
               name: 'MSSQL Mirroring ''{#DBNAME}'': State'
@@ -3145,8 +3552,11 @@ zabbix_export:
                 key: 'db.odbc.get["{#DBNAME}_mirroring_state","{$MSSQL.DSN}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MSSQL Mirroring ''{#DBNAME}'''
+                  tag: component
+                  value: mssql-mirroring
+                -
+                  tag: mssql-mirroring
+                  value: '{#DBNAME}'
               trigger_prototypes:
                 -
                   uuid: 323543b0df0e474abf9190a9630242b1
@@ -3154,18 +3564,39 @@ zabbix_export:
                   name: 'MSSQL Mirroring ''{#DBNAME}'': "{#DBNAME}" is {ITEM.VALUE}'
                   priority: WARNING
                   description: 'The state of the mirror database and of the database mirroring session is "Pending Failover".'
+                  tags:
+                    -
+                      tag: mssql-mirroring
+                      value: '{#DBNAME}'
+                    -
+                      tag: scope
+                      value: availability
                 -
                   uuid: 9a2bcdfb32654a55b8a75c8bf4331950
                   expression: 'last(/MSSQL by ODBC/mssql.mirroring.state["{#DBNAME}"])=5'
                   name: 'MSSQL Mirroring ''{#DBNAME}'': "{#DBNAME}" is {ITEM.VALUE}'
                   priority: HIGH
                   description: 'The state of the mirror database and of the database mirroring session is "Not synchronized". The partners are not synchronized. A failover is not possible now.'
+                  tags:
+                    -
+                      tag: mssql-mirroring
+                      value: '{#DBNAME}'
+                    -
+                      tag: scope
+                      value: availability
                 -
                   uuid: c673a7c4820840528a4aa1771a5a56d4
                   expression: 'last(/MSSQL by ODBC/mssql.mirroring.state["{#DBNAME}"])>=0 and last(/MSSQL by ODBC/mssql.mirroring.state["{#DBNAME}"])<=2'
                   name: 'MSSQL Mirroring ''{#DBNAME}'': "{#DBNAME}" is {ITEM.VALUE}'
                   priority: INFO
                   description: 'The state of the mirror database and of the database mirroring session is "Suspended", "Disconnected from the other partner", or "Synchronizing".'
+                  tags:
+                    -
+                      tag: mssql-mirroring
+                      value: '{#DBNAME}'
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 7e4763d493a745e99082ca71a54c23c2
               name: 'MSSQL Mirroring ''{#DBNAME}'': Witness state'
@@ -3193,8 +3624,11 @@ zabbix_export:
                 key: 'db.odbc.get["{#DBNAME}_mirroring_state","{$MSSQL.DSN}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MSSQL Mirroring ''{#DBNAME}'''
+                  tag: component
+                  value: mssql-mirroring
+                -
+                  tag: mssql-mirroring
+                  value: '{#DBNAME}'
               trigger_prototypes:
                 -
                   uuid: ec374424b79346c99f1d815e0815c799
@@ -3202,6 +3636,13 @@ zabbix_export:
                   name: 'MSSQL Mirroring ''{#DBNAME}'': "{#DBNAME}" Witness is disconnected'
                   priority: WARNING
                   description: 'The state of the witness in the database mirroring session of the database is "Disconnected".'
+                  tags:
+                    -
+                      tag: mssql-mirroring
+                      value: '{#DBNAME}'
+                    -
+                      tag: scope
+                      value: availability
           graph_prototypes:
             -
               uuid: 9bf9203bd4b449b39e288fbb79f9d627
@@ -3264,8 +3705,14 @@ zabbix_export:
               description: 'Getting the states of the non-local availability database.'
               tags:
                 -
-                  tag: Application
-                  value: 'Zabbix raw items'
+                  tag: availability-group
+                  value: '{#GROUP_NAME}'
+                -
+                  tag: component
+                  value: raw
+                -
+                  tag: non-local-db
+                  value: '{#DBNAME}'
             -
               uuid: 32d3797d6b22413e98aa206d3092947f
               name: 'MSSQL AG ''{#GROUP_NAME}'' Non-Local DB ''*{#REPLICA_NAME}*{#DBNAME}'': Log queue size'
@@ -3292,8 +3739,14 @@ zabbix_export:
                 key: 'db.odbc.get["{#GROUP_NAME}*{#REPLICA_NAME}*{#DBNAME}_non-local_db.states","{$MSSQL.DSN}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MSSQL Available Group ''{#GROUP_NAME}'' Non-Local DB ''{#DBNAME}'''
+                  tag: availability-group
+                  value: '{#GROUP_NAME}'
+                -
+                  tag: component
+                  value: non-local-db
+                -
+                  tag: non-local-db
+                  value: '{#DBNAME}'
               trigger_prototypes:
                 -
                   uuid: def3b1d47dac4d039bffcc78f955b433
@@ -3301,6 +3754,16 @@ zabbix_export:
                   name: 'MSSQL AG ''{#GROUP_NAME}'' Non-Local DB ''*{#REPLICA_NAME}*{#DBNAME}'': Log queue size is growing'
                   priority: HIGH
                   description: 'The log records of the primary database are not sent to the secondary databases.'
+                  tags:
+                    -
+                      tag: availability-group
+                      value: '{#GROUP_NAME}'
+                    -
+                      tag: non-local-db
+                      value: '{#DBNAME}'
+                    -
+                      tag: scope
+                      value: capacity
             -
               uuid: 66d9735553754192bb9acf7b27c1501f
               name: 'MSSQL AG ''{#GROUP_NAME}'' Non-Local DB ''*{#REPLICA_NAME}*{#DBNAME}'': Redo log queue size'
@@ -3327,8 +3790,14 @@ zabbix_export:
                 key: 'db.odbc.get["{#GROUP_NAME}*{#REPLICA_NAME}*{#DBNAME}_non-local_db.states","{$MSSQL.DSN}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MSSQL Available Group ''{#GROUP_NAME}'' Non-Local DB ''{#DBNAME}'''
+                  tag: availability-group
+                  value: '{#GROUP_NAME}'
+                -
+                  tag: component
+                  value: non-local-db
+                -
+                  tag: non-local-db
+                  value: '{#DBNAME}'
               trigger_prototypes:
                 -
                   uuid: 2102f244f58b4fe981d569fe0fe599a9
@@ -3336,6 +3805,16 @@ zabbix_export:
                   name: 'MSSQL AG ''{#GROUP_NAME}'' Non-Local DB ''*{#REPLICA_NAME}*{#DBNAME}'': Redo log queue size is growing'
                   priority: HIGH
                   description: 'The log records in the log files of the secondary replica have not yet been redone.'
+                  tags:
+                    -
+                      tag: availability-group
+                      value: '{#GROUP_NAME}'
+                    -
+                      tag: non-local-db
+                      value: '{#DBNAME}'
+                    -
+                      tag: scope
+                      value: capacity
           preprocessing:
             -
               type: DISCARD_UNCHANGED_HEARTBEAT
@@ -3384,8 +3863,14 @@ zabbix_export:
               description: 'Getting the database replica states.'
               tags:
                 -
-                  tag: Application
-                  value: 'Zabbix raw items'
+                  tag: availability-group
+                  value: '{#GROUP_NAME}'
+                -
+                  tag: component
+                  value: raw
+                -
+                  tag: replica
+                  value: '{#REPLICA_NAME}'
             -
               uuid: 7403de703b024d428edfc59f3aa9181b
               name: 'MSSQL AG ''{#GROUP_NAME}'' Replica ''{#REPLICA_NAME}'': Connected state'
@@ -3414,8 +3899,14 @@ zabbix_export:
                 key: 'db.odbc.get["{#GROUP_NAME}_{#REPLICA_NAME}_replica.state","{$MSSQL.DSN}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MSSQL Available Group ''{#GROUP_NAME}'' Replica ''{#REPLICA_NAME}'''
+                  tag: availability-group
+                  value: '{#GROUP_NAME}'
+                -
+                  tag: component
+                  value: replica
+                -
+                  tag: replica
+                  value: '{#REPLICA_NAME}'
             -
               uuid: 51cb8f4fe5954c0ea21eff6102034862
               name: 'MSSQL AG ''{#GROUP_NAME}'' Replica ''{#REPLICA_NAME}'': Is local'
@@ -3442,8 +3933,14 @@ zabbix_export:
                 key: 'db.odbc.get["{#GROUP_NAME}_{#REPLICA_NAME}_replica.state","{$MSSQL.DSN}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MSSQL Available Group ''{#GROUP_NAME}'' Replica ''{#REPLICA_NAME}'''
+                  tag: availability-group
+                  value: '{#GROUP_NAME}'
+                -
+                  tag: component
+                  value: replica
+                -
+                  tag: replica
+                  value: '{#REPLICA_NAME}'
             -
               uuid: ec1b71f75c4247c28d5830bd8004f0ac
               name: 'MSSQL AG ''{#GROUP_NAME}'' Replica ''{#REPLICA_NAME}'': Join state'
@@ -3470,8 +3967,14 @@ zabbix_export:
                 key: 'db.odbc.get["{#GROUP_NAME}_{#REPLICA_NAME}_replica.state","{$MSSQL.DSN}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MSSQL Available Group ''{#GROUP_NAME}'' Replica ''{#REPLICA_NAME}'''
+                  tag: availability-group
+                  value: '{#GROUP_NAME}'
+                -
+                  tag: component
+                  value: replica
+                -
+                  tag: replica
+                  value: '{#REPLICA_NAME}'
             -
               uuid: ad3e6d5bf510496eb050b9a05f8341e1
               name: 'MSSQL AG ''{#GROUP_NAME}'' Replica ''{#REPLICA_NAME}'': Operational state'
@@ -3503,8 +4006,14 @@ zabbix_export:
                 key: 'db.odbc.get["{#GROUP_NAME}_{#REPLICA_NAME}_replica.state","{$MSSQL.DSN}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MSSQL Available Group ''{#GROUP_NAME}'' Replica ''{#REPLICA_NAME}'''
+                  tag: availability-group
+                  value: '{#GROUP_NAME}'
+                -
+                  tag: component
+                  value: replica
+                -
+                  tag: replica
+                  value: '{#REPLICA_NAME}'
               trigger_prototypes:
                 -
                   uuid: 0192e9d5795a4d46acb8de29f710edcd
@@ -3512,18 +4021,48 @@ zabbix_export:
                   name: 'MSSQL AG ''{#GROUP_NAME}'' Replica ''{#REPLICA_NAME}'': {#REPLICA_NAME} is {ITEM.VALUE}'
                   priority: WARNING
                   description: 'The operational state of the replica in a given availability group is "Pending" or "Offline".'
+                  tags:
+                    -
+                      tag: availability-group
+                      value: '{#GROUP_NAME}'
+                    -
+                      tag: replica
+                      value: '{#REPLICA_NAME}'
+                    -
+                      tag: scope
+                      value: availability
                 -
                   uuid: 3f2006b9ae114e01b442b34fec9373d3
                   expression: 'last(/MSSQL by ODBC/mssql.replica.operational_state["{#GROUP_NAME}_{#REPLICA_NAME}"])=4'
                   name: 'MSSQL AG ''{#GROUP_NAME}'' Replica ''{#REPLICA_NAME}'': {#REPLICA_NAME} is {ITEM.VALUE}'
                   priority: AVERAGE
                   description: 'The operational state of the replica in a given availability group is "Failed".'
+                  tags:
+                    -
+                      tag: availability-group
+                      value: '{#GROUP_NAME}'
+                    -
+                      tag: replica
+                      value: '{#REPLICA_NAME}'
+                    -
+                      tag: scope
+                      value: availability
                 -
                   uuid: 94ea79848a5048d8ae417df709b8d612
                   expression: 'last(/MSSQL by ODBC/mssql.replica.operational_state["{#GROUP_NAME}_{#REPLICA_NAME}"])=5'
                   name: 'MSSQL AG ''{#GROUP_NAME}'' Replica ''{#REPLICA_NAME}'': {#REPLICA_NAME} is {ITEM.VALUE}'
                   priority: HIGH
                   description: 'The operational state of the replica in a given availability group is "Failed, no quorum".'
+                  tags:
+                    -
+                      tag: availability-group
+                      value: '{#GROUP_NAME}'
+                    -
+                      tag: replica
+                      value: '{#REPLICA_NAME}'
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 2a58cab2197348d997bdb69bb128414d
               name: 'MSSQL AG ''{#GROUP_NAME}'' Replica ''{#REPLICA_NAME}'': Recovery health'
@@ -3551,8 +4090,14 @@ zabbix_export:
                 key: 'db.odbc.get["{#GROUP_NAME}_{#REPLICA_NAME}_replica.state","{$MSSQL.DSN}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MSSQL Available Group ''{#GROUP_NAME}'' Replica ''{#REPLICA_NAME}'''
+                  tag: availability-group
+                  value: '{#GROUP_NAME}'
+                -
+                  tag: component
+                  value: replica
+                -
+                  tag: replica
+                  value: '{#REPLICA_NAME}'
               trigger_prototypes:
                 -
                   uuid: 58f508b855364d769e2be977793a03c8
@@ -3560,6 +4105,16 @@ zabbix_export:
                   name: 'MSSQL AG ''{#GROUP_NAME}'' Replica ''{#REPLICA_NAME}'': {#REPLICA_NAME} Recovery in progress'
                   priority: INFO
                   description: 'At least one joined database has a database state other than ONLINE.'
+                  tags:
+                    -
+                      tag: availability-group
+                      value: '{#GROUP_NAME}'
+                    -
+                      tag: replica
+                      value: '{#REPLICA_NAME}'
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 5139a4cef5ac46d2ab34cd8bda1c84ac
               name: 'MSSQL AG ''{#GROUP_NAME}'' Replica ''{#REPLICA_NAME}'': Role'
@@ -3587,8 +4142,14 @@ zabbix_export:
                 key: 'db.odbc.get["{#GROUP_NAME}_{#REPLICA_NAME}_replica.state","{$MSSQL.DSN}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MSSQL Available Group ''{#GROUP_NAME}'' Replica ''{#REPLICA_NAME}'''
+                  tag: availability-group
+                  value: '{#GROUP_NAME}'
+                -
+                  tag: component
+                  value: replica
+                -
+                  tag: replica
+                  value: '{#REPLICA_NAME}'
             -
               uuid: 5655f95df0e043acba246f65e4905b0d
               name: 'MSSQL AG ''{#GROUP_NAME}'' Replica ''{#REPLICA_NAME}'': Sync health'
@@ -3616,8 +4177,14 @@ zabbix_export:
                 key: 'db.odbc.get["{#GROUP_NAME}_{#REPLICA_NAME}_replica.state","{$MSSQL.DSN}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'MSSQL Available Group ''{#GROUP_NAME}'' Replica ''{#REPLICA_NAME}'''
+                  tag: availability-group
+                  value: '{#GROUP_NAME}'
+                -
+                  tag: component
+                  value: replica
+                -
+                  tag: replica
+                  value: '{#REPLICA_NAME}'
               trigger_prototypes:
                 -
                   uuid: f2f4d198ad2242088d867abe6fac4ecd
@@ -3625,12 +4192,32 @@ zabbix_export:
                   name: 'MSSQL AG ''{#GROUP_NAME}'' Replica ''{#REPLICA_NAME}'': {#REPLICA_NAME} is Not healthy'
                   priority: AVERAGE
                   description: 'At least one joined database is in the NOT SYNCHRONIZING state.'
+                  tags:
+                    -
+                      tag: availability-group
+                      value: '{#GROUP_NAME}'
+                    -
+                      tag: replica
+                      value: '{#REPLICA_NAME}'
+                    -
+                      tag: scope
+                      value: availability
                 -
                   uuid: 070af612aa7248588fc058d8f9fb9929
                   expression: 'last(/MSSQL by ODBC/mssql.replica.synchronization_health["{#GROUP_NAME}_{#REPLICA_NAME}"])=1'
                   name: 'MSSQL AG ''{#GROUP_NAME}'' Replica ''{#REPLICA_NAME}'': {#REPLICA_NAME} is Partially healthy'
                   priority: WARNING
                   description: 'Some replicas are not in the target synchronization state: synchronous-commit replicas should be synchronized, and asynchronous-commit replicas should be synchronizing.'
+                  tags:
+                    -
+                      tag: availability-group
+                      value: '{#GROUP_NAME}'
+                    -
+                      tag: replica
+                      value: '{#REPLICA_NAME}'
+                    -
+                      tag: scope
+                      value: availability
           trigger_prototypes:
             -
               uuid: 7c6afc5596e94af0979bd20d5ef542ea
@@ -3640,11 +4227,28 @@ zabbix_export:
               description: |
                 The response of an availability replica to the DISCONNECTED state depends on its role:
                 On the primary replica, if a secondary replica is disconnected, its secondary databases are marked as NOT SYNCHRONIZED on the primary replica, which waits for the secondary to reconnect; On a secondary replica, upon detecting that it is disconnected, the secondary replica attempts to reconnect to the primary replica.
+              tags:
+                -
+                  tag: availability-group
+                  value: '{#GROUP_NAME}'
+                -
+                  tag: replica
+                  value: '{#REPLICA_NAME}'
+                -
+                  tag: scope
+                  value: availability
           preprocessing:
             -
               type: DISCARD_UNCHANGED_HEARTBEAT
               parameters:
                 - 1d
+      tags:
+        -
+          tag: class
+          value: database
+        -
+          tag: target
+          value: mssql
       macros:
         -
           macro: '{$MSSQL.AVERAGE_WAIT_TIME.MAX}'
@@ -4031,12 +4635,20 @@ zabbix_export:
       name: 'MSSQL: Too frequently using pointers'
       priority: WARNING
       description: 'Rows with varchar columns can experience expansion when varchar values are updated with a longer string.  In the case where the row cannot fit in the existing page, the row migrates and access to the row will traverse a pointer.  This only happens on heaps (tables without clustered indexes). Evaluate clustered index for heap tables.  In cases where clustered indexes cannot be used, drop non-clustered indexes, build a clustered index to reorg pages and rows, drop the clustered index, then recreate non-clustered indexes.'
+      tags:
+        -
+          tag: scope
+          value: performance
     -
       uuid: 2a58729eb605461b853ec4e855878226
       expression: 'last(/MSSQL by ODBC/mssql.readahead_pages_sec.rate) > {$MSSQL.PERCENT_READAHEAD.MAX} / 100 * last(/MSSQL by ODBC/mssql.page_reads_sec.rate)'
       name: 'MSSQL: Too many physical reads occurring'
       priority: WARNING
       description: 'If this value makes up even a sizeable minority of the total Page Reads/sec (say, greater than 20% of the total page reads), you may have too many physical reads occurring.'
+      tags:
+        -
+          tag: scope
+          value: performance
   graphs:
     -
       uuid: d2db0e08beb6445a8b5dd9fb46249265
diff --git a/templates/db/mysql_agent/template_db_mysql_agent.yaml b/templates/db/mysql_agent/template_db_mysql_agent.yaml
index 70e3a6cbf25..9d97f3fa5b3 100644
--- a/templates/db/mysql_agent/template_db_mysql_agent.yaml
+++ b/templates/db/mysql_agent/template_db_mysql_agent.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-16T07:08:36Z'
+  date: '2022-01-26T10:39:10Z'
   groups:
     -
       uuid: 748ad4d098d447d492bb935c907f652f
@@ -26,7 +26,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/384189-discussion-thread-for-official-zabbix-template-db-mysql
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Databases
@@ -53,8 +53,8 @@ zabbix_export:
             key: 'mysql.get_status_variables["{$MYSQL.HOST}","{$MYSQL.PORT}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: connections
         -
           uuid: d33a03e48f6d45dca04a505bab07a860
           name: 'MySQL: Aborted connections per second'
@@ -77,8 +77,8 @@ zabbix_export:
             key: 'mysql.get_status_variables["{$MYSQL.HOST}","{$MYSQL.PORT}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: connections
           triggers:
             -
               uuid: e51c9ee3061c4e3889be1666afe6959d
@@ -90,6 +90,10 @@ zabbix_export:
                 -
                   name: 'MySQL: Refused connections (max_connections limit reached)'
                   expression: 'last(/MySQL by Zabbix agent/mysql.connection_errors_max_connections.rate)>0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 75b9c78d76334927a3fc2a4d1322ecc2
           name: 'MySQL: Binlog cache disk use'
@@ -112,8 +116,8 @@ zabbix_export:
             key: 'mysql.get_status_variables["{$MYSQL.HOST}","{$MYSQL.PORT}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: cache
         -
           uuid: 9a447424aca84124abdfa389865126d4
           name: 'MySQL: Buffer pool efficiency'
@@ -130,8 +134,8 @@ zabbix_export:
           description: 'The item shows how effectively the buffer pool is serving reads.'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: memory
         -
           uuid: 9aca02e86e744f43ab48e8ca9453cf77
           name: 'MySQL: Buffer pool utilization'
@@ -149,8 +153,8 @@ zabbix_export:
           description: 'Ratio of used to total pages in the buffer pool.'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: memory
           triggers:
             -
               uuid: 0e8ea91d72a64507aaadf9ea5efa6412
@@ -158,6 +162,10 @@ zabbix_export:
               name: 'MySQL: Buffer pool utilization is too low (less than {$MYSQL.BUFF_UTIL.MIN.WARN}% for 5m)'
               priority: WARNING
               description: 'The buffer pool utilization is less than {$MYSQL.BUFF_UTIL.MIN.WARN}% in the last 5 minutes. This means that there is a lot of unused RAM allocated for the buffer pool, which you can easily reallocate at the moment.'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 56512a1e89d34826ad261ab27119e80d
           name: 'MySQL: Bytes received'
@@ -181,8 +189,8 @@ zabbix_export:
             key: 'mysql.get_status_variables["{$MYSQL.HOST}","{$MYSQL.PORT}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: network
         -
           uuid: c4cea16e3dbe4d328d9a50e113f3b904
           name: 'MySQL: Bytes sent'
@@ -206,8 +214,8 @@ zabbix_export:
             key: 'mysql.get_status_variables["{$MYSQL.HOST}","{$MYSQL.PORT}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: network
         -
           uuid: 24ab8f0bd32a45f591c676ef839876df
           name: 'MySQL: Command Delete per second'
@@ -230,8 +238,8 @@ zabbix_export:
             key: 'mysql.get_status_variables["{$MYSQL.HOST}","{$MYSQL.PORT}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: operations
         -
           uuid: e48c67c893e5494fb00ea31222bd2caf
           name: 'MySQL: Command Insert per second'
@@ -254,8 +262,8 @@ zabbix_export:
             key: 'mysql.get_status_variables["{$MYSQL.HOST}","{$MYSQL.PORT}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: operations
         -
           uuid: 718c3af61f2645e8ab7d3496d6639c79
           name: 'MySQL: Command Select per second'
@@ -278,8 +286,8 @@ zabbix_export:
             key: 'mysql.get_status_variables["{$MYSQL.HOST}","{$MYSQL.PORT}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: operations
         -
           uuid: e2c3ea26dd34472c9e5f0e48a67da6dd
           name: 'MySQL: Command Update per second'
@@ -302,8 +310,8 @@ zabbix_export:
             key: 'mysql.get_status_variables["{$MYSQL.HOST}","{$MYSQL.PORT}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: operations
         -
           uuid: bcf8a21aacc54a79a958604b278f9617
           name: 'MySQL: Connections per second'
@@ -326,8 +334,8 @@ zabbix_export:
             key: 'mysql.get_status_variables["{$MYSQL.HOST}","{$MYSQL.PORT}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: connections
         -
           uuid: dc963a1250ab453cb090af0154d745c3
           name: 'MySQL: Connection errors accept per second'
@@ -350,8 +358,8 @@ zabbix_export:
             key: 'mysql.get_status_variables["{$MYSQL.HOST}","{$MYSQL.PORT}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: connections
         -
           uuid: 4cff4caf382f4f00b534651212132bd2
           name: 'MySQL: Connection errors internal per second'
@@ -374,8 +382,8 @@ zabbix_export:
             key: 'mysql.get_status_variables["{$MYSQL.HOST}","{$MYSQL.PORT}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: connections
         -
           uuid: 3cbc55fc7b764a61baceb11e98fd454c
           name: 'MySQL: Connection errors max connections per second'
@@ -398,8 +406,8 @@ zabbix_export:
             key: 'mysql.get_status_variables["{$MYSQL.HOST}","{$MYSQL.PORT}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: connections
           triggers:
             -
               uuid: 2ff2d0f399df4cb08b7196d3a4690567
@@ -407,6 +415,10 @@ zabbix_export:
               name: 'MySQL: Refused connections (max_connections limit reached)'
               priority: AVERAGE
               description: 'Number of refused connections due to the max_connections limit being reached.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: e577b4b6c553401bbb831b7278dbbcb7
           name: 'MySQL: Connection errors peer address per second'
@@ -429,8 +441,8 @@ zabbix_export:
             key: 'mysql.get_status_variables["{$MYSQL.HOST}","{$MYSQL.PORT}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: connections
         -
           uuid: 228aaf5333ce4958aa3a07e0898add63
           name: 'MySQL: Connection errors select per second'
@@ -453,8 +465,8 @@ zabbix_export:
             key: 'mysql.get_status_variables["{$MYSQL.HOST}","{$MYSQL.PORT}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: connections
         -
           uuid: a7632124b2b648bfa80a2e8a0381f4d2
           name: 'MySQL: Connection errors tcpwrap per second'
@@ -477,8 +489,8 @@ zabbix_export:
             key: 'mysql.get_status_variables["{$MYSQL.HOST}","{$MYSQL.PORT}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: connections
         -
           uuid: 52335a039571454ebaccc9ab103200a3
           name: 'MySQL: Created tmp tables on disk per second'
@@ -501,8 +513,11 @@ zabbix_export:
             key: 'mysql.get_status_variables["{$MYSQL.HOST}","{$MYSQL.PORT}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: storage
+            -
+              tag: component
+              value: tables
           triggers:
             -
               uuid: 1b8761292e89476e91834f8e567a1dbe
@@ -510,6 +525,10 @@ zabbix_export:
               name: 'MySQL: Number of on-disk temporary tables created per second is high (over {$MYSQL.CREATED_TMP_DISK_TABLES.MAX.WARN} for 5m)'
               priority: WARNING
               description: 'Possibly the application using the database is in need of query optimization.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: d1dd183666d44010a5054f2e1cc328de
           name: 'MySQL: Created tmp files on disk per second'
@@ -532,8 +551,8 @@ zabbix_export:
             key: 'mysql.get_status_variables["{$MYSQL.HOST}","{$MYSQL.PORT}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: storage
           triggers:
             -
               uuid: 9845d8dc676f4702ae34b626f39d21ac
@@ -541,6 +560,10 @@ zabbix_export:
               name: 'MySQL: Number of temporary files created per second is high (over {$MYSQL.CREATED_TMP_FILES.MAX.WARN} for 5m)'
               priority: WARNING
               description: 'Possibly the application using the database is in need of query optimization.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: c9a94c3145a643ef8ceec33f63b85ae9
           name: 'MySQL: Created tmp tables on memory per second'
@@ -563,8 +586,11 @@ zabbix_export:
             key: 'mysql.get_status_variables["{$MYSQL.HOST}","{$MYSQL.PORT}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: memory
+            -
+              tag: component
+              value: tables
           triggers:
             -
               uuid: c647a51864e04bc69a1f610b1dec56fe
@@ -572,6 +598,10 @@ zabbix_export:
               name: 'MySQL: Number of internal temporary tables created per second is high (over {$MYSQL.CREATED_TMP_TABLES.MAX.WARN} for 5m)'
               priority: WARNING
               description: 'Possibly the application using the database is in need of query optimization.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 2ba81b425bde4ba5b3f7d00a6c922ed9
           name: 'MySQL: Get status variables'
@@ -582,8 +612,8 @@ zabbix_export:
           description: 'The item gets server global status information.'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
         -
           uuid: a9b965a07b504fa1b4e90acae0156221
           name: 'MySQL: InnoDB buffer pool pages free'
@@ -601,8 +631,11 @@ zabbix_export:
             key: 'mysql.get_status_variables["{$MYSQL.HOST}","{$MYSQL.PORT}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: innodb
+            -
+              tag: component
+              value: memory
         -
           uuid: efb2450fe30c4ec78b954a35595b7ac7
           name: 'MySQL: InnoDB buffer pool pages total'
@@ -624,8 +657,11 @@ zabbix_export:
             key: 'mysql.get_status_variables["{$MYSQL.HOST}","{$MYSQL.PORT}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: innodb
+            -
+              tag: component
+              value: memory
         -
           uuid: 7738a4480f69427a96d46a9ca5b38d77
           name: 'MySQL: InnoDB buffer pool reads'
@@ -643,8 +679,11 @@ zabbix_export:
             key: 'mysql.get_status_variables["{$MYSQL.HOST}","{$MYSQL.PORT}"]'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: innodb
+            -
+              tag: component
+              value: memory
         -
           uuid: 1704fe0bf8de4882a6a16ebd75c4c3bf
           name: 'MySQL: InnoDB buffer pool reads per second'
@@ -667,8 +706,11 @@ zabbix_export:
             key: 'mysql.get_status_variables["{$MYSQL.HOST}","{$MYSQL.PORT}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: innodb
+            -
+              tag: component
+              value: memory
         -
           uuid: 598dcdb7eeec42c78484be70c814cd8a
           name: 'MySQL: InnoDB buffer pool read requests'
@@ -686,8 +728,11 @@ zabbix_export:
             key: 'mysql.get_status_variables["{$MYSQL.HOST}","{$MYSQL.PORT}"]'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: innodb
+            -
+              tag: component
+              value: memory
         -
           uuid: 3ed432f4e0c949debaed9d60c5d13810
           name: 'MySQL: InnoDB buffer pool read requests per second'
@@ -710,8 +755,11 @@ zabbix_export:
             key: 'mysql.get_status_variables["{$MYSQL.HOST}","{$MYSQL.PORT}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: innodb
+            -
+              tag: component
+              value: memory
         -
           uuid: 61db0feae0b440c087177f4312eb6b7a
           name: 'MySQL: Innodb buffer pool wait free'
@@ -734,8 +782,11 @@ zabbix_export:
             key: 'mysql.get_status_variables["{$MYSQL.HOST}","{$MYSQL.PORT}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: innodb
+            -
+              tag: component
+              value: memory
         -
           uuid: e5413d85449e4baea683c6365808cc17
           name: 'MySQL: Calculated value of innodb_log_file_size'
@@ -752,8 +803,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: system
         -
           uuid: 2eacd8c07f7148acaaa9b8f8602720ae
           name: 'MySQL: Innodb number open files'
@@ -776,8 +827,11 @@ zabbix_export:
             key: 'mysql.get_status_variables["{$MYSQL.HOST}","{$MYSQL.PORT}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: innodb
+            -
+              tag: component
+              value: system
         -
           uuid: 29d3513668ad4bdea28d947d2f983dd2
           name: 'MySQL: Innodb log written'
@@ -797,8 +851,8 @@ zabbix_export:
             key: 'mysql.get_status_variables["{$MYSQL.HOST}","{$MYSQL.PORT}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: system
         -
           uuid: 3811018fdfaf4d92a5b8ff5d631d0047
           name: 'MySQL: InnoDB row lock time'
@@ -826,8 +880,11 @@ zabbix_export:
             key: 'mysql.get_status_variables["{$MYSQL.HOST}","{$MYSQL.PORT}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: innodb
+            -
+              tag: component
+              value: tables
         -
           uuid: 579c1ad7680349a3b6a25dd12322fc14
           name: 'MySQL: InnoDB row lock time max'
@@ -855,8 +912,11 @@ zabbix_export:
             key: 'mysql.get_status_variables["{$MYSQL.HOST}","{$MYSQL.PORT}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: innodb
+            -
+              tag: component
+              value: tables
         -
           uuid: a4618dd9ed1d4ff19f34bc82f41dbbbb
           name: 'MySQL: InnoDB row lock waits'
@@ -874,8 +934,11 @@ zabbix_export:
             key: 'mysql.get_status_variables["{$MYSQL.HOST}","{$MYSQL.PORT}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: innodb
+            -
+              tag: component
+              value: tables
         -
           uuid: e207dc3c0fe84928a36e643594d8cee5
           name: 'MySQL: Max used connections'
@@ -897,8 +960,8 @@ zabbix_export:
             key: 'mysql.get_status_variables["{$MYSQL.HOST}","{$MYSQL.PORT}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: connections
         -
           uuid: 3dd5ffb7c1cc45a487c5c7cabfa90ca6
           name: 'MySQL: Open tables'
@@ -921,8 +984,8 @@ zabbix_export:
             key: 'mysql.get_status_variables["{$MYSQL.HOST}","{$MYSQL.PORT}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: tables
         -
           uuid: fe572969a6754248b10a35a5c0afedf3
           name: 'MySQL: Open table definitions'
@@ -945,8 +1008,8 @@ zabbix_export:
             key: 'mysql.get_status_variables["{$MYSQL.HOST}","{$MYSQL.PORT}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: tables
         -
           uuid: 41cd6c8c535948f3bde6324e0912f1a8
           name: 'MySQL: Status'
@@ -965,14 +1028,21 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: application
+            -
+              tag: component
+              value: health
           triggers:
             -
               uuid: e78f07e3e507461f8fe33a31b1bc4eb9
               expression: 'last(/MySQL by Zabbix agent/mysql.ping["{$MYSQL.HOST}","{$MYSQL.PORT}"])=0'
               name: 'MySQL: Service is down'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: c11b8c8ec3e843cea63f6cc1d8309ccd
           name: 'MySQL: Queries per second'
@@ -995,8 +1065,8 @@ zabbix_export:
             key: 'mysql.get_status_variables["{$MYSQL.HOST}","{$MYSQL.PORT}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: queries
         -
           uuid: cd7c5c4e262f4a73975d46d06ed903f9
           name: 'MySQL: Questions per second'
@@ -1019,8 +1089,8 @@ zabbix_export:
             key: 'mysql.get_status_variables["{$MYSQL.HOST}","{$MYSQL.PORT}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: queries
         -
           uuid: a1cfc616f23648e9946f408c7146df0a
           name: 'MySQL: Slow queries per second'
@@ -1043,8 +1113,8 @@ zabbix_export:
             key: 'mysql.get_status_variables["{$MYSQL.HOST}","{$MYSQL.PORT}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: queries
           triggers:
             -
               uuid: 113509b7a7b54a108c1c63346a52bbf2
@@ -1052,6 +1122,10 @@ zabbix_export:
               name: 'MySQL: Server has slow queries (over {$MYSQL.SLOW_QUERIES.MAX.WARN} for 5m)'
               priority: WARNING
               description: 'The number of slow queries is more than {$MYSQL.SLOW_QUERIES.MAX.WARN} in the last 5 minutes.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: a9ce1d75a97d4740876fad7b5d569211
           name: 'MySQL: Threads cached'
@@ -1069,8 +1143,8 @@ zabbix_export:
             key: 'mysql.get_status_variables["{$MYSQL.HOST}","{$MYSQL.PORT}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: threads
         -
           uuid: a0079f5ffbdc40cc89b35a8b6170c32b
           name: 'MySQL: Threads connected'
@@ -1088,8 +1162,8 @@ zabbix_export:
             key: 'mysql.get_status_variables["{$MYSQL.HOST}","{$MYSQL.PORT}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: threads
         -
           uuid: 06976fcb42ab4a33b0056a864ecd31e7
           name: 'MySQL: Threads created per second'
@@ -1112,8 +1186,8 @@ zabbix_export:
             key: 'mysql.get_status_variables["{$MYSQL.HOST}","{$MYSQL.PORT}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: threads
         -
           uuid: 255c00a984ba462e84ba46a7430f21c9
           name: 'MySQL: Threads running'
@@ -1131,8 +1205,8 @@ zabbix_export:
             key: 'mysql.get_status_variables["{$MYSQL.HOST}","{$MYSQL.PORT}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: threads
         -
           uuid: 6ffa704603014f0f9f765590955fb01c
           name: 'MySQL: Uptime'
@@ -1151,8 +1225,8 @@ zabbix_export:
             key: 'mysql.get_status_variables["{$MYSQL.HOST}","{$MYSQL.PORT}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: application
           triggers:
             -
               uuid: d3c80c770355464fb5a6be0357d0edca
@@ -1164,12 +1238,20 @@ zabbix_export:
                 -
                   name: 'MySQL: Service is down'
                   expression: 'last(/MySQL by Zabbix agent/mysql.ping["{$MYSQL.HOST}","{$MYSQL.PORT}"])=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
             -
               uuid: f02f51c764934cf394c5ad3f9c4e70d2
               expression: 'last(/MySQL by Zabbix agent/mysql.uptime)<10m'
               name: 'MySQL: Service has been restarted (uptime < 10m)'
               priority: INFO
               description: 'MySQL uptime is less than 10 minutes.'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: a5d0f152c3ef4e069c3d5a6a5a9470fe
           name: 'MySQL: Version'
@@ -1190,8 +1272,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: application
           triggers:
             -
               uuid: 7eab3a7337904ad1b2061d209371543b
@@ -1200,6 +1282,10 @@ zabbix_export:
               priority: INFO
               description: 'MySQL version has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
       discovery_rules:
         -
           uuid: 8ceb226f000d48f099ee6e128ad551b5
@@ -1229,8 +1315,11 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: MySQL
+                  tag: component
+                  value: storage
+                -
+                  tag: database
+                  value: '{#DBNAME}'
           preprocessing:
             -
               type: JAVASCRIPT
@@ -1269,8 +1358,8 @@ zabbix_export:
                 key: 'mysql.get_status_variables["{$MYSQL.HOST}","{$MYSQL.PORT}"]'
               tags:
                 -
-                  tag: Application
-                  value: MySQL
+                  tag: component
+                  value: transactions
             -
               uuid: c897f8f0fb1c4e409dd95305fd221e01
               name: 'MySQL: Binlog group commits'
@@ -1289,8 +1378,8 @@ zabbix_export:
                 key: 'mysql.get_status_variables["{$MYSQL.HOST}","{$MYSQL.PORT}"]'
               tags:
                 -
-                  tag: Application
-                  value: MySQL
+                  tag: component
+                  value: transactions
             -
               uuid: 749e72ebd1014f7faee352e23ac3dfdd
               name: 'MySQL: Master GTID wait count'
@@ -1313,8 +1402,8 @@ zabbix_export:
                 key: 'mysql.get_status_variables["{$MYSQL.HOST}","{$MYSQL.PORT}"]'
               tags:
                 -
-                  tag: Application
-                  value: MySQL
+                  tag: component
+                  value: transactions
             -
               uuid: 4a4537b0db5b43119af910d0ba421035
               name: 'MySQL: Master GTID wait timeouts'
@@ -1337,8 +1426,8 @@ zabbix_export:
                 key: 'mysql.get_status_variables["{$MYSQL.HOST}","{$MYSQL.PORT}"]'
               tags:
                 -
-                  tag: Application
-                  value: MySQL
+                  tag: component
+                  value: transactions
             -
               uuid: c1e95abc88cf486a9226bf760254f797
               name: 'MySQL: Master GTID wait time'
@@ -1361,8 +1450,8 @@ zabbix_export:
                 key: 'mysql.get_status_variables["{$MYSQL.HOST}","{$MYSQL.PORT}"]'
               tags:
                 -
-                  tag: Application
-                  value: MySQL
+                  tag: component
+                  value: transactions
           master_item:
             key: 'mysql.version["{$MYSQL.HOST}","{$MYSQL.PORT}"]'
           preprocessing:
@@ -1408,14 +1497,18 @@ zabbix_export:
                 key: 'mysql.slave_status["{$MYSQL.HOST}","{$MYSQL.PORT}","{#MASTERHOST}"]'
               tags:
                 -
-                  tag: Application
-                  value: MySQL
+                  tag: component
+                  value: replication
               trigger_prototypes:
                 -
                   uuid: a5c91da088414d279f5ea3cd59093ce9
                   expression: 'min(/MySQL by Zabbix agent/mysql.seconds_behind_master["{#MASTERHOST}"],5m)>{$MYSQL.REPL_LAG.MAX.WARN}'
                   name: 'MySQL: Replication lag is too high (over {$MYSQL.REPL_LAG.MAX.WARN} for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 1c075f4785604d92a33a868e213070d8
               name: 'MySQL: Replication Slave IO Running {#MASTERHOST}'
@@ -1442,8 +1535,8 @@ zabbix_export:
                 key: 'mysql.slave_status["{$MYSQL.HOST}","{$MYSQL.PORT}","{#MASTERHOST}"]'
               tags:
                 -
-                  tag: Application
-                  value: MySQL
+                  tag: component
+                  value: replication
               trigger_prototypes:
                 -
                   uuid: 8ee45932311443cb906306b1d2c99b19
@@ -1454,12 +1547,20 @@ zabbix_export:
                     -
                       name: 'MySQL: The slave I/O thread is not running'
                       expression: 'count(/MySQL by Zabbix agent/mysql.slave_io_running["{#MASTERHOST}"],#1,"eq","No")=1'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
                 -
                   uuid: 4c8ca45f26254d9a9a1c9248f1fa1537
                   expression: 'count(/MySQL by Zabbix agent/mysql.slave_io_running["{#MASTERHOST}"],#1,"eq","No")=1'
                   name: 'MySQL: The slave I/O thread is not running'
                   priority: AVERAGE
                   description: 'Whether the I/O thread for reading the master''s binary log is running.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 967c6fd13cc04562a9fea174bd90b8c4
               name: 'MySQL: Replication Slave SQL Running {#MASTERHOST}'
@@ -1485,8 +1586,8 @@ zabbix_export:
                 key: 'mysql.slave_status["{$MYSQL.HOST}","{$MYSQL.PORT}","{#MASTERHOST}"]'
               tags:
                 -
-                  tag: Application
-                  value: MySQL
+                  tag: component
+                  value: replication
               trigger_prototypes:
                 -
                   uuid: bd0d20c05e3b46b6a7c341e5d122208b
@@ -1498,6 +1599,10 @@ zabbix_export:
                     -
                       name: 'MySQL: The slave I/O thread is not running'
                       expression: 'count(/MySQL by Zabbix agent/mysql.slave_io_running["{#MASTERHOST}"],#1,"eq","No")=1'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 27e807d840d4474484c2e1f896726b6b
               name: 'MySQL: Replication Slave SQL Running State {#MASTER_HOST}'
@@ -1521,8 +1626,8 @@ zabbix_export:
                 key: 'mysql.slave_status["{$MYSQL.HOST}","{$MYSQL.PORT}","{#MASTERHOST}"]'
               tags:
                 -
-                  tag: Application
-                  value: MySQL
+                  tag: component
+                  value: replication
             -
               uuid: d87c7c03e5884a43912f60ad91c3b46f
               name: 'MySQL: Replication Slave status {#MASTERHOST}'
@@ -1533,8 +1638,8 @@ zabbix_export:
               description: 'The item gets status information on the essential parameters of the slave threads.'
               tags:
                 -
-                  tag: Application
-                  value: 'Zabbix raw items'
+                  tag: component
+                  value: raw
           preprocessing:
             -
               type: JAVASCRIPT
@@ -1550,6 +1655,13 @@ zabbix_export:
               type: DISCARD_UNCHANGED_HEARTBEAT
               parameters:
                 - 1d
+      tags:
+        -
+          tag: class
+          value: database
+        -
+          tag: target
+          value: mysql
       macros:
         -
           macro: '{$MYSQL.ABORTED_CONN.MAX.WARN}'
diff --git a/templates/db/mysql_agent2/template_db_mysql_agent2.yaml b/templates/db/mysql_agent2/template_db_mysql_agent2.yaml
index cf42b8b2213..c2d0459fe7f 100644
--- a/templates/db/mysql_agent2/template_db_mysql_agent2.yaml
+++ b/templates/db/mysql_agent2/template_db_mysql_agent2.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-16T07:08:41Z'
+  date: '2022-01-26T10:38:48Z'
   groups:
     -
       uuid: 748ad4d098d447d492bb935c907f652f
@@ -26,7 +26,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/384189-discussion-thread-for-official-zabbix-template-db-mysql
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Databases
@@ -53,8 +53,8 @@ zabbix_export:
             key: 'mysql.get_status_variables["{$MYSQL.DSN}","{$MYSQL.USER}","{$MYSQL.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: connections
         -
           uuid: 77a407bb911f4b938c32de289da83383
           name: 'MySQL: Aborted connections per second'
@@ -77,8 +77,8 @@ zabbix_export:
             key: 'mysql.get_status_variables["{$MYSQL.DSN}","{$MYSQL.USER}","{$MYSQL.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: connections
           triggers:
             -
               uuid: 0f984c4458ae4a7f9388b1edb42090bf
@@ -90,6 +90,10 @@ zabbix_export:
                 -
                   name: 'MySQL: Refused connections (max_connections limit reached)'
                   expression: 'last(/MySQL by Zabbix agent 2/mysql.connection_errors_max_connections.rate)>0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 06338fe53a014be095f3807d58b9ed5b
           name: 'MySQL: Binlog cache disk use'
@@ -112,8 +116,8 @@ zabbix_export:
             key: 'mysql.get_status_variables["{$MYSQL.DSN}","{$MYSQL.USER}","{$MYSQL.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: cache
         -
           uuid: e222b97642d04128af8c1ec20e463152
           name: 'MySQL: Buffer pool efficiency'
@@ -130,8 +134,8 @@ zabbix_export:
           description: 'The item shows how effectively the buffer pool is serving reads.'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: memory
         -
           uuid: 70a1642e80114fd3a129c5774acc4f50
           name: 'MySQL: Buffer pool utilization'
@@ -149,8 +153,8 @@ zabbix_export:
           description: 'Ratio of used to total pages in the buffer pool.'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: memory
           triggers:
             -
               uuid: d785a37fe8d7484d9998e47e0e1d741f
@@ -158,6 +162,10 @@ zabbix_export:
               name: 'MySQL: Buffer pool utilization is too low (less than {$MYSQL.BUFF_UTIL.MIN.WARN}% for 5m)'
               priority: WARNING
               description: 'The buffer pool utilization is less than {$MYSQL.BUFF_UTIL.MIN.WARN}% in the last 5 minutes. This means that there is a lot of unused RAM allocated for the buffer pool, which you can easily reallocate at the moment.'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 1501b3b4d2b143378d162bd88ab70504
           name: 'MySQL: Bytes received'
@@ -181,8 +189,8 @@ zabbix_export:
             key: 'mysql.get_status_variables["{$MYSQL.DSN}","{$MYSQL.USER}","{$MYSQL.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: network
         -
           uuid: 0af5a1b506ef4f348a11757cea440a05
           name: 'MySQL: Bytes sent'
@@ -206,8 +214,8 @@ zabbix_export:
             key: 'mysql.get_status_variables["{$MYSQL.DSN}","{$MYSQL.USER}","{$MYSQL.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: network
         -
           uuid: 0ebaced7ea3a4d9d9091128a8b0f6c49
           name: 'MySQL: Command Delete per second'
@@ -230,8 +238,8 @@ zabbix_export:
             key: 'mysql.get_status_variables["{$MYSQL.DSN}","{$MYSQL.USER}","{$MYSQL.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: operations
         -
           uuid: cc5aeff5d46c43259b7a8d0ca3296e8a
           name: 'MySQL: Command Insert per second'
@@ -254,8 +262,8 @@ zabbix_export:
             key: 'mysql.get_status_variables["{$MYSQL.DSN}","{$MYSQL.USER}","{$MYSQL.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: operations
         -
           uuid: e50d21a5d6764626a1eb3eb9f15dbc61
           name: 'MySQL: Command Select per second'
@@ -278,8 +286,8 @@ zabbix_export:
             key: 'mysql.get_status_variables["{$MYSQL.DSN}","{$MYSQL.USER}","{$MYSQL.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: operations
         -
           uuid: 6ce28af307b54a75817536105a14d80b
           name: 'MySQL: Command Update per second'
@@ -302,8 +310,8 @@ zabbix_export:
             key: 'mysql.get_status_variables["{$MYSQL.DSN}","{$MYSQL.USER}","{$MYSQL.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: operations
         -
           uuid: aeb1cc1b7c1d47acb8788e3751bd0e6f
           name: 'MySQL: Connections per second'
@@ -326,8 +334,8 @@ zabbix_export:
             key: 'mysql.get_status_variables["{$MYSQL.DSN}","{$MYSQL.USER}","{$MYSQL.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: connections
         -
           uuid: dd9a33e71dd8468a9e4f2e25d3028a88
           name: 'MySQL: Connection errors accept per second'
@@ -350,8 +358,8 @@ zabbix_export:
             key: 'mysql.get_status_variables["{$MYSQL.DSN}","{$MYSQL.USER}","{$MYSQL.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: connections
         -
           uuid: 12627c45088c4ed6a69c743ddf12e42e
           name: 'MySQL: Connection errors internal per second'
@@ -374,8 +382,8 @@ zabbix_export:
             key: 'mysql.get_status_variables["{$MYSQL.DSN}","{$MYSQL.USER}","{$MYSQL.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: connections
         -
           uuid: 1ad00e1a8a984254bec89c75a2d57ea0
           name: 'MySQL: Connection errors max connections per second'
@@ -398,8 +406,8 @@ zabbix_export:
             key: 'mysql.get_status_variables["{$MYSQL.DSN}","{$MYSQL.USER}","{$MYSQL.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: connections
           triggers:
             -
               uuid: 15cd0177e955459ba0862425755583a0
@@ -407,6 +415,10 @@ zabbix_export:
               name: 'MySQL: Refused connections (max_connections limit reached)'
               priority: AVERAGE
               description: 'Number of refused connections due to the max_connections limit being reached.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: fbabb9b53f754cf6be0f657e90897bd9
           name: 'MySQL: Connection errors peer address per second'
@@ -429,8 +441,8 @@ zabbix_export:
             key: 'mysql.get_status_variables["{$MYSQL.DSN}","{$MYSQL.USER}","{$MYSQL.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: connections
         -
           uuid: 48a2a6533ca4412d86e9f85fd748ad3b
           name: 'MySQL: Connection errors select per second'
@@ -453,8 +465,8 @@ zabbix_export:
             key: 'mysql.get_status_variables["{$MYSQL.DSN}","{$MYSQL.USER}","{$MYSQL.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: connections
         -
           uuid: 6a32e65b2e1a43bbaf718a0962271efe
           name: 'MySQL: Connection errors tcpwrap per second'
@@ -477,8 +489,8 @@ zabbix_export:
             key: 'mysql.get_status_variables["{$MYSQL.DSN}","{$MYSQL.USER}","{$MYSQL.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: connections
         -
           uuid: aaf0c77bf1b647e09633db28480ddfd7
           name: 'MySQL: Created tmp tables on disk per second'
@@ -501,8 +513,11 @@ zabbix_export:
             key: 'mysql.get_status_variables["{$MYSQL.DSN}","{$MYSQL.USER}","{$MYSQL.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: storage
+            -
+              tag: component
+              value: tables
           triggers:
             -
               uuid: 8c4e0c429c8241e28b930bfce7e29be8
@@ -510,6 +525,10 @@ zabbix_export:
               name: 'MySQL: Number of on-disk temporary tables created per second is high (over {$MYSQL.CREATED_TMP_DISK_TABLES.MAX.WARN} for 5m)'
               priority: WARNING
               description: 'Possibly the application using the database is in need of query optimization.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 970c9a50e7304c4eb81c46f4456c3350
           name: 'MySQL: Created tmp files on disk per second'
@@ -532,8 +551,8 @@ zabbix_export:
             key: 'mysql.get_status_variables["{$MYSQL.DSN}","{$MYSQL.USER}","{$MYSQL.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: storage
           triggers:
             -
               uuid: 322b61acd92e46f787e96486d2553886
@@ -541,6 +560,10 @@ zabbix_export:
               name: 'MySQL: Number of temporary files created per second is high (over {$MYSQL.CREATED_TMP_FILES.MAX.WARN} for 5m)'
               priority: WARNING
               description: 'Possibly the application using the database is in need of query optimization.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: fef23a9c80e84d87803f3540277ade1e
           name: 'MySQL: Created tmp tables on memory per second'
@@ -563,8 +586,11 @@ zabbix_export:
             key: 'mysql.get_status_variables["{$MYSQL.DSN}","{$MYSQL.USER}","{$MYSQL.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: memory
+            -
+              tag: component
+              value: tables
           triggers:
             -
               uuid: 86ed19d4ddc84f0da4a77c1dcbdf8c60
@@ -572,6 +598,10 @@ zabbix_export:
               name: 'MySQL: Number of internal temporary tables created per second is high (over {$MYSQL.CREATED_TMP_TABLES.MAX.WARN} for 5m)'
               priority: WARNING
               description: 'Possibly the application using the database is in need of query optimization.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: a18b1092c42a4560abac7af42b14f007
           name: 'MySQL: Get status variables'
@@ -582,8 +612,8 @@ zabbix_export:
           description: 'The item gets server global status information.'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
         -
           uuid: 51ab15a1c63348e48e6a75ed4e0ab5e3
           name: 'MySQL: InnoDB buffer pool pages free'
@@ -601,8 +631,11 @@ zabbix_export:
             key: 'mysql.get_status_variables["{$MYSQL.DSN}","{$MYSQL.USER}","{$MYSQL.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: innodb
+            -
+              tag: component
+              value: memory
         -
           uuid: 14a8ea7cda164240bc7360454b4cd690
           name: 'MySQL: InnoDB buffer pool pages total'
@@ -624,8 +657,11 @@ zabbix_export:
             key: 'mysql.get_status_variables["{$MYSQL.DSN}","{$MYSQL.USER}","{$MYSQL.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: innodb
+            -
+              tag: component
+              value: memory
         -
           uuid: 2b017cf20cb5412fa4e39dc9b4469930
           name: 'MySQL: InnoDB buffer pool reads'
@@ -643,8 +679,11 @@ zabbix_export:
             key: 'mysql.get_status_variables["{$MYSQL.DSN}","{$MYSQL.USER}","{$MYSQL.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: innodb
+            -
+              tag: component
+              value: memory
         -
           uuid: 0f2b813c8d6740d783504055dcd9a9dc
           name: 'MySQL: InnoDB buffer pool reads per second'
@@ -667,8 +706,11 @@ zabbix_export:
             key: 'mysql.get_status_variables["{$MYSQL.DSN}","{$MYSQL.USER}","{$MYSQL.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: innodb
+            -
+              tag: component
+              value: memory
         -
           uuid: ab450aaa081d4a8d9db5dfd327d3b439
           name: 'MySQL: InnoDB buffer pool read requests'
@@ -686,8 +728,11 @@ zabbix_export:
             key: 'mysql.get_status_variables["{$MYSQL.DSN}","{$MYSQL.USER}","{$MYSQL.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: innodb
+            -
+              tag: component
+              value: memory
         -
           uuid: dbf5bd4d705744bcb185e5044ff219e9
           name: 'MySQL: InnoDB buffer pool read requests per second'
@@ -710,8 +755,11 @@ zabbix_export:
             key: 'mysql.get_status_variables["{$MYSQL.DSN}","{$MYSQL.USER}","{$MYSQL.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: innodb
+            -
+              tag: component
+              value: memory
         -
           uuid: 3ab113998cec43da9bb702f5894d7b24
           name: 'MySQL: Innodb buffer pool wait free'
@@ -734,8 +782,11 @@ zabbix_export:
             key: 'mysql.get_status_variables["{$MYSQL.DSN}","{$MYSQL.USER}","{$MYSQL.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: innodb
+            -
+              tag: component
+              value: memory
         -
           uuid: e35cf67b6d2f44ffae908296faccfa50
           name: 'MySQL: Calculated value of innodb_log_file_size'
@@ -752,8 +803,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: system
         -
           uuid: 2c1cba2399ab4b349e9751252c000b95
           name: 'MySQL: Innodb number open files'
@@ -776,8 +827,11 @@ zabbix_export:
             key: 'mysql.get_status_variables["{$MYSQL.DSN}","{$MYSQL.USER}","{$MYSQL.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: innodb
+            -
+              tag: component
+              value: system
         -
           uuid: 6a4c63c40fb042868d2f23c86a0601a5
           name: 'MySQL: Innodb log written'
@@ -801,8 +855,8 @@ zabbix_export:
             key: 'mysql.get_status_variables["{$MYSQL.DSN}","{$MYSQL.USER}","{$MYSQL.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: system
         -
           uuid: 60cbafe89a294f6fb24e3b9efe241bf5
           name: 'MySQL: InnoDB row lock time'
@@ -830,8 +884,11 @@ zabbix_export:
             key: 'mysql.get_status_variables["{$MYSQL.DSN}","{$MYSQL.USER}","{$MYSQL.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: innodb
+            -
+              tag: component
+              value: tables
         -
           uuid: 3827ee01c4434ff09555b4dba63bac47
           name: 'MySQL: InnoDB row lock time max'
@@ -859,8 +916,11 @@ zabbix_export:
             key: 'mysql.get_status_variables["{$MYSQL.DSN}","{$MYSQL.USER}","{$MYSQL.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: innodb
+            -
+              tag: component
+              value: tables
         -
           uuid: 4a849f57a32847ffb41a0e8a7e7735ce
           name: 'MySQL: InnoDB row lock waits'
@@ -878,8 +938,11 @@ zabbix_export:
             key: 'mysql.get_status_variables["{$MYSQL.DSN}","{$MYSQL.USER}","{$MYSQL.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: innodb
+            -
+              tag: component
+              value: tables
         -
           uuid: afd9c494cc584ddd833298820d7beace
           name: 'MySQL: Max used connections'
@@ -901,8 +964,8 @@ zabbix_export:
             key: 'mysql.get_status_variables["{$MYSQL.DSN}","{$MYSQL.USER}","{$MYSQL.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: connections
         -
           uuid: e766adca92fa47299b79e75d263437cc
           name: 'MySQL: Open tables'
@@ -925,8 +988,8 @@ zabbix_export:
             key: 'mysql.get_status_variables["{$MYSQL.DSN}","{$MYSQL.USER}","{$MYSQL.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: tables
         -
           uuid: 26f839251a444e9abf83d4710718962a
           name: 'MySQL: Open table definitions'
@@ -949,8 +1012,8 @@ zabbix_export:
             key: 'mysql.get_status_variables["{$MYSQL.DSN}","{$MYSQL.USER}","{$MYSQL.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: tables
         -
           uuid: 8ca25701d88a4d33899a515d8e25dd5b
           name: 'MySQL: Status'
@@ -965,14 +1028,21 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: application
+            -
+              tag: component
+              value: health
           triggers:
             -
               uuid: 907a105ecee24eef9dd89598a42b6974
               expression: 'last(/MySQL by Zabbix agent 2/mysql.ping["{$MYSQL.DSN}","{$MYSQL.USER}","{$MYSQL.PASSWORD}"])=0'
               name: 'MySQL: Service is down'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 345b2dd64d4041c7849aafc82cc63580
           name: 'MySQL: Queries per second'
@@ -995,8 +1065,8 @@ zabbix_export:
             key: 'mysql.get_status_variables["{$MYSQL.DSN}","{$MYSQL.USER}","{$MYSQL.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: queries
         -
           uuid: 73bc839df32e4d598f589a4a5440925e
           name: 'MySQL: Questions per second'
@@ -1019,8 +1089,8 @@ zabbix_export:
             key: 'mysql.get_status_variables["{$MYSQL.DSN}","{$MYSQL.USER}","{$MYSQL.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: queries
         -
           uuid: 0492b7b8c8464d0596c24dc877ba41e0
           name: 'MySQL: Slow queries per second'
@@ -1043,8 +1113,8 @@ zabbix_export:
             key: 'mysql.get_status_variables["{$MYSQL.DSN}","{$MYSQL.USER}","{$MYSQL.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: queries
           triggers:
             -
               uuid: 8ffcb17b0a644c5e8a2842b34d5713a8
@@ -1052,6 +1122,10 @@ zabbix_export:
               name: 'MySQL: Server has slow queries (over {$MYSQL.SLOW_QUERIES.MAX.WARN} for 5m)'
               priority: WARNING
               description: 'The number of slow queries is more than {$MYSQL.SLOW_QUERIES.MAX.WARN} in the last 5 minutes.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: de0edc0ab52b488681a597ba6bda3e9e
           name: 'MySQL: Threads cached'
@@ -1069,8 +1143,8 @@ zabbix_export:
             key: 'mysql.get_status_variables["{$MYSQL.DSN}","{$MYSQL.USER}","{$MYSQL.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: threads
         -
           uuid: 6cd93969a80b4f738cd734764011b324
           name: 'MySQL: Threads connected'
@@ -1088,8 +1162,8 @@ zabbix_export:
             key: 'mysql.get_status_variables["{$MYSQL.DSN}","{$MYSQL.USER}","{$MYSQL.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: threads
         -
           uuid: eaab0b45e023459fa5c1e8b76e860431
           name: 'MySQL: Threads created per second'
@@ -1112,8 +1186,8 @@ zabbix_export:
             key: 'mysql.get_status_variables["{$MYSQL.DSN}","{$MYSQL.USER}","{$MYSQL.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: threads
         -
           uuid: c4258eb3d8db4f30bc29dc531c5276a2
           name: 'MySQL: Threads running'
@@ -1131,8 +1205,8 @@ zabbix_export:
             key: 'mysql.get_status_variables["{$MYSQL.DSN}","{$MYSQL.USER}","{$MYSQL.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: threads
         -
           uuid: 1f3a71e74d8e42a1b539d67b4fc18531
           name: 'MySQL: Uptime'
@@ -1151,8 +1225,8 @@ zabbix_export:
             key: 'mysql.get_status_variables["{$MYSQL.DSN}","{$MYSQL.USER}","{$MYSQL.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: application
           triggers:
             -
               uuid: 6f4edf8bfca0477b8b28a8ff811476b3
@@ -1164,12 +1238,20 @@ zabbix_export:
                 -
                   name: 'MySQL: Service is down'
                   expression: 'last(/MySQL by Zabbix agent 2/mysql.ping["{$MYSQL.DSN}","{$MYSQL.USER}","{$MYSQL.PASSWORD}"])=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
             -
               uuid: db5159889cb94f27840e6f4974ee5c0e
               expression: 'last(/MySQL by Zabbix agent 2/mysql.uptime)<10m'
               name: 'MySQL: Service has been restarted (uptime < 10m)'
               priority: INFO
               description: 'MySQL uptime is less than 10 minutes.'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 8058b068b90748fea464443058103fc8
           name: 'MySQL: Version'
@@ -1185,8 +1267,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: application
           triggers:
             -
               uuid: e22c2e2213d74df98d344a95c8a96b6d
@@ -1195,6 +1277,10 @@ zabbix_export:
               priority: INFO
               description: 'MySQL version has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
       discovery_rules:
         -
           uuid: 49cbb331980040908673ceb2706d9542
@@ -1224,8 +1310,11 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: MySQL
+                  tag: component
+                  value: storage
+                -
+                  tag: database
+                  value: '{#DATABASE}'
           lld_macro_paths:
             -
               lld_macro: '{#DATABASE}'
@@ -1261,8 +1350,8 @@ zabbix_export:
                 key: 'mysql.get_status_variables["{$MYSQL.DSN}","{$MYSQL.USER}","{$MYSQL.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: MySQL
+                  tag: component
+                  value: transactions
             -
               uuid: 07b27817a20244d68f2609c43aea1dea
               name: 'MySQL: Binlog group commits'
@@ -1281,8 +1370,8 @@ zabbix_export:
                 key: 'mysql.get_status_variables["{$MYSQL.DSN}","{$MYSQL.USER}","{$MYSQL.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: MySQL
+                  tag: component
+                  value: transactions
             -
               uuid: 152c4219a8d14812a813a250c6f17071
               name: 'MySQL: Master GTID wait count'
@@ -1305,8 +1394,8 @@ zabbix_export:
                 key: 'mysql.get_status_variables["{$MYSQL.DSN}","{$MYSQL.USER}","{$MYSQL.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: MySQL
+                  tag: component
+                  value: transactions
             -
               uuid: 3f13ee12a3db4933804c103ebfb170c9
               name: 'MySQL: Master GTID wait timeouts'
@@ -1329,8 +1418,8 @@ zabbix_export:
                 key: 'mysql.get_status_variables["{$MYSQL.DSN}","{$MYSQL.USER}","{$MYSQL.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: MySQL
+                  tag: component
+                  value: transactions
             -
               uuid: 6ed43548a190425a83fce15b84b3ec87
               name: 'MySQL: Master GTID wait time'
@@ -1353,8 +1442,8 @@ zabbix_export:
                 key: 'mysql.get_status_variables["{$MYSQL.DSN}","{$MYSQL.USER}","{$MYSQL.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: MySQL
+                  tag: component
+                  value: transactions
           master_item:
             key: 'mysql.version["{$MYSQL.DSN}","{$MYSQL.USER}","{$MYSQL.PASSWORD}"]'
           preprocessing:
@@ -1379,8 +1468,8 @@ zabbix_export:
               description: 'The item gets status information on the essential parameters of the slave threads.'
               tags:
                 -
-                  tag: Application
-                  value: 'Zabbix raw items'
+                  tag: component
+                  value: raw
             -
               uuid: bdbd657020b24a14a771a29a8a945a2b
               name: 'MySQL: Replication Seconds Behind Master {#MASTER_HOST}'
@@ -1412,14 +1501,18 @@ zabbix_export:
                 key: 'mysql.replication.get_slave_status["{$MYSQL.DSN}","{$MYSQL.USER}","{$MYSQL.PASSWORD}","{#MASTER_HOST}"]'
               tags:
                 -
-                  tag: Application
-                  value: MySQL
+                  tag: component
+                  value: replication
               trigger_prototypes:
                 -
                   uuid: 373e215000a64e05b0379f186141067f
                   expression: 'min(/MySQL by Zabbix agent 2/mysql.replication.seconds_behind_master["{#MASTER_HOST}"],5m)>{$MYSQL.REPL_LAG.MAX.WARN}'
                   name: 'MySQL: Replication lag is too high (over {$MYSQL.REPL_LAG.MAX.WARN} for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 2a5eb9d62cd046138d7564aa22b9ca33
               name: 'MySQL: Replication Slave IO Running {#MASTER_HOST}'
@@ -1446,8 +1539,8 @@ zabbix_export:
                 key: 'mysql.replication.get_slave_status["{$MYSQL.DSN}","{$MYSQL.USER}","{$MYSQL.PASSWORD}","{#MASTER_HOST}"]'
               tags:
                 -
-                  tag: Application
-                  value: MySQL
+                  tag: component
+                  value: replication
               trigger_prototypes:
                 -
                   uuid: efe46a25a1fd48e1a7504a9b06c26aee
@@ -1458,12 +1551,20 @@ zabbix_export:
                     -
                       name: 'MySQL: The slave I/O thread is not running'
                       expression: 'count(/MySQL by Zabbix agent 2/mysql.replication.slave_io_running["{#MASTER_HOST}"],#1,"eq","No")=1'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
                 -
                   uuid: 369f7ade45cd4ca39f5aa47d638e5e00
                   expression: 'count(/MySQL by Zabbix agent 2/mysql.replication.slave_io_running["{#MASTER_HOST}"],#1,"eq","No")=1'
                   name: 'MySQL: The slave I/O thread is not running'
                   priority: AVERAGE
                   description: 'Whether the I/O thread for reading the master''s binary log is running.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 4fbb3cb164064694b37924dfcbaf2271
               name: 'MySQL: Replication Slave SQL Running {#MASTER_HOST}'
@@ -1489,8 +1590,8 @@ zabbix_export:
                 key: 'mysql.replication.get_slave_status["{$MYSQL.DSN}","{$MYSQL.USER}","{$MYSQL.PASSWORD}","{#MASTER_HOST}"]'
               tags:
                 -
-                  tag: Application
-                  value: MySQL
+                  tag: component
+                  value: replication
               trigger_prototypes:
                 -
                   uuid: 9099f769af4c4008a69098f9e9f63673
@@ -1502,6 +1603,10 @@ zabbix_export:
                     -
                       name: 'MySQL: The slave I/O thread is not running'
                       expression: 'count(/MySQL by Zabbix agent 2/mysql.replication.slave_io_running["{#MASTER_HOST}"],#1,"eq","No")=1'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: bb79eaa9fc0d45e7b323a34d0c3f03cf
               name: 'MySQL: Replication Slave SQL Running State {#MASTER_HOST}'
@@ -1525,8 +1630,8 @@ zabbix_export:
                 key: 'mysql.replication.get_slave_status["{$MYSQL.DSN}","{$MYSQL.USER}","{$MYSQL.PASSWORD}","{#MASTER_HOST}"]'
               tags:
                 -
-                  tag: Application
-                  value: MySQL
+                  tag: component
+                  value: replication
           lld_macro_paths:
             -
               lld_macro: '{#MASTER_HOST}'
@@ -1536,6 +1641,13 @@ zabbix_export:
               type: DISCARD_UNCHANGED_HEARTBEAT
               parameters:
                 - 1d
+      tags:
+        -
+          tag: class
+          value: database
+        -
+          tag: target
+          value: mysql
       macros:
         -
           macro: '{$MYSQL.ABORTED_CONN.MAX.WARN}'
diff --git a/templates/db/mysql_odbc/template_db_mysql_odbc.yaml b/templates/db/mysql_odbc/template_db_mysql_odbc.yaml
index 3de7300b43f..0042849c349 100644
--- a/templates/db/mysql_odbc/template_db_mysql_odbc.yaml
+++ b/templates/db/mysql_odbc/template_db_mysql_odbc.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-16T07:08:45Z'
+  date: '2022-01-26T10:36:25Z'
   groups:
     -
       uuid: 748ad4d098d447d492bb935c907f652f
@@ -21,7 +21,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/384189-discussion-thread-for-official-zabbix-template-db-mysql
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Databases
@@ -40,8 +40,8 @@ zabbix_export:
           description: 'The item gets server global status information.'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
         -
           uuid: 5b7c14e38799427cb6520f47bf8afe6c
           name: 'MySQL: Status'
@@ -60,14 +60,21 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: application
+            -
+              tag: component
+              value: health
           triggers:
             -
               uuid: e664e41d7b4f4336a3e5ef4720f6ee41
               expression: 'last(/MySQL by ODBC/db.odbc.select[ping,"{$MYSQL.DSN}"])=0'
               name: 'MySQL: Service is down'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: b9fb80ca366e4d33801472bcd013f881
           name: 'MySQL: Version'
@@ -87,8 +94,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: application
           triggers:
             -
               uuid: 4090a1d3d82d47ac85964baeae121b2b
@@ -97,6 +104,10 @@ zabbix_export:
               priority: INFO
               description: 'MySQL version has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 73235748ba4742c0aa3c4f29509a162d
           name: 'MySQL: Aborted clients per second'
@@ -119,8 +130,8 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MYSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: connections
         -
           uuid: b6185e79abd744f78ce579a83381ba87
           name: 'MySQL: Aborted connections per second'
@@ -143,8 +154,8 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MYSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: connections
           triggers:
             -
               uuid: 5934cb80f9c3442d978c63780b1ebc9f
@@ -156,6 +167,10 @@ zabbix_export:
                 -
                   name: 'MySQL: Refused connections (max_connections limit reached)'
                   expression: 'last(/MySQL by ODBC/mysql.connection_errors_max_connections.rate)>0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 9db77e72fd9d404a8e1fd4e72c92d75c
           name: 'MySQL: Binlog cache disk use'
@@ -178,8 +193,8 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MYSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: cache
         -
           uuid: 05e7e91206bb4138a945ea0de2d8c01d
           name: 'MySQL: Buffer pool efficiency'
@@ -196,8 +211,8 @@ zabbix_export:
           description: 'The item shows how effectively the buffer pool is serving reads.'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: memory
         -
           uuid: ad5520e067ea405eb939d319fa9690e9
           name: 'MySQL: Buffer pool utilization'
@@ -215,8 +230,8 @@ zabbix_export:
           description: 'Ratio of used to total pages in the buffer pool.'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: memory
           triggers:
             -
               uuid: f4c2e4edf0c34bb1856ed392f2bc7c87
@@ -224,6 +239,10 @@ zabbix_export:
               name: 'MySQL: Buffer pool utilization is too low (less than {$MYSQL.BUFF_UTIL.MIN.WARN}% for 5m)'
               priority: WARNING
               description: 'The buffer pool utilization is less than {$MYSQL.BUFF_UTIL.MIN.WARN}% in the last 5 minutes. This means that there is a lot of unused RAM allocated for the buffer pool, which you can easily reallocate at the moment.'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: f05d592e6ae74e64bc54c649418761a6
           name: 'MySQL: Bytes received'
@@ -247,8 +266,8 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MYSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: network
         -
           uuid: ce737bc186f24014a70c75da2386986d
           name: 'MySQL: Bytes sent'
@@ -272,8 +291,8 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MYSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: network
         -
           uuid: a43ec23dad9345a5a1b0ff8bda12ed77
           name: 'MySQL: Command Delete per second'
@@ -296,8 +315,8 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MYSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: operations
         -
           uuid: cd924e3b51074b3baf642a7aa1eeb474
           name: 'MySQL: Command Insert per second'
@@ -320,8 +339,8 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MYSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: operations
         -
           uuid: 31e6372d1249442ab3ebdd993f397e26
           name: 'MySQL: Command Select per second'
@@ -344,8 +363,8 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MYSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: operations
         -
           uuid: 0f5f638777284093bcdc5f2dacc8e951
           name: 'MySQL: Command Update per second'
@@ -368,8 +387,8 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MYSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: operations
         -
           uuid: fad5f4e1885341d1958f653afb85ff07
           name: 'MySQL: Connections per second'
@@ -392,8 +411,8 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MYSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: connections
         -
           uuid: 4b67e0e6291b4e0c841334ac052d7253
           name: 'MySQL: Connection errors accept per second'
@@ -416,8 +435,8 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MYSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: connections
         -
           uuid: 76ad3a39e89e44daad08cc00174d4918
           name: 'MySQL: Connection errors internal per second'
@@ -440,8 +459,8 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MYSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: connections
         -
           uuid: 83dfb916c7674e1fbd300be444241e25
           name: 'MySQL: Connection errors max connections per second'
@@ -464,8 +483,8 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MYSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: connections
           triggers:
             -
               uuid: ac781c951ac0453a9c1008b2cf801518
@@ -473,6 +492,10 @@ zabbix_export:
               name: 'MySQL: Refused connections (max_connections limit reached)'
               priority: AVERAGE
               description: 'Number of refused connections due to the max_connections limit being reached.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 9be4cb9e209344d0869a56082d16ec53
           name: 'MySQL: Connection errors peer address per second'
@@ -495,8 +518,8 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MYSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: connections
         -
           uuid: e50b9fea89cc440abc0155dc25346f05
           name: 'MySQL: Connection errors select per second'
@@ -519,8 +542,8 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MYSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: connections
         -
           uuid: a82a7ada012141c6bdff63bc8d615786
           name: 'MySQL: Connection errors tcpwrap per second'
@@ -543,8 +566,8 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MYSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: connections
         -
           uuid: 84d748ab80444e10bdb60bcfbdfa850a
           name: 'MySQL: Created tmp tables on disk per second'
@@ -567,8 +590,11 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MYSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: storage
+            -
+              tag: component
+              value: tables
           triggers:
             -
               uuid: 8aec6a51fa3e4320b3c7c40858ac7f96
@@ -576,6 +602,10 @@ zabbix_export:
               name: 'MySQL: Number of on-disk temporary tables created per second is high (over {$MYSQL.CREATED_TMP_DISK_TABLES.MAX.WARN} for 5m)'
               priority: WARNING
               description: 'Possibly the application using the database is in need of query optimization.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: c5f2ae1ef46e4f65842ab4a31625906a
           name: 'MySQL: Created tmp files on disk per second'
@@ -598,8 +628,8 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MYSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: storage
           triggers:
             -
               uuid: c1dbcf829bdf43fda3b4c2add576c8f0
@@ -607,6 +637,10 @@ zabbix_export:
               name: 'MySQL: Number of temporary files created per second is high (over {$MYSQL.CREATED_TMP_FILES.MAX.WARN} for 5m)'
               priority: WARNING
               description: 'Possibly the application using the database is in need of query optimization.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 95fa4f4f1db44b2bb65889da246c03b5
           name: 'MySQL: Created tmp tables on memory per second'
@@ -629,8 +663,11 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MYSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: memory
+            -
+              tag: component
+              value: tables
           triggers:
             -
               uuid: d65c3ec6cacd41c58f5e2b209ca5a810
@@ -638,6 +675,10 @@ zabbix_export:
               name: 'MySQL: Number of internal temporary tables created per second is high (over {$MYSQL.CREATED_TMP_TABLES.MAX.WARN} for 5m)'
               priority: WARNING
               description: 'Possibly the application using the database is in need of query optimization.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: e31f66bbc32b404c92debc4d9367162d
           name: 'MySQL: InnoDB buffer pool pages free'
@@ -655,8 +696,11 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MYSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: innodb
+            -
+              tag: component
+              value: memory
         -
           uuid: 41019c084618404db183326c215d71f6
           name: 'MySQL: InnoDB buffer pool pages total'
@@ -678,8 +722,11 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MYSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: innodb
+            -
+              tag: component
+              value: memory
         -
           uuid: 441b718148974e289db93299f869feba
           name: 'MySQL: InnoDB buffer pool reads'
@@ -697,8 +744,11 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MYSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: innodb
+            -
+              tag: component
+              value: memory
         -
           uuid: 22ae5946fc2548cf8eee39a57ce8512b
           name: 'MySQL: InnoDB buffer pool reads per second'
@@ -721,8 +771,11 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MYSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: innodb
+            -
+              tag: component
+              value: memory
         -
           uuid: 0a1775a7de33464e9ce8134950527021
           name: 'MySQL: InnoDB buffer pool read requests'
@@ -740,8 +793,11 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MYSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: innodb
+            -
+              tag: component
+              value: memory
         -
           uuid: 98684abf32e642bd8784e68e64357dc9
           name: 'MySQL: InnoDB buffer pool read requests per second'
@@ -764,8 +820,11 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MYSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: innodb
+            -
+              tag: component
+              value: memory
         -
           uuid: 4e829cbb3cc2485dac2757867badd0f4
           name: 'MySQL: Innodb buffer pool wait free'
@@ -788,8 +847,11 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MYSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: innodb
+            -
+              tag: component
+              value: memory
         -
           uuid: 4680fd31a2514e3f827b0060a6d5bfc4
           name: 'MySQL: Calculated value of innodb_log_file_size'
@@ -806,8 +868,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: system
         -
           uuid: 79218a1068394ce69dfc6eeb626e83bc
           name: 'MySQL: Innodb number open files'
@@ -830,8 +892,11 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MYSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: innodb
+            -
+              tag: component
+              value: system
         -
           uuid: fc561c5392bb43a4842977bdf4b882a8
           name: 'MySQL: Innodb log written'
@@ -855,8 +920,8 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MYSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: system
         -
           uuid: a62951afcfbd44e595a4d294b24056e5
           name: 'MySQL: InnoDB row lock time'
@@ -884,8 +949,11 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MYSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: innodb
+            -
+              tag: component
+              value: tables
         -
           uuid: 22277695b7154c019a76ca730e68e833
           name: 'MySQL: InnoDB row lock time max'
@@ -913,8 +981,11 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MYSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: innodb
+            -
+              tag: component
+              value: tables
         -
           uuid: 17c4270927a74d8388da8c25d9065556
           name: 'MySQL: InnoDB row lock waits'
@@ -932,8 +1003,11 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MYSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: innodb
+            -
+              tag: component
+              value: tables
         -
           uuid: 6106ebf4cae842c1a5acc2f13518de4f
           name: 'MySQL: Max used connections'
@@ -955,8 +1029,8 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MYSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: connections
         -
           uuid: 85e17b6b196e4916838e0318992fe33c
           name: 'MySQL: Open tables'
@@ -979,8 +1053,8 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MYSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: tables
         -
           uuid: c23ce7b2689745728465c5b405d7b3ba
           name: 'MySQL: Open table definitions'
@@ -1003,8 +1077,8 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MYSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: tables
         -
           uuid: 2f0ced88c4524455bf790b3bc6512d04
           name: 'MySQL: Queries per second'
@@ -1027,8 +1101,8 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MYSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: queries
         -
           uuid: 8d0fc2eb0be94d68966e09fca88e8deb
           name: 'MySQL: Questions per second'
@@ -1051,8 +1125,8 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MYSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: queries
         -
           uuid: b0227399437f4219b65ab1511d5e67c6
           name: 'MySQL: Slow queries per second'
@@ -1075,8 +1149,8 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MYSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: queries
           triggers:
             -
               uuid: b981c7a2ffed4eddbc9f1d6913c2e4b0
@@ -1084,6 +1158,10 @@ zabbix_export:
               name: 'MySQL: Server has slow queries (over {$MYSQL.SLOW_QUERIES.MAX.WARN} for 5m)'
               priority: WARNING
               description: 'The number of slow queries is more than {$MYSQL.SLOW_QUERIES.MAX.WARN} in the last 5 minutes.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: b675fd71138a4845965309dc5d6428d9
           name: 'MySQL: Threads cached'
@@ -1101,8 +1179,8 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MYSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: threads
         -
           uuid: af56c636c8b94e4f9976d0d6cf60fcbb
           name: 'MySQL: Threads connected'
@@ -1120,8 +1198,8 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MYSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: threads
         -
           uuid: 8a50d5788f8a449b994dbe76536076a2
           name: 'MySQL: Threads created per second'
@@ -1144,8 +1222,8 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MYSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: threads
         -
           uuid: c41afa83f6a94efda34d7b41c95c89ac
           name: 'MySQL: Threads running'
@@ -1163,8 +1241,8 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MYSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: threads
         -
           uuid: 8fbad224ebdf46e7b25a0be015f21972
           name: 'MySQL: Uptime'
@@ -1183,8 +1261,8 @@ zabbix_export:
             key: 'db.odbc.get[get_status_variables,"{$MYSQL.DSN}"]'
           tags:
             -
-              tag: Application
-              value: MySQL
+              tag: component
+              value: application
           triggers:
             -
               uuid: ba9eb4fc244b41a6a30237e7a382fa54
@@ -1196,12 +1274,20 @@ zabbix_export:
                 -
                   name: 'MySQL: Service is down'
                   expression: 'last(/MySQL by ODBC/db.odbc.select[ping,"{$MYSQL.DSN}"])=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
             -
               uuid: cd8f5996bd85434998595e041d6b0908
               expression: 'last(/MySQL by ODBC/mysql.uptime)<10m'
               name: 'MySQL: Service has been restarted (uptime < 10m)'
               priority: INFO
               description: 'MySQL uptime is less than 10 minutes.'
+              tags:
+                -
+                  tag: scope
+                  value: notice
       discovery_rules:
         -
           uuid: 0987fb6afdae4587bc32864fa42728f2
@@ -1239,8 +1325,11 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: MySQL
+                  tag: component
+                  value: storage
+                -
+                  tag: database
+                  value: '{#DATABASE}'
           preprocessing:
             -
               type: DISCARD_UNCHANGED_HEARTBEAT
@@ -1271,8 +1360,8 @@ zabbix_export:
               description: 'The item gets status information on the essential parameters of the slave threads.'
               tags:
                 -
-                  tag: Application
-                  value: 'Zabbix raw items'
+                  tag: component
+                  value: raw
             -
               uuid: 15f7b22867f54551afbed139d746e210
               name: 'MySQL: Replication Seconds Behind Master {#MASTER_HOST}'
@@ -1304,14 +1393,18 @@ zabbix_export:
                 key: 'db.odbc.get["{#MASTER_HOST}","{$MYSQL.DSN}"]'
               tags:
                 -
-                  tag: Application
-                  value: MySQL
+                  tag: component
+                  value: replication
               trigger_prototypes:
                 -
                   uuid: f2188a73bbf34ffcb95b3e11e2824feb
                   expression: 'min(/MySQL by ODBC/mysql.seconds_behind_master["{#MASTER_HOST}"],5m)>{$MYSQL.REPL_LAG.MAX.WARN}'
                   name: 'MySQL: Replication lag is too high (over {$MYSQL.REPL_LAG.MAX.WARN} for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: e063b116753d4124a88443fe4de20d41
               name: 'MySQL: Replication Slave IO Running {#MASTER_HOST}'
@@ -1338,8 +1431,8 @@ zabbix_export:
                 key: 'db.odbc.get["{#MASTER_HOST}","{$MYSQL.DSN}"]'
               tags:
                 -
-                  tag: Application
-                  value: MySQL
+                  tag: component
+                  value: replication
               trigger_prototypes:
                 -
                   uuid: 6f216036f4f14ae7adc8c70126bb315a
@@ -1350,12 +1443,20 @@ zabbix_export:
                     -
                       name: 'MySQL: The slave I/O thread is not running'
                       expression: 'count(/MySQL by ODBC/mysql.slave_io_running["{#MASTER_HOST}"],#1,"eq","No")=1'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
                 -
                   uuid: ba08061a61df4bbb8bac516ecec91b70
                   expression: 'count(/MySQL by ODBC/mysql.slave_io_running["{#MASTER_HOST}"],#1,"eq","No")=1'
                   name: 'MySQL: The slave I/O thread is not running'
                   priority: AVERAGE
                   description: 'Whether the I/O thread for reading the master''s binary log is running.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 113be79554c14c2aad08036febb15d71
               name: 'MySQL: Replication Slave SQL Running {#MASTER_HOST}'
@@ -1381,8 +1482,8 @@ zabbix_export:
                 key: 'db.odbc.get["{#MASTER_HOST}","{$MYSQL.DSN}"]'
               tags:
                 -
-                  tag: Application
-                  value: MySQL
+                  tag: component
+                  value: replication
               trigger_prototypes:
                 -
                   uuid: 39d229e5e3f34e8b828b4a0e2eaa0026
@@ -1394,6 +1495,10 @@ zabbix_export:
                     -
                       name: 'MySQL: The slave I/O thread is not running'
                       expression: 'count(/MySQL by ODBC/mysql.slave_io_running["{#MASTER_HOST}"],#1,"eq","No")=1'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: a88eb463bb9740a4a4256306f11816bf
               name: 'MySQL: Replication Slave SQL Running State {#MASTER_HOST}'
@@ -1417,8 +1522,8 @@ zabbix_export:
                 key: 'db.odbc.get["{#MASTER_HOST}","{$MYSQL.DSN}"]'
               tags:
                 -
-                  tag: Application
-                  value: MySQL
+                  tag: component
+                  value: replication
           preprocessing:
             -
               type: DISCARD_UNCHANGED_HEARTBEAT
@@ -1450,8 +1555,8 @@ zabbix_export:
                 key: 'db.odbc.get[get_status_variables,"{$MYSQL.DSN}"]'
               tags:
                 -
-                  tag: Application
-                  value: MySQL
+                  tag: component
+                  value: transactions
             -
               uuid: cbb7c1fadd934420b47950f52751795f
               name: 'MySQL: Binlog group commits'
@@ -1470,8 +1575,8 @@ zabbix_export:
                 key: 'db.odbc.get[get_status_variables,"{$MYSQL.DSN}"]'
               tags:
                 -
-                  tag: Application
-                  value: MySQL
+                  tag: component
+                  value: transactions
             -
               uuid: 278488a9c0f543f6815a24592766d9bb
               name: 'MySQL: Master GTID wait count'
@@ -1494,8 +1599,8 @@ zabbix_export:
                 key: 'db.odbc.get[get_status_variables,"{$MYSQL.DSN}"]'
               tags:
                 -
-                  tag: Application
-                  value: MySQL
+                  tag: component
+                  value: transactions
             -
               uuid: 93ad282dc3b24dba9f0351b0d0a59d39
               name: 'MySQL: Master GTID wait timeouts'
@@ -1518,8 +1623,8 @@ zabbix_export:
                 key: 'db.odbc.get[get_status_variables,"{$MYSQL.DSN}"]'
               tags:
                 -
-                  tag: Application
-                  value: MySQL
+                  tag: component
+                  value: transactions
             -
               uuid: fd8bf7e639af4d3291030cdb9dd37bc9
               name: 'MySQL: Master GTID wait time'
@@ -1542,8 +1647,8 @@ zabbix_export:
                 key: 'db.odbc.get[get_status_variables,"{$MYSQL.DSN}"]'
               tags:
                 -
-                  tag: Application
-                  value: MySQL
+                  tag: component
+                  value: transactions
           master_item:
             key: 'db.odbc.select[version,"{$MYSQL.DSN}"]'
           preprocessing:
@@ -1551,6 +1656,13 @@ zabbix_export:
               type: JAVASCRIPT
               parameters:
                 - 'return JSON.stringify(value.search(''MariaDB'')>-1 ? [{''{#SINGLETON}'': ''''}] : []);'
+      tags:
+        -
+          tag: class
+          value: database
+        -
+          tag: target
+          value: mysql
       macros:
         -
           macro: '{$MYSQL.ABORTED_CONN.MAX.WARN}'
diff --git a/templates/db/oracle_agent2/template_db_oracle_agent2.yaml b/templates/db/oracle_agent2/template_db_oracle_agent2.yaml
index aeb4235776c..d6bf3c4fdee 100644
--- a/templates/db/oracle_agent2/template_db_oracle_agent2.yaml
+++ b/templates/db/oracle_agent2/template_db_oracle_agent2.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-16T07:08:49Z'
+  date: '2022-01-26T10:38:59Z'
   groups:
     -
       uuid: 748ad4d098d447d492bb935c907f652f
@@ -10,7 +10,7 @@ zabbix_export:
       uuid: d670c32f007d438c9dcd32db57d2b691
       template: 'Oracle by Zabbix agent 2'
       name: 'Oracle by Zabbix agent 2'
-      description: 'Template tooling version used: 0.40'
+      description: 'Template tooling version used: 0.41'
       groups:
         -
           name: Templates/Databases
@@ -33,8 +33,8 @@ zabbix_export:
             key: 'oracle.sys.metrics["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: sessions
         -
           uuid: 7e4eb79b9b674c5ba57e790fae0fb410
           name: 'Oracle: Active serial sessions'
@@ -53,8 +53,8 @@ zabbix_export:
             key: 'oracle.sys.metrics["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: sessions
         -
           uuid: 9763dd0b223540e4820fd3b8f3281ec3
           name: 'Oracle: Average active sessions'
@@ -73,8 +73,8 @@ zabbix_export:
             key: 'oracle.sys.metrics["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: sessions
         -
           uuid: 1ad93880e4314d68b9e1aa4e00f03b6e
           name: 'Oracle: Get archive log info'
@@ -85,8 +85,11 @@ zabbix_export:
           value_type: TEXT
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: archive-log
+            -
+              tag: component
+              value: raw
         -
           uuid: a5533a1c354a4c8dbfec39c9b0637ba2
           name: 'Oracle: Archiver state'
@@ -106,8 +109,8 @@ zabbix_export:
             key: 'oracle.instance.info["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: application
         -
           uuid: a5f5251364a44a90a66bb2096f53a48a
           name: 'Oracle: Buffer cache hit ratio'
@@ -127,8 +130,8 @@ zabbix_export:
             key: 'oracle.sys.metrics["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: cache
         -
           uuid: 1483e7a312154438a9b09d0b696568f0
           name: 'Oracle: Global cache blocks corrupted'
@@ -136,6 +139,7 @@ zabbix_export:
           key: oracle.cache_blocks_corrupt
           delay: '0'
           history: 7d
+          units: Rps
           description: 'The number of blocks that encountered a corruption or checksum failure during interconnect.'
           preprocessing:
             -
@@ -146,8 +150,8 @@ zabbix_export:
             key: 'oracle.sys.metrics["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: cache
         -
           uuid: 3589d4b2b9114f9cabb027f85f5349ab
           name: 'Oracle: Global cache blocks lost'
@@ -155,6 +159,7 @@ zabbix_export:
           key: oracle.cache_blocks_lost
           delay: '0'
           history: 7d
+          units: Rps
           description: 'The number of global cache blocks lost'
           preprocessing:
             -
@@ -165,8 +170,8 @@ zabbix_export:
             key: 'oracle.sys.metrics["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: cache
         -
           uuid: 1bad65e85d8b482d9cd83b1d202f8d8c
           name: 'Oracle: Get CDB and No-CDB info'
@@ -174,11 +179,14 @@ zabbix_export:
           history: '0'
           trends: '0'
           value_type: TEXT
-          description: 'Get info about CDB and  No-CDB databases on instance.'
+          description: 'Get info about CDB and  No-CDB databases on instansce.'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: cdb
+            -
+              tag: component
+              value: raw
         -
           uuid: fd1ea13484984d0baffc45ea02a33a7c
           name: 'Oracle: Cursor cache hit ratio'
@@ -198,8 +206,8 @@ zabbix_export:
             key: 'oracle.sys.metrics["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: cache
         -
           uuid: 9fd6475d1b824c74b2b3dad1db4f494a
           name: 'Oracle: Database CPU time ratio'
@@ -219,8 +227,8 @@ zabbix_export:
             key: 'oracle.sys.metrics["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: cpu
         -
           uuid: 9fc7f2e986cd4c97ad8778f06dd04822
           name: 'Oracle: Database wait time ratio'
@@ -240,8 +248,8 @@ zabbix_export:
             key: 'oracle.sys.metrics["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: application
         -
           uuid: 12efa23a53eb468ea7b0713b8f610542
           name: 'Oracle: Datafiles count'
@@ -255,8 +263,8 @@ zabbix_export:
                 - $.datafile_num
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: datafiles
         -
           uuid: cdd3d4f1baea4f2ea122e058704d43e9
           name: 'Oracle: Datafiles limit'
@@ -274,8 +282,8 @@ zabbix_export:
             key: 'oracle.sys.params["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: datafiles
         -
           uuid: cb703b07fc514ce5aedc561896bcd53f
           name: 'Oracle: Get ASM stats'
@@ -286,8 +294,11 @@ zabbix_export:
           description: 'Get ASM disk groups stats.'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: asm
+            -
+              tag: component
+              value: raw
         -
           uuid: 9692f4f771844438a3f9224455c504b6
           name: 'Oracle: Disk sort per second'
@@ -307,8 +318,8 @@ zabbix_export:
             key: 'oracle.sys.metrics["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: application
         -
           uuid: 7dc5745f2a124119b058d23195ba5058
           name: 'Oracle: Enqueue timeouts per second'
@@ -328,8 +339,8 @@ zabbix_export:
             key: 'oracle.sys.metrics["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: application
         -
           uuid: 1aa391bbd2484793a31dc9f0dce51b46
           name: 'Oracle: Get FRA stats'
@@ -340,8 +351,8 @@ zabbix_export:
           description: 'Get FRA statistics.'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
         -
           uuid: 5e09413cb3a14a3a87e2ead6b838ce1f
           name: 'Oracle: FRA, Number of files'
@@ -359,8 +370,8 @@ zabbix_export:
             key: 'oracle.fra.stats["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: fra
         -
           uuid: 68f50e7513d642f789a27dfce03ca1b8
           name: 'Oracle: FRA, Number of restore points'
@@ -378,8 +389,8 @@ zabbix_export:
             key: 'oracle.fra.stats["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: fra
         -
           uuid: f7f16828d46a4054a30a22e955542d6a
           name: 'Oracle: FRA, Space limit'
@@ -398,8 +409,8 @@ zabbix_export:
             key: 'oracle.fra.stats["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: fra
         -
           uuid: 92d7abac10dc47a7bec1bd420a41c78c
           name: 'Oracle: FRA, Space reclaimable'
@@ -418,8 +429,8 @@ zabbix_export:
             key: 'oracle.fra.stats["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: fra
         -
           uuid: 1e02a10018124f4db85ef9822a605b61
           name: 'Oracle: FRA, Used space'
@@ -438,8 +449,8 @@ zabbix_export:
             key: 'oracle.fra.stats["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: fra
         -
           uuid: 887c56e1b9f1415db5def1e1f502a6ae
           name: 'Oracle: FRA, Usable space in %'
@@ -458,8 +469,8 @@ zabbix_export:
             key: 'oracle.fra.stats["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: fra
         -
           uuid: e8725c1d79e34fbc8331677fe3d4459e
           name: 'Oracle: GC CR block received per second'
@@ -479,8 +490,8 @@ zabbix_export:
             key: 'oracle.sys.metrics["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: cache
         -
           uuid: 2c7dd0c162b742d08a2432c8bdde4ce2
           name: 'Oracle: Get instance state'
@@ -491,8 +502,8 @@ zabbix_export:
           description: 'The item gets state of the current instance.'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: application
         -
           uuid: 021a98326c8f402693e4fba9fb3c25de
           name: 'Oracle: Instance role'
@@ -512,8 +523,8 @@ zabbix_export:
             key: 'oracle.instance.info["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: application
         -
           uuid: cd0e2c8f164443588ad19647506c0eea
           name: 'Oracle: Instance hostname'
@@ -533,8 +544,8 @@ zabbix_export:
             key: 'oracle.instance.info["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: application
           triggers:
             -
               uuid: 346ef7cacf534988892970d699ef4028
@@ -543,6 +554,10 @@ zabbix_export:
               priority: INFO
               description: 'Oracle DB Instance hostname has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 0cc90c2554a7412eafe42c33dd1e9ede
           name: 'Oracle: Instance name'
@@ -562,8 +577,8 @@ zabbix_export:
             key: 'oracle.instance.info["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: application
           triggers:
             -
               uuid: ed394860378642d5b9f220327ead6766
@@ -572,6 +587,10 @@ zabbix_export:
               priority: INFO
               description: 'Oracle DB Instance name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: f51053d243ef41089b5e635fd1abb5f3
           name: 'Oracle: Instance status'
@@ -591,8 +610,8 @@ zabbix_export:
             key: 'oracle.instance.info["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: application
         -
           uuid: b2551269bf4541dfae378b9e48d1f5da
           name: 'Oracle: Library cache hit ratio'
@@ -612,8 +631,8 @@ zabbix_export:
             key: 'oracle.sys.metrics["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: cache
         -
           uuid: 13a938f495ee464a8ed3f2575cd191b9
           name: 'Oracle: Logons per second'
@@ -633,8 +652,8 @@ zabbix_export:
             key: 'oracle.sys.metrics["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: application
         -
           uuid: 440f42943ebc436fb75bd5d8397fe876
           name: 'Oracle: Long table scans per second'
@@ -654,8 +673,8 @@ zabbix_export:
             key: 'oracle.sys.metrics["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: application
         -
           uuid: 4769432ae04641758daabd5b27deaa01
           name: 'Oracle: Memory sorts ratio'
@@ -675,8 +694,8 @@ zabbix_export:
             key: 'oracle.sys.metrics["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: application
         -
           uuid: ca4452418d2641bd87fa75e946c2bf98
           name: 'Oracle: Get PDB info'
@@ -684,11 +703,14 @@ zabbix_export:
           history: '0'
           trends: '0'
           value_type: TEXT
-          description: 'Get info about PDB databases on instance.'
+          description: 'Get info about PDB databases on instansce.'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: pdb
+            -
+              tag: component
+              value: raw
         -
           uuid: 4926809f2c244b33b1a0650510a30fa4
           name: 'Oracle: Get PGA stats'
@@ -699,8 +721,8 @@ zabbix_export:
           description: 'Get PGA statistics.'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
         -
           uuid: 749a1281ba84475193897a3362f6f873
           name: 'Oracle: PGA, Global memory bound'
@@ -719,8 +741,11 @@ zabbix_export:
             key: 'oracle.pga.stats["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: memory
+            -
+              tag: component
+              value: pga
         -
           uuid: 2b5797f046434125b65daf31121fdd81
           name: 'Oracle: PGA, Aggregate target parameter'
@@ -739,8 +764,11 @@ zabbix_export:
             key: 'oracle.pga.stats["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: memory
+            -
+              tag: component
+              value: pga
         -
           uuid: e96ff6a018dc4553b9ad7f2dc87f4d99
           name: 'Oracle: Physical reads per second'
@@ -760,8 +788,8 @@ zabbix_export:
             key: 'oracle.sys.metrics["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: disk
         -
           uuid: 92bf88b7b07048b785ca37d9b97cd78b
           name: 'Oracle: Physical reads bytes per second'
@@ -781,8 +809,8 @@ zabbix_export:
             key: 'oracle.sys.metrics["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: disk
         -
           uuid: b71df51181c1464486ced05c95bdc938
           name: 'Oracle: Physical writes per second'
@@ -802,8 +830,8 @@ zabbix_export:
             key: 'oracle.sys.metrics["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: disk
         -
           uuid: e34abb4139fe43ae8b27edbe6ad12c8d
           name: 'Oracle: Physical writes bytes per second'
@@ -823,8 +851,8 @@ zabbix_export:
             key: 'oracle.sys.metrics["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: disk
         -
           uuid: 7f4d8ea4912944ec8bf32edff9e3b5ae
           name: 'Oracle: Ping'
@@ -841,8 +869,11 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: application
+            -
+              tag: component
+              value: health
           triggers:
             -
               uuid: df6b0f5dd50848cc8c2e67947df0a5e1
@@ -850,6 +881,10 @@ zabbix_export:
               name: 'Oracle: Connection to database is unavailable'
               priority: DISASTER
               description: 'Connection to Oracle Database is currently unavailable.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: ce9dabcce58d408d8188fe7caa71e666
           name: 'Oracle: Number of processes'
@@ -862,8 +897,8 @@ zabbix_export:
                 - $.proc_num
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: system
         -
           uuid: cdb59700d4a24fb3bea9d2b63d5d7938
           name: 'Oracle: Processes limit'
@@ -881,8 +916,8 @@ zabbix_export:
             key: 'oracle.sys.params["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: system
         -
           uuid: 898a5325c2a2469dabb6a2356107dd66
           name: 'Oracle: Redo logs available to switch'
@@ -896,8 +931,8 @@ zabbix_export:
                 - $.available
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: application
           triggers:
             -
               uuid: 18dba6067a254bdd99a363c3d7b9bdb2
@@ -905,6 +940,10 @@ zabbix_export:
               name: 'Oracle: Number of REDO logs available for switching is too low (less {$ORACLE.REDO.MIN.WARN} for 5 min)'
               priority: WARNING
               description: 'Number of available for log switching inactive/unused REDOs is low (Database down risk)'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
         -
           uuid: e8aca0dfd1d74d3b9b042d3ed3070e42
           name: 'Oracle: Rows per sort'
@@ -923,8 +962,8 @@ zabbix_export:
             key: 'oracle.sys.metrics["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: application
         -
           uuid: 0458d6dd9bde4f2aa51319e3c23f5eae
           name: 'Oracle: SQL service response time'
@@ -948,8 +987,8 @@ zabbix_export:
             key: 'oracle.sys.metrics["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: application
         -
           uuid: 41d61d167bf044fe9f0d9815b4fd27e6
           name: 'Oracle: Get sessions stats'
@@ -960,8 +999,8 @@ zabbix_export:
           description: 'Get sessions statistics. {$ORACLE.SESSION.LOCK.MAX.TIME} -- maximum seconds in the current wait condition for counting long time locked sessions. Default: 600 seconds.'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
         -
           uuid: 89811a05632c478d97165f629dadd5b9
           name: 'Oracle: Active background sessions'
@@ -982,8 +1021,8 @@ zabbix_export:
             key: 'oracle.sessions.stats["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}","{$ORACLE.SESSION.LOCK.MAX.TIME}"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: sessions
         -
           uuid: a7ef5969fff545968d7c133bc67baaac
           name: 'Oracle: Active user sessions'
@@ -1004,8 +1043,8 @@ zabbix_export:
             key: 'oracle.sessions.stats["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}","{$ORACLE.SESSION.LOCK.MAX.TIME}"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: sessions
         -
           uuid: d91119f30b95418bab67f929737e6bf8
           name: 'Oracle: Sessions concurrency'
@@ -1015,7 +1054,7 @@ zabbix_export:
           history: 7d
           value_type: FLOAT
           units: '%'
-          description: 'The percentage of concurrency. Concurrency is a DB behaviour when different transactions request to change the same resource - in case of modifying data transactions sequentially block temporarily the right to change data, the rest of the transactions are waiting for access. In the case when access for resource is locked for a long time, then the concurrency grows (like the transaction queue) and this often has an extremely negative impact on performance. A high contention value does not indicate the root cause of the problem, but is a signal to search for it.'
+          description: 'The percentage of concurrency. Concurrency is a DB behavior when different transactions request to change the same resource - in case of modifying data transactions sequentially block temporarily the right to change data, the rest of the transactions are waiting for access. In the case when access for resource is locked for a long time, then the concurrency grows (like the transaction queue) and this often has an extremely negative impact on performance. A high contention value does not indicate the root cause of the problem, but is a signal to search for it.'
           preprocessing:
             -
               type: JSONPATH
@@ -1025,8 +1064,8 @@ zabbix_export:
             key: 'oracle.sessions.stats["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}","{$ORACLE.SESSION.LOCK.MAX.TIME}"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: sessions
           triggers:
             -
               uuid: ff16c7bbeaa5439f98ffe12ce7deff71
@@ -1034,6 +1073,10 @@ zabbix_export:
               name: 'Oracle: Too high database concurrency (over {$ORACLE.CONCURRENCY.MAX.WARN}% for 5 min)'
               priority: WARNING
               description: 'Concurrency rate is over {$ORACLE.CONCURRENCY.MAX.WARN}%. A high contention value does not indicate the root cause of the problem, but is a signal to search for it. In the case of high competition, an analysis of resource consumption should be carried out, the most "heavy" queries made in the database, possibly - session tracing. All this will help determine the root cause and possible optimization points both in the database configuration and in the logic of building queries of the application itself.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: cfd7559ac25e4c0a837048e675f4d995
           name: 'Oracle: Session count'
@@ -1052,8 +1095,8 @@ zabbix_export:
             key: 'oracle.sessions.stats["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}","{$ORACLE.SESSION.LOCK.MAX.TIME}"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: sessions
         -
           uuid: 2222705798fd464492c6f692dd9a0392
           name: 'Oracle: Inactive user sessions'
@@ -1074,8 +1117,8 @@ zabbix_export:
             key: 'oracle.sessions.stats["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}","{$ORACLE.SESSION.LOCK.MAX.TIME}"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: sessions
         -
           uuid: 381c97858785442389cd6ab74d0ee285
           name: 'Oracle: Sessions limit'
@@ -1093,8 +1136,8 @@ zabbix_export:
             key: 'oracle.sys.params["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: sessions
         -
           uuid: c1717acc82784151b5afc6ad08ce3145
           name: 'Oracle: Sessions lock rate'
@@ -1114,8 +1157,8 @@ zabbix_export:
             key: 'oracle.sessions.stats["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}","{$ORACLE.SESSION.LOCK.MAX.TIME}"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: sessions
           triggers:
             -
               uuid: 504e5d964de645679ce448165dadd027
@@ -1123,6 +1166,10 @@ zabbix_export:
               name: 'Oracle: Too many locked sessions (over {$ORACLE.SESSIONS.LOCK.MAX.WARN}% for 5 min)'
               priority: WARNING
               description: 'Number of locked sessions is over {$ORACLE.SESSIONS.LOCK.MAX.WARN}% of the running sessions.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: c279df21264642369d65a6c72a11698d
           name: 'Oracle: Sessions locked over {$ORACLE.SESSION.LOCK.MAX.TIME}s'
@@ -1141,8 +1188,8 @@ zabbix_export:
             key: 'oracle.sessions.stats["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}","{$ORACLE.SESSION.LOCK.MAX.TIME}"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: sessions
           triggers:
             -
               uuid: 5abc07cd48514a0dac90ce946ce6bc3a
@@ -1150,6 +1197,10 @@ zabbix_export:
               name: 'Oracle: Too many sessions locked over {$ORACLE.SESSION.LOCK.MAX.TIME}s (over {$ORACLE.SESSION.LONG.LOCK.MAX.WARN} for 5 min)'
               priority: WARNING
               description: 'Number of sessions locked over {$ORACLE.SESSION.LOCK.MAX.TIME} seconds is too high. Long-term locks can negatively affect database performance, therefore, if they are detected, you should first find the most difficult queries from the database point of view and analyze possible resource leaks.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 1bafc80a94fb454785362593b8a73be3
           name: 'Oracle: Get SGA stats'
@@ -1160,8 +1211,8 @@ zabbix_export:
           description: 'Get SGA statistics.'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
         -
           uuid: 7ad06a6ccb834c5c95f30c319a48446c
           name: 'Oracle: SGA, buffer cache'
@@ -1180,8 +1231,11 @@ zabbix_export:
             key: 'oracle.sga.stats["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: cache
+            -
+              tag: component
+              value: sga
         -
           uuid: 39dc67c29cce4742acf832949dc57760
           name: 'Oracle: SGA, fixed'
@@ -1200,8 +1254,11 @@ zabbix_export:
             key: 'oracle.sga.stats["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: memory
+            -
+              tag: component
+              value: sga
         -
           uuid: 562c02f282974020add8f98e9865fb9d
           name: 'Oracle: SGA, java pool'
@@ -1220,8 +1277,11 @@ zabbix_export:
             key: 'oracle.sga.stats["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: memory
+            -
+              tag: component
+              value: sga
         -
           uuid: 35e3346e273a46339e7b5d3721584d3a
           name: 'Oracle: SGA, large pool'
@@ -1240,8 +1300,11 @@ zabbix_export:
             key: 'oracle.sga.stats["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: memory
+            -
+              tag: component
+              value: sga
         -
           uuid: 77c17fc1056745c4949b3476c3b920d4
           name: 'Oracle: SGA, log buffer'
@@ -1260,8 +1323,11 @@ zabbix_export:
             key: 'oracle.sga.stats["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: memory
+            -
+              tag: component
+              value: sga
         -
           uuid: b64f3cad53814e989c576d3ce51bf42d
           name: 'Oracle: SGA, shared pool'
@@ -1280,8 +1346,11 @@ zabbix_export:
             key: 'oracle.sga.stats["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: memory
+            -
+              tag: component
+              value: sga
         -
           uuid: 517c7b3bbf8d40988e6a8289319eaec9
           name: 'Oracle: Shared pool free %'
@@ -1301,8 +1370,8 @@ zabbix_export:
             key: 'oracle.sys.metrics["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: memory
           triggers:
             -
               uuid: 80dbf89c86764cf09d2c5ec834e8940c
@@ -1310,6 +1379,10 @@ zabbix_export:
               name: 'Oracle: Shared pool free is too low (less {$ORACLE.SHARED.FREE.MIN.WARN}% for 5m)'
               priority: WARNING
               description: 'The shared pool free memory percent has been less than {$ORACLE.SHARED.FREE.MIN.WARN}% in the last 5 minutes.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
         -
           uuid: 28c7030b02714d5ea402fe6f2a3d769a
           name: 'Oracle: Total sorts per user call'
@@ -1328,8 +1401,8 @@ zabbix_export:
             key: 'oracle.sys.metrics["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: application
         -
           uuid: eccce1efc85d46199b3147ec586e1cd5
           name: 'Oracle: Get system metrics'
@@ -1341,8 +1414,8 @@ zabbix_export:
           description: 'The item gets system metric values.'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
         -
           uuid: d59cca864e8044d89f9b4689ec712511
           name: 'Oracle: Get system parameters'
@@ -1353,8 +1426,8 @@ zabbix_export:
           description: 'Get a set of system parameter values.'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
         -
           uuid: 48f54a0324a64e80aaf22d5cd26798cd
           name: 'Oracle: Temp space used'
@@ -1374,8 +1447,8 @@ zabbix_export:
             key: 'oracle.sys.metrics["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: application
         -
           uuid: 1a4efb793cff4224b0ae02272be2fe85
           name: 'Oracle: PGA, Total allocated'
@@ -1394,8 +1467,11 @@ zabbix_export:
             key: 'oracle.pga.stats["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: memory
+            -
+              tag: component
+              value: pga
         -
           uuid: 264b73d153694b52a47ac0219a8de66c
           name: 'Oracle: PGA, Total freeable'
@@ -1414,8 +1490,11 @@ zabbix_export:
             key: 'oracle.pga.stats["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: memory
+            -
+              tag: component
+              value: pga
         -
           uuid: 3f3083748a4f42998b135b1b4f88d11a
           name: 'Oracle: PGA, Total inuse'
@@ -1434,8 +1513,11 @@ zabbix_export:
             key: 'oracle.pga.stats["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: memory
+            -
+              tag: component
+              value: pga
         -
           uuid: 97ac4acedcde465b8d004a8ac476dd99
           name: 'Oracle: Get tablespaces stats'
@@ -1446,8 +1528,11 @@ zabbix_export:
           description: 'Get tablespaces stats.'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
+            -
+              tag: component
+              value: tablespaces
         -
           uuid: 4f1a9efea8594486b226307a52e35474
           name: 'Oracle: Uptime'
@@ -1467,8 +1552,8 @@ zabbix_export:
             key: 'oracle.instance.info["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: application
           triggers:
             -
               uuid: bcdaf519783f453e81d7064207f8bd30
@@ -1476,6 +1561,10 @@ zabbix_export:
               name: 'Oracle: Failed to fetch info data (or no data for 30m)'
               priority: INFO
               description: 'Zabbix has not received data for items for the last 5 minutes. The database might be unavailable for connecting.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
             -
               uuid: 5eae478e85834eee91b94680d529dcdb
               expression: 'last(/Oracle by Zabbix agent 2/oracle.uptime)<10m'
@@ -1483,6 +1572,10 @@ zabbix_export:
               priority: INFO
               description: 'Uptime is less than 10 minutes'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 73ff311f3d5c4e93b5919f5633fc09f9
           name: 'Oracle: User''s expire password'
@@ -1498,8 +1591,8 @@ zabbix_export:
                 - $.exp_passwd_days_before
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: application
           triggers:
             -
               uuid: 5eaa700c3bb74399ad2d26c382397415
@@ -1507,6 +1600,10 @@ zabbix_export:
               name: 'Oracle: Zabbix account will expire soon (under {$ORACLE.EXPIRE.PASSWORD.MIN.WARN} days)'
               priority: WARNING
               description: 'Password for zabbix user in the database will expire soon.'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: cec9a53d637e42c79e2a838588ceeaca
           name: 'Oracle: User rollbacks per second'
@@ -1526,8 +1623,8 @@ zabbix_export:
             key: 'oracle.sys.metrics["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: application
         -
           uuid: 04c0b90a0a7c4d6a95f51d006a65a530
           name: 'Oracle: Version'
@@ -1551,8 +1648,8 @@ zabbix_export:
             key: 'oracle.instance.info["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: application
           triggers:
             -
               uuid: 4a68bcb6149c4c839e263c949343add8
@@ -1561,6 +1658,10 @@ zabbix_export:
               priority: INFO
               description: 'Oracle DB version has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
       discovery_rules:
         -
           uuid: e2f1ce8c037f4efa9bdb98166d344be6
@@ -1592,8 +1693,11 @@ zabbix_export:
                 key: 'oracle.archive.info["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Oracle Archivelog'
+                  tag: component
+                  value: archive-log
+                -
+                  tag: destination
+                  value: '{#DEST_NAME}'
             -
               uuid: ce76a8ece06f4a17bfaf08b4351346d5
               name: 'Archivelog ''{#DEST_NAME}'': Last sequence'
@@ -1611,8 +1715,11 @@ zabbix_export:
                 key: 'oracle.archive.info["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Oracle Archivelog'
+                  tag: component
+                  value: archive-log
+                -
+                  tag: destination
+                  value: '{#DEST_NAME}'
             -
               uuid: a411a4e1c8ca4ea2a1ece92075cd0325
               name: 'Archivelog ''{#DEST_NAME}'': Status'
@@ -1636,8 +1743,11 @@ zabbix_export:
                 key: 'oracle.archive.info["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Oracle Archivelog'
+                  tag: component
+                  value: archive-log
+                -
+                  tag: destination
+                  value: '{#DEST_NAME}'
               trigger_prototypes:
                 -
                   uuid: e2d393c0ff2f420097e19890bcbe215c
@@ -1645,6 +1755,10 @@ zabbix_export:
                   name: 'Archivelog ''{#DEST_NAME}'': Log Archive is not valid'
                   priority: HIGH
                   description: 'ARL destination not in 3 - Valid or 2 - Deferred.'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
         -
           uuid: 59840e68757644afbcf6ec49a6f5e95d
           name: 'Database discovery'
@@ -1687,8 +1801,14 @@ zabbix_export:
                 key: 'oracle.cdb.info["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Oracle {#TYPE}'
+                  tag: component
+                  value: database
+                -
+                  tag: database
+                  value: '{#DBNAME}'
+                -
+                  tag: type
+                  value: '{#TYPE}'
             -
               uuid: a499423d6e8d44f2bc11beceb30c5fc1
               name: 'Oracle Database ''{#DBNAME}'': Log mode'
@@ -1712,8 +1832,14 @@ zabbix_export:
                 key: 'oracle.cdb.info["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Oracle {#TYPE}'
+                  tag: component
+                  value: database
+                -
+                  tag: database
+                  value: '{#DBNAME}'
+                -
+                  tag: type
+                  value: '{#TYPE}'
             -
               uuid: 0b0cfebb30aa4d21b8ff91f887fdffde
               name: 'Oracle Database ''{#DBNAME}'': Open status'
@@ -1737,8 +1863,14 @@ zabbix_export:
                 key: 'oracle.cdb.info["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Oracle {#TYPE}'
+                  tag: component
+                  value: database
+                -
+                  tag: database
+                  value: '{#DBNAME}'
+                -
+                  tag: type
+                  value: '{#TYPE}'
               trigger_prototypes:
                 -
                   uuid: fb642c2cfeb142409c67a7755d1047cc
@@ -1751,12 +1883,20 @@ zabbix_export:
                     -
                       name: 'Oracle Database ''{#DBNAME}'': Open status in mount mode'
                       expression: 'last(/Oracle by Zabbix agent 2/oracle.db_open_mode["{#DBNAME}"])=1'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: ef1c57d8f7d34c02bf0b7347d9fddf54
                   expression: 'last(/Oracle by Zabbix agent 2/oracle.db_open_mode["{#DBNAME}"])=1'
                   name: 'Oracle Database ''{#DBNAME}'': Open status in mount mode'
                   priority: WARNING
                   description: 'The Oracle DB has a MOUNTED state.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 560b010dcdfc445cbd4e266b88b60e24
               name: 'Oracle Database ''{#DBNAME}'': Role'
@@ -1780,8 +1920,14 @@ zabbix_export:
                 key: 'oracle.cdb.info["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Oracle {#TYPE}'
+                  tag: component
+                  value: database
+                -
+                  tag: database
+                  value: '{#DBNAME}'
+                -
+                  tag: type
+                  value: '{#TYPE}'
               trigger_prototypes:
                 -
                   uuid: 24fef0b751fd4d089eced3c210954b4f
@@ -1790,6 +1936,10 @@ zabbix_export:
                   priority: INFO
                   description: 'Oracle DB role has changed. Ack to close.'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
           trigger_prototypes:
             -
               uuid: 049473f763d84700b62abf5c914390fe
@@ -1797,6 +1947,10 @@ zabbix_export:
               name: 'Oracle Database ''{#DBNAME}'': Force logging is deactivated for DB with active Archivelog'
               priority: WARNING
               description: 'Force Logging mode  - it is very important metric for Databases in ''ARCHIVELOG''. This feature allows to forcibly write all transactions to the REDO.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 8d31eea973a7408abf0eb25ca7ba70c6
           name: 'ASM disk groups discovery'
@@ -1822,8 +1976,11 @@ zabbix_export:
                 key: 'oracle.diskgroups.stats["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Oracle ASM'
+                  tag: component
+                  value: asm
+                -
+                  tag: disk-group
+                  value: '{#DG_NAME}'
             -
               uuid: b80f69f44dd24eae82a301dbefb0c60f
               name: 'ASM ''{#DG_NAME}'': Total size'
@@ -1842,8 +1999,11 @@ zabbix_export:
                 key: 'oracle.diskgroups.stats["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Oracle ASM'
+                  tag: component
+                  value: asm
+                -
+                  tag: disk-group
+                  value: '{#DG_NAME}'
             -
               uuid: e2a0ac73040f401bb05ff88140f6665b
               name: 'ASM ''{#DG_NAME}'': Free size'
@@ -1863,8 +2023,11 @@ zabbix_export:
                 key: 'oracle.diskgroups.stats["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Oracle ASM'
+                  tag: component
+                  value: asm
+                -
+                  tag: disk-group
+                  value: '{#DG_NAME}'
               trigger_prototypes:
                 -
                   uuid: b8aa1b00e2574e35bf71554cabfffcfc
@@ -1872,6 +2035,10 @@ zabbix_export:
                   name: 'ASM ''{#DG_NAME}'': Disk group usage is too high (over {$ORACLE.ASM.USED.PCT.MAX.HIGH}% for 5m)'
                   priority: HIGH
                   description: 'Usage percent of ASM disk group is over {$ORACLE.ASM.USED.PCT.MAX.WARN}'
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
                 -
                   uuid: af6ff1d099524209b2806b1257e9a8e3
                   expression: 'min(/Oracle by Zabbix agent 2/oracle.asm_used_pct["{#DG_NAME}"],5m)>{$ORACLE.ASM.USED.PCT.MAX.WARN}'
@@ -1882,6 +2049,10 @@ zabbix_export:
                     -
                       name: 'ASM ''{#DG_NAME}'': Disk group usage is too high (over {$ORACLE.ASM.USED.PCT.MAX.HIGH}% for 5m)'
                       expression: 'min(/Oracle by Zabbix agent 2/oracle.asm_used_pct["{#DG_NAME}"],5m)>{$ORACLE.ASM.USED.PCT.MAX.HIGH}'
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
           graph_prototypes:
             -
               uuid: f42e49e6743f4b08b5bdc3ab284b26f3
@@ -1940,8 +2111,14 @@ zabbix_export:
                 key: 'oracle.pdb.info["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Oracle PDB'
+                  tag: component
+                  value: database
+                -
+                  tag: database
+                  value: '{#DBNAME}'
+                -
+                  tag: type
+                  value: PDB
               trigger_prototypes:
                 -
                   uuid: 61f48e1d858f4e95a603b32ee1c409dc
@@ -1950,12 +2127,20 @@ zabbix_export:
                   priority: INFO
                   description: 'Oracle DB open status has changed. Ack to close.'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: a6921cc3b42843dcb5624b3bb172f996
                   expression: 'last(/Oracle by Zabbix agent 2/oracle.pdb_open_mode["{#DBNAME}"])=1'
                   name: 'Oracle Database ''{#DBNAME}'': Open status in mount mode'
                   priority: WARNING
                   description: 'The Oracle DB has a MOUNTED state.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
         -
           uuid: 46ee5f42a15b43a58f7ef0ce5e3638d3
           name: 'Tablespace discovery'
@@ -1993,8 +2178,14 @@ zabbix_export:
                 key: 'oracle.ts.stats["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Oracle {#CONTENTS} Tablespaces. {#TABLESPACE}'
+                  tag: component
+                  value: tablespaces
+                -
+                  tag: contents
+                  value: '{#CONTENTS}'
+                -
+                  tag: tablespace
+                  value: '{#TABLESPACE}'
             -
               uuid: d7263b6da6c04c7798909a8448f526ab
               name: 'Oracle TBS ''{#TABLESPACE}'': Tablespace free, bytes'
@@ -2013,8 +2204,14 @@ zabbix_export:
                 key: 'oracle.ts.stats["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Oracle {#CONTENTS} Tablespaces. {#TABLESPACE}'
+                  tag: component
+                  value: tablespaces
+                -
+                  tag: contents
+                  value: '{#CONTENTS}'
+                -
+                  tag: tablespace
+                  value: '{#TABLESPACE}'
             -
               uuid: d2d919d303b244829c797245e08c2fe5
               name: 'Oracle TBS ''{#TABLESPACE}'': Tablespace MAX size, bytes'
@@ -2033,8 +2230,14 @@ zabbix_export:
                 key: 'oracle.ts.stats["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Oracle {#CONTENTS} Tablespaces. {#TABLESPACE}'
+                  tag: component
+                  value: tablespaces
+                -
+                  tag: contents
+                  value: '{#CONTENTS}'
+                -
+                  tag: tablespace
+                  value: '{#TABLESPACE}'
             -
               uuid: de6892ac5ca4499db01dd02c0444aafc
               name: 'Oracle TBS ''{#TABLESPACE}'': Open status'
@@ -2054,8 +2257,14 @@ zabbix_export:
                 key: 'oracle.ts.stats["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Oracle {#CONTENTS} Tablespaces. {#TABLESPACE}'
+                  tag: component
+                  value: tablespaces
+                -
+                  tag: contents
+                  value: '{#CONTENTS}'
+                -
+                  tag: tablespace
+                  value: '{#TABLESPACE}'
               trigger_prototypes:
                 -
                   uuid: 832f908ca3b84a3c9a030b5d33b96016
@@ -2063,6 +2272,10 @@ zabbix_export:
                   name: 'Oracle TBS ''{#TABLESPACE}'': Tablespace is OFFLINE'
                   priority: WARNING
                   description: 'The tablespace is in the offline state.'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
                 -
                   uuid: 2e84836974b340b5b916eed08e1fcdf4
                   expression: 'last(/Oracle by Zabbix agent 2/oracle.tbs_status["{#TABLESPACE}"],#1)<>last(/Oracle by Zabbix agent 2/oracle.tbs_status["{#TABLESPACE}"],#2)'
@@ -2074,6 +2287,10 @@ zabbix_export:
                     -
                       name: 'Oracle TBS ''{#TABLESPACE}'': Tablespace is OFFLINE'
                       expression: 'last(/Oracle by Zabbix agent 2/oracle.tbs_status["{#TABLESPACE}"])=2'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: ab56fee407e143db912dffcf24fb0106
               name: 'Oracle TBS ''{#TABLESPACE}'': Tablespace used, bytes'
@@ -2092,8 +2309,14 @@ zabbix_export:
                 key: 'oracle.ts.stats["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Oracle {#CONTENTS} Tablespaces. {#TABLESPACE}'
+                  tag: component
+                  value: tablespaces
+                -
+                  tag: contents
+                  value: '{#CONTENTS}'
+                -
+                  tag: tablespace
+                  value: '{#TABLESPACE}'
             -
               uuid: 358615a3e372462e9cec05df1df22743
               name: 'Oracle TBS ''{#TABLESPACE}'': Tablespace usage, percent'
@@ -2113,14 +2336,24 @@ zabbix_export:
                 key: 'oracle.ts.stats["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Oracle {#CONTENTS} Tablespaces. {#TABLESPACE}'
+                  tag: component
+                  value: tablespaces
+                -
+                  tag: contents
+                  value: '{#CONTENTS}'
+                -
+                  tag: tablespace
+                  value: '{#TABLESPACE}'
               trigger_prototypes:
                 -
                   uuid: bbc86236064348ee9150dfdd07623061
                   expression: 'min(/Oracle by Zabbix agent 2/oracle.tbs_used_file_pct["{#TABLESPACE}"],5m)>{$ORACLE.TBS.USED.PCT.MAX.HIGH}'
                   name: 'Oracle TBS ''{#TABLESPACE}'': Tablespace usage is too high (over {$ORACLE.TBS.USED.PCT.MAX.HIGH}% for 5m).'
                   priority: HIGH
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
                 -
                   uuid: ba298d35aaaa4386b4f03914dcf1cb27
                   expression: 'min(/Oracle by Zabbix agent 2/oracle.tbs_used_file_pct["{#TABLESPACE}"],5m)>{$ORACLE.TBS.USED.PCT.MAX.WARN}'
@@ -2130,6 +2363,10 @@ zabbix_export:
                     -
                       name: 'Oracle TBS ''{#TABLESPACE}'': Tablespace usage is too high (over {$ORACLE.TBS.USED.PCT.MAX.HIGH}% for 5m).'
                       expression: 'min(/Oracle by Zabbix agent 2/oracle.tbs_used_file_pct["{#TABLESPACE}"],5m)>{$ORACLE.TBS.USED.PCT.MAX.HIGH}'
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
             -
               uuid: 5d6293b33a46488c88a75dc898bf7059
               name: 'Oracle TBS ''{#TABLESPACE}'': Tablespace allocated, percent'
@@ -2149,8 +2386,14 @@ zabbix_export:
                 key: 'oracle.ts.stats["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Oracle {#CONTENTS} Tablespaces. {#TABLESPACE}'
+                  tag: component
+                  value: tablespaces
+                -
+                  tag: contents
+                  value: '{#CONTENTS}'
+                -
+                  tag: tablespace
+                  value: '{#TABLESPACE}'
               trigger_prototypes:
                 -
                   uuid: 2530cb03fb4e4e728396834f0db89466
@@ -2161,11 +2404,19 @@ zabbix_export:
                     -
                       name: 'Oracle TBS ''{#TABLESPACE}'': Tablespace utilization is too high (over {$ORACLE.TBS.UTIL.PCT.MAX.HIGH}% for 5m).'
                       expression: 'min(/Oracle by Zabbix agent 2/oracle.tbs_used_pct["{#TABLESPACE}"],5m)>{$ORACLE.TBS.UTIL.PCT.MAX.HIGH}'
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
                 -
                   uuid: 451108a2251848ea8719378d5c0abb42
                   expression: 'min(/Oracle by Zabbix agent 2/oracle.tbs_used_pct["{#TABLESPACE}"],5m)>{$ORACLE.TBS.UTIL.PCT.MAX.HIGH}'
                   name: 'Oracle TBS ''{#TABLESPACE}'': Tablespace utilization is too high (over {$ORACLE.TBS.UTIL.PCT.MAX.HIGH}% for 5m).'
                   priority: HIGH
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
           graph_prototypes:
             -
               uuid: 4b20cce21abb453f9aab0dbce75ff060
@@ -2188,6 +2439,13 @@ zabbix_export:
                   item:
                     host: 'Oracle by Zabbix agent 2'
                     key: 'oracle.tbs_used_bytes["{#TABLESPACE}"]'
+      tags:
+        -
+          tag: class
+          value: database
+        -
+          tag: target
+          value: oracle
       macros:
         -
           macro: '{$ORACLE.ASM.USED.PCT.MAX.HIGH}'
@@ -2450,24 +2708,40 @@ zabbix_export:
       name: 'Oracle: Too many active processes (over {$ORACLE.PROCESSES.MAX.WARN}% for 5 min)'
       priority: WARNING
       description: 'Active processes are using more than {$ORACLE.PROCESSES.MAX.WARN}% of the available number of processes.'
+      tags:
+        -
+          tag: scope
+          value: capacity
     -
       uuid: d9977c48c6e7435eafde4cabc43bb5fc
       expression: 'min(/Oracle by Zabbix agent 2/oracle.session_count,5m) * 100 / last(/Oracle by Zabbix agent 2/oracle.session_limit) > {$ORACLE.SESSIONS.MAX.WARN}'
       name: 'Oracle: Too many active sessions (over {$ORACLE.SESSIONS.MAX.WARN}% for 5 min)'
       priority: WARNING
       description: 'Active sessions are using more than {$ORACLE.SESSIONS.MAX.WARN}% of the available sessions.'
+      tags:
+        -
+          tag: scope
+          value: capacity
     -
       uuid: 362882973d0b45d1a09a687353734032
       expression: 'min(/Oracle by Zabbix agent 2/oracle.datafiles.stats["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}"],5m) * 100 / last(/Oracle by Zabbix agent 2/oracle.db_files_limit) > {$ORACLE.DB.FILE.MAX.WARN}'
       name: 'Oracle: Too many database files (over {$ORACLE.DB.FILE.MAX.WARN}% for 5 min)'
       priority: WARNING
       description: 'Number of datafiles is higher than {$ORACLE.DB.FILE.MAX.WARN}% of the available datafile files limit.'
+      tags:
+        -
+          tag: scope
+          value: capacity
     -
       uuid: aecb78fc9a7549f2b8e68325530bcd99
       expression: 'min(/Oracle by Zabbix agent 2/oracle.total_pga_used,5m) * 100 / last(/Oracle by Zabbix agent 2/oracle.pga_target) > {$ORACLE.PGA.USE.MAX.WARN}'
       name: 'Oracle: Total PGA inuse is too high (over {$ORACLE.PGA.USE.MAX.WARN}% for 5 min)'
       priority: WARNING
       description: 'Total PGA in use is more than {$ORACLE.PGA.USE.MAX.WARN}% of PGA_AGGREGATE_TARGET.'
+      tags:
+        -
+          tag: scope
+          value: capacity
   graphs:
     -
       uuid: 292f08d249d344db882a3447cc268ca6
diff --git a/templates/db/oracle_odbc/template_db_oracle_odbc.yaml b/templates/db/oracle_odbc/template_db_oracle_odbc.yaml
index 152fb8ed3be..1fe2d598e03 100644
--- a/templates/db/oracle_odbc/template_db_oracle_odbc.yaml
+++ b/templates/db/oracle_odbc/template_db_oracle_odbc.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-14T17:44:06Z'
+  date: '2022-01-26T10:37:32Z'
   groups:
     -
       uuid: 748ad4d098d447d492bb935c907f652f
@@ -22,7 +22,7 @@ zabbix_export:
         The "Service's TCP port state" item uses {HOST.CONN} and {$ORACLE.PORT} macros to check the availability of the listener.
         
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Databases
@@ -47,8 +47,11 @@ zabbix_export:
           password: '{$ORACLE.PASSWORD}'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: archive-log
+            -
+              tag: component
+              value: raw
         -
           uuid: 63fad55a2ced487aa30017b33bf1692e
           name: 'Oracle: Get ASM stats'
@@ -69,8 +72,11 @@ zabbix_export:
           description: 'Get ASM disk groups stats.'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: asm
+            -
+              tag: component
+              value: raw
         -
           uuid: 5de7c786988d49d0b50f28d2d622db62
           name: 'Oracle: Get CDB and No-CDB info'
@@ -88,11 +94,14 @@ zabbix_export:
             FROM v$database
           username: '{$ORACLE.USER}'
           password: '{$ORACLE.PASSWORD}'
-          description: 'Get info about CDB and  No-CDB databases on instance.'
+          description: 'Get info about CDB and  No-CDB databases on instansce.'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: cdb
+            -
+              tag: component
+              value: raw
         -
           uuid: dde19b79507648bd80a82a0575bf8671
           name: 'Oracle: Get instance state'
@@ -116,8 +125,8 @@ zabbix_export:
           description: 'The item gets state of the current instance.'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
         -
           uuid: cedcebd0b7ce474c9681022fcc75df1c
           name: 'Oracle: Get PDB info'
@@ -133,11 +142,14 @@ zabbix_export:
             FROM v$pdbs;
           username: '{$ORACLE.USER}'
           password: '{$ORACLE.PASSWORD}'
-          description: 'Get info about PDB databases on instance.'
+          description: 'Get info about PDB databases on instansce.'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: pdb
+            -
+              tag: component
+              value: raw
         -
           uuid: 3839683749974cdeafd9178bdccb38d6
           name: 'Oracle: Get system metrics'
@@ -210,8 +222,8 @@ zabbix_export:
           description: 'The item gets system metric values.'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
         -
           uuid: 972be2e777e44c539d0ddd7918b79e88
           name: 'Oracle: Get tablespaces stats'
@@ -255,9 +267,9 @@ zabbix_export:
               NVL(SUM(Y.MAX_BYTES), 0) AS MAX_BYTES,
               NVL(MAX(NVL(Y.FREE_BYTES, 0)), 0) AS FREE,
               SUM(Y.BYTES)-MAX(Y.FREE_BYTES) AS USED_BYTES,
-              ROUND(DECODE(SUM(Y.MAX_BYTES), 0, 0, (SUM(Y.BYTES) / SUM(Y.MAX_BYTES) * 100)), 2) AS USED_PCT_MAX, 
+              ROUND(DECODE(SUM(Y.MAX_BYTES), 0, 0, (SUM(Y.BYTES) / SUM(Y.MAX_BYTES) * 100)), 2) AS USED_PCT_MAX,
               ROUND(DECODE(SUM(Y.BYTES), 0, 0,(SUM(Y.BYTES)-MAX(Y.FREE_BYTES))/ SUM(Y.BYTES)* 100), 2) AS USED_FILE_PCT,
-              DECODE(Y.TBS_STATUS, 'ONLINE', 1, 'OFFLINE', 2, 'READ ONLY', 3, 0) AS STATUS 
+              DECODE(Y.TBS_STATUS, 'ONLINE', 1, 'OFFLINE', 2, 'READ ONLY', 3, 0) AS STATUS
                FROM ( SELECT
                  dtf.tablespace_name AS name,
                  dt.contents AS TYPE,
@@ -289,8 +301,11 @@ zabbix_export:
           description: 'Get tablespaces stats.'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
+            -
+              tag: component
+              value: tablespaces
         -
           uuid: 7ee99dfbd8dd4048bc2867aaa2fc335e
           name: 'Oracle: Service''s TCP port state'
@@ -307,8 +322,11 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
         -
           uuid: 6b6ce717919e45df93015a8f65337055
           name: 'Oracle: Active parallel sessions'
@@ -327,8 +345,8 @@ zabbix_export:
             key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: sessions
         -
           uuid: 928b095ffe57404eb6863b06b466524d
           name: 'Oracle: Active serial sessions'
@@ -347,8 +365,8 @@ zabbix_export:
             key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: sessions
         -
           uuid: 70633c6c4e27410dabcf035dd583f820
           name: 'Oracle: Average active sessions'
@@ -367,8 +385,8 @@ zabbix_export:
             key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: sessions
         -
           uuid: eb9f4179a87249fc9df9989f58502a12
           name: 'Oracle: Archiver state'
@@ -388,8 +406,8 @@ zabbix_export:
             key: 'db.odbc.get[get_instance_state,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: application
         -
           uuid: 836e01f5247a468dbf1866a744979376
           name: 'Oracle: Buffer cache hit ratio'
@@ -409,8 +427,8 @@ zabbix_export:
             key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: cache
         -
           uuid: dedafce88267427a8f0b51d74de28c58
           name: 'Oracle: Global cache blocks corrupted'
@@ -418,6 +436,7 @@ zabbix_export:
           key: oracle.cache_blocks_corrupt
           delay: '0'
           history: 7d
+          units: Rps
           description: 'The number of blocks that encountered a corruption or checksum failure during interconnect.'
           preprocessing:
             -
@@ -428,8 +447,8 @@ zabbix_export:
             key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: cache
         -
           uuid: d0d0dbbf1869487d957e60d03e8e3512
           name: 'Oracle: Global cache blocks lost'
@@ -437,6 +456,7 @@ zabbix_export:
           key: oracle.cache_blocks_lost
           delay: '0'
           history: 7d
+          units: Rps
           description: 'The number of global cache blocks lost'
           preprocessing:
             -
@@ -447,8 +467,8 @@ zabbix_export:
             key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: cache
         -
           uuid: 50ea6f52e01c44e5b9039add026faaa2
           name: 'Oracle: Cursor cache hit ratio'
@@ -468,8 +488,8 @@ zabbix_export:
             key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: cache
         -
           uuid: 82228fbb70bf4660aa64bdde2f57686d
           name: 'Oracle: Database CPU time ratio'
@@ -489,8 +509,8 @@ zabbix_export:
             key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: cpu
         -
           uuid: 877272b0b9424d279b1efaa6536eb19b
           name: 'Oracle: Database wait time ratio'
@@ -510,8 +530,8 @@ zabbix_export:
             key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: application
         -
           uuid: 751fe010337e40a5a12fc24d327ffcee
           name: 'Oracle: Datafiles count'
@@ -529,8 +549,8 @@ zabbix_export:
             key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: datafiles
         -
           uuid: a0e263bf207042058b5d9d2e735e05eb
           name: 'Oracle: Datafiles limit'
@@ -548,8 +568,8 @@ zabbix_export:
             key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: datafiles
         -
           uuid: 22d9cccf44924f99aaf444c80b3beab9
           name: 'Oracle: Disk sort per second'
@@ -569,8 +589,8 @@ zabbix_export:
             key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: application
         -
           uuid: 46e0598b703a412e96a3b18e2248e754
           name: 'Oracle: Enqueue timeouts per second'
@@ -590,8 +610,8 @@ zabbix_export:
             key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: application
         -
           uuid: beca246cadb44e48a20bc8809624a6f4
           name: 'Oracle: FRA, Number of files'
@@ -611,8 +631,8 @@ zabbix_export:
             key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: fra
         -
           uuid: 61eb041ea3b349df88cb3495b383fbe4
           name: 'Oracle: FRA, Number of restore points'
@@ -630,8 +650,8 @@ zabbix_export:
             key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: fra
         -
           uuid: 375e094a1a024a19b8e69e4f362c0163
           name: 'Oracle: FRA, Space limit'
@@ -652,8 +672,8 @@ zabbix_export:
             key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: fra
         -
           uuid: 4028e389cc9e4b24946657f1ded1ba47
           name: 'Oracle: FRA, Space reclaimable'
@@ -674,8 +694,8 @@ zabbix_export:
             key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: fra
         -
           uuid: 40b03e917c3c4c0385536336e48affcb
           name: 'Oracle: FRA, Used space'
@@ -696,8 +716,8 @@ zabbix_export:
             key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: fra
         -
           uuid: b29c93eecf9d4d1b8c5de1ce9721801f
           name: 'Oracle: FRA, Usable space in %'
@@ -718,8 +738,8 @@ zabbix_export:
             key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: fra
         -
           uuid: 3243beb0fe70425f8d71938a52f765ae
           name: 'Oracle: GC CR block received per second'
@@ -739,8 +759,8 @@ zabbix_export:
             key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: cache
         -
           uuid: cc3c9200deed42e5a8e187e82c123009
           name: 'Oracle: Instance role'
@@ -760,8 +780,8 @@ zabbix_export:
             key: 'db.odbc.get[get_instance_state,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: application
         -
           uuid: 3da27d558e034236a42b3b94bfa13159
           name: 'Oracle: Instance hostname'
@@ -781,8 +801,8 @@ zabbix_export:
             key: 'db.odbc.get[get_instance_state,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: application
           triggers:
             -
               uuid: 618a3e3c82dc4ccba82477afdd100a98
@@ -791,6 +811,10 @@ zabbix_export:
               priority: INFO
               description: 'Oracle DB Instance hostname has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 4e5df3339a2940c6b3cdad6f5b65234b
           name: 'Oracle: Instance name'
@@ -810,8 +834,8 @@ zabbix_export:
             key: 'db.odbc.get[get_instance_state,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: application
           triggers:
             -
               uuid: 2fe53d1d931e4eb38fef10a3171c1665
@@ -820,6 +844,10 @@ zabbix_export:
               priority: INFO
               description: 'Oracle DB Instance name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 632a953eead74114bdaf640bbf5929a5
           name: 'Oracle: Instance status'
@@ -839,8 +867,8 @@ zabbix_export:
             key: 'db.odbc.get[get_instance_state,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: application
         -
           uuid: 9a3084287a354fb0b0eb5de377a6de92
           name: 'Oracle: Library cache hit ratio'
@@ -860,8 +888,8 @@ zabbix_export:
             key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: cache
         -
           uuid: ac44884b2518485eae4bc7caf46799a8
           name: 'Oracle: Logons per second'
@@ -881,8 +909,8 @@ zabbix_export:
             key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: application
         -
           uuid: f7691a5d7ef74a4d99cac61835052fba
           name: 'Oracle: Long table scans per second'
@@ -902,8 +930,8 @@ zabbix_export:
             key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: application
         -
           uuid: 49445baea18640ea844f869c51aee565
           name: 'Oracle: Memory sorts ratio'
@@ -923,8 +951,8 @@ zabbix_export:
             key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: application
         -
           uuid: 786188c7719048cb863450f98ab921ac
           name: 'Oracle: PGA, Global memory bound'
@@ -943,8 +971,11 @@ zabbix_export:
             key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: memory
+            -
+              tag: component
+              value: pga
         -
           uuid: 1f532b6599f34db285b60a8879638d75
           name: 'Oracle: PGA, Aggregate target parameter'
@@ -963,8 +994,11 @@ zabbix_export:
             key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: memory
+            -
+              tag: component
+              value: pga
         -
           uuid: 001bf0d526cb455386f5a63e6bb8f410
           name: 'Oracle: Physical reads per second'
@@ -984,8 +1018,8 @@ zabbix_export:
             key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: disk
         -
           uuid: 2f305e09eafd4f7a9360f138be20a631
           name: 'Oracle: Physical reads bytes per second'
@@ -1005,8 +1039,8 @@ zabbix_export:
             key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: disk
         -
           uuid: d20f81d99e6647479abcc9ffcbc208fc
           name: 'Oracle: Physical writes per second'
@@ -1026,8 +1060,8 @@ zabbix_export:
             key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: disk
         -
           uuid: e2e21384fbae431a88f1eef610b0307b
           name: 'Oracle: Physical writes bytes per second'
@@ -1047,8 +1081,8 @@ zabbix_export:
             key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: disk
         -
           uuid: 533ae91bb94e4077870aa362a8cea7e5
           name: 'Oracle: Number of processes'
@@ -1065,8 +1099,8 @@ zabbix_export:
             key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: system
         -
           uuid: 721c04b5f3ba42d0ae7acceb5876c360
           name: 'Oracle: Processes limit'
@@ -1084,8 +1118,8 @@ zabbix_export:
             key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: system
         -
           uuid: 65064008eef54657b7b7f2beeba70b0a
           name: 'Oracle: Redo logs available to switch'
@@ -1103,8 +1137,8 @@ zabbix_export:
             key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: application
           triggers:
             -
               uuid: 1348b1e854e64d34b6b00be118f045c3
@@ -1112,6 +1146,10 @@ zabbix_export:
               name: 'Oracle: Number of REDO logs available for switching is too low (less {$ORACLE.REDO.MIN.WARN} for 5 min)'
               priority: WARNING
               description: 'Number of available for log switching inactive/unused REDOs is low (Database down risk)'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
         -
           uuid: ab298981f26a4ec6849e1155ce35ee76
           name: 'Oracle: Rows per sort'
@@ -1130,8 +1168,8 @@ zabbix_export:
             key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: application
         -
           uuid: ddbdd3d7d40d42b9b9711470516a5aec
           name: 'Oracle: SQL service response time'
@@ -1155,8 +1193,8 @@ zabbix_export:
             key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: application
         -
           uuid: e269a27f3c3f47ae86fef231da2a6fce
           name: 'Oracle: Active background sessions'
@@ -1177,8 +1215,8 @@ zabbix_export:
             key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: sessions
         -
           uuid: 6e8defc1e3e2485784d8bef6e2b988c7
           name: 'Oracle: Active user sessions'
@@ -1199,8 +1237,8 @@ zabbix_export:
             key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: sessions
         -
           uuid: a3f2b314a6354d238d6604afa2333ae6
           name: 'Oracle: Sessions concurrency'
@@ -1210,7 +1248,7 @@ zabbix_export:
           history: 7d
           value_type: FLOAT
           units: '%'
-          description: 'The percentage of concurrency. Concurrency is a DB behaviour when different transactions request to change the same resource - in case of modifying data transactions sequentially block temporarily the right to change data, the rest of the transactions are waiting for access. In the case when access for resource is locked for a long time, then the concurrency grows (like the transaction queue) and this often has an extremely negative impact on performance. A high contention value does not indicate the root cause of the problem, but is a signal to search for it.'
+          description: 'The percentage of concurrency. Concurrency is a DB behavior when different transactions request to change the same resource - in case of modifying data transactions sequentially block temporarily the right to change data, the rest of the transactions are waiting for access. In the case when access for resource is locked for a long time, then the concurrency grows (like the transaction queue) and this often has an extremely negative impact on performance. A high contention value does not indicate the root cause of the problem, but is a signal to search for it.'
           preprocessing:
             -
               type: JSONPATH
@@ -1220,8 +1258,8 @@ zabbix_export:
             key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: sessions
           triggers:
             -
               uuid: 7099e4a160c1446395b9e5b721db7b38
@@ -1229,6 +1267,10 @@ zabbix_export:
               name: 'Oracle: Too high database concurrency (over {$ORACLE.CONCURRENCY.MAX.WARN}% for 5 min)'
               priority: WARNING
               description: 'Concurrency rate is over {$ORACLE.CONCURRENCY.MAX.WARN}%. A high contention value does not indicate the root cause of the problem, but is a signal to search for it. In the case of high competition, an analysis of resource consumption should be carried out, the most "heavy" queries made in the database, possibly - session tracing. All this will help determine the root cause and possible optimization points both in the database configuration and in the logic of building queries of the application itself.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 3459ae7c82454882a9655db8a83120fd
           name: 'Oracle: Session count'
@@ -1247,8 +1289,8 @@ zabbix_export:
             key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: sessions
         -
           uuid: 5abf01d0bad442e7817752ae01dfc2d2
           name: 'Oracle: Inactive user sessions'
@@ -1269,8 +1311,8 @@ zabbix_export:
             key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: sessions
         -
           uuid: ebc142a0784041d2bbe982c4d766b98f
           name: 'Oracle: Sessions limit'
@@ -1288,8 +1330,8 @@ zabbix_export:
             key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: sessions
         -
           uuid: 64361f8862e8482d86a8bdd71c709142
           name: 'Oracle: Sessions lock rate'
@@ -1309,8 +1351,8 @@ zabbix_export:
             key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: sessions
           triggers:
             -
               uuid: 9a75f3a039094ca89c2ba7e3fa93b1a8
@@ -1318,6 +1360,10 @@ zabbix_export:
               name: 'Oracle: Too many locked sessions (over {$ORACLE.SESSIONS.LOCK.MAX.WARN}% for 5 min)'
               priority: WARNING
               description: 'Number of locked sessions is over {$ORACLE.SESSIONS.LOCK.MAX.WARN}% of the running sessions.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: a9669cb6290b4a158e7f02c1f079b6f9
           name: 'Oracle: Sessions locked over {$ORACLE.SESSION.LOCK.MAX.TIME}s'
@@ -1336,8 +1382,8 @@ zabbix_export:
             key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: sessions
           triggers:
             -
               uuid: a8f5ec966f5e4c72baad1380eda4d0a2
@@ -1345,6 +1391,10 @@ zabbix_export:
               name: 'Oracle: Too many sessions locked over {$ORACLE.SESSION.LOCK.MAX.TIME}s (over {$ORACLE.SESSION.LONG.LOCK.MAX.WARN} for 5 min)'
               priority: WARNING
               description: 'Number of sessions locked over {$ORACLE.SESSION.LOCK.MAX.TIME} seconds is too high. Long-term locks can negatively affect database performance, therefore, if they are detected, you should first find the most difficult queries from the database point of view and analyze possible resource leaks.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 94fe3a129f08415bb7e02a862bd9e8a8
           name: 'Oracle: SGA, buffer cache'
@@ -1365,8 +1415,11 @@ zabbix_export:
             key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: cache
+            -
+              tag: component
+              value: sga
         -
           uuid: 062fbd601d6f41208e364c80f1d08b1e
           name: 'Oracle: SGA, fixed'
@@ -1387,8 +1440,11 @@ zabbix_export:
             key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: memory
+            -
+              tag: component
+              value: sga
         -
           uuid: 614066ff91e144dbae58b4920c1db932
           name: 'Oracle: SGA, java pool'
@@ -1409,8 +1465,11 @@ zabbix_export:
             key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: memory
+            -
+              tag: component
+              value: sga
         -
           uuid: 0f726310d4a8426188658f7c093c3989
           name: 'Oracle: SGA, large pool'
@@ -1431,8 +1490,11 @@ zabbix_export:
             key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: memory
+            -
+              tag: component
+              value: sga
         -
           uuid: 03e9cea3887447349c9116b89b1be026
           name: 'Oracle: SGA, log buffer'
@@ -1453,8 +1515,11 @@ zabbix_export:
             key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: memory
+            -
+              tag: component
+              value: sga
         -
           uuid: eb4c2f63ef8449d99794e5fdb7fed7bf
           name: 'Oracle: SGA, shared pool'
@@ -1475,8 +1540,11 @@ zabbix_export:
             key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: memory
+            -
+              tag: component
+              value: sga
         -
           uuid: b14b0126cf64436ea206ec151984cd95
           name: 'Oracle: Shared pool free %'
@@ -1496,8 +1564,8 @@ zabbix_export:
             key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: memory
           triggers:
             -
               uuid: 8facfa98bcd3447ea53d0a3d09ada933
@@ -1505,6 +1573,10 @@ zabbix_export:
               name: 'Oracle: Shared pool free is too low (less {$ORACLE.SHARED.FREE.MIN.WARN}% for 5m)'
               priority: WARNING
               description: 'The shared pool free memory percent has been less than {$ORACLE.SHARED.FREE.MIN.WARN}% in the last 5 minutes.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
         -
           uuid: 8b3e958d76d14ef7a6869634106f1277
           name: 'Oracle: Total sorts per user call'
@@ -1523,8 +1595,8 @@ zabbix_export:
             key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: application
         -
           uuid: fc2cff59b0804989989179e1dbc338b5
           name: 'Oracle: Temp space used'
@@ -1544,8 +1616,8 @@ zabbix_export:
             key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: application
         -
           uuid: 085c097ab3b34f07b262caf80703b469
           name: 'Oracle: PGA, Total allocated'
@@ -1564,8 +1636,11 @@ zabbix_export:
             key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: memory
+            -
+              tag: component
+              value: pga
         -
           uuid: c2c18a0a502d4fbe91db25d29ae57d45
           name: 'Oracle: PGA, Total freeable'
@@ -1584,8 +1659,11 @@ zabbix_export:
             key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: memory
+            -
+              tag: component
+              value: pga
         -
           uuid: e0e88ce92ece4ca0b776f09dc4ec5039
           name: 'Oracle: PGA, Total inuse'
@@ -1604,8 +1682,11 @@ zabbix_export:
             key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: memory
+            -
+              tag: component
+              value: pga
         -
           uuid: 3c817d2b45fc471aa86771ce1739de6f
           name: 'Oracle: Uptime'
@@ -1625,8 +1706,8 @@ zabbix_export:
             key: 'db.odbc.get[get_instance_state,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: application
           triggers:
             -
               uuid: 03a4fb1d6e684c9b82c1317699c71468
@@ -1638,6 +1719,10 @@ zabbix_export:
                 -
                   name: 'Oracle: Port {$ORACLE.PORT} is unavailable'
                   expression: 'max(/Oracle by ODBC/net.tcp.service[tcp,{HOST.CONN},{$ORACLE.PORT}],#3)=0  and max(/Oracle by ODBC/proc.num[,,,"tnslsnr LISTENER"],#3)>0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
             -
               uuid: 431201a1ce0d47948751c7e4e6bbeb92
               expression: 'last(/Oracle by ODBC/oracle.uptime)<10m'
@@ -1645,6 +1730,10 @@ zabbix_export:
               priority: INFO
               description: 'Uptime is less than 10 minutes'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: ad275dbbe8af483b93d37e416c3f1fd2
           name: 'Oracle: User ''{$ORACLE.USER}'' expire password'
@@ -1664,8 +1753,8 @@ zabbix_export:
             key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: application
           triggers:
             -
               uuid: a909d8cccacf4470a3e2da88b4e5c3d5
@@ -1673,6 +1762,10 @@ zabbix_export:
               name: 'Oracle: Zabbix account will expire soon (under {$ORACLE.EXPIRE.PASSWORD.MIN.WARN} days)'
               priority: WARNING
               description: 'Password for zabbix user in the database will expire soon.'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 3455378f6ecf4ecb93a69d2387e4a57d
           name: 'Oracle: User rollbacks per second'
@@ -1692,8 +1785,8 @@ zabbix_export:
             key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: application
         -
           uuid: 45143cb0d0284608bf48897885a91bbb
           name: 'Oracle: Version'
@@ -1717,8 +1810,8 @@ zabbix_export:
             key: 'db.odbc.get[get_instance_state,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: application
           triggers:
             -
               uuid: a5dd4fe627c44afebdfe7beeefc4ec3d
@@ -1727,6 +1820,10 @@ zabbix_export:
               priority: INFO
               description: 'Oracle DB version has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: bf89a6ced768432a9cc3c27e1e3159d0
           name: 'Oracle: Number of LISTENER processes'
@@ -1741,14 +1838,18 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: Oracle
+              tag: component
+              value: application
           triggers:
             -
               uuid: eb5e531eb3f142569775349a126d1ab0
               expression: 'max(/Oracle by ODBC/proc.num[,,,"tnslsnr LISTENER"],#3)=0'
               name: 'Oracle: LISTENER process is not running'
               priority: DISASTER
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: a527b14b1cee4115be5c5e9387af821b
@@ -1786,8 +1887,11 @@ zabbix_export:
                 key: 'db.odbc.get[get_archivelog_stat,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Oracle Archivelog'
+                  tag: component
+                  value: archive-log
+                -
+                  tag: destination
+                  value: '{#DEST_NAME}'
             -
               uuid: 1948e6bfaa48451cac6ee83a16b07826
               name: 'Archivelog ''{#DEST_NAME}'': Last sequence'
@@ -1805,8 +1909,11 @@ zabbix_export:
                 key: 'db.odbc.get[get_archivelog_stat,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Oracle Archivelog'
+                  tag: component
+                  value: archive-log
+                -
+                  tag: destination
+                  value: '{#DEST_NAME}'
             -
               uuid: 0d561969fc2942fea854541a03b6a490
               name: 'Archivelog ''{#DEST_NAME}'': Status'
@@ -1830,8 +1937,11 @@ zabbix_export:
                 key: 'db.odbc.get[get_archivelog_stat,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Oracle Archivelog'
+                  tag: component
+                  value: archive-log
+                -
+                  tag: destination
+                  value: '{#DEST_NAME}'
               trigger_prototypes:
                 -
                   uuid: 1202e75015304115a4ccdab027617816
@@ -1839,6 +1949,10 @@ zabbix_export:
                   name: 'Archivelog ''{#DEST_NAME}'': Log Archive is not valid'
                   priority: HIGH
                   description: 'ARL destination not in 3 - Valid or 2 - Deferred.'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
         -
           uuid: c40708b755c7464bb064b7bffc584381
           name: 'ASM disk groups discovery'
@@ -1868,8 +1982,11 @@ zabbix_export:
                 key: 'db.odbc.get[get_asm_stat,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Oracle ASM'
+                  tag: component
+                  value: asm
+                -
+                  tag: disk-group
+                  value: '{#DG_NAME}'
             -
               uuid: 7f2a51d7eeb64c5b8929dcb0e3a49273
               name: 'ASM ''{#DG_NAME}'': Total size'
@@ -1888,8 +2005,11 @@ zabbix_export:
                 key: 'db.odbc.get[get_asm_stat,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Oracle ASM'
+                  tag: component
+                  value: asm
+                -
+                  tag: disk-group
+                  value: '{#DG_NAME}'
             -
               uuid: 9c87a9089a19468f85eb1d3c28893092
               name: 'ASM ''{#DG_NAME}'': Free size'
@@ -1909,8 +2029,11 @@ zabbix_export:
                 key: 'db.odbc.get[get_asm_stat,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Oracle ASM'
+                  tag: component
+                  value: asm
+                -
+                  tag: disk-group
+                  value: '{#DG_NAME}'
               trigger_prototypes:
                 -
                   uuid: 756a8b4b04bc4aadab6b4b4cc856ad32
@@ -1918,6 +2041,10 @@ zabbix_export:
                   name: 'ASM ''{#DG_NAME}'': Disk group usage is too high (over {$ORACLE.ASM.USED.PCT.MAX.HIGH}% for 5m)'
                   priority: HIGH
                   description: 'Usage percent of ASM disk group is over {$ORACLE.ASM.USED.PCT.MAX.WARN}'
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
                 -
                   uuid: d65971e0f3994dfcbcbde145c9866678
                   expression: 'min(/Oracle by ODBC/oracle.asm_used_pct["{#DG_NAME}"],5m)>{$ORACLE.ASM.USED.PCT.MAX.WARN}'
@@ -1928,6 +2055,10 @@ zabbix_export:
                     -
                       name: 'ASM ''{#DG_NAME}'': Disk group usage is too high (over {$ORACLE.ASM.USED.PCT.MAX.HIGH}% for 5m)'
                       expression: 'min(/Oracle by ODBC/oracle.asm_used_pct["{#DG_NAME}"],5m)>{$ORACLE.ASM.USED.PCT.MAX.HIGH}'
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
           graph_prototypes:
             -
               uuid: 75f9f07dbae84443900aad10095e37f9
@@ -1990,8 +2121,14 @@ zabbix_export:
                 key: 'db.odbc.get[get_cdb_info,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Oracle {#TYPE}'
+                  tag: component
+                  value: database
+                -
+                  tag: database
+                  value: '{#DBNAME}'
+                -
+                  tag: type
+                  value: '{#TYPE}'
             -
               uuid: 9b88e24d523e4111b2ff65ae26650e04
               name: 'Oracle Database ''{#DBNAME}'': Log mode'
@@ -2015,8 +2152,14 @@ zabbix_export:
                 key: 'db.odbc.get[get_cdb_info,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Oracle {#TYPE}'
+                  tag: component
+                  value: database
+                -
+                  tag: database
+                  value: '{#DBNAME}'
+                -
+                  tag: type
+                  value: '{#TYPE}'
             -
               uuid: f1971909355f4ef48c32695b5d204d56
               name: 'Oracle Database ''{#DBNAME}'': Open status'
@@ -2040,8 +2183,14 @@ zabbix_export:
                 key: 'db.odbc.get[get_cdb_info,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Oracle {#TYPE}'
+                  tag: component
+                  value: database
+                -
+                  tag: database
+                  value: '{#DBNAME}'
+                -
+                  tag: type
+                  value: '{#TYPE}'
               trigger_prototypes:
                 -
                   uuid: 9bf80a9372ef4b3898fd5a4f0c3cec7c
@@ -2054,12 +2203,20 @@ zabbix_export:
                     -
                       name: 'Oracle Database ''{#DBNAME}'': Open status in mount mode'
                       expression: 'last(/Oracle by ODBC/oracle.db_open_mode["{#DBNAME}"])=1'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: 3620ac4e75644789a2f0245dbb948771
                   expression: 'last(/Oracle by ODBC/oracle.db_open_mode["{#DBNAME}"])=1'
                   name: 'Oracle Database ''{#DBNAME}'': Open status in mount mode'
                   priority: WARNING
                   description: 'The Oracle DB has a MOUNTED state.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 949d1e5fc4424b2bb0ffd220f00f6a79
               name: 'Oracle Database ''{#DBNAME}'': Role'
@@ -2083,8 +2240,14 @@ zabbix_export:
                 key: 'db.odbc.get[get_cdb_info,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Oracle {#TYPE}'
+                  tag: component
+                  value: database
+                -
+                  tag: database
+                  value: '{#DBNAME}'
+                -
+                  tag: type
+                  value: '{#TYPE}'
               trigger_prototypes:
                 -
                   uuid: fb5ccc917a8344d7945b8867a1982d6b
@@ -2093,6 +2256,10 @@ zabbix_export:
                   priority: INFO
                   description: 'Oracle DB role has changed. Ack to close.'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
           trigger_prototypes:
             -
               uuid: 9c17e0fdd6fe409e8f298433e58b7445
@@ -2100,6 +2267,10 @@ zabbix_export:
               name: 'Oracle Database ''{#DBNAME}'': Force logging is deactivated for DB with active Archivelog'
               priority: WARNING
               description: 'Force Logging mode  - it is very important metric for Databases in ''ARCHIVELOG''. This feature allows to forcibly write all transactions to the REDO.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 2611e69f735a42b190852589658dd591
           name: 'PDB discovery'
@@ -2146,8 +2317,14 @@ zabbix_export:
                 key: 'db.odbc.get[get_pdb_info,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Oracle PDB'
+                  tag: component
+                  value: database
+                -
+                  tag: database
+                  value: '{#DBNAME}'
+                -
+                  tag: type
+                  value: PDB
               trigger_prototypes:
                 -
                   uuid: 3dbb9379f8024924b197037acfbbdac4
@@ -2156,12 +2333,20 @@ zabbix_export:
                   priority: INFO
                   description: 'Oracle DB open status has changed. Ack to close.'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: 5f8ed69b2c074a29b9975baf10a2a2f8
                   expression: 'last(/Oracle by ODBC/oracle.pdb_open_mode["{#DBNAME}"])=1'
                   name: 'Oracle Database ''{#DBNAME}'': Open status in mount mode'
                   priority: WARNING
                   description: 'The Oracle DB has a MOUNTED state.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
         -
           uuid: c8de553c98f64e59b40bf927f6447ad1
           name: 'Tablespace discovery'
@@ -2206,8 +2391,14 @@ zabbix_export:
                 key: 'db.odbc.get[get_tablespaces_stats,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Oracle {#CONTENTS} Tablespaces. {#TABLESPACE}'
+                  tag: component
+                  value: tablespaces
+                -
+                  tag: contents
+                  value: '{#CONTENTS}'
+                -
+                  tag: tablespace
+                  value: '{#TABLESPACE}'
             -
               uuid: 8c3284a21872423499ee15fd7b0038f1
               name: 'Oracle TBS ''{#TABLESPACE}'': Tablespace free, bytes'
@@ -2226,8 +2417,14 @@ zabbix_export:
                 key: 'db.odbc.get[get_tablespaces_stats,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Oracle {#CONTENTS} Tablespaces. {#TABLESPACE}'
+                  tag: component
+                  value: tablespaces
+                -
+                  tag: contents
+                  value: '{#CONTENTS}'
+                -
+                  tag: tablespace
+                  value: '{#TABLESPACE}'
             -
               uuid: afd8c1a01b64408fbc6f8f95fbb13593
               name: 'Oracle TBS ''{#TABLESPACE}'': Tablespace MAX size, bytes'
@@ -2246,8 +2443,14 @@ zabbix_export:
                 key: 'db.odbc.get[get_tablespaces_stats,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Oracle {#CONTENTS} Tablespaces. {#TABLESPACE}'
+                  tag: component
+                  value: tablespaces
+                -
+                  tag: contents
+                  value: '{#CONTENTS}'
+                -
+                  tag: tablespace
+                  value: '{#TABLESPACE}'
             -
               uuid: 42c7812a75d5433ab8a275498635c81c
               name: 'Oracle TBS ''{#TABLESPACE}'': Open status'
@@ -2267,8 +2470,14 @@ zabbix_export:
                 key: 'db.odbc.get[get_tablespaces_stats,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Oracle {#CONTENTS} Tablespaces. {#TABLESPACE}'
+                  tag: component
+                  value: tablespaces
+                -
+                  tag: contents
+                  value: '{#CONTENTS}'
+                -
+                  tag: tablespace
+                  value: '{#TABLESPACE}'
               trigger_prototypes:
                 -
                   uuid: 3c5f54f41f95440aa18ca5316aeb50f6
@@ -2276,6 +2485,10 @@ zabbix_export:
                   name: 'Oracle TBS ''{#TABLESPACE}'': Tablespace is OFFLINE'
                   priority: WARNING
                   description: 'The tablespace is in the offline state.'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
                 -
                   uuid: 05c2af5a765842a1a70f2f67355db1b3
                   expression: 'last(/Oracle by ODBC/oracle.tbs_status["{#TABLESPACE}"],#1)<>last(/Oracle by ODBC/oracle.tbs_status["{#TABLESPACE}"],#2)'
@@ -2287,6 +2500,10 @@ zabbix_export:
                     -
                       name: 'Oracle TBS ''{#TABLESPACE}'': Tablespace is OFFLINE'
                       expression: 'last(/Oracle by ODBC/oracle.tbs_status["{#TABLESPACE}"])=2'
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
             -
               uuid: b9cc0eabdcbc404fb0df2a2a082411f1
               name: 'Oracle TBS ''{#TABLESPACE}'': Tablespace used, bytes'
@@ -2305,8 +2522,14 @@ zabbix_export:
                 key: 'db.odbc.get[get_tablespaces_stats,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Oracle {#CONTENTS} Tablespaces. {#TABLESPACE}'
+                  tag: component
+                  value: tablespaces
+                -
+                  tag: contents
+                  value: '{#CONTENTS}'
+                -
+                  tag: tablespace
+                  value: '{#TABLESPACE}'
             -
               uuid: 877961c286e448238f58cff9c51088c8
               name: 'Oracle TBS ''{#TABLESPACE}'': Tablespace usage, percent'
@@ -2326,14 +2549,24 @@ zabbix_export:
                 key: 'db.odbc.get[get_tablespaces_stats,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Oracle {#CONTENTS} Tablespaces. {#TABLESPACE}'
+                  tag: component
+                  value: tablespaces
+                -
+                  tag: contents
+                  value: '{#CONTENTS}'
+                -
+                  tag: tablespace
+                  value: '{#TABLESPACE}'
               trigger_prototypes:
                 -
                   uuid: 78c293ae7ded42b0b05d50af99762017
                   expression: 'min(/Oracle by ODBC/oracle.tbs_used_file_pct["{#TABLESPACE}"],5m)>{$ORACLE.TBS.USED.PCT.MAX.HIGH}'
                   name: 'Oracle TBS ''{#TABLESPACE}'': Tablespace usage is too high (over {$ORACLE.TBS.USED.PCT.MAX.HIGH}% for 5m).'
                   priority: HIGH
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
                 -
                   uuid: e6f2cb4ade52464b97f5e0f5e05ab61b
                   expression: 'min(/Oracle by ODBC/oracle.tbs_used_file_pct["{#TABLESPACE}"],5m)>{$ORACLE.TBS.USED.PCT.MAX.WARN}'
@@ -2343,6 +2576,10 @@ zabbix_export:
                     -
                       name: 'Oracle TBS ''{#TABLESPACE}'': Tablespace usage is too high (over {$ORACLE.TBS.USED.PCT.MAX.HIGH}% for 5m).'
                       expression: 'min(/Oracle by ODBC/oracle.tbs_used_file_pct["{#TABLESPACE}"],5m)>{$ORACLE.TBS.USED.PCT.MAX.HIGH}'
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
             -
               uuid: c3a904455ff244e1a30bf32f0b4ea0d7
               name: 'Oracle TBS ''{#TABLESPACE}'': Tablespace allocated, percent'
@@ -2362,8 +2599,14 @@ zabbix_export:
                 key: 'db.odbc.get[get_tablespaces_stats,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Oracle {#CONTENTS} Tablespaces. {#TABLESPACE}'
+                  tag: component
+                  value: tablespaces
+                -
+                  tag: contents
+                  value: '{#CONTENTS}'
+                -
+                  tag: tablespace
+                  value: '{#TABLESPACE}'
               trigger_prototypes:
                 -
                   uuid: 9469e51bd69e4baba82de4fd4e5eb14c
@@ -2374,11 +2617,19 @@ zabbix_export:
                     -
                       name: 'Oracle TBS ''{#TABLESPACE}'': Tablespace utilization is too high (over {$ORACLE.TBS.UTIL.PCT.MAX.HIGH}% for 5m).'
                       expression: 'min(/Oracle by ODBC/oracle.tbs_used_pct["{#TABLESPACE}"],5m)>{$ORACLE.TBS.UTIL.PCT.MAX.HIGH}'
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
                 -
                   uuid: a8aa7255866d4a5ba71d2f89a1d234fe
                   expression: 'min(/Oracle by ODBC/oracle.tbs_used_pct["{#TABLESPACE}"],5m)>{$ORACLE.TBS.UTIL.PCT.MAX.HIGH}'
                   name: 'Oracle TBS ''{#TABLESPACE}'': Tablespace utilization is too high (over {$ORACLE.TBS.UTIL.PCT.MAX.HIGH}% for 5m).'
                   priority: HIGH
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
           graph_prototypes:
             -
               uuid: a9f3bc52aa0340feb35600ad249e82d3
@@ -2401,6 +2652,13 @@ zabbix_export:
                   item:
                     host: 'Oracle by ODBC'
                     key: 'oracle.tbs_used_bytes["{#TABLESPACE}"]'
+      tags:
+        -
+          tag: class
+          value: database
+        -
+          tag: target
+          value: oracle
       macros:
         -
           macro: '{$ORACLE.ASM.USED.PCT.MAX.HIGH}'
@@ -2668,30 +2926,50 @@ zabbix_export:
       name: 'Oracle: Port {$ORACLE.PORT} is unavailable'
       priority: DISASTER
       description: 'The TCP port of the Oracle Server service is currently unavailable.'
+      tags:
+        -
+          tag: scope
+          value: availability
     -
       uuid: 38471058988c46f4b81af9f77637914a
       expression: 'min(/Oracle by ODBC/oracle.processes_count,5m) * 100 / last(/Oracle by ODBC/oracle.processes_limit) > {$ORACLE.PROCESSES.MAX.WARN}'
       name: 'Oracle: Too many active processes (over {$ORACLE.PROCESSES.MAX.WARN}% for 5 min)'
       priority: WARNING
       description: 'Active processes are using more than {$ORACLE.PROCESSES.MAX.WARN}% of the available number of processes.'
+      tags:
+        -
+          tag: scope
+          value: capacity
     -
       uuid: 4a055da31f09489ea0f03e4582ee4333
       expression: 'min(/Oracle by ODBC/oracle.session_count,5m) * 100 / last(/Oracle by ODBC/oracle.session_limit) > {$ORACLE.SESSIONS.MAX.WARN}'
       name: 'Oracle: Too many active sessions (over {$ORACLE.SESSIONS.MAX.WARN}% for 5 min)'
       priority: WARNING
       description: 'Active sessions are using more than {$ORACLE.SESSIONS.MAX.WARN}% of the available sessions.'
+      tags:
+        -
+          tag: scope
+          value: capacity
     -
       uuid: 5752d92063f84aaa818bc85b135cd4fd
       expression: 'min(/Oracle by ODBC/oracle.db_files_count,5m) * 100 / last(/Oracle by ODBC/oracle.db_files_limit) > {$ORACLE.DB.FILE.MAX.WARN}'
       name: 'Oracle: Too many database files (over {$ORACLE.DB.FILE.MAX.WARN}% for 5 min)'
       priority: WARNING
       description: 'Number of datafiles is higher than {$ORACLE.DB.FILE.MAX.WARN}% of the available datafile files limit.'
+      tags:
+        -
+          tag: scope
+          value: capacity
     -
       uuid: 476001f0f52a45f59942d73c643371c1
       expression: 'min(/Oracle by ODBC/oracle.total_pga_used,5m) * 100 / last(/Oracle by ODBC/oracle.pga_target) > {$ORACLE.PGA.USE.MAX.WARN}'
       name: 'Oracle: Total PGA inuse is too high (over {$ORACLE.PGA.USE.MAX.WARN}% for 5 min)'
       priority: WARNING
       description: 'Total PGA in use is more than {$ORACLE.PGA.USE.MAX.WARN}% of PGA_AGGREGATE_TARGET.'
+      tags:
+        -
+          tag: scope
+          value: capacity
   graphs:
     -
       uuid: 72ad9e81bb5147e6827499143d256068
diff --git a/templates/db/postgresql/template_db_postgresql.yaml b/templates/db/postgresql/template_db_postgresql.yaml
index c6a1c3ce7a7..6483133e7da 100644
--- a/templates/db/postgresql/template_db_postgresql.yaml
+++ b/templates/db/postgresql/template_db_postgresql.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-12T12:00:46Z'
+  date: '2022-01-26T10:51:40Z'
   groups:
     -
       uuid: 748ad4d098d447d492bb935c907f652f
@@ -13,7 +13,7 @@ zabbix_export:
       description: |
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/384190-%C2%A0discussion-thread-for-official-zabbix-template-db-postgresql
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Databases
@@ -41,8 +41,8 @@ zabbix_export:
             key: 'pgsql.bgwriter["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.PASSWORD}","{$PG.DB}"]'
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: bgwriter
         -
           uuid: 2c3ee691d4a54fb6b566739a3a648df4
           name: 'Bgwriter: Buffers written directly by a backend per second'
@@ -66,8 +66,8 @@ zabbix_export:
             key: 'pgsql.bgwriter["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.PASSWORD}","{$PG.DB}"]'
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: bgwriter
         -
           uuid: 77e1eb202a6346ce9df0f1bb2c078688
           name: 'Bgwriter: Buffers backend fsync per second'
@@ -90,8 +90,8 @@ zabbix_export:
             key: 'pgsql.bgwriter["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.PASSWORD}","{$PG.DB}"]'
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: bgwriter
         -
           uuid: e29d26a48d0143579bf3acc6655cd659
           name: 'Bgwriter: Buffers written during checkpoints per second'
@@ -115,8 +115,8 @@ zabbix_export:
             key: 'pgsql.bgwriter["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.PASSWORD}","{$PG.DB}"]'
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: bgwriter
         -
           uuid: 5151183461a54d2bbfaad04b8cab3798
           name: 'Bgwriter: Buffers written by the background writer per second'
@@ -140,8 +140,8 @@ zabbix_export:
             key: 'pgsql.bgwriter["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.PASSWORD}","{$PG.DB}"]'
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: bgwriter
         -
           uuid: ff290c0602b9447e87240c1ecf467050
           name: 'Bgwriter: Requested checkpoints per second'
@@ -164,8 +164,8 @@ zabbix_export:
             key: 'pgsql.bgwriter["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.PASSWORD}","{$PG.DB}"]'
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: bgwriter
           triggers:
             -
               uuid: 65e7954489854ad3ad1698dead7c4c02
@@ -175,6 +175,10 @@ zabbix_export:
               description: |
                 Checkpoints are points in the sequence of transactions at which it is guaranteed that the heap and index data files have been updated with all information written before that checkpoint. At checkpoint time, all dirty data pages are flushed to disk and a special checkpoint record is written to the log file.
                 https://www.postgresql.org/docs/current/wal-configuration.html
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: a5271230be8b431cb96580180e099b98
           name: 'Bgwriter: Scheduled checkpoints per second'
@@ -197,8 +201,8 @@ zabbix_export:
             key: 'pgsql.bgwriter["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.PASSWORD}","{$PG.DB}"]'
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: bgwriter
         -
           uuid: 782d2368763b48ad8663aa9fb75c3326
           name: 'Bgwriter: Checkpoint sync time'
@@ -226,8 +230,8 @@ zabbix_export:
             key: 'pgsql.bgwriter["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.PASSWORD}","{$PG.DB}"]'
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: bgwriter
         -
           uuid: b5e5f463978c46dd9401963f48ea72eb
           name: 'Bgwriter: Checkpoint write time'
@@ -255,8 +259,8 @@ zabbix_export:
             key: 'pgsql.bgwriter["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.PASSWORD}","{$PG.DB}"]'
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: bgwriter
         -
           uuid: f273c71f92bf4ac0b6ec5a0a88d1239c
           name: 'Bgwriter: Max written per second'
@@ -279,8 +283,8 @@ zabbix_export:
             key: 'pgsql.bgwriter["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.PASSWORD}","{$PG.DB}"]'
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: bgwriter
         -
           uuid: 1fc5ba48a0974bd7bf965b5f130deded
           name: 'PostgreSQL: Get bgwriter'
@@ -291,8 +295,8 @@ zabbix_export:
           description: 'Statistics about the background writer process''s activity'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
           triggers:
             -
               uuid: 768d28b9360b46cda3065f5082ba97ac
@@ -304,6 +308,10 @@ zabbix_export:
                 -
                   name: 'PostgreSQL: Service is down'
                   expression: 'last(/PostgreSQL by Zabbix agent/pgsql.ping["{$PG.HOST}","{$PG.PORT}"]) = 0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 70a7581fabd14e05bda762b79811187c
           name: 'Status: Cache hit ratio %'
@@ -314,14 +322,18 @@ zabbix_export:
           description: 'Cache hit ratio'
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: cache
           triggers:
             -
               uuid: 4d87cc71b40f4b59ad27f30f33b15a69
               expression: 'max(/PostgreSQL by Zabbix agent/pgsql.cache.hit["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.PASSWORD}","{$PG.DB}"],5m) < {$PG.CACHE_HITRATIO.MIN.WARN}'
               name: 'PostgreSQL: Cache hit ratio too low (under {$PG.CACHE_HITRATIO.MIN.WARN} in 5m)'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 248cbe5067324b9ca435f2aced5e2a5f
           name: 'Status: Config hash'
@@ -338,14 +350,18 @@ zabbix_export:
                 - 1h
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: application
           triggers:
             -
               uuid: b727cfa6d3de4063b6a2dcb6cc84e27b
               expression: 'last(/PostgreSQL by Zabbix agent/pgsql.config.hash["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.PASSWORD}","{$PG.DB}"],#1)<>last(/PostgreSQL by Zabbix agent/pgsql.config.hash["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.PASSWORD}","{$PG.DB}"],#2) and length(last(/PostgreSQL by Zabbix agent/pgsql.config.hash["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.PASSWORD}","{$PG.DB}"]))>0'
               name: 'PostgreSQL: Configuration has changed'
               priority: INFO
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: c78116d3acf24e6990ed27ba8008728c
           name: 'Connections sum: Active'
@@ -363,8 +379,8 @@ zabbix_export:
             key: 'pgsql.connections.sum["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.PASSWORD}","{$PG.DB}"]'
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: connections
         -
           uuid: be6eb6ecbfad420b889c58d1f1550b23
           name: 'Connections sum: Idle'
@@ -382,8 +398,8 @@ zabbix_export:
             key: 'pgsql.connections.sum["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.PASSWORD}","{$PG.DB}"]'
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: connections
         -
           uuid: 6471d014722c4072ae045df4c69578e3
           name: 'Connections sum: Idle in transaction'
@@ -401,8 +417,8 @@ zabbix_export:
             key: 'pgsql.connections.sum["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.PASSWORD}","{$PG.DB}"]'
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: connections
         -
           uuid: 197cc14f55db485b891614c7b7ee2a51
           name: 'Connections sum: Prepared'
@@ -422,8 +438,8 @@ zabbix_export:
             key: 'pgsql.connections.sum["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.PASSWORD}","{$PG.DB}"]'
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: connections
         -
           uuid: 24d23377c7cd4cc5b63f98a261c2501c
           name: 'Connections sum: Total'
@@ -441,8 +457,8 @@ zabbix_export:
             key: 'pgsql.connections.sum["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.PASSWORD}","{$PG.DB}"]'
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: connections
         -
           uuid: 488050d9aa8e4c2ea5b3e991ec5ddacc
           name: 'Connections sum: Total %'
@@ -461,14 +477,18 @@ zabbix_export:
             key: 'pgsql.connections.sum["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.PASSWORD}","{$PG.DB}"]'
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: connections
           triggers:
             -
               uuid: 54ef12b8ff1e4383a3097c71478ceefa
               expression: 'min(/PostgreSQL by Zabbix agent/pgsql.connections.sum.total_pct,5m) > {$PG.CONN_TOTAL_PCT.MAX.WARN}'
               name: 'PostgreSQL: Total number of connections is too high (over {$PG.CONN_TOTAL_PCT.MAX.WARN} in 5m)'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: fadd1333189c4ed29db57cf2acd158d0
           name: 'Connections sum: Waiting'
@@ -488,8 +508,8 @@ zabbix_export:
             key: 'pgsql.connections.sum["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.PASSWORD}","{$PG.DB}"]'
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: connections
         -
           uuid: b0da0c4856a645ca8ef03405d2d8d4a5
           name: 'PostgreSQL: Get connections sum'
@@ -502,8 +522,8 @@ zabbix_export:
             https://www.postgresql.org/docs/current/monitoring-stats.html#PG-STAT-ACTIVITY-VIEW
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
         -
           uuid: b44f263fb33e461e8c3d700fb7688c7b
           name: 'PostgreSQL: Get dbstat'
@@ -516,8 +536,8 @@ zabbix_export:
             https://www.postgresql.org/docs/current/monitoring-stats.html#PG-STAT-DATABASE-VIEW
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
         -
           uuid: 7cee21f6225340ef80e9cdef7ce20b10
           name: 'PostgreSQL: Get locks'
@@ -530,8 +550,8 @@ zabbix_export:
             https://www.postgresql.org/docs/current/explicit-locking.html#LOCKING-TABLES
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
         -
           uuid: f42bd73b3af6451b8a3a6113dcc1b675
           name: 'Status: Ping time'
@@ -551,8 +571,11 @@ zabbix_export:
                 - '0.001'
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: application
+            -
+              tag: component
+              value: health
           triggers:
             -
               uuid: e19b5630737b4c63886b5df77a3c748c
@@ -563,6 +586,13 @@ zabbix_export:
                 -
                   name: 'PostgreSQL: Service is down'
                   expression: 'last(/PostgreSQL by Zabbix agent/pgsql.ping["{$PG.HOST}","{$PG.PORT}"]) = 0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: f5bd615243b344cb88dac1e83436cc85
           name: 'Status: Ping'
@@ -581,14 +611,21 @@ zabbix_export:
                 - 1h
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: application
+            -
+              tag: component
+              value: health
           triggers:
             -
               uuid: 6d9c2b5353ce4f6baeeb0f254fb7d1e2
               expression: 'last(/PostgreSQL by Zabbix agent/pgsql.ping["{$PG.HOST}","{$PG.PORT}"]) = 0'
               name: 'PostgreSQL: Service is down'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 47bf580e1e4e48cf9c0e94fcf90288ac
           name: 'PostgreSQL: Get queries'
@@ -599,8 +636,8 @@ zabbix_export:
           description: 'Collect all metrics by query execution time'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
         -
           uuid: d8a509bd011a4ecda5d439295e257e9d
           name: 'Replication: standby count'
@@ -609,8 +646,8 @@ zabbix_export:
           description: 'Number of standby servers'
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: replication
         -
           uuid: 21f8bea1141249c7a4dfafad5bc3ef41
           name: 'Replication: lag in seconds'
@@ -620,14 +657,21 @@ zabbix_export:
           description: 'Replication lag with Master in seconds'
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: replication
           triggers:
             -
               uuid: 11831c52e86445498eed42de6a629b65
               expression: 'min(/PostgreSQL by Zabbix agent/pgsql.replication.lag.sec["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.PASSWORD}","{$PG.DB}"],5m) > {$PG.REPL_LAG.MAX.WARN}'
               name: 'PostgreSQL: Streaming lag with {#MASTER} is too high (over {$PG.REPL_LAG.MAX.WARN} in 5m)'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 09f696124fca4c5b844bf66c9c912b87
           name: 'Replication: recovery role'
@@ -638,8 +682,8 @@ zabbix_export:
             name: 'PostgreSQL recovery role'
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: replication
         -
           uuid: d449017462704508a4aad51a6b45fb30
           name: 'Replication: status'
@@ -650,14 +694,18 @@ zabbix_export:
             name: 'PostgreSQL replication status'
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: replication
           triggers:
             -
               uuid: aef1e1d2bab540f8ab738b4a3fad863c
               expression: 'max(/PostgreSQL by Zabbix agent/pgsql.replication.status["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.PASSWORD}","{$PG.DB}"],5m)=0'
               name: 'PostgreSQL: Replication is down'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 4883717865c84c19b48d46f009317de2
           name: 'Transactions: Max active transaction time'
@@ -677,8 +725,8 @@ zabbix_export:
             key: 'pgsql.transactions["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.PASSWORD}","{$PG.DB}"]'
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: transactions
         -
           uuid: 4c89121d71a14c15b6169417ea69d0a3
           name: 'Transactions: Max idle transaction time'
@@ -698,8 +746,8 @@ zabbix_export:
             key: 'pgsql.transactions["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.PASSWORD}","{$PG.DB}"]'
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: transactions
         -
           uuid: 0ee43ddd9da246d19097107b45e4c8e8
           name: 'Transactions: Max prepared transaction time'
@@ -719,8 +767,8 @@ zabbix_export:
             key: 'pgsql.transactions["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.PASSWORD}","{$PG.DB}"]'
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: transactions
         -
           uuid: da341b2011714a1f994ecbe96bd52155
           name: 'Transactions: Max waiting transaction time'
@@ -740,8 +788,8 @@ zabbix_export:
             key: 'pgsql.transactions["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.PASSWORD}","{$PG.DB}"]'
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: transactions
         -
           uuid: ff26a1c256bd40978f49a7a025538aa1
           name: 'PostgreSQL: Get transactions'
@@ -752,8 +800,8 @@ zabbix_export:
           description: 'Collect metrics by transaction execution time'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
         -
           uuid: 6418a2f286e64ecabf2295fca063f8af
           name: 'Status: Uptime'
@@ -762,8 +810,8 @@ zabbix_export:
           units: uptime
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: application
           triggers:
             -
               uuid: 85565aba402740868a16c0e4639a98fc
@@ -771,6 +819,10 @@ zabbix_export:
               name: 'PostgreSQL: Service has been restarted (uptime < 10m)'
               priority: INFO
               description: 'PostgreSQL uptime is less than 10 minutes'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 321525ebcea44396922e96deec2e8ad1
           name: 'Status: Version'
@@ -787,14 +839,18 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: application
           triggers:
             -
               uuid: 8111eb42b0e74fffb43da474677ebc2f
               expression: 'last(/PostgreSQL by Zabbix agent/pgsql.version["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.PASSWORD}","{$PG.DB}"],#1)<>last(/PostgreSQL by Zabbix agent/pgsql.version["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.PASSWORD}","{$PG.DB}"],#2) and length(last(/PostgreSQL by Zabbix agent/pgsql.version["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.PASSWORD}","{$PG.DB}"]))>0'
               name: 'PostgreSQL: Version has changed (new version value received: {ITEM.VALUE})'
               priority: INFO
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 5385ec7d39514039a641d18cba335ddc
           name: 'WAL: Segments count'
@@ -812,8 +868,8 @@ zabbix_export:
             key: 'pgsql.wal.stat["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.PASSWORD}","{$PG.DB}"]'
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: wal
         -
           uuid: 7cd6c524ecab41f9a22489866d503361
           name: 'PostgreSQL: Get WAL'
@@ -825,8 +881,8 @@ zabbix_export:
           description: 'Master item to collect WAL metrics'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
         -
           uuid: 5cc9c67621cc46e0a42b1eb79bda83b3
           name: 'WAL: Bytes written'
@@ -849,8 +905,8 @@ zabbix_export:
             key: 'pgsql.wal.stat["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.PASSWORD}","{$PG.DB}"]'
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: wal
       discovery_rules:
         -
           uuid: 5c4c658507394f5bb362e601f7c59d63
@@ -874,8 +930,11 @@ zabbix_export:
               description: 'Database size'
               tags:
                 -
-                  tag: Application
-                  value: 'PostgreSQL: DB {#DBNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: 615e6567a85e421bb06ab8cac0eaba69
               name: 'DB {#DBNAME}: Blocks hit per second'
@@ -898,8 +957,11 @@ zabbix_export:
                 key: 'pgsql.dbstat["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.PASSWORD}","{$PG.DB}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'PostgreSQL: DB {#DBNAME}'
+                  tag: component
+                  value: cache
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: 9136517d08b447869e5b8f5fd684c3b9
               name: 'DB {#DBNAME}: Disk blocks read per second'
@@ -922,8 +984,11 @@ zabbix_export:
                 key: 'pgsql.dbstat["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.PASSWORD}","{$PG.DB}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'PostgreSQL: DB {#DBNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: a76f6d28995441ff9fe28bbc09445e64
               name: 'DB {#DBNAME}: Detected conflicts per second'
@@ -946,8 +1011,11 @@ zabbix_export:
                 key: 'pgsql.dbstat["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.PASSWORD}","{$PG.DB}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'PostgreSQL: DB {#DBNAME}'
+                  tag: component
+                  value: queries
+                -
+                  tag: database
+                  value: '{#DBNAME}'
               trigger_prototypes:
                 -
                   uuid: 3b51f02258bd4e02829f04ca016dd01d
@@ -957,6 +1025,10 @@ zabbix_export:
                   description: |
                     The primary and standby servers are in many ways loosely connected. Actions on the primary will have an effect on the standby. As a result, there is potential for negative interactions or conflicts between them.
                     https://www.postgresql.org/docs/current/hot-standby.html#HOT-STANDBY-CONFLICT
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: b874cc2dd80643208c2479ad25fae0ac
               name: 'DB {#DBNAME}: Detected deadlocks per second'
@@ -979,14 +1051,21 @@ zabbix_export:
                 key: 'pgsql.dbstat["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.PASSWORD}","{$PG.DB}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'PostgreSQL: DB {#DBNAME}'
+                  tag: component
+                  value: deadlocks
+                -
+                  tag: database
+                  value: '{#DBNAME}'
               trigger_prototypes:
                 -
                   uuid: 3bee63fa04d94586937e22aafab9bdd8
                   expression: 'min(/PostgreSQL by Zabbix agent/pgsql.dbstat.deadlocks.rate["{#DBNAME}"],5m) > {$PG.DEADLOCKS.MAX.WARN:"{#DBNAME}"}'
                   name: 'DB {#DBNAME}: Deadlock occurred (over {$PG.DEADLOCKS.MAX.WARN:"{#DBNAME}"} in 5m)'
                   priority: HIGH
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: d235ead54c8b41f9a91398c75383e5d7
               name: 'DB {#DBNAME}: Temp_bytes written per second'
@@ -1009,8 +1088,11 @@ zabbix_export:
                 key: 'pgsql.dbstat["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.PASSWORD}","{$PG.DB}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'PostgreSQL: DB {#DBNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: af4e35eee1764d3f97d9c1218867f885
               name: 'DB {#DBNAME}: Temp_files created per second'
@@ -1032,8 +1114,11 @@ zabbix_export:
                 key: 'pgsql.dbstat["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.PASSWORD}","{$PG.DB}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'PostgreSQL: DB {#DBNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: 35c6f93aefe4439bbc36f2f358440b16
               name: 'DB {#DBNAME}: Tuples deleted per second'
@@ -1056,8 +1141,11 @@ zabbix_export:
                 key: 'pgsql.dbstat["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.PASSWORD}","{$PG.DB}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'PostgreSQL: DB {#DBNAME}'
+                  tag: component
+                  value: queries
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: 92f33d96f8a348088cdba593c0e66929
               name: 'DB {#DBNAME}: Tuples fetched per second'
@@ -1080,8 +1168,11 @@ zabbix_export:
                 key: 'pgsql.dbstat["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.PASSWORD}","{$PG.DB}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'PostgreSQL: DB {#DBNAME}'
+                  tag: component
+                  value: queries
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: 8c03c87a44fe43928c32087ca7561e88
               name: 'DB {#DBNAME}: Tuples inserted per second'
@@ -1104,8 +1195,11 @@ zabbix_export:
                 key: 'pgsql.dbstat["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.PASSWORD}","{$PG.DB}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'PostgreSQL: DB {#DBNAME}'
+                  tag: component
+                  value: queries
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: f6d378f4e38e455fa5a12467fe977657
               name: 'DB {#DBNAME}: Tuples returned per second'
@@ -1128,8 +1222,11 @@ zabbix_export:
                 key: 'pgsql.dbstat["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.PASSWORD}","{$PG.DB}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'PostgreSQL: DB {#DBNAME}'
+                  tag: component
+                  value: queries
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: 4c8de8c1064d43ffa18c4f37fead37f7
               name: 'DB {#DBNAME}: Tuples updated per second'
@@ -1152,8 +1249,11 @@ zabbix_export:
                 key: 'pgsql.dbstat["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.PASSWORD}","{$PG.DB}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'PostgreSQL: DB {#DBNAME}'
+                  tag: component
+                  value: queries
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: 81c33f5b3c31475fa5f28f4ad149a328
               name: 'DB {#DBNAME}: Commits per second'
@@ -1176,8 +1276,11 @@ zabbix_export:
                 key: 'pgsql.dbstat["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.PASSWORD}","{$PG.DB}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'PostgreSQL: DB {#DBNAME}'
+                  tag: component
+                  value: transactions
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: 8e5080186d034323be21473099b0b0ce
               name: 'DB {#DBNAME}: Rollbacks per second'
@@ -1200,8 +1303,11 @@ zabbix_export:
                 key: 'pgsql.dbstat["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.PASSWORD}","{$PG.DB}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'PostgreSQL: DB {#DBNAME}'
+                  tag: component
+                  value: transactions
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: df9dd9bac2a54f1085b29fb22b394a1f
               name: 'DB {#DBNAME}: Frozen XID before avtovacuum %'
@@ -1223,8 +1329,11 @@ zabbix_export:
                 key: 'pgsql.frozenxid["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.PASSWORD}","{#DBNAME}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'PostgreSQL: DB {#DBNAME}'
+                  tag: component
+                  value: transactions
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: 44ddd66ea37449cb8fab6979b98dfd3c
               name: 'DB {#DBNAME}: Frozen XID before stop %'
@@ -1246,8 +1355,11 @@ zabbix_export:
                 key: 'pgsql.frozenxid["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.PASSWORD}","{#DBNAME}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'PostgreSQL: DB {#DBNAME}'
+                  tag: component
+                  value: transactions
+                -
+                  tag: database
+                  value: '{#DBNAME}'
               trigger_prototypes:
                 -
                   uuid: 709df9c1e29a4ff68a3de9423ff7ae58
@@ -1257,6 +1369,10 @@ zabbix_export:
                   description: |
                     Preventing Transaction ID Wraparound Failures
                     https://www.postgresql.org/docs/current/routine-vacuuming.html#VACUUM-FOR-WRAPAROUND
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: ddf6d0b7b5fe4cbbb540687051b8e5f5
               name: 'DB {#DBNAME}: Get frozen XID'
@@ -1266,8 +1382,11 @@ zabbix_export:
               value_type: TEXT
               tags:
                 -
-                  tag: Application
-                  value: 'Zabbix raw items'
+                  tag: component
+                  value: raw
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: 3d0acf4b45fc4a72bb2a214222f93f2a
               name: 'DB {#DBNAME}: Locks total'
@@ -1285,14 +1404,21 @@ zabbix_export:
                 key: 'pgsql.locks["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.PASSWORD}","{$PG.DB}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'PostgreSQL: DB {#DBNAME}'
+                  tag: component
+                  value: locks
+                -
+                  tag: database
+                  value: '{#DBNAME}'
               trigger_prototypes:
                 -
                   uuid: ef7d3c9866df44aa9b378e7f125a34de
                   expression: 'min(/PostgreSQL by Zabbix agent/pgsql.locks.total["{#DBNAME}"],5m)>{$PG.LOCKS.MAX.WARN:"{#DBNAME}"}'
                   name: 'DB {#DBNAME}: Number of locks is too high (over {$PG.LOCKS.MAX.WARN:"{#DBNAME}"} in 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 939ab05c71ed4be9979662203ebba980
               name: 'DB {#DBNAME}: Queries slow maintenance count'
@@ -1310,8 +1436,11 @@ zabbix_export:
                 key: 'pgsql.queries["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.PASSWORD}","{$PG.DB}","{$PG.QUERY_ETIME.MAX.WARN}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'PostgreSQL: DB {#DBNAME}'
+                  tag: component
+                  value: queries
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: bbc8f9bf86394cf28e0c2db44ee4711d
               name: 'DB {#DBNAME}: Queries max maintenance time'
@@ -1330,8 +1459,11 @@ zabbix_export:
                 key: 'pgsql.queries["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.PASSWORD}","{$PG.DB}","{$PG.QUERY_ETIME.MAX.WARN}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'PostgreSQL: DB {#DBNAME}'
+                  tag: component
+                  value: queries
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: f1427228bfa14ad3b7bb9d63bcfaec59
               name: 'DB {#DBNAME}: Queries sum maintenance time'
@@ -1350,8 +1482,11 @@ zabbix_export:
                 key: 'pgsql.queries["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.PASSWORD}","{$PG.DB}","{$PG.QUERY_ETIME.MAX.WARN}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'PostgreSQL: DB {#DBNAME}'
+                  tag: component
+                  value: queries
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: 5d937f46f4684f1e8253ec62e0f75379
               name: 'DB {#DBNAME}: Queries slow query count'
@@ -1369,14 +1504,21 @@ zabbix_export:
                 key: 'pgsql.queries["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.PASSWORD}","{$PG.DB}","{$PG.QUERY_ETIME.MAX.WARN}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'PostgreSQL: DB {#DBNAME}'
+                  tag: component
+                  value: queries
+                -
+                  tag: database
+                  value: '{#DBNAME}'
               trigger_prototypes:
                 -
                   uuid: facc8f6976664da4ad5567d270f0f311
                   expression: 'min(/PostgreSQL by Zabbix agent/pgsql.queries.query.slow_count["{#DBNAME}"],5m)>{$PG.SLOW_QUERIES.MAX.WARN:"{#DBNAME}"}'
                   name: 'DB {#DBNAME}: Too many slow queries (over {$PG.SLOW_QUERIES.MAX.WARN:"{#DBNAME}"} in 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 044cc16d0a2f46b28d88eff86c33b30b
               name: 'DB {#DBNAME}: Queries max query time'
@@ -1395,8 +1537,11 @@ zabbix_export:
                 key: 'pgsql.queries["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.PASSWORD}","{$PG.DB}","{$PG.QUERY_ETIME.MAX.WARN}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'PostgreSQL: DB {#DBNAME}'
+                  tag: component
+                  value: queries
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: c6232400b39c4564a30a403859ffb4ee
               name: 'DB {#DBNAME}: Queries sum query time'
@@ -1415,8 +1560,11 @@ zabbix_export:
                 key: 'pgsql.queries["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.PASSWORD}","{$PG.DB}","{$PG.QUERY_ETIME.MAX.WARN}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'PostgreSQL: DB {#DBNAME}'
+                  tag: component
+                  value: queries
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: f7099043ea6345f0a5531f70f9573a3e
               name: 'DB {#DBNAME}: Queries slow transaction count'
@@ -1434,8 +1582,11 @@ zabbix_export:
                 key: 'pgsql.queries["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.PASSWORD}","{$PG.DB}","{$PG.QUERY_ETIME.MAX.WARN}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'PostgreSQL: DB {#DBNAME}'
+                  tag: component
+                  value: queries
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: c6800ca30a564766ba745e875cb4e929
               name: 'DB {#DBNAME}: Queries max transaction time'
@@ -1454,8 +1605,11 @@ zabbix_export:
                 key: 'pgsql.queries["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.PASSWORD}","{$PG.DB}","{$PG.QUERY_ETIME.MAX.WARN}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'PostgreSQL: DB {#DBNAME}'
+                  tag: component
+                  value: queries
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: 0eda974576794768ac9ddc592ff27e19
               name: 'DB {#DBNAME}: Queries sum transaction time'
@@ -1474,8 +1628,11 @@ zabbix_export:
                 key: 'pgsql.queries["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.PASSWORD}","{$PG.DB}","{$PG.QUERY_ETIME.MAX.WARN}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'PostgreSQL: DB {#DBNAME}'
+                  tag: component
+                  value: queries
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: cafcc00cce824c33a321da0e9ecc7f6e
               name: 'DB {#DBNAME}: Index scans per second'
@@ -1497,8 +1654,11 @@ zabbix_export:
                 key: 'pgsql.scans["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.PASSWORD}","{#DBNAME}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'PostgreSQL: DB {#DBNAME}'
+                  tag: component
+                  value: scans
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: f07396ca9d224e1b819f22efe6c4259d
               name: 'DB {#DBNAME}: Sequential scans per second'
@@ -1521,8 +1681,11 @@ zabbix_export:
                 key: 'pgsql.scans["{$PG.HOST}","{$PG.PORT}","{$PG.USER}","{$PG.PASSWORD}","{#DBNAME}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'PostgreSQL: DB {#DBNAME}'
+                  tag: component
+                  value: scans
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: 4bf92e4b0fed4d32b808b299d9e1fb0c
               name: 'DB {#DBNAME}: Get scans'
@@ -1533,8 +1696,11 @@ zabbix_export:
               description: 'Number of scans done for table/index in the database'
               tags:
                 -
-                  tag: Application
-                  value: 'Zabbix raw items'
+                  tag: component
+                  value: raw
+                -
+                  tag: database
+                  value: '{#DBNAME}'
           graph_prototypes:
             -
               uuid: 3f8124b817f2437096c620d62ec2e055
@@ -1720,6 +1886,13 @@ zabbix_export:
                   item:
                     host: 'PostgreSQL by Zabbix agent'
                     key: 'pgsql.dbstat.tup_updated.rate["{#DBNAME}"]'
+      tags:
+        -
+          tag: class
+          value: database
+        -
+          tag: target
+          value: postgresql
       macros:
         -
           macro: '{$PG.CACHE_HITRATIO.MIN.WARN}'
diff --git a/templates/db/postgresql_agent2/template_db_postgresql_agent2.yaml b/templates/db/postgresql_agent2/template_db_postgresql_agent2.yaml
index 2d1b22baede..0226b0a7226 100644
--- a/templates/db/postgresql_agent2/template_db_postgresql_agent2.yaml
+++ b/templates/db/postgresql_agent2/template_db_postgresql_agent2.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-16T07:31:47Z'
+  date: '2022-01-26T10:38:38Z'
   groups:
     -
       uuid: 748ad4d098d447d492bb935c907f652f
@@ -13,7 +13,7 @@ zabbix_export:
       description: |
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/384190-%C2%A0discussion-thread-for-official-zabbix-template-db-postgresql
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Databases
@@ -38,8 +38,8 @@ zabbix_export:
             key: 'pgsql.archive["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: archive
         -
           uuid: 729208d50ef64e50b0bb342899e211c2
           name: 'Archive: Count of files in archive_status need to archive'
@@ -57,8 +57,8 @@ zabbix_export:
             key: 'pgsql.archive["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: archive
         -
           uuid: b60523c62afc4813aeb64cf9598fb7bd
           name: 'Archive: Count of attempts to archive files'
@@ -79,8 +79,8 @@ zabbix_export:
             key: 'pgsql.archive["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: archive
         -
           uuid: 285f434f79864d24a4e66d5a49c539e9
           name: 'Archive: Count of files need to archive'
@@ -99,8 +99,8 @@ zabbix_export:
             key: 'pgsql.archive["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: archive
         -
           uuid: e9f4284fd3a1459e9c519dbdd8ee3425
           name: 'PostgreSQL: Get archive'
@@ -111,8 +111,8 @@ zabbix_export:
           description: 'Collect archive status metrics'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
         -
           uuid: d9169b4b31554063b9d01d0d27b4beee
           name: 'Autovacuum: Count of autovacuum workers'
@@ -122,8 +122,8 @@ zabbix_export:
           description: 'Number of autovacuum workers.'
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: system
         -
           uuid: c49f777ae0db48879bc946989bfc36f6
           name: 'Bgwriter: Buffers allocated'
@@ -146,8 +146,8 @@ zabbix_export:
             key: 'pgsql.bgwriter["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: bgwriter
         -
           uuid: 1624e89567824e0493492a3dcc979788
           name: 'Bgwriter: Buffers written directly by a backend'
@@ -170,8 +170,8 @@ zabbix_export:
             key: 'pgsql.bgwriter["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: bgwriter
         -
           uuid: 6e5990d8a0854efd83b3e6a57aa2c2f9
           name: 'Bgwriter: Times a backend execute its own fsync'
@@ -194,8 +194,8 @@ zabbix_export:
             key: 'pgsql.bgwriter["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: bgwriter
         -
           uuid: 3bf0496d313f4dfea67c95010be54372
           name: 'Checkpoint: Buffers checkpoints written'
@@ -218,8 +218,8 @@ zabbix_export:
             key: 'pgsql.bgwriter["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: bgwriter
         -
           uuid: 65f4aeedbc7d40ed9a14e0dbd8024c4b
           name: 'Checkpoint: Buffers background written'
@@ -242,8 +242,8 @@ zabbix_export:
             key: 'pgsql.bgwriter["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: bgwriter
         -
           uuid: 23fcb5ee8c19436b827001114961eb16
           name: 'Checkpoint: Requested'
@@ -266,8 +266,8 @@ zabbix_export:
             key: 'pgsql.bgwriter["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: bgwriter
         -
           uuid: 9c578a8e072940728cc00d94f52cec8d
           name: 'Checkpoint: By timeout'
@@ -290,8 +290,8 @@ zabbix_export:
             key: 'pgsql.bgwriter["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: bgwriter
         -
           uuid: b94507037a584b9391f610e59dd34e6c
           name: 'Checkpoint: Checkpoint sync time'
@@ -319,8 +319,8 @@ zabbix_export:
             key: 'pgsql.bgwriter["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: bgwriter
         -
           uuid: 26839587c46043caa2991e973962b954
           name: 'Checkpoint: Checkpoint write time'
@@ -348,8 +348,8 @@ zabbix_export:
             key: 'pgsql.bgwriter["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: bgwriter
         -
           uuid: b83939ecfb094a7e9eb42cd9a7e2695c
           name: 'Bgwriter: Number of bgwriter stopped'
@@ -372,8 +372,8 @@ zabbix_export:
             key: 'pgsql.bgwriter["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: bgwriter
         -
           uuid: 6020e17c25104cbfba182e9cddfe6336
           name: 'PostgreSQL: Get bgwriter'
@@ -384,8 +384,8 @@ zabbix_export:
           description: 'https://www.postgresql.org/docs/12/monitoring-stats.html#PG-STAT-BGWRITER-VIEW'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
         -
           uuid: b98d2328694f44598f2177b3f93d4b90
           name: 'PostgreSQL: Cache hit'
@@ -397,8 +397,8 @@ zabbix_export:
           params: 'last(//pgsql.dbstat.sum.blks_hit.rate) * 100 / (last(//pgsql.dbstat.sum.blks_hit.rate) + last(//pgsql.dbstat.sum.blks_read.rate))'
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: cache
         -
           uuid: 2ea55460f0d34063ae4ab65b74ec852c
           name: 'Connections sum: Active'
@@ -416,8 +416,8 @@ zabbix_export:
             key: 'pgsql.connections["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: connections
         -
           uuid: 69f14028e98b48d489fbd7345c2213dd
           name: 'Connections sum: Disabled'
@@ -435,8 +435,8 @@ zabbix_export:
             key: 'pgsql.connections["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: connections
         -
           uuid: 62a2401041724b4888bf058035dc6a0c
           name: 'Connections sum: Fastpath function call'
@@ -454,8 +454,8 @@ zabbix_export:
             key: 'pgsql.connections["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: connections
         -
           uuid: fc3b357cc8a24c4aad60784d1bfb7e18
           name: 'Connections sum: Idle'
@@ -473,8 +473,8 @@ zabbix_export:
             key: 'pgsql.connections["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: connections
         -
           uuid: b900a8123dfa48e0ac8fd4b92ae8678d
           name: 'Connections sum: Idle in transaction'
@@ -492,8 +492,8 @@ zabbix_export:
             key: 'pgsql.connections["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: connections
         -
           uuid: 99b0a3e14af44924b0319a0a9f6c16c7
           name: 'Connections sum: Idle in transaction (aborted)'
@@ -511,8 +511,8 @@ zabbix_export:
             key: 'pgsql.connections["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: connections
         -
           uuid: 194c41f88e9e44879a70033913dd41d3
           name: 'Connections sum: Prepared'
@@ -532,8 +532,8 @@ zabbix_export:
             key: 'pgsql.connections["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: connections
         -
           uuid: 1ec042e5853b430d9d7982c53c3fcf14
           name: 'Connections sum: Total'
@@ -551,8 +551,8 @@ zabbix_export:
             key: 'pgsql.connections["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: connections
         -
           uuid: 101149dd68994084a1cdab82c9d064f0
           name: 'Connections sum: Total %'
@@ -571,14 +571,18 @@ zabbix_export:
             key: 'pgsql.connections["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: connections
           triggers:
             -
               uuid: 1d0903401af64d93ac16761808d672ca
               expression: 'min(/PostgreSQL by Zabbix agent 2/pgsql.connections.total_pct,5m) > {$PG.CONN_TOTAL_PCT.MAX.WARN}'
               name: 'Connections sum: Total number of connections is too high (over {$PG.CONN_TOTAL_PCT.MAX.WARN} in 5m)'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: f2c298008b914434b96da85a985e4a54
           name: 'Connections sum: Waiting'
@@ -598,8 +602,8 @@ zabbix_export:
             key: 'pgsql.connections["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: connections
         -
           uuid: e926ecd967f342bf90e9923825147d64
           name: 'PostgreSQL: Get connections'
@@ -612,8 +616,8 @@ zabbix_export:
             https://www.postgresql.org/docs/current/monitoring-stats.html#PG-STAT-ACTIVITY-VIEW
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
         -
           uuid: 1cab825fac8a49ba96dfbf7a696be729
           name: 'PostgreSQL: Custom queries'
@@ -625,8 +629,8 @@ zabbix_export:
           description: 'Execute custom queries from file *.sql (check for option Plugins.Postgres.CustomQueriesPath at agent configuration)'
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: application
         -
           uuid: 5c6de0fe332043bfb35c999b10893e4c
           name: 'Dbstat: Hit blocks read'
@@ -649,8 +653,8 @@ zabbix_export:
             key: 'pgsql.dbstat.sum["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: cache
         -
           uuid: 4dc3f2c23dfd4dfebe024a5c2d4409ae
           name: 'Dbstat: Disk blocks read'
@@ -673,8 +677,8 @@ zabbix_export:
             key: 'pgsql.dbstat.sum["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: storage
         -
           uuid: 619211cc2afa4a159f36abf1a17d5476
           name: 'Dbstat: Blocks read time'
@@ -698,8 +702,8 @@ zabbix_export:
             key: 'pgsql.dbstat.sum["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: storage
         -
           uuid: fba3b51d644c4c16ac71b3eda1be1701
           name: 'Dbstat: Blocks write time'
@@ -723,8 +727,8 @@ zabbix_export:
             key: 'pgsql.dbstat.sum["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: storage
         -
           uuid: 1b98b9c95b32424baa68c354496ed2de
           name: 'Dbstat: Checksum failures'
@@ -753,8 +757,8 @@ zabbix_export:
             key: 'pgsql.dbstat.sum["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: system
         -
           uuid: 0106dfc55ace4dacaff00ce2c98de2ea
           name: 'Dbstat: Conflicts'
@@ -777,8 +781,8 @@ zabbix_export:
             key: 'pgsql.dbstat.sum["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: queries
         -
           uuid: e5d3838e5cf84be9ae83cacf22dc99af
           name: 'Dbstat: Deadlocks'
@@ -801,8 +805,8 @@ zabbix_export:
             key: 'pgsql.dbstat.sum["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: deadlocks
         -
           uuid: c61f60e6f7d24ffe99db480f6bbd9613
           name: 'Dbstat: Backends connected'
@@ -820,8 +824,8 @@ zabbix_export:
             key: 'pgsql.dbstat.sum["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: 'PostgreSQL: DB {#DBNAME}'
+              tag: component
+              value: backends
         -
           uuid: 96cb6b388b2c480ead1568293dd81e70
           name: 'Dbstat: Number temp bytes'
@@ -845,8 +849,8 @@ zabbix_export:
             key: 'pgsql.dbstat.sum["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: storage
         -
           uuid: bea47c8a95074ad3997aff64fcfcf49b
           name: 'Dbstat: Number temp bytes'
@@ -869,8 +873,8 @@ zabbix_export:
             key: 'pgsql.dbstat.sum["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: storage
         -
           uuid: 731f4adac9d34eaaaa1f8d5080fdf6ce
           name: 'Dbstat: Rows deleted'
@@ -893,8 +897,8 @@ zabbix_export:
             key: 'pgsql.dbstat.sum["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: queries
         -
           uuid: 4eb6cc273484453bab1233de085363f5
           name: 'Dbstat: Rows fetched'
@@ -917,8 +921,8 @@ zabbix_export:
             key: 'pgsql.dbstat.sum["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: queries
         -
           uuid: ae250ffa30c94df187c2010011e794aa
           name: 'Dbstat: Rows inserted'
@@ -941,8 +945,8 @@ zabbix_export:
             key: 'pgsql.dbstat.sum["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: queries
         -
           uuid: 3253ed1c96db4a84974e62b85d80bc0f
           name: 'Dbstat: Rows returned'
@@ -965,8 +969,8 @@ zabbix_export:
             key: 'pgsql.dbstat.sum["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: queries
         -
           uuid: 13feadafa00a4bd293fcf1a98ddf1f39
           name: 'Dbstat: Rows updated'
@@ -989,8 +993,8 @@ zabbix_export:
             key: 'pgsql.dbstat.sum["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: queries
         -
           uuid: bc8a3b29a6684b7f8a70a54b962f0e7e
           name: 'Dbstat: Committed transactions'
@@ -1013,8 +1017,8 @@ zabbix_export:
             key: 'pgsql.dbstat.sum["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: transactions
         -
           uuid: 8aedfe3e385b447eb75b85f92301665a
           name: 'Dbstat: Roll backed transactions'
@@ -1037,8 +1041,8 @@ zabbix_export:
             key: 'pgsql.dbstat.sum["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: transactions
         -
           uuid: ddddde3084d54f55838b970f44290523
           name: 'PostgreSQL: Get dbstat sum'
@@ -1051,8 +1055,8 @@ zabbix_export:
             https://www.postgresql.org/docs/current/monitoring-stats.html#PG-STAT-DATABASE-VIEW
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
         -
           uuid: 3be06ec14cba44d0892f3271a599c473
           name: 'PostgreSQL: Get dbstat'
@@ -1065,8 +1069,8 @@ zabbix_export:
             https://www.postgresql.org/docs/current/monitoring-stats.html#PG-STAT-DATABASE-VIEW
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
         -
           uuid: 7112eeb300c14d959c79715462bf9563
           name: 'PostgreSQL: Get locks'
@@ -1079,8 +1083,8 @@ zabbix_export:
             https://www.postgresql.org/docs/current/explicit-locking.html#LOCKING-TABLES
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
         -
           uuid: 0377fe6f2f8d4539b649c636ab012415
           name: 'PostgreSQL: Age of oldest xid'
@@ -1090,14 +1094,18 @@ zabbix_export:
           description: 'Age of oldest xid.'
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: transactions
           triggers:
             -
               uuid: 2a5c11571d9d46f093ed9081f9d51504
               expression: 'last(/PostgreSQL by Zabbix agent 2/pgsql.oldest.xid["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]) > 18000000'
               name: 'PostgreSQL: Oldest xid is too big'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 56323e572fa443228987c62039153825
           name: 'PostgreSQL: Ping'
@@ -1110,14 +1118,21 @@ zabbix_export:
                 - 1h
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: application
+            -
+              tag: component
+              value: health
           triggers:
             -
               uuid: 48a24a78519d47349200f0b41ceec56a
               expression: 'last(/PostgreSQL by Zabbix agent 2/pgsql.ping["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"])=0'
               name: 'PostgreSQL: Service is down'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: a171db459d6144e4ad294579fb8dc56d
           name: 'Replication: Standby count'
@@ -1126,8 +1141,8 @@ zabbix_export:
           description: 'Number of standby servers'
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: replication
         -
           uuid: da9ce769f9444a3f9600ce64c4ab2857
           name: 'Replication: Lag in bytes'
@@ -1137,8 +1152,8 @@ zabbix_export:
           description: 'Replication lag with Master in byte.'
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: replication
         -
           uuid: 5a9eb8ee4a484911903688e620eb618b
           name: 'Replication: Lag in seconds'
@@ -1148,8 +1163,8 @@ zabbix_export:
           description: 'Replication lag with Master in seconds.'
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: replication
         -
           uuid: 4120befb754d47e9a931f868c28badb9
           name: 'PostgreSQL: Get replication'
@@ -1160,8 +1175,8 @@ zabbix_export:
           description: 'Collect metrics from the pg_stat_replication, which contains information about the WAL sender process, showing statistics about replication to that sender''s connected standby server.'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
         -
           uuid: 4085b836bf614f3d910818074c386845
           name: 'Replication: Recovery role'
@@ -1172,8 +1187,8 @@ zabbix_export:
             name: 'PostgreSQL recovery role'
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: replication
         -
           uuid: 3c83904cbad74ff7a0d10136a233e6c6
           name: 'Replication: Status'
@@ -1184,8 +1199,8 @@ zabbix_export:
             name: 'PostgreSQL replication status'
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: replication
         -
           uuid: efa946a67e5844ecb905c68a2a6b85bb
           name: 'PostgreSQL: Uptime'
@@ -1195,14 +1210,18 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: application
           triggers:
             -
               uuid: 5fbabc5f60b74a369a13a260d25cce3c
               expression: 'last(/PostgreSQL by Zabbix agent 2/pgsql.uptime["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]) < 600'
               name: 'PostgreSQL: Service has been restarted (uptime={ITEM.LASTVALUE})'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 6d5aa6213cf248749cbffdea9aff694f
           name: 'WAL: Segments count'
@@ -1220,8 +1239,8 @@ zabbix_export:
             key: 'pgsql.wal.stat["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: wal
         -
           uuid: 0e58a74b8a2d47d28f596196405b22b5
           name: 'WAL: Bytes received'
@@ -1244,8 +1263,8 @@ zabbix_export:
             key: 'pgsql.wal.stat["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: wal
         -
           uuid: c3d96741af454f6b9a3a49b6117c31be
           name: 'PostgreSQL: Get WAL'
@@ -1257,8 +1276,8 @@ zabbix_export:
           description: 'Collect WAL metrics'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
         -
           uuid: 95f67516be544daf9ad8a1cad2e46114
           name: 'WAL: Bytes written'
@@ -1281,8 +1300,8 @@ zabbix_export:
             key: 'pgsql.wal.stat["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]'
           tags:
             -
-              tag: Application
-              value: PostgreSQL
+              tag: component
+              value: wal
       discovery_rules:
         -
           uuid: b1a4bfe1031a40529a7c38ac6bed3c6d
@@ -1306,8 +1325,11 @@ zabbix_export:
               description: 'Database age'
               tags:
                 -
-                  tag: Application
-                  value: 'PostgreSQL: DB {#DBNAME}'
+                  tag: component
+                  value: application
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: 4367ba7fdffd459ea2b18e1877bc74ca
               name: 'DB {#DBNAME}: Get bloating tables'
@@ -1316,8 +1338,11 @@ zabbix_export:
               description: 'Number of bloating tables'
               tags:
                 -
-                  tag: Application
-                  value: 'PostgreSQL: DB {#DBNAME}'
+                  tag: component
+                  value: tables
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: b614a0909eec40bc841bf7446e842544
               name: 'DB {#DBNAME}: Database size'
@@ -1328,8 +1353,11 @@ zabbix_export:
               description: 'Database size'
               tags:
                 -
-                  tag: Application
-                  value: 'PostgreSQL: DB {#DBNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: 4b1b1a4374c0429cb1790e774f181512
               name: 'DB {#DBNAME}: Blocks hit per second'
@@ -1352,8 +1380,11 @@ zabbix_export:
                 key: 'pgsql.dbstat["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'PostgreSQL: DB {#DBNAME}'
+                  tag: component
+                  value: cache
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: 841496e662cc43cf8db7728e96fcba76
               name: 'DB {#DBNAME}: Disk blocks read per second'
@@ -1376,8 +1407,11 @@ zabbix_export:
                 key: 'pgsql.dbstat["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'PostgreSQL: DB {#DBNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: 0313d02ce8274bc9bcaee54d062300c8
               name: 'DB {#DBNAME}: Disk blocks read per second'
@@ -1405,8 +1439,11 @@ zabbix_export:
                 key: 'pgsql.dbstat["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'PostgreSQL: DB {#DBNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: e746a7760d554a0e9d41ba01c3be9db5
               name: 'DB {#DBNAME}: Disk blocks read per second'
@@ -1434,8 +1471,11 @@ zabbix_export:
                 key: 'pgsql.dbstat["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'PostgreSQL: DB {#DBNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: d44335162082498bbc42e29e938a4de7
               name: 'DB {#DBNAME}: Checksum failures'
@@ -1464,8 +1504,11 @@ zabbix_export:
                 key: 'pgsql.dbstat["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'PostgreSQL: DB {#DBNAME}'
+                  tag: component
+                  value: system
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: 4eb67f16bc2948a7927ed58c9d037466
               name: 'DB {#DBNAME}: Detected conflicts per second'
@@ -1488,8 +1531,11 @@ zabbix_export:
                 key: 'pgsql.dbstat["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'PostgreSQL: DB {#DBNAME}'
+                  tag: component
+                  value: queries
+                -
+                  tag: database
+                  value: '{#DBNAME}'
               trigger_prototypes:
                 -
                   uuid: 05ac4216e1a941df8880224ffd38b806
@@ -1499,6 +1545,10 @@ zabbix_export:
                   description: |
                     The primary and standby servers are in many ways loosely connected. Actions on the primary will have an effect on the standby. As a result, there is potential for negative interactions or conflicts between them.
                     https://www.postgresql.org/docs/current/hot-standby.html#HOT-STANDBY-CONFLICT
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: d53da0cc702f4fe381e4d13d454ec229
               name: 'DB {#DBNAME}: Detected deadlocks per second'
@@ -1521,14 +1571,21 @@ zabbix_export:
                 key: 'pgsql.dbstat["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'PostgreSQL: DB {#DBNAME}'
+                  tag: component
+                  value: deadlocks
+                -
+                  tag: database
+                  value: '{#DBNAME}'
               trigger_prototypes:
                 -
                   uuid: dd948e3ec19c419e8c9a62ace8d1695f
                   expression: 'min(/PostgreSQL by Zabbix agent 2/pgsql.dbstat.deadlocks.rate["{#DBNAME}"],5m) > {$PG.DEADLOCKS.MAX.WARN:"{#DBNAME}"}'
                   name: 'DB {#DBNAME}: Deadlock occurred (over {$PG.DEADLOCKS.MAX.WARN:"{#DBNAME}"} in 5m)'
                   priority: HIGH
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 2e31986867d24bca930d141cc5d9cc0f
               name: 'DB {#DBNAME}: Backends connected'
@@ -1546,8 +1603,11 @@ zabbix_export:
                 key: 'pgsql.dbstat["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'PostgreSQL: DB {#DBNAME}'
+                  tag: component
+                  value: backends
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: 82a2f4b2dc4f4dfe9a0a42144f603a8a
               name: 'DB {#DBNAME}: Temp_bytes written per second'
@@ -1570,8 +1630,11 @@ zabbix_export:
                 key: 'pgsql.dbstat["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'PostgreSQL: DB {#DBNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: 480ffc23ca8d41e3ac86bb162007065f
               name: 'DB {#DBNAME}: Temp_files created per second'
@@ -1593,8 +1656,11 @@ zabbix_export:
                 key: 'pgsql.dbstat["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'PostgreSQL: DB {#DBNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: cf288751fb894e5291b2d539b4c1a6a1
               name: 'DB {#DBNAME}: Tuples deleted per second'
@@ -1617,8 +1683,11 @@ zabbix_export:
                 key: 'pgsql.dbstat["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'PostgreSQL: DB {#DBNAME}'
+                  tag: component
+                  value: queries
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: a512a7a075244ccb90ab6824125a405e
               name: 'DB {#DBNAME}: Tuples fetched per second'
@@ -1641,8 +1710,11 @@ zabbix_export:
                 key: 'pgsql.dbstat["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'PostgreSQL: DB {#DBNAME}'
+                  tag: component
+                  value: queries
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: 2f24c195df5842f1bdf65a11dea3a315
               name: 'DB {#DBNAME}: Tuples inserted per second'
@@ -1665,8 +1737,11 @@ zabbix_export:
                 key: 'pgsql.dbstat["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'PostgreSQL: DB {#DBNAME}'
+                  tag: component
+                  value: queries
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: 175c5051ef0c4a31b76270cacbdd7ed5
               name: 'DB {#DBNAME}: Tuples returned per second'
@@ -1689,8 +1764,11 @@ zabbix_export:
                 key: 'pgsql.dbstat["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'PostgreSQL: DB {#DBNAME}'
+                  tag: component
+                  value: queries
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: 9888b495d3f04cceb373c341bd4f1941
               name: 'DB {#DBNAME}: Tuples updated per second'
@@ -1713,8 +1791,11 @@ zabbix_export:
                 key: 'pgsql.dbstat["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'PostgreSQL: DB {#DBNAME}'
+                  tag: component
+                  value: queries
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: 5b0ecb9c928c49a6a01b5df6aec931dd
               name: 'DB {#DBNAME}: Commits per second'
@@ -1737,8 +1818,11 @@ zabbix_export:
                 key: 'pgsql.dbstat["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'PostgreSQL: DB {#DBNAME}'
+                  tag: component
+                  value: transactions
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: 1d280198e31649fcb053d4c87a0e869d
               name: 'DB {#DBNAME}: Rollbacks per second'
@@ -1761,8 +1845,11 @@ zabbix_export:
                 key: 'pgsql.dbstat["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'PostgreSQL: DB {#DBNAME}'
+                  tag: component
+                  value: transactions
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: 8eb2bd907a0e4385bcac9e0f467f9748
               name: 'DB {#DBNAME}: Num of accessexclusive locks'
@@ -1780,8 +1867,11 @@ zabbix_export:
                 key: 'pgsql.locks["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'PostgreSQL: DB {#DBNAME}'
+                  tag: component
+                  value: locks
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: 5f783de0d6124fc0ae14522a4ad89189
               name: 'DB {#DBNAME}: Num of accessshare locks'
@@ -1799,8 +1889,11 @@ zabbix_export:
                 key: 'pgsql.locks["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'PostgreSQL: DB {#DBNAME}'
+                  tag: component
+                  value: locks
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: 3c754430815f411e9aa8dde593f6333a
               name: 'DB {#DBNAME}: Num of exclusive locks'
@@ -1818,8 +1911,11 @@ zabbix_export:
                 key: 'pgsql.locks["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'PostgreSQL: DB {#DBNAME}'
+                  tag: component
+                  value: locks
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: b1ccea7698264d768da1299ec9d13738
               name: 'DB {#DBNAME}: Num of rowexclusive locks'
@@ -1837,8 +1933,11 @@ zabbix_export:
                 key: 'pgsql.locks["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'PostgreSQL: DB {#DBNAME}'
+                  tag: component
+                  value: locks
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: b4b1402b99284f3bbf0ac0dff493449f
               name: 'DB {#DBNAME}: Num of rowshare locks'
@@ -1856,8 +1955,11 @@ zabbix_export:
                 key: 'pgsql.locks["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'PostgreSQL: DB {#DBNAME}'
+                  tag: component
+                  value: locks
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: 15eb93e90c1241a99aaff834d69cc5be
               name: 'DB {#DBNAME}: Num of sharerowexclusive locks'
@@ -1875,8 +1977,11 @@ zabbix_export:
                 key: 'pgsql.locks["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'PostgreSQL: DB {#DBNAME}'
+                  tag: component
+                  value: locks
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: 04e6cec0423f4dddb09e6643561bdf77
               name: 'DB {#DBNAME}: Num of shareupdateexclusive locks'
@@ -1894,8 +1999,11 @@ zabbix_export:
                 key: 'pgsql.locks["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'PostgreSQL: DB {#DBNAME}'
+                  tag: component
+                  value: locks
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: 8a410cf1f0be41fbb5a976f368f07430
               name: 'DB {#DBNAME}: Num of share locks'
@@ -1913,8 +2021,11 @@ zabbix_export:
                 key: 'pgsql.locks["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'PostgreSQL: DB {#DBNAME}'
+                  tag: component
+                  value: locks
+                -
+                  tag: database
+                  value: '{#DBNAME}'
             -
               uuid: a982064d710644db85ebc1cde67bfe4d
               name: 'DB {#DBNAME}: Num of total locks'
@@ -1932,8 +2043,11 @@ zabbix_export:
                 key: 'pgsql.locks["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'PostgreSQL: DB {#DBNAME}'
+                  tag: component
+                  value: locks
+                -
+                  tag: database
+                  value: '{#DBNAME}'
           graph_prototypes:
             -
               uuid: af6eac83efc94d2a9f4a3501207fb5ce
@@ -2131,8 +2245,11 @@ zabbix_export:
                 key: 'pgsql.replication.process["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'PostgreSQL: Application {#APPLICATION_NAME}'
+                  tag: application
+                  value: '{#APPLICATION_NAME}'
+                -
+                  tag: component
+                  value: replication
             -
               uuid: 0daf6e3c7843488cb3160a2bd6b09fbf
               name: 'Application {#APPLICATION_NAME}: Replication replay lag'
@@ -2151,8 +2268,11 @@ zabbix_export:
                 key: 'pgsql.replication.process["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'PostgreSQL: Application {#APPLICATION_NAME}'
+                  tag: application
+                  value: '{#APPLICATION_NAME}'
+                -
+                  tag: component
+                  value: replication
             -
               uuid: 2d96bc517d3a4c3fbcae8a7f1436bf72
               name: 'Application {#APPLICATION_NAME}: Replication write lag'
@@ -2171,8 +2291,11 @@ zabbix_export:
                 key: 'pgsql.replication.process["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'PostgreSQL: Application {#APPLICATION_NAME}'
+                  tag: application
+                  value: '{#APPLICATION_NAME}'
+                -
+                  tag: component
+                  value: replication
           graph_prototypes:
             -
               uuid: e79dfe2d436d49da898772a9e7345825
@@ -2195,6 +2318,13 @@ zabbix_export:
                   item:
                     host: 'PostgreSQL by Zabbix agent 2'
                     key: 'pgsql.replication.process.write_lag["{#APPLICATION_NAME}"]'
+      tags:
+        -
+          tag: class
+          value: database
+        -
+          tag: target
+          value: postgresql
       macros:
         -
           macro: '{$PG.CONFLICTS.MAX.WARN}'
diff --git a/templates/db/redis/template_db_redis.yaml b/templates/db/redis/template_db_redis.yaml
index e5d76ab3eb4..2e1286590fb 100644
--- a/templates/db/redis/template_db_redis.yaml
+++ b/templates/db/redis/template_db_redis.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-16T07:35:55Z'
+  date: '2022-01-26T10:37:20Z'
   groups:
     -
       uuid: 748ad4d098d447d492bb935c907f652f
@@ -15,7 +15,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/389050-discussion-thread-for-official-zabbix-template-redis
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Databases
@@ -37,8 +37,8 @@ zabbix_export:
             key: 'redis.info["{$REDIS.CONN.URI}"]'
           tags:
             -
-              tag: Application
-              value: Redis
+              tag: component
+              value: connections
         -
           uuid: 6140e8ff18fe41c6b65165b0f5346c7b
           name: 'Redis: Connected clients'
@@ -56,8 +56,8 @@ zabbix_export:
             key: 'redis.info["{$REDIS.CONN.URI}"]'
           tags:
             -
-              tag: Application
-              value: Redis
+              tag: component
+              value: connections
         -
           uuid: 3f5d6532f403436c823e1461e49e54c2
           name: 'Redis: Max input buffer'
@@ -77,8 +77,8 @@ zabbix_export:
             key: 'redis.info["{$REDIS.CONN.URI}"]'
           tags:
             -
-              tag: Application
-              value: Redis
+              tag: component
+              value: connections
         -
           uuid: 44788aa774e64fe685fe6496a9bea97d
           name: 'Redis: Max output buffer'
@@ -98,8 +98,8 @@ zabbix_export:
             key: 'redis.info["{$REDIS.CONN.URI}"]'
           tags:
             -
-              tag: Application
-              value: Redis
+              tag: component
+              value: connections
         -
           uuid: 74f9fe26bdaf4a7bb86214bd7d500363
           name: 'Redis: Cluster enabled'
@@ -119,8 +119,8 @@ zabbix_export:
             key: 'redis.info["{$REDIS.CONN.URI}"]'
           tags:
             -
-              tag: Application
-              value: Redis
+              tag: component
+              value: system
         -
           uuid: 066486e3be25406185e624611eeb167a
           name: 'Redis: Max clients'
@@ -144,8 +144,8 @@ zabbix_export:
             key: 'redis.config["{$REDIS.CONN.URI}"]'
           tags:
             -
-              tag: Application
-              value: Redis
+              tag: component
+              value: connections
         -
           uuid: bf68f3ecc3544ef0af00889139caf313
           name: 'Redis: Get config'
@@ -160,8 +160,8 @@ zabbix_export:
                 - 1h
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
           triggers:
             -
               uuid: 819b379b51c34616820f86d21c703b27
@@ -170,6 +170,10 @@ zabbix_export:
               priority: INFO
               description: 'Redis configuration has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 99d427f1f76a468c9878225abb8cebbd
           name: 'Redis: CPU sys'
@@ -189,8 +193,8 @@ zabbix_export:
             key: 'redis.info["{$REDIS.CONN.URI}"]'
           tags:
             -
-              tag: Application
-              value: Redis
+              tag: component
+              value: cpu
         -
           uuid: 1bfce9a62c924510a9cac3b04320d838
           name: 'Redis: CPU sys children'
@@ -210,8 +214,8 @@ zabbix_export:
             key: 'redis.info["{$REDIS.CONN.URI}"]'
           tags:
             -
-              tag: Application
-              value: Redis
+              tag: component
+              value: cpu
         -
           uuid: 83e7c9f5b8a24c949d72125671d6d39a
           name: 'Redis: CPU user'
@@ -231,8 +235,8 @@ zabbix_export:
             key: 'redis.info["{$REDIS.CONN.URI}"]'
           tags:
             -
-              tag: Application
-              value: Redis
+              tag: component
+              value: cpu
         -
           uuid: 8bc18ca0c79d4a81811b600cf3fe8ddd
           name: 'Redis: CPU user children'
@@ -252,8 +256,8 @@ zabbix_export:
             key: 'redis.info["{$REDIS.CONN.URI}"]'
           tags:
             -
-              tag: Application
-              value: Redis
+              tag: component
+              value: cpu
         -
           uuid: 720f146ffe7e481482e11db4b99634c8
           name: 'Redis: Get info'
@@ -263,8 +267,8 @@ zabbix_export:
           value_type: TEXT
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
           triggers:
             -
               uuid: 0a5176877ba24df8b5d38c8cc544f0a8
@@ -277,6 +281,10 @@ zabbix_export:
                 -
                   name: 'Redis: Service is down'
                   expression: 'last(/Redis by Zabbix agent 2/redis.ping["{$REDIS.CONN.URI}"])=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 5fe2afa1c8ff434a876822ea0b290659
           name: 'Redis: Memory fragmentation ratio'
@@ -302,8 +310,8 @@ zabbix_export:
             key: 'redis.info["{$REDIS.CONN.URI}"]'
           tags:
             -
-              tag: Application
-              value: Redis
+              tag: component
+              value: memory
           triggers:
             -
               uuid: 629531ff1ebc4bdbb1f277848c436230
@@ -318,6 +326,10 @@ zabbix_export:
                 Note: If your peak memory usage is much higher than your current memory usage, the memory fragmentation ratio may be unreliable.
                 
                 https://redis.io/topics/memory-optimization
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 5fef1d341a974cc5aa164e550aff1537
           name: 'Redis: Memory used'
@@ -336,8 +348,8 @@ zabbix_export:
             key: 'redis.info["{$REDIS.CONN.URI}"]'
           tags:
             -
-              tag: Application
-              value: Redis
+              tag: component
+              value: memory
         -
           uuid: de026d98fd9146b78f9a0be2c0b9de10
           name: 'Redis: Memory used Lua'
@@ -356,8 +368,8 @@ zabbix_export:
             key: 'redis.info["{$REDIS.CONN.URI}"]'
           tags:
             -
-              tag: Application
-              value: Redis
+              tag: component
+              value: memory
         -
           uuid: d3f05ab1c0404f01875afb964d9820e2
           name: 'Redis: Memory used peak'
@@ -376,8 +388,8 @@ zabbix_export:
             key: 'redis.info["{$REDIS.CONN.URI}"]'
           tags:
             -
-              tag: Application
-              value: Redis
+              tag: component
+              value: memory
         -
           uuid: ef06ae3dd4784702ad0d281da94c294d
           name: 'Redis: Memory used RSS'
@@ -396,8 +408,8 @@ zabbix_export:
             key: 'redis.info["{$REDIS.CONN.URI}"]'
           tags:
             -
-              tag: Application
-              value: Redis
+              tag: component
+              value: memory
         -
           uuid: 86501872c68c4e9fa4b55aaacebb3c3c
           name: 'Redis: AOF current rewrite time sec'
@@ -419,8 +431,8 @@ zabbix_export:
             key: 'redis.info["{$REDIS.CONN.URI}"]'
           tags:
             -
-              tag: Application
-              value: Redis
+              tag: component
+              value: persistence
         -
           uuid: d298e1ce9aa1481391a48754e2a648b0
           name: 'Redis: AOF enabled'
@@ -440,8 +452,8 @@ zabbix_export:
             key: 'redis.info["{$REDIS.CONN.URI}"]'
           tags:
             -
-              tag: Application
-              value: Redis
+              tag: component
+              value: persistence
         -
           uuid: e2e62cc728c04169afeb051000042e28
           name: 'Redis: AOF last bgrewrite status'
@@ -465,8 +477,8 @@ zabbix_export:
             key: 'redis.info["{$REDIS.CONN.URI}"]'
           tags:
             -
-              tag: Application
-              value: Redis
+              tag: component
+              value: persistence
         -
           uuid: 5a14501541c44699b81e3a89cc93d628
           name: 'Redis: AOF last rewrite time sec'
@@ -488,8 +500,8 @@ zabbix_export:
             key: 'redis.info["{$REDIS.CONN.URI}"]'
           tags:
             -
-              tag: Application
-              value: Redis
+              tag: component
+              value: persistence
         -
           uuid: 2cfd96e347d341219238bdaf65f1846d
           name: 'Redis: AOF last write status'
@@ -513,8 +525,8 @@ zabbix_export:
             key: 'redis.info["{$REDIS.CONN.URI}"]'
           tags:
             -
-              tag: Application
-              value: Redis
+              tag: component
+              value: persistence
           triggers:
             -
               uuid: 324e0e8fac514ba99d67aea7eb0ddf7c
@@ -522,6 +534,10 @@ zabbix_export:
               name: 'Redis: Last AOF write operation failed'
               priority: WARNING
               description: 'Detailed information about persistence: https://redis.io/topics/persistence'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 3f4866909425447a828600e9b44ace5b
           name: 'Redis: AOF rewrite in progress'
@@ -539,8 +555,8 @@ zabbix_export:
             key: 'redis.info["{$REDIS.CONN.URI}"]'
           tags:
             -
-              tag: Application
-              value: Redis
+              tag: component
+              value: persistence
         -
           uuid: 83d243cc46304694954e08c0b03a3527
           name: 'Redis: AOF rewrite scheduled'
@@ -558,8 +574,8 @@ zabbix_export:
             key: 'redis.info["{$REDIS.CONN.URI}"]'
           tags:
             -
-              tag: Application
-              value: Redis
+              tag: component
+              value: persistence
         -
           uuid: 90df2d442dc049d690044b92e0888c31
           name: 'Redis: Dump loading'
@@ -579,8 +595,8 @@ zabbix_export:
             key: 'redis.info["{$REDIS.CONN.URI}"]'
           tags:
             -
-              tag: Application
-              value: Redis
+              tag: component
+              value: persistence
         -
           uuid: 5b1ecad187764429a22cbeb69afa3a28
           name: 'Redis: RDB bgsave in progress'
@@ -598,8 +614,8 @@ zabbix_export:
             key: 'redis.info["{$REDIS.CONN.URI}"]'
           tags:
             -
-              tag: Application
-              value: Redis
+              tag: component
+              value: persistence
         -
           uuid: ea673953a3014dc091ec62a20ee53945
           name: 'Redis: RDB changes since last save'
@@ -617,8 +633,8 @@ zabbix_export:
             key: 'redis.info["{$REDIS.CONN.URI}"]'
           tags:
             -
-              tag: Application
-              value: Redis
+              tag: component
+              value: persistence
         -
           uuid: d8c4d8fceeb5482a951999eedd350f73
           name: 'Redis: RDB current bgsave time sec'
@@ -640,8 +656,8 @@ zabbix_export:
             key: 'redis.info["{$REDIS.CONN.URI}"]'
           tags:
             -
-              tag: Application
-              value: Redis
+              tag: component
+              value: persistence
         -
           uuid: e25772b422314949a564f219d6f725bc
           name: 'Redis: RDB last bgsave status'
@@ -665,8 +681,8 @@ zabbix_export:
             key: 'redis.info["{$REDIS.CONN.URI}"]'
           tags:
             -
-              tag: Application
-              value: Redis
+              tag: component
+              value: persistence
           triggers:
             -
               uuid: 44e427ae3ce7419dbac3059be11e31ef
@@ -674,6 +690,10 @@ zabbix_export:
               name: 'Redis: Last RDB save operation failed'
               priority: WARNING
               description: 'Detailed information about persistence: https://redis.io/topics/persistence'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: f506941104e34db08c0d8f5a6d9d9710
           name: 'Redis: RDB last bgsave time sec'
@@ -695,8 +715,8 @@ zabbix_export:
             key: 'redis.info["{$REDIS.CONN.URI}"]'
           tags:
             -
-              tag: Application
-              value: Redis
+              tag: component
+              value: persistence
         -
           uuid: 04e1c21ca49246d7aba062cd001a8c00
           name: 'Redis: RDB last save time'
@@ -714,8 +734,8 @@ zabbix_export:
             key: 'redis.info["{$REDIS.CONN.URI}"]'
           tags:
             -
-              tag: Application
-              value: Redis
+              tag: component
+              value: persistence
         -
           uuid: 5949fadcbe2b405baff0668e81627278
           name: 'Redis: Ping'
@@ -730,8 +750,11 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: Redis
+              tag: component
+              value: application
+            -
+              tag: component
+              value: health
           triggers:
             -
               uuid: 62353f9ed6204b70ba270827c3922244
@@ -739,6 +762,10 @@ zabbix_export:
               name: 'Redis: Service is down'
               priority: AVERAGE
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 6680a01fb98c4504bed6458ba6cde146
           name: 'Redis: Connected slaves'
@@ -756,8 +783,8 @@ zabbix_export:
             key: 'redis.info["{$REDIS.CONN.URI}"]'
           tags:
             -
-              tag: Application
-              value: Redis
+              tag: component
+              value: replication
           triggers:
             -
               uuid: 6d213088211a4bb38ff97b59113dccd9
@@ -767,6 +794,10 @@ zabbix_export:
               priority: INFO
               description: 'Redis number of slaves has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 37fa1595299c4a3ea091039f4db47cf3
           name: 'Redis: Master replication offset'
@@ -787,8 +818,8 @@ zabbix_export:
             key: 'redis.info["{$REDIS.CONN.URI}"]'
           tags:
             -
-              tag: Application
-              value: Redis
+              tag: component
+              value: replication
         -
           uuid: cf067374339e44e5a4ba2cd70d4fec3a
           name: 'Redis: Replication backlog active'
@@ -808,8 +839,8 @@ zabbix_export:
             key: 'redis.info["{$REDIS.CONN.URI}"]'
           tags:
             -
-              tag: Application
-              value: Redis
+              tag: component
+              value: replication
         -
           uuid: b4ea8df4d73144f99ffd4f5f6e6359ef
           name: 'Redis: Replication backlog first byte offset'
@@ -828,8 +859,8 @@ zabbix_export:
             key: 'redis.info["{$REDIS.CONN.URI}"]'
           tags:
             -
-              tag: Application
-              value: Redis
+              tag: component
+              value: replication
         -
           uuid: 081cd9df926d48cea7e5c68f7761ddb1
           name: 'Redis: Replication backlog history length'
@@ -847,8 +878,8 @@ zabbix_export:
             key: 'redis.info["{$REDIS.CONN.URI}"]'
           tags:
             -
-              tag: Application
-              value: Redis
+              tag: component
+              value: replication
         -
           uuid: a437a46aafe3413884975fc480091bb5
           name: 'Redis: Replication backlog size'
@@ -867,8 +898,8 @@ zabbix_export:
             key: 'redis.info["{$REDIS.CONN.URI}"]'
           tags:
             -
-              tag: Application
-              value: Redis
+              tag: component
+              value: replication
         -
           uuid: d8371457697744159aabc3bdece4af2e
           name: 'Redis: Replication role'
@@ -892,8 +923,8 @@ zabbix_export:
             key: 'redis.info["{$REDIS.CONN.URI}"]'
           tags:
             -
-              tag: Application
-              value: Redis
+              tag: component
+              value: replication
           triggers:
             -
               uuid: d24f7aabefb345e791b3bb276f30ac8c
@@ -903,6 +934,10 @@ zabbix_export:
               priority: WARNING
               description: 'Redis replication role has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 8a08d4f30b78448986b9fd94cafd398c
           name: 'Redis: Process id'
@@ -924,8 +959,8 @@ zabbix_export:
             key: 'redis.info["{$REDIS.CONN.URI}"]'
           tags:
             -
-              tag: Application
-              value: Redis
+              tag: component
+              value: os
         -
           uuid: b2deab550d984b3e93741c53019e7f89
           name: 'Redis: Redis mode'
@@ -949,8 +984,8 @@ zabbix_export:
             key: 'redis.info["{$REDIS.CONN.URI}"]'
           tags:
             -
-              tag: Application
-              value: Redis
+              tag: component
+              value: system
         -
           uuid: 9699d6a6563b498ea73f88a4c1dd9cf1
           name: 'Redis: Redis version'
@@ -974,8 +1009,8 @@ zabbix_export:
             key: 'redis.info["{$REDIS.CONN.URI}"]'
           tags:
             -
-              tag: Application
-              value: Redis
+              tag: component
+              value: application
           triggers:
             -
               uuid: 6e307546b26344deb83f2295c90e9a33
@@ -984,6 +1019,10 @@ zabbix_export:
               priority: INFO
               description: 'Redis version has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 8c28e54f9e5d40d6b69c1f5b39b85054
           name: 'Redis: TCP port'
@@ -1005,8 +1044,8 @@ zabbix_export:
             key: 'redis.info["{$REDIS.CONN.URI}"]'
           tags:
             -
-              tag: Application
-              value: Redis
+              tag: component
+              value: network
         -
           uuid: af225edd976146f2920bc05afb703f14
           name: 'Redis: Uptime'
@@ -1025,8 +1064,8 @@ zabbix_export:
             key: 'redis.info["{$REDIS.CONN.URI}"]'
           tags:
             -
-              tag: Application
-              value: Redis
+              tag: component
+              value: application
           triggers:
             -
               uuid: 4961e91eed2a4e83899d135315748b0e
@@ -1035,6 +1074,10 @@ zabbix_export:
               priority: INFO
               description: 'Uptime is less than 10 minutes'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 51a65fa1d27e4fcd915c5019687e7bc9
           name: 'Redis: Slowlog entries per second'
@@ -1047,14 +1090,18 @@ zabbix_export:
                 - ''
           tags:
             -
-              tag: Application
-              value: Redis
+              tag: component
+              value: application
           triggers:
             -
               uuid: 37fb0255e49c42c8913e56fe4aaa1d14
               expression: 'min(/Redis by Zabbix agent 2/redis.slowlog.count["{$REDIS.CONN.URI}"],5m)>{$REDIS.SLOWLOG.COUNT.MAX.WARN}'
               name: 'Redis: Too many entries in the slowlog (over {$REDIS.SLOWLOG.COUNT.MAX.WARN} per second in 5m)'
               priority: INFO
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: eca69284ac8e4ae3a7e965b6549e9343
           name: 'Redis: Evicted keys'
@@ -1072,8 +1119,8 @@ zabbix_export:
             key: 'redis.info["{$REDIS.CONN.URI}"]'
           tags:
             -
-              tag: Application
-              value: Redis
+              tag: component
+              value: keys
         -
           uuid: 0a77355cfba348bb8884d2405892ed5d
           name: 'Redis: Expired keys'
@@ -1091,8 +1138,8 @@ zabbix_export:
             key: 'redis.info["{$REDIS.CONN.URI}"]'
           tags:
             -
-              tag: Application
-              value: Redis
+              tag: component
+              value: keys
         -
           uuid: 5841b6f2a76b432080029367e7008cd1
           name: 'Redis: Instantaneous input bytes per second'
@@ -1116,8 +1163,8 @@ zabbix_export:
             key: 'redis.info["{$REDIS.CONN.URI}"]'
           tags:
             -
-              tag: Application
-              value: Redis
+              tag: component
+              value: network
         -
           uuid: 3552b285d7ca41f796c1838e268a92c1
           name: 'Redis: Instantaneous operations per sec'
@@ -1135,8 +1182,8 @@ zabbix_export:
             key: 'redis.info["{$REDIS.CONN.URI}"]'
           tags:
             -
-              tag: Application
-              value: Redis
+              tag: component
+              value: operations
         -
           uuid: 86c05ed58e8448e9b7307a3c82e182af
           name: 'Redis: Instantaneous output bytes per second'
@@ -1160,8 +1207,8 @@ zabbix_export:
             key: 'redis.info["{$REDIS.CONN.URI}"]'
           tags:
             -
-              tag: Application
-              value: Redis
+              tag: component
+              value: network
         -
           uuid: 66d30a422e704174ae7700e1dd006aa1
           name: 'Redis: Keyspace hits'
@@ -1179,8 +1226,8 @@ zabbix_export:
             key: 'redis.info["{$REDIS.CONN.URI}"]'
           tags:
             -
-              tag: Application
-              value: Redis
+              tag: component
+              value: keys
         -
           uuid: e24da63a83dc4223bed35cf80fc22300
           name: 'Redis: Keyspace misses'
@@ -1198,8 +1245,8 @@ zabbix_export:
             key: 'redis.info["{$REDIS.CONN.URI}"]'
           tags:
             -
-              tag: Application
-              value: Redis
+              tag: component
+              value: keys
         -
           uuid: 1f11810f06d44e498a895c516f902f95
           name: 'Redis: Latest fork usec'
@@ -1222,8 +1269,8 @@ zabbix_export:
             key: 'redis.info["{$REDIS.CONN.URI}"]'
           tags:
             -
-              tag: Application
-              value: Redis
+              tag: component
+              value: operations
         -
           uuid: 2662dfd3524749998306f1d7afe33019
           name: 'Redis: Migrate cached sockets'
@@ -1241,8 +1288,8 @@ zabbix_export:
             key: 'redis.info["{$REDIS.CONN.URI}"]'
           tags:
             -
-              tag: Application
-              value: Redis
+              tag: component
+              value: connections
         -
           uuid: 186e6bda0a0e463bb8218a58f227ff2b
           name: 'Redis: Pubsub channels'
@@ -1260,8 +1307,8 @@ zabbix_export:
             key: 'redis.info["{$REDIS.CONN.URI}"]'
           tags:
             -
-              tag: Application
-              value: Redis
+              tag: component
+              value: subscribes
         -
           uuid: 1e0711a2b40e4fea88c0c57a1f6d2b30
           name: 'Redis: Pubsub patterns'
@@ -1279,8 +1326,8 @@ zabbix_export:
             key: 'redis.info["{$REDIS.CONN.URI}"]'
           tags:
             -
-              tag: Application
-              value: Redis
+              tag: component
+              value: subscribes
         -
           uuid: 65135267c836435d872325a7129e5857
           name: 'Redis: Rejected connections'
@@ -1298,8 +1345,8 @@ zabbix_export:
             key: 'redis.info["{$REDIS.CONN.URI}"]'
           tags:
             -
-              tag: Application
-              value: Redis
+              tag: component
+              value: connections
           triggers:
             -
               uuid: 5bf0680529ce496b8fe419e2732c69d1
@@ -1310,6 +1357,10 @@ zabbix_export:
                 The number of connections has reached the value of "maxclients".
                 
                 https://redis.io/topics/clients
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 37135fd8b7e94c41bc21e802f21baeb4
           name: 'Redis: Sync full'
@@ -1327,8 +1378,8 @@ zabbix_export:
             key: 'redis.info["{$REDIS.CONN.URI}"]'
           tags:
             -
-              tag: Application
-              value: Redis
+              tag: component
+              value: replication
         -
           uuid: cb5b6380b164419280fdcd98077c5d8f
           name: 'Redis: Sync partial err'
@@ -1346,8 +1397,8 @@ zabbix_export:
             key: 'redis.info["{$REDIS.CONN.URI}"]'
           tags:
             -
-              tag: Application
-              value: Redis
+              tag: component
+              value: replication
         -
           uuid: 231560fd350e4b5096b242dddecd7c8b
           name: 'Redis: Sync partial ok'
@@ -1365,8 +1416,8 @@ zabbix_export:
             key: 'redis.info["{$REDIS.CONN.URI}"]'
           tags:
             -
-              tag: Application
-              value: Redis
+              tag: component
+              value: replication
         -
           uuid: 278ff045f367443380fcd594dba77d53
           name: 'Redis: Total commands processed'
@@ -1384,8 +1435,8 @@ zabbix_export:
             key: 'redis.info["{$REDIS.CONN.URI}"]'
           tags:
             -
-              tag: Application
-              value: Redis
+              tag: component
+              value: commands
         -
           uuid: c9afbbbec8a44926887389a590f1df91
           name: 'Redis: Total connections received'
@@ -1403,8 +1454,8 @@ zabbix_export:
             key: 'redis.info["{$REDIS.CONN.URI}"]'
           tags:
             -
-              tag: Application
-              value: Redis
+              tag: component
+              value: connections
         -
           uuid: 838cb6cbfd8a42e1b9cfa4a60670324a
           name: 'Redis: Total net input bytes'
@@ -1423,8 +1474,8 @@ zabbix_export:
             key: 'redis.info["{$REDIS.CONN.URI}"]'
           tags:
             -
-              tag: Application
-              value: Redis
+              tag: component
+              value: network
         -
           uuid: 762f6b06eb094de896d265fcf3f9a603
           name: 'Redis: Total net output bytes'
@@ -1443,8 +1494,8 @@ zabbix_export:
             key: 'redis.info["{$REDIS.CONN.URI}"]'
           tags:
             -
-              tag: Application
-              value: Redis
+              tag: component
+              value: network
       discovery_rules:
         -
           uuid: 527a3526b0e64225bb3dcf2dbbfbda5b
@@ -1463,8 +1514,8 @@ zabbix_export:
               description: 'Process CPU utilization percentage.'
               tags:
                 -
-                  tag: Application
-                  value: Redis
+                  tag: component
+                  value: cpu
             -
               uuid: 9d68e00f913a4faea5a334d361f324b0
               name: 'Redis: Memory usage (rss)'
@@ -1474,8 +1525,8 @@ zabbix_export:
               description: 'Resident set size memory used by process in bytes.'
               tags:
                 -
-                  tag: Application
-                  value: Redis
+                  tag: component
+                  value: memory
             -
               uuid: 325cabaa95994a58bf30992586ba7544
               name: 'Redis: Memory usage (vsize)'
@@ -1485,8 +1536,8 @@ zabbix_export:
               description: 'Virtual memory size used by process in bytes.'
               tags:
                 -
-                  tag: Application
-                  value: Redis
+                  tag: component
+                  value: memory
             -
               uuid: d9ccc25e5d1b4f05b22354a7672b518c
               name: 'Redis: Number of processes running'
@@ -1494,14 +1545,18 @@ zabbix_export:
               history: 7d
               tags:
                 -
-                  tag: Application
-                  value: Redis
+                  tag: component
+                  value: system
               trigger_prototypes:
                 -
                   uuid: 590bd23c52b74dd7951dcf74903ac2ed
                   expression: 'last(/Redis by Zabbix agent 2/proc.num["{$REDIS.PROCESS_NAME}{#SINGLETON}"])=0'
                   name: 'Redis: Process is not running'
                   priority: HIGH
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
           graph_prototypes:
             -
               uuid: e26f8c31c3654febbeda2ffb97438c36
@@ -1565,8 +1620,11 @@ zabbix_export:
                 key: 'redis.info["{$REDIS.CONN.URI}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Redis: DB {#DB}'
+                  tag: component
+                  value: keys
+                -
+                  tag: database
+                  value: '{#DB}'
             -
               uuid: bde12d459b7b4e23a22ed6188b57bb25
               name: 'DB {#DB}: Expires'
@@ -1584,8 +1642,11 @@ zabbix_export:
                 key: 'redis.info["{$REDIS.CONN.URI}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Redis: DB {#DB}'
+                  tag: component
+                  value: keys
+                -
+                  tag: database
+                  value: '{#DB}'
             -
               uuid: 2bae0d2f8b8348bcad207b61ef6286c3
               name: 'DB {#DB}: Keys'
@@ -1603,8 +1664,11 @@ zabbix_export:
                 key: 'redis.info["{$REDIS.CONN.URI}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Redis: DB {#DB}'
+                  tag: component
+                  value: keys
+                -
+                  tag: database
+                  value: '{#DB}'
           graph_prototypes:
             -
               uuid: 3271f3a143dc43f38a674b6cbae8cd0d
@@ -1657,8 +1721,8 @@ zabbix_export:
                 key: 'redis.info["{$REDIS.CONN.URI}"]'
               tags:
                 -
-                  tag: Application
-                  value: Redis
+                  tag: component
+                  value: memory
             -
               uuid: 2065e38cd7e5417abfd0b80116b0d77b
               name: 'Redis: Lazyfree pending objects{#SINGLETON}'
@@ -1676,8 +1740,8 @@ zabbix_export:
                 key: 'redis.info["{$REDIS.CONN.URI}"]'
               tags:
                 -
-                  tag: Application
-                  value: Redis
+                  tag: component
+                  value: memory
             -
               uuid: 2c5c700b53374dac86d805384b6bc9b0
               name: 'Redis: Max memory{#SINGLETON}'
@@ -1696,8 +1760,8 @@ zabbix_export:
                 key: 'redis.info["{$REDIS.CONN.URI}"]'
               tags:
                 -
-                  tag: Application
-                  value: Redis
+                  tag: component
+                  value: memory
             -
               uuid: 0f094be6d0fa4afda3aa7916fac4d3a3
               name: 'Redis: Max memory policy{#SINGLETON}'
@@ -1721,8 +1785,8 @@ zabbix_export:
                 key: 'redis.info["{$REDIS.CONN.URI}"]'
               tags:
                 -
-                  tag: Application
-                  value: Redis
+                  tag: component
+                  value: memory
             -
               uuid: bf804c6ee44640168e15ca62803b7f10
               name: 'Redis: Total system memory{#SINGLETON}'
@@ -1741,8 +1805,8 @@ zabbix_export:
                 key: 'redis.info["{$REDIS.CONN.URI}"]'
               tags:
                 -
-                  tag: Application
-                  value: Redis
+                  tag: component
+                  value: memory
             -
               uuid: 1c0e0355d5cd429f9a914fb67f29e366
               name: 'Redis: Memory used dataset{#SINGLETON}'
@@ -1761,8 +1825,8 @@ zabbix_export:
                 key: 'redis.info["{$REDIS.CONN.URI}"]'
               tags:
                 -
-                  tag: Application
-                  value: Redis
+                  tag: component
+                  value: memory
             -
               uuid: 4e5937420b3843568d9f36b40c0a3c28
               name: 'Redis: Memory used dataset %{#SINGLETON}'
@@ -1787,8 +1851,8 @@ zabbix_export:
                 key: 'redis.info["{$REDIS.CONN.URI}"]'
               tags:
                 -
-                  tag: Application
-                  value: Redis
+                  tag: component
+                  value: memory
             -
               uuid: e085382c18f3473f9d2271024cd61e93
               name: 'Redis: Memory used overhead{#SINGLETON}'
@@ -1807,8 +1871,8 @@ zabbix_export:
                 key: 'redis.info["{$REDIS.CONN.URI}"]'
               tags:
                 -
-                  tag: Application
-                  value: Redis
+                  tag: component
+                  value: memory
             -
               uuid: 5da63141e8b145a38954736806602b4a
               name: 'Redis: Memory used peak %{#SINGLETON}'
@@ -1833,8 +1897,8 @@ zabbix_export:
                 key: 'redis.info["{$REDIS.CONN.URI}"]'
               tags:
                 -
-                  tag: Application
-                  value: Redis
+                  tag: component
+                  value: memory
             -
               uuid: dabd2918056b4b999f4b30bd8e64e8a1
               name: 'Redis: Memory used startup{#SINGLETON}'
@@ -1853,8 +1917,8 @@ zabbix_export:
                 key: 'redis.info["{$REDIS.CONN.URI}"]'
               tags:
                 -
-                  tag: Application
-                  value: Redis
+                  tag: component
+                  value: memory
             -
               uuid: 9da41967290742cb8daa2f69ac1d6966
               name: 'Redis: AOF last CoW size{#SINGLETON}'
@@ -1873,8 +1937,8 @@ zabbix_export:
                 key: 'redis.info["{$REDIS.CONN.URI}"]'
               tags:
                 -
-                  tag: Application
-                  value: Redis
+                  tag: component
+                  value: persistence
             -
               uuid: 768839c72e3f4be89e30dd0d140c9d03
               name: 'Redis: RDB last CoW size{#SINGLETON}'
@@ -1893,8 +1957,8 @@ zabbix_export:
                 key: 'redis.info["{$REDIS.CONN.URI}"]'
               tags:
                 -
-                  tag: Application
-                  value: Redis
+                  tag: component
+                  value: persistence
             -
               uuid: bead155d26054d0487622f29b86dcd2b
               name: 'Redis: Replication second offset{#SINGLETON}'
@@ -1916,8 +1980,8 @@ zabbix_export:
                 key: 'redis.info["{$REDIS.CONN.URI}"]'
               tags:
                 -
-                  tag: Application
-                  value: Redis
+                  tag: component
+                  value: replication
             -
               uuid: 14d062351a114e8eafa2b2b889317903
               name: 'Redis: Executable path{#SINGLETON}'
@@ -1941,8 +2005,8 @@ zabbix_export:
                 key: 'redis.info["{$REDIS.CONN.URI}"]'
               tags:
                 -
-                  tag: Application
-                  value: Redis
+                  tag: component
+                  value: system
             -
               uuid: 5458542148954618a6d22df1effffe57
               name: 'Redis: Active defrag hits{#SINGLETON}'
@@ -1960,8 +2024,8 @@ zabbix_export:
                 key: 'redis.info["{$REDIS.CONN.URI}"]'
               tags:
                 -
-                  tag: Application
-                  value: Redis
+                  tag: component
+                  value: memory
             -
               uuid: f8b424743dd24691be2bd07d5538b16a
               name: 'Redis: Active defrag key hits{#SINGLETON}'
@@ -1979,8 +2043,8 @@ zabbix_export:
                 key: 'redis.info["{$REDIS.CONN.URI}"]'
               tags:
                 -
-                  tag: Application
-                  value: Redis
+                  tag: component
+                  value: keys
             -
               uuid: 8aba0ad8d7314b6b8cf1e80cb0afb618
               name: 'Redis: Active defrag key misses{#SINGLETON}'
@@ -1998,8 +2062,8 @@ zabbix_export:
                 key: 'redis.info["{$REDIS.CONN.URI}"]'
               tags:
                 -
-                  tag: Application
-                  value: Redis
+                  tag: component
+                  value: keys
             -
               uuid: 3c20cca8b4a84c619d90d64a34386dfa
               name: 'Redis: Active defrag misses{#SINGLETON}'
@@ -2017,8 +2081,8 @@ zabbix_export:
                 key: 'redis.info["{$REDIS.CONN.URI}"]'
               tags:
                 -
-                  tag: Application
-                  value: Redis
+                  tag: component
+                  value: memory
             -
               uuid: a34f4e33a0cb4381b5c3b7a507e90bee
               name: 'Redis: Expired stale %{#SINGLETON}'
@@ -2036,8 +2100,8 @@ zabbix_export:
                 key: 'redis.info["{$REDIS.CONN.URI}"]'
               tags:
                 -
-                  tag: Application
-                  value: Redis
+                  tag: component
+                  value: keys
             -
               uuid: 81667ae170b04ac0980e122566c5ed8e
               name: 'Redis: Expired time cap reached count{#SINGLETON}'
@@ -2054,8 +2118,8 @@ zabbix_export:
                 key: 'redis.info["{$REDIS.CONN.URI}"]'
               tags:
                 -
-                  tag: Application
-                  value: Redis
+                  tag: component
+                  value: cycles
             -
               uuid: 93bf8753d6b242f1b8d2288fb926e01b
               name: 'Redis: Slave expires tracked keys{#SINGLETON}'
@@ -2073,14 +2137,21 @@ zabbix_export:
                 key: 'redis.info["{$REDIS.CONN.URI}"]'
               tags:
                 -
-                  tag: Application
-                  value: Redis
+                  tag: component
+                  value: keys
           trigger_prototypes:
             -
               uuid: 0c3560588d2d421c843c006ef5fa4645
               expression: 'last(/Redis by Zabbix agent 2/redis.memory.used_memory)/min(/Redis by Zabbix agent 2/redis.memory.maxmemory[{#SINGLETON}],5m)*100>{$REDIS.MEM.PUSED.MAX.WARN}'
               name: 'Redis: Memory usage is too high (over {$REDIS.MEM.PUSED.MAX.WARN}% in 5m)'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
           master_item:
             key: 'redis.info["{$REDIS.CONN.URI}"]'
           preprocessing:
@@ -2116,8 +2187,8 @@ zabbix_export:
                 key: 'redis.info["{$REDIS.CONN.URI}"]'
               tags:
                 -
-                  tag: Application
-                  value: Redis
+                  tag: component
+                  value: memory
             -
               uuid: 81ef89fc751746ac8254a55a2b2e4ea7
               name: 'Redis: Allocator allocated{#SINGLETON}'
@@ -2134,8 +2205,8 @@ zabbix_export:
                 key: 'redis.info["{$REDIS.CONN.URI}"]'
               tags:
                 -
-                  tag: Application
-                  value: Redis
+                  tag: component
+                  value: memory
             -
               uuid: 23e034630d7246f7ba993d5c6db2d6bb
               name: 'Redis: Allocator fragmentation bytes{#SINGLETON}'
@@ -2153,8 +2224,8 @@ zabbix_export:
                 key: 'redis.info["{$REDIS.CONN.URI}"]'
               tags:
                 -
-                  tag: Application
-                  value: Redis
+                  tag: component
+                  value: memory
             -
               uuid: 690a13b13d134f648b4b8381f6a185f0
               name: 'Redis: Allocator fragmentation ratio{#SINGLETON}'
@@ -2172,8 +2243,8 @@ zabbix_export:
                 key: 'redis.info["{$REDIS.CONN.URI}"]'
               tags:
                 -
-                  tag: Application
-                  value: Redis
+                  tag: component
+                  value: memory
             -
               uuid: 0abd6a9adb034536b3a389e0af2af732
               name: 'Redis: Allocator resident{#SINGLETON}'
@@ -2190,8 +2261,8 @@ zabbix_export:
                 key: 'redis.info["{$REDIS.CONN.URI}"]'
               tags:
                 -
-                  tag: Application
-                  value: Redis
+                  tag: component
+                  value: memory
             -
               uuid: b5ecad496c554ccaad495d2f112b5e2f
               name: 'Redis: Allocator RSS bytes{#SINGLETON}'
@@ -2209,8 +2280,8 @@ zabbix_export:
                 key: 'redis.info["{$REDIS.CONN.URI}"]'
               tags:
                 -
-                  tag: Application
-                  value: Redis
+                  tag: component
+                  value: memory
             -
               uuid: 643fe70e1a7f488196b053722a2df9c2
               name: 'Redis: Allocator RSS ratio{#SINGLETON}'
@@ -2228,8 +2299,8 @@ zabbix_export:
                 key: 'redis.info["{$REDIS.CONN.URI}"]'
               tags:
                 -
-                  tag: Application
-                  value: Redis
+                  tag: component
+                  value: memory
             -
               uuid: 40a639acab5a415a8fb48b7520b7d198
               name: 'Redis: Memory fragmentation bytes{#SINGLETON}'
@@ -2247,8 +2318,8 @@ zabbix_export:
                 key: 'redis.info["{$REDIS.CONN.URI}"]'
               tags:
                 -
-                  tag: Application
-                  value: Redis
+                  tag: component
+                  value: memory
             -
               uuid: 70c53f60d020440c8f7cba83b32f58c9
               name: 'Redis: Memory AOF buffer{#SINGLETON}'
@@ -2266,8 +2337,11 @@ zabbix_export:
                 key: 'redis.info["{$REDIS.CONN.URI}"]'
               tags:
                 -
-                  tag: Application
-                  value: Redis
+                  tag: component
+                  value: memory
+                -
+                  tag: component
+                  value: persistence
             -
               uuid: d64718269f20470e9661ff7c479dc300
               name: 'Redis: Memory clients normal{#SINGLETON}'
@@ -2284,8 +2358,8 @@ zabbix_export:
                 key: 'redis.info["{$REDIS.CONN.URI}"]'
               tags:
                 -
-                  tag: Application
-                  value: Redis
+                  tag: component
+                  value: memory
             -
               uuid: e685ab11ab534f8abd1a7e2ee35839e8
               name: 'Redis: Memory clients slaves{#SINGLETON}'
@@ -2302,8 +2376,8 @@ zabbix_export:
                 key: 'redis.info["{$REDIS.CONN.URI}"]'
               tags:
                 -
-                  tag: Application
-                  value: Redis
+                  tag: component
+                  value: memory
             -
               uuid: f6c9bfda015d47d0b34f466e95356a5d
               name: 'Redis: Memory not counted for evict{#SINGLETON}'
@@ -2320,8 +2394,8 @@ zabbix_export:
                 key: 'redis.info["{$REDIS.CONN.URI}"]'
               tags:
                 -
-                  tag: Application
-                  value: Redis
+                  tag: component
+                  value: memory
             -
               uuid: eaac8b142fc540ad9c7563e145819643
               name: 'Redis: Memory number of cached scripts{#SINGLETON}'
@@ -2338,8 +2412,8 @@ zabbix_export:
                 key: 'redis.info["{$REDIS.CONN.URI}"]'
               tags:
                 -
-                  tag: Application
-                  value: Redis
+                  tag: component
+                  value: memory
             -
               uuid: a221fd161be641c1a8091d0bfd1d2157
               name: 'Redis: Memory replication backlog{#SINGLETON}'
@@ -2356,8 +2430,11 @@ zabbix_export:
                 key: 'redis.info["{$REDIS.CONN.URI}"]'
               tags:
                 -
-                  tag: Application
-                  value: Redis
+                  tag: component
+                  value: memory
+                -
+                  tag: component
+                  value: replication
             -
               uuid: e699ad3b29ca486f91688684ffde6b73
               name: 'Redis: Memory RSS overhead bytes{#SINGLETON}'
@@ -2376,8 +2453,8 @@ zabbix_export:
                 key: 'redis.info["{$REDIS.CONN.URI}"]'
               tags:
                 -
-                  tag: Application
-                  value: Redis
+                  tag: component
+                  value: memory
             -
               uuid: d4d51ae4ce214699ba760fcb62289a51
               name: 'Redis: Memory RSS overhead ratio{#SINGLETON}'
@@ -2395,8 +2472,8 @@ zabbix_export:
                 key: 'redis.info["{$REDIS.CONN.URI}"]'
               tags:
                 -
-                  tag: Application
-                  value: Redis
+                  tag: component
+                  value: memory
             -
               uuid: e3733b2993cb4199bfac8b0711d4bb72
               name: 'Redis: Memory used scripts{#SINGLETON}'
@@ -2413,8 +2490,8 @@ zabbix_export:
                 key: 'redis.info["{$REDIS.CONN.URI}"]'
               tags:
                 -
-                  tag: Application
-                  value: Redis
+                  tag: component
+                  value: memory
           master_item:
             key: 'redis.info["{$REDIS.CONN.URI}"]'
           preprocessing:
@@ -2452,8 +2529,8 @@ zabbix_export:
                 key: 'redis.info["{$REDIS.CONN.URI}"]'
               tags:
                 -
-                  tag: Application
-                  value: Redis
+                  tag: component
+                  value: persistence
             -
               uuid: 875ace20e5c94044ae63f36d98ac6256
               name: 'Redis: AOF buffer length{#SINGLETON}'
@@ -2472,8 +2549,8 @@ zabbix_export:
                 key: 'redis.info["{$REDIS.CONN.URI}"]'
               tags:
                 -
-                  tag: Application
-                  value: Redis
+                  tag: component
+                  value: persistence
             -
               uuid: 679bd919383a4106916a84fae5be47bb
               name: 'Redis: AOF current size{#SINGLETON}'
@@ -2492,8 +2569,8 @@ zabbix_export:
                 key: 'redis.info["{$REDIS.CONN.URI}"]'
               tags:
                 -
-                  tag: Application
-                  value: Redis
+                  tag: component
+                  value: persistence
             -
               uuid: ff9955c770aa4e0883cc72bf1d762be7
               name: 'Redis: AOF delayed fsync{#SINGLETON}'
@@ -2511,8 +2588,8 @@ zabbix_export:
                 key: 'redis.info["{$REDIS.CONN.URI}"]'
               tags:
                 -
-                  tag: Application
-                  value: Redis
+                  tag: component
+                  value: persistence
             -
               uuid: 0606ef5762b04d91abba95269eb77ae2
               name: 'Redis: AOF pending background I/O fsync{#SINGLETON}'
@@ -2530,8 +2607,8 @@ zabbix_export:
                 key: 'redis.info["{$REDIS.CONN.URI}"]'
               tags:
                 -
-                  tag: Application
-                  value: Redis
+                  tag: component
+                  value: persistence
             -
               uuid: 194061b8ad6c484ca8c732d69eeb0f1e
               name: 'Redis: AOF pending rewrite{#SINGLETON}'
@@ -2551,8 +2628,8 @@ zabbix_export:
                 key: 'redis.info["{$REDIS.CONN.URI}"]'
               tags:
                 -
-                  tag: Application
-                  value: Redis
+                  tag: component
+                  value: persistence
             -
               uuid: 1a39f5854ae948759deadac0ae57e9f7
               name: 'Redis: AOF rewrite buffer length{#SINGLETON}'
@@ -2571,8 +2648,8 @@ zabbix_export:
                 key: 'redis.info["{$REDIS.CONN.URI}"]'
               tags:
                 -
-                  tag: Application
-                  value: Redis
+                  tag: component
+                  value: persistence
           master_item:
             key: 'redis.info["{$REDIS.CONN.URI}"]'
           preprocessing:
@@ -2620,8 +2697,8 @@ zabbix_export:
                 key: 'redis.info["{$REDIS.CONN.URI}"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Redis: Slave {#SLAVE_IP}:{#SLAVE_PORT}'
+                  tag: component
+                  value: replication
           graph_prototypes:
             -
               uuid: 0bce553a5a1240e2b097754dba8f6939
@@ -2677,8 +2754,8 @@ zabbix_export:
                 key: 'redis.info["{$REDIS.CONN.URI}"]'
               tags:
                 -
-                  tag: Application
-                  value: Redis
+                  tag: component
+                  value: replication
             -
               uuid: 0acbeb8633da41be9bfb56627a946fd9
               name: 'Redis: Master last I/O seconds ago{#SINGLETON}'
@@ -2697,14 +2774,18 @@ zabbix_export:
                 key: 'redis.info["{$REDIS.CONN.URI}"]'
               tags:
                 -
-                  tag: Application
-                  value: Redis
+                  tag: component
+                  value: replication
               trigger_prototypes:
                 -
                   uuid: 292f477d970d4a138d2d1b2c45d965dd
                   expression: 'min(/Redis by Zabbix agent 2/redis.replication.master_last_io_seconds_ago[{#SINGLETON}],5m)>{$REDIS.REPL.LAG.MAX.WARN}'
                   name: 'Redis: Replication lag with master is too high (over {$REDIS.REPL.LAG.MAX.WARN} in 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 8024463a9f644e6e91def5a0e88abd4b
               name: 'Redis: Master link status{#SINGLETON}'
@@ -2728,8 +2809,8 @@ zabbix_export:
                 key: 'redis.info["{$REDIS.CONN.URI}"]'
               tags:
                 -
-                  tag: Application
-                  value: Redis
+                  tag: component
+                  value: replication
             -
               uuid: da63a0b31bed47edaba3f802738fa4fd
               name: 'Redis: Master port{#SINGLETON}'
@@ -2751,8 +2832,8 @@ zabbix_export:
                 key: 'redis.info["{$REDIS.CONN.URI}"]'
               tags:
                 -
-                  tag: Application
-                  value: Redis
+                  tag: component
+                  value: replication
             -
               uuid: 6835a260e66741159ee10046265a1ea4
               name: 'Redis: Master sync in progress{#SINGLETON}'
@@ -2770,8 +2851,8 @@ zabbix_export:
                 key: 'redis.info["{$REDIS.CONN.URI}"]'
               tags:
                 -
-                  tag: Application
-                  value: Redis
+                  tag: component
+                  value: replication
             -
               uuid: 3f92dfa07237495ca7696bb4b078eb93
               name: 'Redis: Slave priority{#SINGLETON}'
@@ -2789,8 +2870,8 @@ zabbix_export:
                 key: 'redis.info["{$REDIS.CONN.URI}"]'
               tags:
                 -
-                  tag: Application
-                  value: Redis
+                  tag: component
+                  value: replication
             -
               uuid: f38492a49f214ec8b71fdc51d243281e
               name: 'Redis: Slave priority{#SINGLETON}'
@@ -2812,8 +2893,8 @@ zabbix_export:
                 key: 'redis.info["{$REDIS.CONN.URI}"]'
               tags:
                 -
-                  tag: Application
-                  value: Redis
+                  tag: component
+                  value: replication
             -
               uuid: 7eb23d1d96ea489c9e0b39b7839147bd
               name: 'Redis: Slave replication offset{#SINGLETON}'
@@ -2832,8 +2913,8 @@ zabbix_export:
                 key: 'redis.info["{$REDIS.CONN.URI}"]'
               tags:
                 -
-                  tag: Application
-                  value: Redis
+                  tag: component
+                  value: replication
           graph_prototypes:
             -
               uuid: bbc5fb3021be4c3381e48fe623b611f0
@@ -2855,6 +2936,13 @@ zabbix_export:
                   return JSON.stringify(JSON.parse(value).Replication.role === 'slave'
                     ? [{'{#SINGLETON}': ''}]
                     : []);
+      tags:
+        -
+          tag: class
+          value: database
+        -
+          tag: target
+          value: redis
       macros:
         -
           macro: '{$REDIS.CLIENTS.PRC.MAX.WARN}'
@@ -3182,6 +3270,10 @@ zabbix_export:
         When the number of clients reaches the value of the "maxclients" parameter, new connections will be rejected.
         
         https://redis.io/topics/clients#maximum-number-of-clients
+      tags:
+        -
+          tag: scope
+          value: performance
   graphs:
     -
       uuid: c04e813d482a4709b13aa2a98911e11d
diff --git a/templates/db/tidb_http/tidb_pd_http/template_db_tidb_pd_http.yaml b/templates/db/tidb_http/tidb_pd_http/template_db_tidb_pd_http.yaml
index 69e23bcb624..e8b1c768a80 100644
--- a/templates/db/tidb_http/tidb_pd_http/template_db_tidb_pd_http.yaml
+++ b/templates/db/tidb_http/tidb_pd_http/template_db_tidb_pd_http.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-16T07:40:17Z'
+  date: '2022-01-26T10:37:09Z'
   groups:
     -
       uuid: 748ad4d098d447d492bb935c907f652f
@@ -19,7 +19,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Databases
@@ -45,8 +45,8 @@ zabbix_export:
           url: '{$PD.URL}:{$PD.PORT}/metrics'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
         -
           uuid: 7eb740eed4eb43a0a449e1c1436e582b
           name: 'PD: Get instance status'
@@ -66,8 +66,11 @@ zabbix_export:
           url: '{$PD.URL}:{$PD.PORT}/pd/api/v1/status'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: health
+            -
+              tag: component
+              value: raw
         -
           uuid: 101266930d0747748bf3cbd9259e2818
           name: 'PD: GRPC Commands total, rate'
@@ -91,8 +94,8 @@ zabbix_export:
             key: pd.get_metrics
           tags:
             -
-              tag: Application
-              value: 'PD instance'
+              tag: component
+              value: grpc
         -
           uuid: c18f702f68bf4fed94a598daffdada8a
           name: 'PD: Status'
@@ -120,14 +123,18 @@ zabbix_export:
             key: pd.get_status
           tags:
             -
-              tag: Application
-              value: 'PD instance'
+              tag: component
+              value: health
           triggers:
             -
               uuid: ab1d0d23dad844099e42debb71512887
               expression: 'last(/TiDB PD by HTTP/pd.status)=0'
               name: 'PD: Instance is not responding'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 0b71c8a5104b46ebbeabe0d708b6676e
           name: 'PD: Uptime'
@@ -153,8 +160,8 @@ zabbix_export:
             key: pd.get_status
           tags:
             -
-              tag: Application
-              value: 'PD instance'
+              tag: component
+              value: application
           triggers:
             -
               uuid: 9f47a19f6f424df598e74c5a653ebf27
@@ -163,6 +170,10 @@ zabbix_export:
               priority: INFO
               description: 'Uptime is less than 10 minutes'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: c7e8e9bf01d04e5db25bd8eaafff3b80
           name: 'PD: Version'
@@ -186,8 +197,8 @@ zabbix_export:
             key: pd.get_status
           tags:
             -
-              tag: Application
-              value: 'PD instance'
+              tag: component
+              value: application
           triggers:
             -
               uuid: 6fb6045405af4c89b09750f57ada472a
@@ -196,6 +207,10 @@ zabbix_export:
               priority: INFO
               description: 'PD version has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
       discovery_rules:
         -
           uuid: cd1f27cf5f1d4f6f84032386ec7f8abb
@@ -222,8 +237,11 @@ zabbix_export:
                 key: pd.get_metrics
               tags:
                 -
-                  tag: Application
-                  value: 'TiDB cluster'
+                  tag: component
+                  value: cluster
+                -
+                  tag: component
+                  value: regions
             -
               uuid: 0950ba514e05447c8cfe726ec2d76944
               name: 'TiDB cluster: Current peer count'
@@ -241,8 +259,11 @@ zabbix_export:
                 key: pd.get_metrics
               tags:
                 -
-                  tag: Application
-                  value: 'TiDB cluster'
+                  tag: component
+                  value: cluster
+                -
+                  tag: component
+                  value: peers
             -
               uuid: d39f58372e3f464c87b2ec42acdf2061
               name: 'TiDB cluster: Storage capacity'
@@ -266,8 +287,11 @@ zabbix_export:
                 key: pd.get_metrics
               tags:
                 -
-                  tag: Application
-                  value: 'TiDB cluster'
+                  tag: component
+                  value: cluster
+                -
+                  tag: component
+                  value: storage
             -
               uuid: c72e6a2f89d041c4bf764021b9bc182c
               name: 'TiDB cluster: Storage size'
@@ -287,8 +311,11 @@ zabbix_export:
                 key: pd.get_metrics
               tags:
                 -
-                  tag: Application
-                  value: 'TiDB cluster'
+                  tag: component
+                  value: cluster
+                -
+                  tag: component
+                  value: storage
             -
               uuid: 517cea991add45319d30047ac96fd9e4
               name: 'TiDB cluster: Disconnect stores'
@@ -310,8 +337,11 @@ zabbix_export:
                 key: pd.get_metrics
               tags:
                 -
-                  tag: Application
-                  value: 'TiDB cluster'
+                  tag: component
+                  value: cluster
+                -
+                  tag: component
+                  value: stores
               trigger_prototypes:
                 -
                   uuid: 077d39f8ea194081a9d0c5dfdec4d1b5
@@ -319,6 +349,10 @@ zabbix_export:
                   name: 'TiDB cluster: There are disconnected TiKV nodes'
                   priority: WARNING
                   description: 'PD does not receive a TiKV heartbeat within 20 seconds. Normally a TiKV heartbeat comes in every 10 seconds.'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 7125a7c858264f339e879c1389c6c027
               name: 'TiDB cluster: Down stores'
@@ -340,8 +374,11 @@ zabbix_export:
                 key: pd.get_metrics
               tags:
                 -
-                  tag: Application
-                  value: 'TiDB cluster'
+                  tag: component
+                  value: cluster
+                -
+                  tag: component
+                  value: stores
               trigger_prototypes:
                 -
                   uuid: 526b935d3fa04825b7544eb6efd50ab5
@@ -349,6 +386,10 @@ zabbix_export:
                   name: 'TiDB cluster: There are offline TiKV nodes'
                   priority: AVERAGE
                   description: 'PD has not received a TiKV heartbeat for a long time.'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: c3bd9d1e0f6c427ab5232e57769030d1
               name: 'TiDB cluster: Lowspace stores'
@@ -370,8 +411,11 @@ zabbix_export:
                 key: pd.get_metrics
               tags:
                 -
-                  tag: Application
-                  value: 'TiDB cluster'
+                  tag: component
+                  value: cluster
+                -
+                  tag: component
+                  value: stores
               trigger_prototypes:
                 -
                   uuid: 87ef0f211afd4d58adec05007ef1d263
@@ -379,6 +423,10 @@ zabbix_export:
                   name: 'TiDB cluster: There are low space TiKV nodes'
                   priority: AVERAGE
                   description: 'Indicates that there is no sufficient space on the TiKV node.'
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
             -
               uuid: 3c24fb49463b45f199dbc3955e87d01b
               name: 'TiDB cluster: Offline stores'
@@ -399,8 +447,11 @@ zabbix_export:
                 key: pd.get_metrics
               tags:
                 -
-                  tag: Application
-                  value: 'TiDB cluster'
+                  tag: component
+                  value: cluster
+                -
+                  tag: component
+                  value: stores
             -
               uuid: 476a1b6e3c9b4b41ae1637f0e12801c9
               name: 'TiDB cluster: Tombstone stores'
@@ -422,8 +473,11 @@ zabbix_export:
                 key: pd.get_metrics
               tags:
                 -
-                  tag: Application
-                  value: 'TiDB cluster'
+                  tag: component
+                  value: cluster
+                -
+                  tag: component
+                  value: stores
             -
               uuid: 89db2b996fbe41bdb6b82ccf75139090
               name: 'TiDB cluster: Unhealth stores'
@@ -445,8 +499,11 @@ zabbix_export:
                 key: pd.get_metrics
               tags:
                 -
-                  tag: Application
-                  value: 'TiDB cluster'
+                  tag: component
+                  value: cluster
+                -
+                  tag: component
+                  value: stores
             -
               uuid: ff80108e2a5e45779a428a6fd31ea089
               name: 'TiDB cluster: Normal stores'
@@ -468,8 +525,11 @@ zabbix_export:
                 key: pd.get_metrics
               tags:
                 -
-                  tag: Application
-                  value: 'TiDB cluster'
+                  tag: component
+                  value: cluster
+                -
+                  tag: component
+                  value: stores
           trigger_prototypes:
             -
               uuid: 843d566b33bc401390c2a633d08bb033
@@ -477,6 +537,10 @@ zabbix_export:
               name: 'TiDB cluster: Current storage usage is too high (over {$PD.STORAGE_USAGE.MAX.WARN}% for 5m)'
               priority: WARNING
               description: 'Over {$PD.STORAGE_USAGE.MAX.WARN}% of the cluster space is occupied.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
           graph_prototypes:
             -
               uuid: 270de7aa73cf454cb147a3f5b39ebb35
@@ -540,8 +604,11 @@ zabbix_export:
                 key: pd.get_metrics
               tags:
                 -
-                  tag: Application
-                  value: 'PD instance'
+                  tag: component
+                  value: grpc
+                -
+                  tag: grpc_method
+                  value: '{#GRPC_METHOD}'
           master_item:
             key: pd.get_metrics
           preprocessing:
@@ -602,8 +669,11 @@ zabbix_export:
                 key: pd.get_metrics
               tags:
                 -
-                  tag: Application
-                  value: 'TiDB Store [{#STORE_ADDRESS}]'
+                  tag: address
+                  value: '{#STORE_ADDRESS}'
+                -
+                  tag: component
+                  value: regions
             -
               uuid: 1d1d686f5c544a89a691a9b75e5c3b11
               name: 'PD: Region heartbeat: active, rate'
@@ -628,8 +698,11 @@ zabbix_export:
                 key: pd.get_metrics
               tags:
                 -
-                  tag: Application
-                  value: 'TiDB Store [{#STORE_ADDRESS}]'
+                  tag: address
+                  value: '{#STORE_ADDRESS}'
+                -
+                  tag: component
+                  value: regions
             -
               uuid: c44f934ce8a144afa95252041535ef44
               name: 'PD: Region schedule push: total, rate'
@@ -653,8 +726,11 @@ zabbix_export:
                 key: pd.get_metrics
               tags:
                 -
-                  tag: Application
-                  value: 'TiDB Store [{#STORE_ADDRESS}]'
+                  tag: address
+                  value: '{#STORE_ADDRESS}'
+                -
+                  tag: component
+                  value: regions
             -
               uuid: ea76344669de4251a0e7bef35d70494a
               name: 'PD: Region heartbeat: total, rate'
@@ -679,8 +755,11 @@ zabbix_export:
                 key: pd.get_metrics
               tags:
                 -
-                  tag: Application
-                  value: 'TiDB Store [{#STORE_ADDRESS}]'
+                  tag: address
+                  value: '{#STORE_ADDRESS}'
+                -
+                  tag: component
+                  value: regions
           master_item:
             key: pd.get_metrics
           preprocessing:
@@ -735,8 +814,11 @@ zabbix_export:
                 key: pd.get_metrics
               tags:
                 -
-                  tag: Application
-                  value: 'TiDB cluster'
+                  tag: component
+                  value: regions
+                -
+                  tag: type
+                  value: '{#TYPE}'
           master_item:
             key: pd.get_metrics
           preprocessing:
@@ -784,8 +866,11 @@ zabbix_export:
                 key: pd.get_metrics
               tags:
                 -
-                  tag: Application
-                  value: 'TiDB cluster'
+                  tag: component
+                  value: regions
+                -
+                  tag: type
+                  value: '{#TYPE}'
               trigger_prototypes:
                 -
                   uuid: 2bc6b48bbfd8436e80903ea947571501
@@ -794,6 +879,10 @@ zabbix_export:
                   discover: NO_DISCOVER
                   priority: WARNING
                   description: 'The number of Regions with an unresponsive peer reported by the Raft leader.'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
                 -
                   uuid: 1f80bd81d11345f59699617113a0cad5
                   expression: 'min(/TiDB PD by HTTP/pd.region_status[{#TYPE}],5m)>{$PD.MISS_REGION.MAX.WARN}'
@@ -801,6 +890,10 @@ zabbix_export:
                   discover: NO_DISCOVER
                   priority: WARNING
                   description: 'The number of Region replicas is smaller than the value of max-replicas. When a TiKV machine is down and its downtime exceeds max-down-time, it usually leads to missing replicas for some Regions during a period of time. When a TiKV node is made offline, it might result in a small number of Regions with missing replicas.'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
           master_item:
             key: pd.get_metrics
           preprocessing:
@@ -883,8 +976,11 @@ zabbix_export:
                 key: pd.get_metrics
               tags:
                 -
-                  tag: Application
-                  value: 'TiDB cluster'
+                  tag: component
+                  value: scheduler
+                -
+                  tag: scheduler
+                  value: '{#KIND}'
           master_item:
             key: pd.get_metrics
           preprocessing:
@@ -906,6 +1002,16 @@ zabbix_export:
               type: DISCARD_UNCHANGED_HEARTBEAT
               parameters:
                 - 1h
+      tags:
+        -
+          tag: class
+          value: database
+        -
+          tag: target
+          value: pd
+        -
+          tag: target
+          value: tidb
       macros:
         -
           macro: '{$PD.MISS_REGION.MAX.WARN}'
diff --git a/templates/db/tidb_http/tidb_tidb_http/template_db_tidb_tidb_http.yaml b/templates/db/tidb_http/tidb_tidb_http/template_db_tidb_tidb_http.yaml
index 5f3a1c91946..39f70dfd01b 100644
--- a/templates/db/tidb_http/tidb_tidb_http/template_db_tidb_tidb_http.yaml
+++ b/templates/db/tidb_http/tidb_tidb_http/template_db_tidb_tidb_http.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-16T07:09:48Z'
+  date: '2022-01-26T10:39:26Z'
   groups:
     -
       uuid: 748ad4d098d447d492bb935c907f652f
@@ -19,7 +19,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Databases
@@ -51,8 +51,8 @@ zabbix_export:
             key: tidb.get_metrics
           tags:
             -
-              tag: Application
-              value: 'TiDB node'
+              tag: component
+              value: cpu
         -
           uuid: e1da33fc95ab46bcbe6bc6a68154d172
           name: 'TiDB: DDL waiting jobs'
@@ -71,14 +71,18 @@ zabbix_export:
             key: tidb.get_metrics
           tags:
             -
-              tag: Application
-              value: 'TiDB node'
+              tag: component
+              value: operations
           triggers:
             -
               uuid: 4125d55d9931455091d2f3a0b25e9678
               expression: 'min(/TiDB by HTTP/tidb.ddl_waiting_jobs,5m)>{$TIDB.DDL.WAITING.MAX.WARN}'
               name: 'TiDB: Too many DDL waiting jobs (over {$TIDB.DDL.WAITING.MAX.WARN} for 5m)'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 0fe0c1dee67e469d9d38193ef7b040ec
           name: 'TiDB: Load schema failed, rate'
@@ -102,14 +106,18 @@ zabbix_export:
             key: tidb.get_metrics
           tags:
             -
-              tag: Application
-              value: 'TiDB node'
+              tag: component
+              value: domain
           triggers:
             -
               uuid: b4948f37af804c01a2b8887f9e89ec90
               expression: 'min(/TiDB by HTTP/tidb.domain_load_schema.failed.rate,5m)>{$TIDB.SCHEMA_LOAD_ERRORS.MAX.WARN}'
               name: 'TiDB: Too many schema lease errors (over {$TIDB.SCHEMA_LOAD_ERRORS.MAX.WARN} for 5m)'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: b0e960ddac4d43a3860e8a06dfe09e03
           name: 'TiDB: Load schema total, rate'
@@ -132,8 +140,8 @@ zabbix_export:
             key: tidb.get_metrics
           tags:
             -
-              tag: Application
-              value: 'TiDB node'
+              tag: component
+              value: domain
         -
           uuid: 8fffe502bd2f42368e60d2110f1c3319
           name: 'TiDB: Failed Query, rate'
@@ -157,8 +165,8 @@ zabbix_export:
             key: tidb.get_metrics
           tags:
             -
-              tag: Application
-              value: 'TiDB node'
+              tag: component
+              value: sql
         -
           uuid: 954f5e433a7c44128d7772b87d493270
           name: 'TiDB: Get instance metrics'
@@ -180,8 +188,8 @@ zabbix_export:
           url: '{$TIDB.URL}:{$TIDB.PORT}/metrics'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
         -
           uuid: e95ebe1050b8404f8274e243203fdecc
           name: 'TiDB: Get instance status'
@@ -201,8 +209,11 @@ zabbix_export:
           url: '{$TIDB.URL}:{$TIDB.PORT}/status'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: health
+            -
+              tag: component
+              value: raw
         -
           uuid: 14cf8296365048a59fd42f03966b1e1e
           name: 'TiDB: Goroutine count'
@@ -220,8 +231,8 @@ zabbix_export:
             key: tidb.get_metrics
           tags:
             -
-              tag: Application
-              value: 'TiDB node'
+              tag: component
+              value: goroutines
         -
           uuid: 78e60bd44e3e4a4a859705c94ef94420
           name: 'TiDB: Heap memory usage'
@@ -241,14 +252,18 @@ zabbix_export:
             key: tidb.get_metrics
           tags:
             -
-              tag: Application
-              value: 'TiDB node'
+              tag: component
+              value: memory
           triggers:
             -
               uuid: 575a4821ed8c4a1881b7f9bd264b1929
               expression: 'min(/TiDB by HTTP/tidb.heap_bytes,5m)>{$TIDB.HEAP.USAGE.MAX.WARN}'
               name: 'TiDB: Heap memory usage is too high (over {$TIDB.HEAP.USAGE.MAX.WARN} for 5m)'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: capacity
         -
           uuid: 104c09cb47f640fb804c136a09aa3bd2
           name: 'TiDB: Keep alive, rate'
@@ -273,8 +288,8 @@ zabbix_export:
             key: tidb.get_metrics
           tags:
             -
-              tag: Application
-              value: 'TiDB node'
+              tag: component
+              value: health
           triggers:
             -
               uuid: eb3c09904fa843d78401b00eff4f6a08
@@ -282,6 +297,10 @@ zabbix_export:
               name: 'TiDB: Too few keep alive operations (less {$TIDB.MONITOR_KEEP_ALIVE.MAX.WARN} for 5m)'
               priority: AVERAGE
               description: 'Indicates whether the TiDB process still exists. If the number of times for tidb_monitor_keep_alive_total increases less than 10 per minute, the TiDB process might already exit and an alert is triggered.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: d3ef55b9fd8b4a2aa1cbbc48f15203cb
           name: 'TiDB: Time jump back, rate'
@@ -305,14 +324,18 @@ zabbix_export:
             key: tidb.get_metrics
           tags:
             -
-              tag: Application
-              value: 'TiDB node'
+              tag: component
+              value: application
           triggers:
             -
               uuid: c3c1f6eab224453b92534d5393aca2b7
               expression: 'min(/TiDB by HTTP/tidb.monitor_time_jump_back.rate,5m)>{$TIDB.TIME_JUMP_BACK.MAX.WARN}'
               name: 'TiDB: Too many time jump backs (over {$TIDB.TIME_JUMP_BACK.MAX.WARN} for 5m)'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: dce76be0ccbe44969bb09ad29d599790
           name: 'TiDB: PD TSO commands, rate'
@@ -336,8 +359,8 @@ zabbix_export:
             key: tidb.get_metrics
           tags:
             -
-              tag: Application
-              value: 'TiDB node'
+              tag: component
+              value: pd-commands
         -
           uuid: 2bde50849f5541c3ac8aa5b26f5b8b52
           name: 'TiDB: PD TSO requests, rate'
@@ -361,8 +384,8 @@ zabbix_export:
             key: tidb.get_metrics
           tags:
             -
-              tag: Application
-              value: 'TiDB node'
+              tag: component
+              value: pd-commands
         -
           uuid: ad8764623b8e46238efc0a94f0766a5b
           name: 'TiDB: Open file descriptors, max'
@@ -381,8 +404,8 @@ zabbix_export:
             key: tidb.get_metrics
           tags:
             -
-              tag: Application
-              value: 'TiDB node'
+              tag: component
+              value: fds
         -
           uuid: 04b3d6bf810c449db1e4b79be6b263a9
           name: 'TiDB: Open file descriptors'
@@ -401,8 +424,8 @@ zabbix_export:
             key: tidb.get_metrics
           tags:
             -
-              tag: Application
-              value: 'TiDB node'
+              tag: component
+              value: fds
         -
           uuid: fbee374d0fda4679a693ccccc26e5713
           name: 'TiDB: RSS memory usage'
@@ -422,8 +445,8 @@ zabbix_export:
             key: tidb.get_metrics
           tags:
             -
-              tag: Application
-              value: 'TiDB node'
+              tag: component
+              value: memory
         -
           uuid: 651140aae7334994a31d24568c08a9ab
           name: 'TiDB: Total "error" server query, rate'
@@ -447,8 +470,8 @@ zabbix_export:
             key: tidb.get_metrics
           tags:
             -
-              tag: Application
-              value: 'TiDB node'
+              tag: component
+              value: queries
         -
           uuid: 00374eab11a14ab1b4e636996519ab80
           name: 'TiDB: Total "ok" server query, rate'
@@ -472,8 +495,8 @@ zabbix_export:
             key: tidb.get_metrics
           tags:
             -
-              tag: Application
-              value: 'TiDB node'
+              tag: component
+              value: queries
         -
           uuid: 938e7bb83c714e198db55f3bb009daaf
           name: 'TiDB: Total server query, rate'
@@ -497,8 +520,8 @@ zabbix_export:
             key: tidb.get_metrics
           tags:
             -
-              tag: Application
-              value: 'TiDB node'
+              tag: component
+              value: queries
         -
           uuid: 84824ff459b74679b33e34a1f1e8cc69
           name: 'TiDB: Schema lease "change" errors, rate'
@@ -524,8 +547,8 @@ zabbix_export:
             key: tidb.get_metrics
           tags:
             -
-              tag: Application
-              value: 'TiDB node'
+              tag: component
+              value: sessions
         -
           uuid: fe35df7cc7de4b0b8d616b042da99d69
           name: 'TiDB: Schema lease "outdate" errors , rate'
@@ -551,8 +574,8 @@ zabbix_export:
             key: tidb.get_metrics
           tags:
             -
-              tag: Application
-              value: 'TiDB node'
+              tag: component
+              value: sessions
           triggers:
             -
               uuid: b077eb1afe6a4da79707987324fb40c8
@@ -560,6 +583,10 @@ zabbix_export:
               name: 'TiDB: Too many schema lease errors (over {$TIDB.SCHEMA_LEASE_ERRORS.MAX.WARN} for 5m)'
               priority: AVERAGE
               description: 'The latest schema information is not reloaded in TiDB within one lease.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: fe8cf5e5c7704db797e76fd9d64e6d17
           name: 'TiDB: SQL statements, rate'
@@ -582,8 +609,8 @@ zabbix_export:
             key: tidb.get_metrics
           tags:
             -
-              tag: Application
-              value: 'TiDB node'
+              tag: component
+              value: sql
         -
           uuid: ed86585a496b4b438c521c4765d76b11
           name: 'TiDB: Status'
@@ -611,14 +638,18 @@ zabbix_export:
             key: tidb.get_status
           tags:
             -
-              tag: Application
-              value: 'TiDB node'
+              tag: component
+              value: health
           triggers:
             -
               uuid: 82a638ac4a3f4b349ee7bb0d53bc1f29
               expression: 'last(/TiDB by HTTP/tidb.status)=0'
               name: 'TiDB: Instance is not responding'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: b5db09e71f2341b8ac1b9e48cbdefc82
           name: 'TiDB: Server connections'
@@ -636,8 +667,8 @@ zabbix_export:
             key: tidb.get_metrics
           tags:
             -
-              tag: Application
-              value: 'TiDB node'
+              tag: component
+              value: connections
         -
           uuid: 73992d4be61e443eafcc03aaa1bbf4a5
           name: 'TiDB: Server critical error, rate'
@@ -660,8 +691,8 @@ zabbix_export:
             key: tidb.get_metrics
           tags:
             -
-              tag: Application
-              value: 'TiDB node'
+              tag: component
+              value: server
         -
           uuid: f1e2436ced3c456a85650e0622715777
           name: 'TiDB: Server panic, rate'
@@ -685,8 +716,8 @@ zabbix_export:
             key: tidb.get_metrics
           tags:
             -
-              tag: Application
-              value: 'TiDB node'
+              tag: component
+              value: server
           triggers:
             -
               uuid: c457465731c947eab7b477186d8ba876
@@ -694,6 +725,10 @@ zabbix_export:
               name: 'TiDB: There are panicked TiDB threads'
               priority: AVERAGE
               description: 'When a panic occurs, an alert is triggered. The thread is often recovered, otherwise, TiDB will frequently restart.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 8a63b326356f4fdbb9cb6e73437348be
           name: 'TiDB: KV backoff, rate'
@@ -718,8 +753,8 @@ zabbix_export:
             key: tidb.get_metrics
           tags:
             -
-              tag: Application
-              value: 'TiDB node'
+              tag: component
+              value: tikv-commands
         -
           uuid: aef7cdfd07f1420c970f20c821fed8dd
           name: 'TiDB: Lock resolves, rate'
@@ -743,8 +778,8 @@ zabbix_export:
             key: tidb.get_metrics
           tags:
             -
-              tag: Application
-              value: 'TiDB node'
+              tag: component
+              value: tikv-commands
         -
           uuid: c116313e63fa45d89bf44772cc9cb3b8
           name: 'TiDB: TiClient region errors, rate'
@@ -768,14 +803,18 @@ zabbix_export:
             key: tidb.get_metrics
           tags:
             -
-              tag: Application
-              value: 'TiDB node'
+              tag: component
+              value: regions
           triggers:
             -
               uuid: d3cb81c46e414ff2a7e411a877b899ef
               expression: 'min(/TiDB by HTTP/tidb.tikvclient_region_err.rate,5m)>{$TIDB.REGION_ERROR.MAX.WARN}'
               name: 'TiDB: Too many region related errors (over {$TIDB.REGION_ERROR.MAX.WARN} for 5m)'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 8ddf164df8c9404ba9f7c0f87db3bc2f
           name: 'TiDB: KV commands, rate'
@@ -799,8 +838,8 @@ zabbix_export:
             key: tidb.get_metrics
           tags:
             -
-              tag: Application
-              value: 'TiDB node'
+              tag: component
+              value: tikv-commands
         -
           uuid: 20c0fffd66c84a16bb4d8f7882c896bc
           name: 'TiDB: Uptime'
@@ -826,8 +865,8 @@ zabbix_export:
             key: tidb.get_metrics
           tags:
             -
-              tag: Application
-              value: 'TiDB node'
+              tag: component
+              value: application
           triggers:
             -
               uuid: 91adc4c6b9364693891faf58c8cced75
@@ -836,6 +875,10 @@ zabbix_export:
               priority: INFO
               description: 'Uptime is less than 10 minutes'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 65fa2b077073467387b39bef035b0644
           name: 'TiDB: Version'
@@ -859,8 +902,8 @@ zabbix_export:
             key: tidb.get_status
           tags:
             -
-              tag: Application
-              value: 'TiDB node'
+              tag: component
+              value: application
           triggers:
             -
               uuid: 5f863fc0944848fdad145f42c94dbea3
@@ -869,6 +912,10 @@ zabbix_export:
               priority: INFO
               description: 'TiDB version has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
       discovery_rules:
         -
           uuid: 4db735b652eb451d911f6dc01de6b1ba
@@ -901,8 +948,11 @@ zabbix_export:
                 key: tidb.get_metrics
               tags:
                 -
-                  tag: Application
-                  value: 'TiDB node'
+                  tag: component
+                  value: tikv-commands
+                -
+                  tag: type
+                  value: '{#TYPE}'
           master_item:
             key: tidb.get_metrics
           preprocessing:
@@ -954,8 +1004,11 @@ zabbix_export:
                 key: tidb.get_metrics
               tags:
                 -
-                  tag: Application
-                  value: 'TiDB node'
+                  tag: component
+                  value: queries
+                -
+                  tag: type
+                  value: '{#TYPE}'
             -
               uuid: 125bdd3eb1b643f4ad00d58fbed455f6
               name: 'TiDB: Server query "OK": {#TYPE}, rate'
@@ -979,8 +1032,11 @@ zabbix_export:
                 key: tidb.get_metrics
               tags:
                 -
-                  tag: Application
-                  value: 'TiDB node'
+                  tag: component
+                  value: queries
+                -
+                  tag: type
+                  value: '{#TYPE}'
           master_item:
             key: tidb.get_metrics
           preprocessing:
@@ -1038,8 +1094,11 @@ zabbix_export:
                 key: tidb.get_metrics
               tags:
                 -
-                  tag: Application
-                  value: 'TiDB node'
+                  tag: component
+                  value: sql
+                -
+                  tag: type
+                  value: '{#TYPE}'
           master_item:
             key: tidb.get_metrics
           preprocessing:
@@ -1091,8 +1150,11 @@ zabbix_export:
                 key: tidb.get_metrics
               tags:
                 -
-                  tag: Application
-                  value: 'TiDB node'
+                  tag: component
+                  value: tikv-backoff
+                -
+                  tag: type
+                  value: '{#TYPE}'
           master_item:
             key: tidb.get_metrics
           preprocessing:
@@ -1145,8 +1207,11 @@ zabbix_export:
                 key: tidb.get_metrics
               tags:
                 -
-                  tag: Application
-                  value: 'TiDB node'
+                  tag: component
+                  value: gc
+                -
+                  tag: type
+                  value: '{#TYPE}'
               trigger_prototypes:
                 -
                   uuid: 2d24956d0a4f459fad155590376696c1
@@ -1154,6 +1219,10 @@ zabbix_export:
                   name: 'TiDB: Too many failed GC-related operations (over {$TIDB.GC_ACTIONS.ERRORS.MAX.WARN} in 5m)'
                   discover: NO_DISCOVER
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           master_item:
             key: tidb.get_metrics
           preprocessing:
@@ -1223,8 +1292,11 @@ zabbix_export:
                 key: tidb.get_metrics
               tags:
                 -
-                  tag: Application
-                  value: 'TiDB node'
+                  tag: component
+                  value: locks
+                -
+                  tag: type
+                  value: '{#TYPE}'
           master_item:
             key: tidb.get_metrics
           preprocessing:
@@ -1245,6 +1317,13 @@ zabbix_export:
               type: DISCARD_UNCHANGED_HEARTBEAT
               parameters:
                 - 1h
+      tags:
+        -
+          tag: class
+          value: database
+        -
+          tag: target
+          value: tidb
       macros:
         -
           macro: '{$TIDB.DDL.WAITING.MAX.WARN}'
@@ -1308,6 +1387,10 @@ zabbix_export:
       name: 'TiDB: Current number of open files is too high (over {$TIDB.OPEN.FDS.MAX.WARN}% for 5m)'
       priority: WARNING
       description: 'Heavy file descriptor usage (i.e., near the process''s file descriptor limit) indicates a potential file descriptor exhaustion issue.'
+      tags:
+        -
+          tag: scope
+          value: capacity
   graphs:
     -
       uuid: ee25671d0b5446348341be56967a74b2
diff --git a/templates/db/tidb_http/tidb_tikv_http/template_db_tidb_tikv_http.yaml b/templates/db/tidb_http/tidb_tikv_http/template_db_tidb_tikv_http.yaml
index ae5033259aa..91f70555682 100644
--- a/templates/db/tidb_http/tidb_tikv_http/template_db_tidb_tikv_http.yaml
+++ b/templates/db/tidb_http/tidb_tikv_http/template_db_tidb_tikv_http.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-16T07:40:23Z'
+  date: '2022-01-26T10:37:43Z'
   groups:
     -
       uuid: 748ad4d098d447d492bb935c907f652f
@@ -19,7 +19,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Databases
@@ -46,8 +46,8 @@ zabbix_export:
             key: tikv.get_metrics
           tags:
             -
-              tag: Application
-              value: 'TiKV node'
+              tag: component
+              value: scheduler
         -
           uuid: b5ce79ee79804e76bb7b91e17915159c
           name: 'TiKV: Scheduler: Low priority commands total, rate'
@@ -70,8 +70,8 @@ zabbix_export:
             key: tikv.get_metrics
           tags:
             -
-              tag: Application
-              value: 'TiKV node'
+              tag: component
+              value: scheduler
         -
           uuid: df3fa02457ac47168fad251727b300ff
           name: 'TiKV: Scheduler: Normal priority commands total, rate'
@@ -94,8 +94,8 @@ zabbix_export:
             key: tikv.get_metrics
           tags:
             -
-              tag: Application
-              value: 'TiKV node'
+              tag: component
+              value: scheduler
         -
           uuid: dbf8288b5cab4e8a95b5e7c4355676bd
           name: 'TiKV: Coprocessor: Requests, rate'
@@ -119,8 +119,8 @@ zabbix_export:
             key: tikv.get_metrics
           tags:
             -
-              tag: Application
-              value: 'TiKV node'
+              tag: component
+              value: coprocessor
         -
           uuid: d6185382a1974b9194e68bea4f14eb75
           name: 'TiKV: Coprocessor: Errors, rate'
@@ -145,14 +145,43 @@ zabbix_export:
             key: tikv.get_metrics
           tags:
             -
-              tag: Application
-              value: 'TiKV node'
+              tag: component
+              value: coprocessor
           triggers:
             -
               uuid: 31eca27ff6ce4ed78ee428ed3b8d8806
               expression: 'min(/TiDB TiKV by HTTP/tikv.coprocessor_request_error.rate,5m)>{$TIKV.COPOCESSOR.ERRORS.MAX.WARN}'
               name: 'TiKV: Too many coprocessor request error (over {$TIKV.COPOCESSOR.ERRORS.MAX.WARN} in 5m)'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: performance
+        -
+          uuid: 5567ebf02fb6441dbb6672e1bc77b3ab
+          name: 'TiKV: Coprocessor: Response size, rate'
+          type: DEPENDENT
+          key: tikv.coprocessor_response_bytes.rate
+          delay: '0'
+          history: 7d
+          value_type: FLOAT
+          units: Bps
+          description: 'The total size of coprocessor response per second.'
+          preprocessing:
+            -
+              type: JSONPATH
+              parameters:
+                - '$[?(@.name == "tikv_coprocessor_response_bytes")].value.first()'
+            -
+              type: CHANGE_PER_SECOND
+              parameters:
+                - ''
+          master_item:
+            key: tikv.get_metrics
+          tags:
+            -
+              tag: component
+              value: coprocessor
         -
           uuid: 237f6ba2973e472d8c20de1d61b4695c
           name: 'TiKV: Coprocessor: RocksDB ops, rate'
@@ -176,23 +205,23 @@ zabbix_export:
             key: tikv.get_metrics
           tags:
             -
-              tag: Application
-              value: 'TiKV node'
+              tag: component
+              value: coprocessor
         -
-          uuid: 5567ebf02fb6441dbb6672e1bc77b3ab
-          name: 'TiKV: Coprocessor: Response size, rate'
+          uuid: bfcec759c0894cf89c5267fc6b3862d7
+          name: 'TiKV: Coprocessor: Scan keys, rate'
           type: DEPENDENT
-          key: tikv.coprocessor_scan_keys.rate
+          key: tikv.coprocessor_scan_keys_sum.rate
           delay: '0'
           history: 7d
           value_type: FLOAT
-          units: Bps
-          description: 'The total size of coprocessor response per second.'
+          units: Ops
+          description: 'Total number of scan keys observed per request per second.'
           preprocessing:
             -
               type: JSONPATH
               parameters:
-                - '$[?(@.name == "tikv_coprocessor_response_bytes")].value.first()'
+                - '$[?(@.name == "tikv_coprocessor_scan_keys")].value.sum()'
             -
               type: CHANGE_PER_SECOND
               parameters:
@@ -201,8 +230,8 @@ zabbix_export:
             key: tikv.get_metrics
           tags:
             -
-              tag: Application
-              value: 'TiKV node'
+              tag: component
+              value: coprocessor
         -
           uuid: a76665b7a9924f8cbd4a455bc248d790
           name: 'TiKV: CPU util'
@@ -230,8 +259,8 @@ zabbix_export:
             key: tikv.get_metrics
           tags:
             -
-              tag: Application
-              value: 'TiKV node'
+              tag: component
+              value: cpu
         -
           uuid: 4558a5a11c304584bf24a7c3d2eace23
           name: 'TiKV: Bytes read'
@@ -251,8 +280,8 @@ zabbix_export:
             key: tikv.get_metrics
           tags:
             -
-              tag: Application
-              value: 'TiKV node'
+              tag: component
+              value: storage
         -
           uuid: 0d44c3c9a7f34905b0404ae39a3bc881
           name: 'TiKV: Bytes write'
@@ -272,8 +301,8 @@ zabbix_export:
             key: tikv.get_metrics
           tags:
             -
-              tag: Application
-              value: 'TiKV node'
+              tag: component
+              value: storage
         -
           uuid: f79d5daea61842b18e39c7289657ddf5
           name: 'TiKV: Store size'
@@ -293,8 +322,8 @@ zabbix_export:
             key: tikv.get_metrics
           tags:
             -
-              tag: Application
-              value: 'TiKV node'
+              tag: component
+              value: storage
         -
           uuid: 418bcc8c0bc440468efe833bef02929d
           name: 'TiKV: Get instance metrics'
@@ -316,8 +345,8 @@ zabbix_export:
           url: '{$TIKV.URL}:{$TIKV.PORT}/metrics'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
         -
           uuid: fed3db7222fa41a8bf51d2ad860a22d4
           name: 'TiKV: Total query, rate'
@@ -341,8 +370,8 @@ zabbix_export:
             key: tikv.get_metrics
           tags:
             -
-              tag: Application
-              value: 'TiKV node'
+              tag: component
+              value: queries
         -
           uuid: c68db41c184d44d98445cc66489ef39c
           name: 'TiKV: Total query errors, rate'
@@ -367,8 +396,8 @@ zabbix_export:
             key: tikv.get_metrics
           tags:
             -
-              tag: Application
-              value: 'TiKV node'
+              tag: component
+              value: grpc
         -
           uuid: 7afa5147a1e247a5b8914d8739d31f15
           name: 'TiKV: Server: failure messages total, rate'
@@ -392,8 +421,8 @@ zabbix_export:
             key: tikv.get_metrics
           tags:
             -
-              tag: Application
-              value: 'TiKV node'
+              tag: component
+              value: application
         -
           uuid: e6137dd87faa496497b23cadaa37dca9
           name: 'TiKV: Regions, count'
@@ -411,8 +440,8 @@ zabbix_export:
             key: tikv.get_metrics
           tags:
             -
-              tag: Application
-              value: 'TiKV node'
+              tag: component
+              value: regions
         -
           uuid: 2ab7643435794ec6b5a2c3eb1dd7e913
           name: 'TiKV: Regions, leader'
@@ -430,8 +459,8 @@ zabbix_export:
             key: tikv.get_metrics
           tags:
             -
-              tag: Application
-              value: 'TiKV node'
+              tag: component
+              value: regions
         -
           uuid: 1c480fa23eaa42bcb367bb5afdcb65b9
           name: 'TiKV: RSS memory usage'
@@ -451,8 +480,8 @@ zabbix_export:
             key: tikv.get_metrics
           tags:
             -
-              tag: Application
-              value: 'TiKV node'
+              tag: component
+              value: memory
         -
           uuid: 62f856cf22804262aef64e9369049332
           name: 'TiKV: Scheduler: Commands total, rate'
@@ -477,38 +506,37 @@ zabbix_export:
             key: tikv.get_metrics
           tags:
             -
-              tag: Application
-              value: 'TiKV node'
+              tag: component
+              value: scheduler
         -
-          uuid: 8b7c2dc8c60e491db76cafd2d0e1234b
-          name: 'TiKV: Snapshot: Pending tasks'
+          uuid: 33a1b2f676134cf1b81771fbaf152f59
+          name: 'TiKV: Scheduler: Pending commands'
           type: DEPENDENT
           key: tikv.scheduler_contex
           delay: '0'
           history: 7d
-          description: 'The number of tasks currently running by the worker or pending.'
+          description: 'The total number of pending commands. The scheduler receives commands from clients, executes them against the MVCC layer storage engine.'
           preprocessing:
             -
               type: JSONPATH
               parameters:
-                - '$[?(@.name == "tikv_worker_pending_task_total")].value.first()'
+                - '$[?(@.name == "tikv_scheduler_contex_total")].value.first()'
           master_item:
             key: tikv.get_metrics
           tags:
             -
-              tag: Application
-              value: 'TiKV node'
+              tag: component
+              value: scheduler
           triggers:
             -
-              uuid: be07ed23d6e040bd90866a4981d3c712
+              uuid: 0f21c02b8e1c45d9bbe0c3313cea1a23
               expression: 'min(/TiDB TiKV by HTTP/tikv.scheduler_contex,5m)>{$TIKV.PENDING_COMMANDS.MAX.WARN}'
               name: 'TiKV: Too many pending commands (over {$TIKV.PENDING_COMMANDS.MAX.WARN} for 5m)'
               priority: AVERAGE
-            -
-              uuid: f26874f910e34933983685ae43a90bee
-              expression: 'min(/TiDB TiKV by HTTP/tikv.scheduler_contex,5m)>{$TIKV.PENDING_TASKS.MAX.WARN}'
-              name: 'TiKV: Too many pending commands (over {$TIKV.PENDING_TASKS.MAX.WARN} for 5m)'
-              priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 8f5c9d2b9eca4a489d764420ee06e4b6
           name: 'TiKV: Scheduler: Busy, rate'
@@ -532,8 +560,8 @@ zabbix_export:
             key: tikv.get_metrics
           tags:
             -
-              tag: Application
-              value: 'TiKV node'
+              tag: component
+              value: scheduler
         -
           uuid: 0a2d0a119bcd406aadfc5c014186c5d3
           name: 'TiKV: Snapshot: Applying'
@@ -551,8 +579,8 @@ zabbix_export:
             key: tikv.get_metrics
           tags:
             -
-              tag: Application
-              value: 'TiKV node'
+              tag: component
+              value: snapshot
         -
           uuid: 58559be859d64887a1b919e36aa1e336
           name: 'TiKV: Snapshot: Receiving'
@@ -570,8 +598,8 @@ zabbix_export:
             key: tikv.get_metrics
           tags:
             -
-              tag: Application
-              value: 'TiKV node'
+              tag: component
+              value: snapshot
         -
           uuid: 0ae6a2024ed3488498e22bc542d27619
           name: 'TiKV: Snapshot: Sending'
@@ -589,8 +617,8 @@ zabbix_export:
             key: tikv.get_metrics
           tags:
             -
-              tag: Application
-              value: 'TiKV node'
+              tag: component
+              value: snapshot
         -
           uuid: ce31318a420d40668e62a47fe19d3d40
           name: 'TiKV: Storage: commands total, rate'
@@ -613,8 +641,8 @@ zabbix_export:
             key: tikv.get_metrics
           tags:
             -
-              tag: Application
-              value: 'TiKV node'
+              tag: component
+              value: commands
         -
           uuid: fbfaa0d967c049c0a1bbcec5afea4bf2
           name: 'TiKV: Available size'
@@ -634,8 +662,8 @@ zabbix_export:
             key: tikv.get_metrics
           tags:
             -
-              tag: Application
-              value: 'TiKV node'
+              tag: component
+              value: storage
         -
           uuid: 1e0c1c071b604e77998797c2f9d41dfc
           name: 'TiKV: Capacity size'
@@ -655,8 +683,8 @@ zabbix_export:
             key: tikv.get_metrics
           tags:
             -
-              tag: Application
-              value: 'TiKV node'
+              tag: component
+              value: storage
         -
           uuid: f2632dbd773140398a7d61608d85f392
           name: 'TiKV: Uptime'
@@ -682,8 +710,8 @@ zabbix_export:
             key: tikv.get_metrics
           tags:
             -
-              tag: Application
-              value: 'TiKV node'
+              tag: component
+              value: application
           triggers:
             -
               uuid: ca06602fa0b64a2ba0c51ed4835c52b2
@@ -692,6 +720,39 @@ zabbix_export:
               priority: INFO
               description: 'Uptime is less than 10 minutes'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+        -
+          uuid: 8b7c2dc8c60e491db76cafd2d0e1234b
+          name: 'TiKV: Snapshot: Pending tasks'
+          type: DEPENDENT
+          key: tikv.worker_pending_task
+          delay: '0'
+          history: 7d
+          description: 'The number of tasks currently running by the worker or pending.'
+          preprocessing:
+            -
+              type: JSONPATH
+              parameters:
+                - '$[?(@.name == "tikv_worker_pending_task_total")].value.first()'
+          master_item:
+            key: tikv.get_metrics
+          tags:
+            -
+              tag: component
+              value: snapshot
+          triggers:
+            -
+              uuid: f26874f910e34933983685ae43a90bee
+              expression: 'min(/TiDB TiKV by HTTP/tikv.worker_pending_task,5m)>{$TIKV.PENDING_TASKS.MAX.WARN}'
+              name: 'TiKV: Too many pending tasks (over {$TIKV.PENDING_TASKS.MAX.WARN} for 5m)'
+              priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: performance
       discovery_rules:
         -
           uuid: f1c7de94679e40a4ac6f569e05ad61d0
@@ -724,8 +785,11 @@ zabbix_export:
                 key: tikv.get_metrics
               tags:
                 -
-                  tag: Application
-                  value: 'TiKV node'
+                  tag: component
+                  value: coprocessor
+                -
+                  tag: request
+                  value: '{#REQ_TYPE}'
             -
               uuid: 08060401409b4fff97430c595fec7b82
               name: 'TiKV: Coprocessor: {#REQ_TYPE} errors, rate'
@@ -750,8 +814,11 @@ zabbix_export:
                 key: tikv.get_metrics
               tags:
                 -
-                  tag: Application
-                  value: 'TiKV node'
+                  tag: component
+                  value: coprocessor
+                -
+                  tag: request
+                  value: '{#REQ_TYPE}'
             -
               uuid: bff6ee970f7349edba6cac1cd0da70ed
               name: 'TiKV: Coprocessor: {#REQ_TYPE} RocksDB ops, rate'
@@ -775,8 +842,11 @@ zabbix_export:
                 key: tikv.get_metrics
               tags:
                 -
-                  tag: Application
-                  value: 'TiKV node'
+                  tag: component
+                  value: coprocessor
+                -
+                  tag: request
+                  value: '{#REQ_TYPE}'
             -
               uuid: 8ef93de8a25b4f35b2e54f6ced4a5bd2
               name: 'TiKV: Coprocessor: {#REQ_TYPE} scan keys, rate'
@@ -800,8 +870,11 @@ zabbix_export:
                 key: tikv.get_metrics
               tags:
                 -
-                  tag: Application
-                  value: 'TiKV node'
+                  tag: component
+                  value: coprocessor
+                -
+                  tag: request
+                  value: '{#REQ_TYPE}'
           master_item:
             key: tikv.get_metrics
           preprocessing:
@@ -850,8 +923,11 @@ zabbix_export:
                 key: tikv.get_metrics
               tags:
                 -
-                  tag: Application
-                  value: 'TiKV node'
+                  tag: component
+                  value: grpc
+                -
+                  tag: type
+                  value: '{#TYPE}'
           master_item:
             key: tikv.get_metrics
           preprocessing:
@@ -904,8 +980,11 @@ zabbix_export:
                 key: tikv.get_metrics
               tags:
                 -
-                  tag: Application
-                  value: 'TiKV node'
+                  tag: component
+                  value: scheduler
+                -
+                  tag: stage
+                  value: '{#STAGE}'
           master_item:
             key: tikv.get_metrics
           preprocessing:
@@ -963,8 +1042,14 @@ zabbix_export:
                 key: tikv.get_metrics
               tags:
                 -
-                  tag: Application
-                  value: 'TiKV node'
+                  tag: component
+                  value: stores
+                -
+                  tag: message-type
+                  value: '{#TYPE}'
+                -
+                  tag: store
+                  value: '{#STORE_ID}'
               trigger_prototypes:
                 -
                   uuid: 1f65b64824d64852aaa609df5f3e27fd
@@ -973,6 +1058,10 @@ zabbix_export:
                   discover: NO_DISCOVER
                   priority: WARNING
                   description: 'Indicates that the remote TiKV cannot be connected.'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
           master_item:
             key: tikv.get_metrics
           preprocessing:
@@ -1013,6 +1102,16 @@ zabbix_export:
                   value: 'Too many failure messages'
                   status: ENABLED
                   discover: DISCOVER
+      tags:
+        -
+          tag: class
+          value: database
+        -
+          tag: target
+          value: tidb
+        -
+          tag: target
+          value: tikv
       macros:
         -
           macro: '{$TIKV.COPOCESSOR.ERRORS.MAX.WARN}'
diff --git a/templates/module/ether_like_snmp/README.md b/templates/module/ether_like_snmp/README.md
index 548f526bb52..d417576d8bc 100644
--- a/templates/module/ether_like_snmp/README.md
+++ b/templates/module/ether_like_snmp/README.md
@@ -28,7 +28,7 @@ There are no template links in this template.
 
 |Group|Name|Description|Type|Key and additional info|
 |-----|----|-----------|----|---------------------|
-|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Duplex status |<p>MIB: EtherLike-MIB</p><p>The current mode of operation of the MAC</p><p>entity.  'unknown' indicates that the current</p><p>duplex mode could not be determined.</p><p>Management control of the duplex mode is</p><p>accomplished through the MAU MIB.  When</p><p>an interface does not support autonegotiation,</p><p>or when autonegotiation is not enabled, the</p><p>duplex mode is controlled using</p><p>ifMauDefaultType.  When autonegotiation is</p><p>supported and enabled, duplex mode is controlled</p><p>using ifMauAutoNegAdvertisedBits.  In either</p><p>case, the currently operating duplex mode is</p><p>reflected both in this object and in ifMauType.</p><p>Note that this object provides redundant</p><p>information with ifMauType.  Normally, redundant</p><p>objects are discouraged.  However, in this</p><p>instance, it allows a management application to</p><p>determine the duplex status of an interface</p><p>without having to know every possible value of</p><p>ifMauType.  This was felt to be sufficiently</p><p>valuable to justify the redundancy.</p><p>Reference: [IEEE 802.3 Std.], 30.3.1.1.32,aDuplexStatus.</p> |SNMP |net.if.duplex[dot3StatsDuplexStatus.{#SNMPINDEX}] |
+|Network interfaces |Interface {#IFNAME}({#IFALIAS}): Duplex status |<p>MIB: EtherLike-MIB</p><p>The current mode of operation of the MAC</p><p>entity.  'unknown' indicates that the current</p><p>duplex mode could not be determined.</p><p>Management control of the duplex mode is</p><p>accomplished through the MAU MIB.  When</p><p>an interface does not support autonegotiation,</p><p>or when autonegotiation is not enabled, the</p><p>duplex mode is controlled using</p><p>ifMauDefaultType.  When autonegotiation is</p><p>supported and enabled, duplex mode is controlled</p><p>using ifMauAutoNegAdvertisedBits.  In either</p><p>case, the currently operating duplex mode is</p><p>reflected both in this object and in ifMauType.</p><p>Note that this object provides redundant</p><p>information with ifMauType.  Normally, redundant</p><p>objects are discouraged.  However, in this</p><p>instance, it allows a management application to</p><p>determine the duplex status of an interface</p><p>without having to know every possible value of</p><p>ifMauType.  This was felt to be sufficiently</p><p>valuable to justify the redundancy.</p><p>Reference: [IEEE 802.3 Std.], 30.3.1.1.32,aDuplexStatus.</p> |SNMP |net.if.duplex[dot3StatsDuplexStatus.{#SNMPINDEX}] |
 
 ## Triggers
 
diff --git a/templates/module/ether_like_snmp/template_module_ether_like_snmp.yaml b/templates/module/ether_like_snmp/template_module_ether_like_snmp.yaml
index 003f5e1d4e4..8b0d7d28c70 100644
--- a/templates/module/ether_like_snmp/template_module_ether_like_snmp.yaml
+++ b/templates/module/ether_like_snmp/template_module_ether_like_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-16T08:28:11Z'
+  date: '2022-01-26T10:32:41Z'
   groups:
     -
       uuid: 57b7ae836ca64446ba2c296389c009b7
@@ -16,7 +16,7 @@ zabbix_export:
         MIBs used:
         EtherLike-MIB
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Modules
@@ -78,8 +78,14 @@ zabbix_export:
                 name: 'EtherLike-MIB::dot3StatsDuplexStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: e6ae9fc7d4454d389d066450af3a3066
@@ -88,6 +94,10 @@ zabbix_export:
                   priority: WARNING
                   description: 'Please check autonegotiation settings and cabling'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           preprocessing:
             -
               type: JAVASCRIPT
diff --git a/templates/module/generic_snmp_snmp/template_module_generic_snmp_snmp.yaml b/templates/module/generic_snmp_snmp/template_module_generic_snmp_snmp.yaml
index f2638ca5641..4708007b455 100644
--- a/templates/module/generic_snmp_snmp/template_module_generic_snmp_snmp.yaml
+++ b/templates/module/generic_snmp_snmp/template_module_generic_snmp_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:38:37Z'
+  date: '2022-01-26T10:32:00Z'
   groups:
     -
       uuid: 57b7ae836ca64446ba2c296389c009b7
@@ -31,8 +31,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 085d6f785f1e46faa447d6921036d01d
@@ -40,6 +43,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 5d306c51188e496ba19b75b99e28cc7b
           name: 'ICMP loss'
@@ -50,8 +57,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: d1bd868814ba4ace9b5034ac4e303259
@@ -63,6 +73,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/Generic SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 9ad39c8c6ede46e6953aa6f9466eaf69
           name: 'ICMP response time'
@@ -73,8 +90,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: ecd74ec29b484a499414293bf671160b
@@ -89,6 +109,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/Generic SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 2cda26906f254e13985cecdbb7901d1a
           name: 'SNMP traps (fallback)'
@@ -101,8 +128,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: 62da59c7aae54df7976f327119fe7cc2
           name: 'System contact details'
@@ -124,8 +151,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 29a3e5277de94386a5985fcf38a09364
           name: 'System description'
@@ -148,8 +175,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 02b453f44c014f2bb1054e801058b381
           name: 'System location'
@@ -171,8 +198,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 3996a3a8d927473aa07c47e63a09b865
           name: 'System name'
@@ -194,8 +221,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 072bf35ea9d04c559ada5cb13d4b6802
@@ -204,6 +231,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: 9dbcc5a1cd7240c896e2ea718f9ccb35
           name: 'System object ID'
@@ -224,8 +258,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 000b97abddcd44bfb57e0eeb1b77f69e
           name: Uptime
@@ -246,8 +280,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 6f00359af55f45909bdecbad234c7654
@@ -260,6 +294,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/Generic SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 3e8c2d440441416b9ccec7dd90e21503
           name: 'SNMP agent availability'
@@ -276,8 +314,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: d3aba975ec574b258c7f971152c5d4cd
@@ -290,6 +331,17 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/Generic SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+      tags:
+        -
+          tag: class
+          value: device
+        -
+          tag: target
+          value: generic
       macros:
         -
           macro: '{$ICMP_LOSS_WARN}'
diff --git a/templates/module/host_resources_snmp/template_module_host_resources_snmp.yaml b/templates/module/host_resources_snmp/template_module_host_resources_snmp.yaml
index b1a6bd941f3..98392d1187c 100644
--- a/templates/module/host_resources_snmp/template_module_host_resources_snmp.yaml
+++ b/templates/module/host_resources_snmp/template_module_host_resources_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:38:41Z'
+  date: '2022-01-26T10:32:52Z'
   groups:
     -
       uuid: 57b7ae836ca64446ba2c296389c009b7
@@ -41,8 +41,8 @@ zabbix_export:
                 - '$..[''{#CPU.UTIL}''].avg()'
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
           triggers:
             -
               uuid: bb8b2193ed4c437284d569a38f500367
@@ -51,6 +51,10 @@ zabbix_export:
               opdata: 'Current utilization: {ITEM.LASTVALUE1}'
               priority: WARNING
               description: 'CPU utilization is too high. The system might be slow to respond.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
@@ -118,8 +122,8 @@ zabbix_export:
                     - '{#ALLOC_UNITS}'
               tags:
                 -
-                  tag: Application
-                  value: Memory
+                  tag: component
+                  value: memory
             -
               uuid: f5b701faf10d40d596d04e1d921861f9
               name: '{#MEMNAME}: Used memory'
@@ -138,8 +142,8 @@ zabbix_export:
                     - '{#ALLOC_UNITS}'
               tags:
                 -
-                  tag: Application
-                  value: Memory
+                  tag: component
+                  value: memory
             -
               uuid: 99961a81ae4a474ea157f108c8014c77
               name: '{#MEMNAME}: Memory utilization'
@@ -152,8 +156,8 @@ zabbix_export:
               description: 'Memory utilization in %'
               tags:
                 -
-                  tag: Application
-                  value: Memory
+                  tag: component
+                  value: memory
               trigger_prototypes:
                 -
                   uuid: fb87fa900e404e2ba53fa5769fecc511
@@ -161,6 +165,13 @@ zabbix_export:
                   name: '{#MEMNAME}: High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
                   priority: AVERAGE
                   description: 'The system is running out of free memory.'
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 47a47f92e42047fe937e01ad163ca665
@@ -230,8 +241,8 @@ zabbix_export:
                 - '$..[''{#CPU.UTIL}''].avg()'
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
           triggers:
             -
               uuid: d1b02854c6cd473090735eabfbd4d908
@@ -240,6 +251,10 @@ zabbix_export:
               opdata: 'Current utilization: {ITEM.LASTVALUE1}'
               priority: WARNING
               description: 'CPU utilization is too high. The system might be slow to respond.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
       discovery_rules:
         -
           uuid: 083012fc49c248cc8869484266c5bc35
@@ -283,8 +298,11 @@ zabbix_export:
               description: 'Space utilization in % for {#FSNAME}'
               tags:
                 -
-                  tag: Application
-                  value: 'Filesystem {#FSNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: fe61fddd59e34574b4cde449a4a1bd0e
               name: '{#FSNAME}: Total space'
@@ -305,8 +323,11 @@ zabbix_export:
                     - '{#ALLOC_UNITS}'
               tags:
                 -
-                  tag: Application
-                  value: 'Filesystem {#FSNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 7e5e0fae3cd24a8fb0a526d726599915
               name: '{#FSNAME}: Used space'
@@ -325,8 +346,11 @@ zabbix_export:
                     - '{#ALLOC_UNITS}'
               tags:
                 -
-                  tag: Application
-                  value: 'Filesystem {#FSNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
           trigger_prototypes:
             -
               uuid: 8283f8b8663f444aad85633010615c15
@@ -342,6 +366,13 @@ zabbix_export:
                  - The disk free space is less than 5G.
                  - The disk will be full in less than 24 hours.
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
             -
               uuid: 2d9c475d718b4c2ba14b129f66014f75
               expression: |
@@ -362,6 +393,13 @@ zabbix_export:
                   expression: |
                     last(/HOST-RESOURCES-MIB SNMP/vfs.fs.pused[storageUsedPercentage.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"{#FSNAME}"} and
                     ((last(/HOST-RESOURCES-MIB SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/HOST-RESOURCES-MIB SNMP/vfs.fs.used[hrStorageUsed.{#SNMPINDEX}]))<5G or timeleft(/HOST-RESOURCES-MIB SNMP/vfs.fs.pused[storageUsedPercentage.{#SNMPINDEX}],1h,100)<1d)
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
           graph_prototypes:
             -
               uuid: 347d802fcd114cad882a2299eb2b02de
@@ -435,8 +473,8 @@ zabbix_export:
                     - '{#ALLOC_UNITS}'
               tags:
                 -
-                  tag: Application
-                  value: Memory
+                  tag: component
+                  value: memory
             -
               uuid: c555b61dfac744c3abb77d014efc8e0d
               name: '{#MEMNAME}: Used memory'
@@ -455,8 +493,8 @@ zabbix_export:
                     - '{#ALLOC_UNITS}'
               tags:
                 -
-                  tag: Application
-                  value: Memory
+                  tag: component
+                  value: memory
             -
               uuid: 01e2f5515f2145a68d93a4637abfe4e9
               name: '{#MEMNAME}: Memory utilization'
@@ -469,8 +507,8 @@ zabbix_export:
               description: 'Memory utilization in %'
               tags:
                 -
-                  tag: Application
-                  value: Memory
+                  tag: component
+                  value: memory
               trigger_prototypes:
                 -
                   uuid: 730a76bd19a24a55be24f72175251046
@@ -478,6 +516,13 @@ zabbix_export:
                   name: '{#MEMNAME}: High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
                   priority: AVERAGE
                   description: 'The system is running out of free memory.'
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: ce1f2938b1da4b1c9d78b99e9e1e3435
@@ -662,8 +707,11 @@ zabbix_export:
               description: 'Space utilization in % for {#FSNAME}'
               tags:
                 -
-                  tag: Application
-                  value: 'Filesystem {#FSNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: de2da3226b2145f3943d18ce59f2d803
               name: '{#FSNAME}: Total space'
@@ -684,8 +732,11 @@ zabbix_export:
                     - '{#ALLOC_UNITS}'
               tags:
                 -
-                  tag: Application
-                  value: 'Filesystem {#FSNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 719bf2d97348421cb02544efe5caf1bb
               name: '{#FSNAME}: Used space'
@@ -704,8 +755,11 @@ zabbix_export:
                     - '{#ALLOC_UNITS}'
               tags:
                 -
-                  tag: Application
-                  value: 'Filesystem {#FSNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
           trigger_prototypes:
             -
               uuid: 9fbb4a0ceeba4c9e935f54610d5f1afb
@@ -721,6 +775,13 @@ zabbix_export:
                  - The disk free space is less than 5G.
                  - The disk will be full in less than 24 hours.
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
             -
               uuid: 5db5f43d1c3b4b1f91bef16ec1090945
               expression: |
@@ -741,6 +802,13 @@ zabbix_export:
                   expression: |
                     last(/HOST-RESOURCES-MIB storage SNMP/vfs.fs.pused[storageUsedPercentage.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"{#FSNAME}"} and
                     ((last(/HOST-RESOURCES-MIB storage SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/HOST-RESOURCES-MIB storage SNMP/vfs.fs.used[hrStorageUsed.{#SNMPINDEX}]))<5G or timeleft(/HOST-RESOURCES-MIB storage SNMP/vfs.fs.pused[storageUsedPercentage.{#SNMPINDEX}],1h,100)<1d)
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
           graph_prototypes:
             -
               uuid: c5af27b4061c4e9795489f7bc25c42dd
@@ -789,7 +857,7 @@ zabbix_export:
           value: '80'
   graphs:
     -
-      uuid: fe501ac6688d4165a645ef804644cf93
+      uuid: f55018667c2242c5a9bb969bbcaf4770
       name: 'CPU utilization'
       ymin_type_1: FIXED
       ymax_type_1: FIXED
@@ -798,10 +866,10 @@ zabbix_export:
           drawtype: GRADIENT_LINE
           color: 1A7C11
           item:
-            host: 'HOST-RESOURCES-MIB CPU SNMP'
+            host: 'HOST-RESOURCES-MIB SNMP'
             key: system.cpu.util
     -
-      uuid: f55018667c2242c5a9bb969bbcaf4770
+      uuid: fe501ac6688d4165a645ef804644cf93
       name: 'CPU utilization'
       ymin_type_1: FIXED
       ymax_type_1: FIXED
@@ -810,5 +878,5 @@ zabbix_export:
           drawtype: GRADIENT_LINE
           color: 1A7C11
           item:
-            host: 'HOST-RESOURCES-MIB SNMP'
+            host: 'HOST-RESOURCES-MIB CPU SNMP'
             key: system.cpu.util
diff --git a/templates/module/icmp_ping/template_module_icmp_ping.yaml b/templates/module/icmp_ping/template_module_icmp_ping.yaml
index c082d025e7f..5233866da55 100644
--- a/templates/module/icmp_ping/template_module_icmp_ping.yaml
+++ b/templates/module/icmp_ping/template_module_icmp_ping.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-16T11:49:43Z'
+  date: '2022-01-26T10:32:10Z'
   groups:
     -
       uuid: 57b7ae836ca64446ba2c296389c009b7
@@ -13,7 +13,7 @@ zabbix_export:
       description: |
         Template Module ICMP Ping
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Modules
@@ -28,8 +28,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: b030876299434f3ba43e11c584104a81
@@ -37,6 +40,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 04b21adaf422473a88df2c52786474ed
           name: 'ICMP loss'
@@ -47,8 +54,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 42c4b0310aaf4b9c8cb502542b7dea90
@@ -60,6 +70,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/ICMP Ping/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: a79e33e5fd264725b934f603fa071555
           name: 'ICMP response time'
@@ -70,8 +87,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 32b4d8f3eba34bd380803410111d4b7f
@@ -86,6 +106,17 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/ICMP Ping/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
+      tags:
+        -
+          tag: class
+          value: software
       macros:
         -
           macro: '{$ICMP_LOSS_WARN}'
diff --git a/templates/module/interfaces_simple_snmp/README.md b/templates/module/interfaces_simple_snmp/README.md
index 690c65b0925..5d12a782d3b 100644
--- a/templates/module/interfaces_simple_snmp/README.md
+++ b/templates/module/interfaces_simple_snmp/README.md
@@ -45,15 +45,15 @@ There are no template links in this template.
 
 |Group|Name|Description|Type|Key and additional info|
 |-----|----|-----------|----|---------------------|
-|Network_interfaces |Interface {#IFDESCR}: Operational status |<p>MIB: IF-MIB</p><p>The current operational state of the interface.</p><p>- The testing(3) state indicates that no operational packet scan be passed</p><p>- If ifAdminStatus is down(2) then ifOperStatus should be down(2)</p><p>- If ifAdminStatus is changed to up(1) then ifOperStatus should change to up(1) if the interface is ready to transmit and receive network traffic</p><p>- It should change todormant(5) if the interface is waiting for external actions (such as a serial line waiting for an incoming connection)</p><p>- It should remain in the down(2) state if and only if there is a fault that prevents it from going to the up(1) state</p><p>- It should remain in the notPresent(6) state if the interface has missing(typically, hardware) components.</p> |SNMP |net.if.status[ifOperStatus.{#SNMPINDEX}] |
-|Network_interfaces |Interface {#IFDESCR}: Bits received |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface,including framing characters. Discontinuities in the value of this counter can occurat re-initialization of the management system, and atother times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.in[ifInOctets.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p><p>- MULTIPLIER: `8`</p> |
-|Network_interfaces |Interface {#IFDESCR}: Bits sent |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the interface, including framing characters. Discontinuities in the value of this counter can occurat re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.out[ifOutOctets.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p><p>- MULTIPLIER: `8`</p> |
-|Network_interfaces |Interface {#IFDESCR}: Inbound packets with errors |<p>MIB: IF-MIB</p><p>For packet-oriented interfaces, the number of inbound packets that contained errors preventing them from being deliverable to a higher-layer protocol.  For character-oriented or fixed-length interfaces, the number of inbound transmission units that contained errors preventing them from being deliverable to a higher-layer protocol. Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.in.errors[ifInErrors.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |Interface {#IFDESCR}: Outbound packets with errors |<p>MIB: IF-MIB</p><p>For packet-oriented interfaces, the number of outbound packets that contained errors preventing them from being deliverable to a higher-layer protocol.  For character-oriented or fixed-length interfaces, the number of outbound transmission units that contained errors preventing them from being deliverable to a higher-layer protocol. Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.out.errors[ifOutErrors.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |Interface {#IFDESCR}: Outbound packets discarded |<p>MIB: IF-MIB</p><p>The number of outbound packets which were chosen to be discarded</p><p>even though no errors had been detected to prevent their being deliverable to a higher-layer protocol.</p><p>One possible reason for discarding such a packet could be to free up buffer space.</p><p>Discontinuities in the value of this counter can occur at re-initialization of the management system,</p><p>and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.out.discards[ifOutDiscards.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |Interface {#IFDESCR}: Inbound packets discarded |<p>MIB: IF-MIB</p><p>The number of inbound packets which were chosen to be discarded</p><p>even though no errors had been detected to prevent their being deliverable to a higher-layer protocol.</p><p>One possible reason for discarding such a packet could be to free up buffer space.</p><p>Discontinuities in the value of this counter can occur at re-initialization of the management system,</p><p>and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.in.discards[ifInDiscards.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |Interface {#IFDESCR}: Interface type |<p>MIB: IF-MIB</p><p>The type of interface.</p><p>Additional values for ifType are assigned by the Internet Assigned NumbersAuthority (IANA),</p><p>through updating the syntax of the IANAifType textual convention.</p> |SNMP |net.if.type[ifType.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
-|Network_interfaces |Interface {#IFDESCR}: Speed |<p>MIB: IF-MIB</p><p>An estimate of the interface's current bandwidth in bits per second.</p><p>For interfaces which do not vary in bandwidth or for those where no accurate estimation can be made,</p><p>this object should contain the nominal bandwidth.</p><p>If the bandwidth of the interface is greater than the maximum value reportable by this object then</p><p>this object should report its maximum value (4,294,967,295) and ifHighSpeed must be used to report the interace's speed.</p><p>For a sub-layer which has no concept of bandwidth, this object should be zero.</p> |SNMP |net.if.speed[ifSpeed.{#SNMPINDEX}] |
+|Network interfaces |Interface {#IFDESCR}: Operational status |<p>MIB: IF-MIB</p><p>The current operational state of the interface.</p><p>- The testing(3) state indicates that no operational packet scan be passed</p><p>- If ifAdminStatus is down(2) then ifOperStatus should be down(2)</p><p>- If ifAdminStatus is changed to up(1) then ifOperStatus should change to up(1) if the interface is ready to transmit and receive network traffic</p><p>- It should change todormant(5) if the interface is waiting for external actions (such as a serial line waiting for an incoming connection)</p><p>- It should remain in the down(2) state if and only if there is a fault that prevents it from going to the up(1) state</p><p>- It should remain in the notPresent(6) state if the interface has missing(typically, hardware) components.</p> |SNMP |net.if.status[ifOperStatus.{#SNMPINDEX}] |
+|Network interfaces |Interface {#IFDESCR}: Bits received |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface,including framing characters. Discontinuities in the value of this counter can occurat re-initialization of the management system, and atother times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.in[ifInOctets.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p><p>- MULTIPLIER: `8`</p> |
+|Network interfaces |Interface {#IFDESCR}: Bits sent |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the interface, including framing characters. Discontinuities in the value of this counter can occurat re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.out[ifOutOctets.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p><p>- MULTIPLIER: `8`</p> |
+|Network interfaces |Interface {#IFDESCR}: Inbound packets with errors |<p>MIB: IF-MIB</p><p>For packet-oriented interfaces, the number of inbound packets that contained errors preventing them from being deliverable to a higher-layer protocol.  For character-oriented or fixed-length interfaces, the number of inbound transmission units that contained errors preventing them from being deliverable to a higher-layer protocol. Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.in.errors[ifInErrors.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |Interface {#IFDESCR}: Outbound packets with errors |<p>MIB: IF-MIB</p><p>For packet-oriented interfaces, the number of outbound packets that contained errors preventing them from being deliverable to a higher-layer protocol.  For character-oriented or fixed-length interfaces, the number of outbound transmission units that contained errors preventing them from being deliverable to a higher-layer protocol. Discontinuities in the value of this counter can occur at re-initialization of the management system, and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.out.errors[ifOutErrors.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |Interface {#IFDESCR}: Outbound packets discarded |<p>MIB: IF-MIB</p><p>The number of outbound packets which were chosen to be discarded</p><p>even though no errors had been detected to prevent their being deliverable to a higher-layer protocol.</p><p>One possible reason for discarding such a packet could be to free up buffer space.</p><p>Discontinuities in the value of this counter can occur at re-initialization of the management system,</p><p>and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.out.discards[ifOutDiscards.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |Interface {#IFDESCR}: Inbound packets discarded |<p>MIB: IF-MIB</p><p>The number of inbound packets which were chosen to be discarded</p><p>even though no errors had been detected to prevent their being deliverable to a higher-layer protocol.</p><p>One possible reason for discarding such a packet could be to free up buffer space.</p><p>Discontinuities in the value of this counter can occur at re-initialization of the management system,</p><p>and at other times as indicated by the value of ifCounterDiscontinuityTime.</p> |SNMP |net.if.in.discards[ifInDiscards.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |Interface {#IFDESCR}: Interface type |<p>MIB: IF-MIB</p><p>The type of interface.</p><p>Additional values for ifType are assigned by the Internet Assigned NumbersAuthority (IANA),</p><p>through updating the syntax of the IANAifType textual convention.</p> |SNMP |net.if.type[ifType.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Network interfaces |Interface {#IFDESCR}: Speed |<p>MIB: IF-MIB</p><p>An estimate of the interface's current bandwidth in bits per second.</p><p>For interfaces which do not vary in bandwidth or for those where no accurate estimation can be made,</p><p>this object should contain the nominal bandwidth.</p><p>If the bandwidth of the interface is greater than the maximum value reportable by this object then</p><p>this object should report its maximum value (4,294,967,295) and ifHighSpeed must be used to report the interace's speed.</p><p>For a sub-layer which has no concept of bandwidth, this object should be zero.</p> |SNMP |net.if.speed[ifSpeed.{#SNMPINDEX}] |
 
 ## Triggers
 
diff --git a/templates/module/interfaces_simple_snmp/template_module_interfaces_simple_snmp.yaml b/templates/module/interfaces_simple_snmp/template_module_interfaces_simple_snmp.yaml
index 68c398283e4..82c2fe3a63d 100644
--- a/templates/module/interfaces_simple_snmp/template_module_interfaces_simple_snmp.yaml
+++ b/templates/module/interfaces_simple_snmp/template_module_interfaces_simple_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-16T08:28:20Z'
+  date: '2022-01-26T10:32:33Z'
   groups:
     -
       uuid: 57b7ae836ca64446ba2c296389c009b7
@@ -20,7 +20,7 @@ zabbix_export:
         
           Description: 32bit counters are used in this template (since there is no ifXtable available). If busy interfaces return incorrect bits sent/received - set update interval to 1m or less.
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Modules
@@ -104,8 +104,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFDESCR}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: f97ed0e4b7b3473a988f27a60e5d79ef
               name: 'Interface {#IFDESCR}: Inbound packets with errors'
@@ -124,8 +130,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFDESCR}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 3a971825c99e476aa2c18b1a792ec19d
               name: 'Interface {#IFDESCR}: Bits received'
@@ -149,8 +161,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFDESCR}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 2395b3a694474b9894e64f759dbe805e
               name: 'Interface {#IFDESCR}: Outbound packets discarded'
@@ -173,8 +191,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFDESCR}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: f6872ed88b464c37800738fd5e492896
               name: 'Interface {#IFDESCR}: Outbound packets with errors'
@@ -193,8 +217,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFDESCR}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 2a7b5b7e48444c8c8cf38f89a1a1091e
               name: 'Interface {#IFDESCR}: Bits sent'
@@ -218,8 +248,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFDESCR}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: b93b4164db1c4c838ecfd5c2b261acfb
               name: 'Interface {#IFDESCR}: Speed'
@@ -240,8 +276,14 @@ zabbix_export:
                 For a sub-layer which has no concept of bandwidth, this object should be zero.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFDESCR}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 43d9d7883a1b4f6dbe4e118ef12d731e
               name: 'Interface {#IFDESCR}: Operational status'
@@ -263,8 +305,14 @@ zabbix_export:
                 name: 'IF-MIB::ifOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFDESCR}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 94097ac2b53748aea45fed2f3014c1b6
@@ -282,6 +330,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 9470d6a01c4e4ea2a007582ac1c0ce64
               name: 'Interface {#IFDESCR}: Interface type'
@@ -305,8 +357,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFDESCR}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           trigger_prototypes:
             -
               uuid: 13c523ffdf154e6fb1ab7628e3a2010a
@@ -336,6 +394,10 @@ zabbix_export:
                   name: 'Interface {#IFDESCR}: Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Interfaces Simple SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/Interfaces Simple SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/Interfaces Simple SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/Interfaces Simple SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 7594011ba1964285abd0f232ffeb22e3
               expression: |
@@ -356,6 +418,10 @@ zabbix_export:
                   name: 'Interface {#IFDESCR}: Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Interfaces Simple SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/Interfaces Simple SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/Interfaces Simple SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/Interfaces Simple SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 2eb4baaf86a2405b9a1a232241eee72b
               expression: |
@@ -375,6 +441,10 @@ zabbix_export:
                   name: 'Interface {#IFDESCR}: Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Interfaces Simple SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/Interfaces Simple SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/Interfaces Simple SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/Interfaces Simple SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: 80ae528968304d06a676f69c4e321c07
diff --git a/templates/module/interfaces_snmp/template_module_interfaces_snmp.yaml b/templates/module/interfaces_snmp/template_module_interfaces_snmp.yaml
index 770740e92f9..c0832e9d656 100644
--- a/templates/module/interfaces_snmp/template_module_interfaces_snmp.yaml
+++ b/templates/module/interfaces_snmp/template_module_interfaces_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-16T08:28:23Z'
+  date: '2022-01-26T10:32:25Z'
   groups:
     -
       uuid: 57b7ae836ca64446ba2c296389c009b7
@@ -16,7 +16,7 @@ zabbix_export:
         MIBs used:
         IF-MIB
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Modules
@@ -109,8 +109,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 2c7296aa56884ef48bb66c25097848f9
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -129,8 +135,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 633cdf45222b454198ec66308aa7a55d
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -154,8 +166,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: baca586b493448959a945c9433c38fe7
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -178,8 +196,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 2712f191e05046da85321c0ceeea85b3
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -198,8 +222,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 9037dd45e90a45baa58014d20db3ab0f
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -223,8 +253,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: b63cb94bb9954ee4ab56d2a7d25d5957
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -249,8 +285,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 0ac3b237358a4df69712d3829341766b
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -272,8 +314,14 @@ zabbix_export:
                 name: 'IF-MIB::ifOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 35d62eb5323141a3a3f3afc4c9250243
@@ -291,6 +339,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 565967032d23436486868eb495f7ed17
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -314,8 +366,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           trigger_prototypes:
             -
               uuid: 9f1f6cff58454b469f588af8624f9078
@@ -345,6 +403,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Interfaces SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/Interfaces SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/Interfaces SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/Interfaces SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 913c87be8cd94aeb8a3f9e008a4cd560
               expression: |
@@ -365,6 +427,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Interfaces SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/Interfaces SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/Interfaces SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/Interfaces SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 15b436b13012415bb9773d3ddab22178
               expression: |
@@ -384,6 +450,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Interfaces SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/Interfaces SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/Interfaces SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/Interfaces SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: 748719ae10ea43da9efec7225dac54cb
@@ -430,6 +503,13 @@ zabbix_export:
                   item:
                     host: 'Interfaces SNMP'
                     key: 'net.if.in.discards[ifInDiscards.{#SNMPINDEX}]'
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: interfaces
       macros:
         -
           macro: '{$IF.ERRORS.WARN}'
diff --git a/templates/module/interfaces_win_snmp/template_module_interfaces_win_snmp.yaml b/templates/module/interfaces_win_snmp/template_module_interfaces_win_snmp.yaml
index eb96375bdf0..38271d6e89f 100644
--- a/templates/module/interfaces_win_snmp/template_module_interfaces_win_snmp.yaml
+++ b/templates/module/interfaces_win_snmp/template_module_interfaces_win_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-16T08:28:25Z'
+  date: '2022-01-26T10:32:56Z'
   groups:
     -
       uuid: 57b7ae836ca64446ba2c296389c009b7
@@ -20,7 +20,7 @@ zabbix_export:
         
           Description: 32bit counters are used in this template (since 64bit are not supported by Windows OS). If busy interfaces return incorrect bits sent/received - set update interval to 1m or less.
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Modules
@@ -113,8 +113,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: network
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: 199eb3a0274a43f198137abefba57f09
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -133,8 +139,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: network
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: a7994f0c49e747b480428f20f4ddd49b
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -158,8 +170,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: network
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: 16f12f7e76d14fe4b2675a3c86dbe0ff
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -182,8 +200,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: network
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: e6695fe534d44477a06da86bdd9e49a4
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -202,8 +226,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: network
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: 95e58c279df24606b28fb325e7006b54
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -227,8 +257,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: network
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: 290ed87b085144c5bea26de86e7d5c7f
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -253,8 +289,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: network
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: 73b1182c727449f69fb0dc67b19aec5d
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -276,8 +318,14 @@ zabbix_export:
                 name: 'IF-MIB::ifOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: network
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: efe4c7dbbd804e41bc1bcd0630afcf09
@@ -295,6 +343,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 557b8ccf262a4d94abff327bcf41822b
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -318,8 +370,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: network
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
           trigger_prototypes:
             -
               uuid: 31393aeac3b44062b98267fc1f594c52
@@ -349,6 +407,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Interfaces Windows SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/Interfaces Windows SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/Interfaces Windows SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/Interfaces Windows SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 232019e4163a4e7ebd63876751721824
               expression: |
@@ -369,6 +431,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Interfaces Windows SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/Interfaces Windows SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/Interfaces Windows SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/Interfaces Windows SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 9ee9204a4a4044ae82bd0f75299f2a5d
               expression: |
@@ -388,6 +454,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Interfaces Windows SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/Interfaces Windows SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/Interfaces Windows SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/Interfaces Windows SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: a6a274c68cb94f9fac0920858806054b
diff --git a/templates/module/smart_agent2/template_module_smart_agent2.yaml b/templates/module/smart_agent2/template_module_smart_agent2.yaml
index 59a06b944a0..178bcdca14c 100644
--- a/templates/module/smart_agent2/template_module_smart_agent2.yaml
+++ b/templates/module/smart_agent2/template_module_smart_agent2.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-16T08:28:27Z'
+  date: '2022-01-26T10:32:37Z'
   groups:
     -
       uuid: 57b7ae836ca64446ba2c296389c009b7
@@ -15,7 +15,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/415662-discussion-thread-for-official-zabbix-smart-disk-monitoring
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Modules
@@ -29,8 +29,11 @@ zabbix_export:
           value_type: TEXT
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
+            -
+              tag: component
+              value: storage
       discovery_rules:
         -
           uuid: c5aede547c19434c90f72e43276fe1d7
@@ -61,8 +64,14 @@ zabbix_export:
                 key: smart.disk.get
               tags:
                 -
-                  tag: Application
-                  value: '{#DISKTYPE} {#NAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: diskname
+                  value: '{#NAME}'
+                -
+                  tag: disktype
+                  value: '{#DISKTYPE}'
             -
               uuid: 2af3d630a99a4989b94e2afd782a3f78
               name: 'SMART [{#NAME}]: ID {#ID} {#ATTRNAME}'
@@ -83,8 +92,14 @@ zabbix_export:
                 key: smart.disk.get
               tags:
                 -
-                  tag: Application
-                  value: '{#DISKTYPE} {#NAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: diskname
+                  value: '{#NAME}'
+                -
+                  tag: disktype
+                  value: '{#DISKTYPE}'
               trigger_prototypes:
                 -
                   uuid: 686066892ab94b86a97ba1902d361f97
@@ -92,6 +107,10 @@ zabbix_export:
                   name: 'SMART [{#NAME}]: Attribute {#ID} {#ATTRNAME} is failed'
                   priority: WARNING
                   description: 'The value should be greater than THRESH.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
           overrides:
             -
               name: 'ID filter'
@@ -140,8 +159,14 @@ zabbix_export:
                 key: smart.disk.get
               tags:
                 -
-                  tag: Application
-                  value: '{#DISKTYPE} {#NAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: diskname
+                  value: '{#NAME}'
+                -
+                  tag: disktype
+                  value: '{#DISKTYPE}'
             -
               uuid: 365f9642f2764116923bb3e014eefa22
               name: 'SMART [{#NAME}]: Power on hours'
@@ -163,8 +188,14 @@ zabbix_export:
                 key: smart.disk.get
               tags:
                 -
-                  tag: Application
-                  value: '{#DISKTYPE} {#NAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: diskname
+                  value: '{#NAME}'
+                -
+                  tag: disktype
+                  value: '{#DISKTYPE}'
             -
               uuid: 8478d6421fb044339e2118848ac6d56b
               name: 'SMART [{#NAME}]: Media errors'
@@ -186,8 +217,14 @@ zabbix_export:
                 key: smart.disk.get
               tags:
                 -
-                  tag: Application
-                  value: '{#DISKTYPE} {#NAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: diskname
+                  value: '{#NAME}'
+                -
+                  tag: disktype
+                  value: '{#DISKTYPE}'
             -
               uuid: b6abf9b52c694600b63fce4a68fc0fbd
               name: 'SMART [{#NAME}]: Device model'
@@ -210,8 +247,14 @@ zabbix_export:
                 key: smart.disk.get
               tags:
                 -
-                  tag: Application
-                  value: '{#DISKTYPE} {#NAME}'
+                  tag: component
+                  value: inventory
+                -
+                  tag: diskname
+                  value: '{#NAME}'
+                -
+                  tag: disktype
+                  value: '{#DISKTYPE}'
             -
               uuid: 6ce46d274a694eac9700bd02a936f4be
               name: 'SMART [{#NAME}]: Percentage used'
@@ -234,14 +277,24 @@ zabbix_export:
                 key: smart.disk.get
               tags:
                 -
-                  tag: Application
-                  value: '{#DISKTYPE} {#NAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: diskname
+                  value: '{#NAME}'
+                -
+                  tag: disktype
+                  value: '{#DISKTYPE}'
               trigger_prototypes:
                 -
                   uuid: e2bc2b0e195446d7973037be8e41eb6f
                   expression: 'last(/SMART by Zabbix agent 2/smart.disk.percentage_used[{#NAME}])>90'
                   name: 'SMART [{#NAME}]: NVMe disk percentage using is over 90% of estimated endurance'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 62f98419c8034f389a5be3755eac8938
               name: 'SMART [{#NAME}]: Serial number'
@@ -264,8 +317,14 @@ zabbix_export:
                 key: smart.disk.get
               tags:
                 -
-                  tag: Application
-                  value: '{#DISKTYPE} {#NAME}'
+                  tag: component
+                  value: inventory
+                -
+                  tag: diskname
+                  value: '{#NAME}'
+                -
+                  tag: disktype
+                  value: '{#DISKTYPE}'
               trigger_prototypes:
                 -
                   uuid: 7257c02f398f4338ace1eb3a07cb7362
@@ -274,6 +333,10 @@ zabbix_export:
                   priority: INFO
                   description: 'Device serial number has changed. Ack to close.'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 2f5b054d7a644e029a195d17f525c191
               name: 'SMART [{#NAME}]: Temperature'
@@ -296,14 +359,24 @@ zabbix_export:
                 key: smart.disk.get
               tags:
                 -
-                  tag: Application
-                  value: '{#DISKTYPE} {#NAME}'
+                  tag: component
+                  value: temperature
+                -
+                  tag: diskname
+                  value: '{#NAME}'
+                -
+                  tag: disktype
+                  value: '{#DISKTYPE}'
               trigger_prototypes:
                 -
                   uuid: cd09aebe3ca146119cdf5b977bf6b018
                   expression: 'avg(/SMART by Zabbix agent 2/smart.disk.temperature[{#NAME}],5m)>{$SMART.TEMPERATURE.MAX.CRIT}'
                   name: 'SMART [{#NAME}]: Average disk temperature is critical (over {$SMART.TEMPERATURE.MAX.CRIT}°C for 5m)'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: aaa5acb3196b481f894998c0ca5ea165
                   expression: 'avg(/SMART by Zabbix agent 2/smart.disk.temperature[{#NAME}],5m)>{$SMART.TEMPERATURE.MAX.WARN}'
@@ -313,6 +386,10 @@ zabbix_export:
                     -
                       name: 'SMART [{#NAME}]: Average disk temperature is critical (over {$SMART.TEMPERATURE.MAX.CRIT}°C for 5m)'
                       expression: 'avg(/SMART by Zabbix agent 2/smart.disk.temperature[{#NAME}],5m)>{$SMART.TEMPERATURE.MAX.CRIT}'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 434b338d88e041dd9b6a0b7aaa403076
               name: 'SMART [{#NAME}]: Self-test passed'
@@ -336,14 +413,24 @@ zabbix_export:
                 key: smart.disk.get
               tags:
                 -
-                  tag: Application
-                  value: '{#DISKTYPE} {#NAME}'
+                  tag: component
+                  value: health
+                -
+                  tag: diskname
+                  value: '{#NAME}'
+                -
+                  tag: disktype
+                  value: '{#DISKTYPE}'
               trigger_prototypes:
                 -
                   uuid: 5fa97df4012e45279fb55724f617ef4a
                   expression: 'last(/SMART by Zabbix agent 2/smart.disk.test[{#NAME}])="false"'
                   name: 'SMART [{#NAME}]: Disk self-test is not passed'
                   priority: HIGH
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
           overrides:
             -
               name: 'Not NVMe'
diff --git a/templates/module/smart_agent2_active/template_module_smart_agent2_active.yaml b/templates/module/smart_agent2_active/template_module_smart_agent2_active.yaml
index 292c7e7a8e3..cf4e17673f4 100644
--- a/templates/module/smart_agent2_active/template_module_smart_agent2_active.yaml
+++ b/templates/module/smart_agent2_active/template_module_smart_agent2_active.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-16T11:48:11Z'
+  date: '2022-01-26T10:32:29Z'
   groups:
     -
       uuid: 57b7ae836ca64446ba2c296389c009b7
@@ -15,7 +15,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/415662-discussion-thread-for-official-zabbix-smart-disk-monitoring
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Modules
@@ -30,8 +30,11 @@ zabbix_export:
           value_type: TEXT
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
+            -
+              tag: component
+              value: storage
       discovery_rules:
         -
           uuid: 3b19696e4d8f4f98acb40481adfa7513
@@ -63,8 +66,14 @@ zabbix_export:
                 key: smart.disk.get
               tags:
                 -
-                  tag: Application
-                  value: '{#DISKTYPE} {#NAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: diskname
+                  value: '{#NAME}'
+                -
+                  tag: disktype
+                  value: '{#DISKTYPE}'
             -
               uuid: 498a4f1b4b7442b5a38c52400646cc47
               name: 'SMART [{#NAME}]: ID {#ID} {#ATTRNAME}'
@@ -85,8 +94,14 @@ zabbix_export:
                 key: smart.disk.get
               tags:
                 -
-                  tag: Application
-                  value: '{#DISKTYPE} {#NAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: diskname
+                  value: '{#NAME}'
+                -
+                  tag: disktype
+                  value: '{#DISKTYPE}'
               trigger_prototypes:
                 -
                   uuid: 26a3e4a0b79340b1bb753ec23c07c79b
@@ -94,6 +109,10 @@ zabbix_export:
                   name: 'SMART [{#NAME}]: Attribute {#ID} {#ATTRNAME} is failed'
                   priority: WARNING
                   description: 'The value should be greater than THRESH.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
           overrides:
             -
               name: 'ID filter'
@@ -143,8 +162,14 @@ zabbix_export:
                 key: smart.disk.get
               tags:
                 -
-                  tag: Application
-                  value: '{#DISKTYPE} {#NAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: diskname
+                  value: '{#NAME}'
+                -
+                  tag: disktype
+                  value: '{#DISKTYPE}'
             -
               uuid: e5bbd606e330469389bf081588b88d17
               name: 'SMART [{#NAME}]: Power on hours'
@@ -166,8 +191,14 @@ zabbix_export:
                 key: smart.disk.get
               tags:
                 -
-                  tag: Application
-                  value: '{#DISKTYPE} {#NAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: diskname
+                  value: '{#NAME}'
+                -
+                  tag: disktype
+                  value: '{#DISKTYPE}'
             -
               uuid: 0861b008b09a41799978e085625aaa4a
               name: 'SMART [{#NAME}]: Media errors'
@@ -189,8 +220,14 @@ zabbix_export:
                 key: smart.disk.get
               tags:
                 -
-                  tag: Application
-                  value: '{#DISKTYPE} {#NAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: diskname
+                  value: '{#NAME}'
+                -
+                  tag: disktype
+                  value: '{#DISKTYPE}'
             -
               uuid: f48fe3366b194eb4942411cc776c8633
               name: 'SMART [{#NAME}]: Device model'
@@ -213,8 +250,14 @@ zabbix_export:
                 key: smart.disk.get
               tags:
                 -
-                  tag: Application
-                  value: '{#DISKTYPE} {#NAME}'
+                  tag: component
+                  value: inventory
+                -
+                  tag: diskname
+                  value: '{#NAME}'
+                -
+                  tag: disktype
+                  value: '{#DISKTYPE}'
             -
               uuid: d5cef21c49994c3e8e12ef6471d7cdcd
               name: 'SMART [{#NAME}]: Percentage used'
@@ -237,14 +280,24 @@ zabbix_export:
                 key: smart.disk.get
               tags:
                 -
-                  tag: Application
-                  value: '{#DISKTYPE} {#NAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: diskname
+                  value: '{#NAME}'
+                -
+                  tag: disktype
+                  value: '{#DISKTYPE}'
               trigger_prototypes:
                 -
                   uuid: 68f373252bee4f9e8f3b33d04fc1adbd
                   expression: 'last(/SMART by Zabbix agent 2 active/smart.disk.percentage_used[{#NAME}])>90'
                   name: 'SMART [{#NAME}]: NVMe disk percentage using is over 90% of estimated endurance'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 189d8e8d16ed40229ba3ca52b75d2dc4
               name: 'SMART [{#NAME}]: Serial number'
@@ -267,8 +320,14 @@ zabbix_export:
                 key: smart.disk.get
               tags:
                 -
-                  tag: Application
-                  value: '{#DISKTYPE} {#NAME}'
+                  tag: component
+                  value: inventory
+                -
+                  tag: diskname
+                  value: '{#NAME}'
+                -
+                  tag: disktype
+                  value: '{#DISKTYPE}'
               trigger_prototypes:
                 -
                   uuid: 2d5cf100fe094c819d725ee598d37de8
@@ -277,6 +336,10 @@ zabbix_export:
                   priority: INFO
                   description: 'Device serial number has changed. Ack to close.'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: e79eaaf7ee0d40e7b91fc019f5edb19e
               name: 'SMART [{#NAME}]: Temperature'
@@ -299,14 +362,24 @@ zabbix_export:
                 key: smart.disk.get
               tags:
                 -
-                  tag: Application
-                  value: '{#DISKTYPE} {#NAME}'
+                  tag: component
+                  value: temperature
+                -
+                  tag: diskname
+                  value: '{#NAME}'
+                -
+                  tag: disktype
+                  value: '{#DISKTYPE}'
               trigger_prototypes:
                 -
                   uuid: 7f46b24934854866849dd758cb5999d5
                   expression: 'avg(/SMART by Zabbix agent 2 active/smart.disk.temperature[{#NAME}],5m)>{$SMART.TEMPERATURE.MAX.CRIT}'
                   name: 'SMART [{#NAME}]: Average disk temperature is critical (over {$SMART.TEMPERATURE.MAX.CRIT}°C for 5m)'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: c903a37f4b004e1593ef85ac893c3f6c
                   expression: 'avg(/SMART by Zabbix agent 2 active/smart.disk.temperature[{#NAME}],5m)>{$SMART.TEMPERATURE.MAX.WARN}'
@@ -316,6 +389,10 @@ zabbix_export:
                     -
                       name: 'SMART [{#NAME}]: Average disk temperature is critical (over {$SMART.TEMPERATURE.MAX.CRIT}°C for 5m)'
                       expression: 'avg(/SMART by Zabbix agent 2 active/smart.disk.temperature[{#NAME}],5m)>{$SMART.TEMPERATURE.MAX.CRIT}'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 2475415cc95b4103b2933f921e62dd36
               name: 'SMART [{#NAME}]: Self-test passed'
@@ -339,14 +416,24 @@ zabbix_export:
                 key: smart.disk.get
               tags:
                 -
-                  tag: Application
-                  value: '{#DISKTYPE} {#NAME}'
+                  tag: component
+                  value: health
+                -
+                  tag: diskname
+                  value: '{#NAME}'
+                -
+                  tag: disktype
+                  value: '{#DISKTYPE}'
               trigger_prototypes:
                 -
                   uuid: 304bd042b7644a31bb74a1e71808d196
                   expression: 'last(/SMART by Zabbix agent 2 active/smart.disk.test[{#NAME}])="false"'
                   name: 'SMART [{#NAME}]: Disk self-test is not passed'
                   priority: HIGH
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
           overrides:
             -
               name: 'Not NVMe'
diff --git a/templates/module/zabbix_agent/README.md b/templates/module/zabbix_agent/README.md
index be6cc7d5cce..149541016bd 100644
--- a/templates/module/zabbix_agent/README.md
+++ b/templates/module/zabbix_agent/README.md
@@ -30,9 +30,9 @@ There are no template links in this template.
 
 |Group|Name|Description|Type|Key and additional info|
 |-----|----|-----------|----|---------------------|
-|Monitoring_agent |Version of Zabbix agent running |<p>-</p> |ZABBIX_PASSIVE |agent.version<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
-|Monitoring_agent |Host name of Zabbix agent running |<p>-</p> |ZABBIX_PASSIVE |agent.hostname<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
-|Monitoring_agent |Zabbix agent ping |<p>The agent always returns 1 for this item. It could be used in combination with nodata() for availability check.</p> |ZABBIX_PASSIVE |agent.ping |
+|Monitoring agent |Version of Zabbix agent running |<p>-</p> |ZABBIX_PASSIVE |agent.version<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Monitoring agent |Host name of Zabbix agent running |<p>-</p> |ZABBIX_PASSIVE |agent.hostname<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Monitoring agent |Zabbix agent ping |<p>The agent always returns 1 for this item. It could be used in combination with nodata() for availability check.</p> |ZABBIX_PASSIVE |agent.ping |
 |Status |Zabbix agent availability |<p>Monitoring agent availability status</p> |INTERNAL |zabbix[host,agent,available] |
 
 ## Triggers
@@ -76,8 +76,8 @@ There are no template links in this template.
 
 |Group|Name|Description|Type|Key and additional info|
 |-----|----|-----------|----|---------------------|
-|Monitoring_agent |Version of Zabbix agent running |<p>-</p> |ZABBIX_ACTIVE |agent.version<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
-|Monitoring_agent |Host name of Zabbix agent running |<p>-</p> |ZABBIX_ACTIVE |agent.hostname<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Monitoring agent |Version of Zabbix agent running |<p>-</p> |ZABBIX_ACTIVE |agent.version<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Monitoring agent |Host name of Zabbix agent running |<p>-</p> |ZABBIX_ACTIVE |agent.hostname<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
 |Status |Zabbix agent ping |<p>The agent always returns 1 for this item. It could be used in combination with nodata() for availability check.</p> |ZABBIX_ACTIVE |agent.ping |
 
 ## Triggers
diff --git a/templates/module/zabbix_agent/template_module_zabbix_agent.yaml b/templates/module/zabbix_agent/template_module_zabbix_agent.yaml
index 39e3bc46a40..970966a93d3 100644
--- a/templates/module/zabbix_agent/template_module_zabbix_agent.yaml
+++ b/templates/module/zabbix_agent/template_module_zabbix_agent.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-16T08:28:32Z'
+  date: '2022-01-26T10:32:20Z'
   groups:
     -
       uuid: 57b7ae836ca64446ba2c296389c009b7
@@ -13,7 +13,7 @@ zabbix_export:
       description: |
         Use this template for agents reachable from Zabbix server/proxy (passive mode).
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Modules
@@ -33,8 +33,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: 'Monitoring agent'
+              tag: component
+              value: system
         -
           uuid: 37a952edc12f47d6ac6f3ca04eb41326
           name: 'Zabbix agent ping'
@@ -45,8 +45,8 @@ zabbix_export:
             name: 'Zabbix agent ping status'
           tags:
             -
-              tag: Application
-              value: 'Monitoring agent'
+              tag: component
+              value: system
         -
           uuid: 3a6af03a083b4366bd1d4c6ccf06ca88
           name: 'Version of Zabbix agent running'
@@ -62,8 +62,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: 'Monitoring agent'
+              tag: component
+              value: application
         -
           uuid: 49708b126e3844b898d2625f77c0030c
           name: 'Zabbix agent availability'
@@ -75,8 +75,8 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 6767f9c764bb42dfa961baacf879f45c
@@ -85,6 +85,17 @@ zabbix_export:
               priority: AVERAGE
               description: 'For passive only agents, host availability is used with {$AGENT.TIMEOUT} as time threshold.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+      tags:
+        -
+          tag: class
+          value: software
+        -
+          tag: target
+          value: zabbix-agent
       macros:
         -
           macro: '{$AGENT.TIMEOUT}'
@@ -118,7 +129,7 @@ zabbix_export:
       description: |
         Use this template instead of 'Template Module Zabbix agent' for agents running in active mode only.
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Modules
@@ -139,8 +150,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: 'Monitoring agent'
+              tag: component
+              value: system
         -
           uuid: 0f86ec6cde2249f7946c678f9fd2665a
           name: 'Zabbix agent ping'
@@ -152,8 +163,8 @@ zabbix_export:
             name: 'Zabbix agent ping status'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 6bbb74c522d44baea8c6ceb666423da2
@@ -162,6 +173,10 @@ zabbix_export:
               priority: AVERAGE
               description: 'For active agents, nodata() with agent.ping is used with {$AGENT.NODATA_TIMEOUT} as time threshold.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 41fb0f76fa1d464f8ab67f744fc29e8b
           name: 'Version of Zabbix agent running'
@@ -178,8 +193,15 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: 'Monitoring agent'
+              tag: component
+              value: application
+      tags:
+        -
+          tag: class
+          value: software
+        -
+          tag: target
+          value: zabbix-agent
       macros:
         -
           macro: '{$AGENT.NODATA_TIMEOUT}'
diff --git a/templates/net/alcatel_timetra_snmp/README.md b/templates/net/alcatel_timetra_snmp/README.md
index 4240d585a9a..2955f1abc77 100644
--- a/templates/net/alcatel_timetra_snmp/README.md
+++ b/templates/net/alcatel_timetra_snmp/README.md
@@ -110,7 +110,7 @@ There are no template links in this template.
 |Interface {#IFNAME}({#IFALIAS}): Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p><p>3. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{$IFCONTROL:"{#IFNAME}"}=1 and last(/Alcatel Timetra TiMOS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/Alcatel Timetra TiMOS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/Alcatel Timetra TiMOS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))`<p>Recovery expression:</p>`last(/Alcatel Timetra TiMOS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0` |AVERAGE |<p>Manual close: YES</p> |
 |Interface {#IFNAME}({#IFALIAS}): High bandwidth usage (>{$IF.UTIL.MAX:"{#IFNAME}"}%) |<p>The network interface utilization is close to its estimated maximum bandwidth.</p> |`(avg(/Alcatel Timetra TiMOS SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/Alcatel Timetra TiMOS SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) or avg(/Alcatel Timetra TiMOS SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/Alcatel Timetra TiMOS SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])) and last(/Alcatel Timetra TiMOS SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0`<p>Recovery expression:</p>`avg(/Alcatel Timetra TiMOS SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/Alcatel Timetra TiMOS SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) and avg(/Alcatel Timetra TiMOS SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/Alcatel Timetra TiMOS SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |Interface {#IFNAME}({#IFALIAS}): High error rate (>{$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) |<p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p> |`min(/Alcatel Timetra TiMOS SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"} or min(/Alcatel Timetra TiMOS SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`max(/Alcatel Timetra TiMOS SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8 and max(/Alcatel Timetra TiMOS SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
-|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/Alcatel Timetra TiMOS SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/Alcatel Timetra TiMOS SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/Alcatel Timetra TiMOS SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/Alcatel Timetra TiMOS SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/Alcatel Timetra TiMOS SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/Alcatel Timetra TiMOS SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/Alcatel Timetra TiMOS SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/Alcatel Timetra TiMOS SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/Alcatel Timetra TiMOS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2) `<p>Recovery expression:</p>`(change(/Alcatel Timetra TiMOS SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/Alcatel Timetra TiMOS SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/Alcatel Timetra TiMOS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2) ` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/Alcatel Timetra TiMOS SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/Alcatel Timetra TiMOS SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/Alcatel Timetra TiMOS SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/Alcatel Timetra TiMOS SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/Alcatel Timetra TiMOS SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/Alcatel Timetra TiMOS SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/Alcatel Timetra TiMOS SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/Alcatel Timetra TiMOS SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/Alcatel Timetra TiMOS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2)`<p>Recovery expression:</p>`(change(/Alcatel Timetra TiMOS SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/Alcatel Timetra TiMOS SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/Alcatel Timetra TiMOS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2)` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |#{#SNMPINDEX}: Power supply is in critical state |<p>Please check the power supply unit for errors</p> |`count(/Alcatel Timetra TiMOS SNMP/sensor.psu.status[tmnxChassisPowerSupply1Status.{#SNMPINDEX}],#1,"eq","{$PSU_CRIT_STATUS}")=1` |AVERAGE | |
 |#{#SNMPINDEX}: Power supply is in critical state |<p>Please check the power supply unit for errors</p> |`count(/Alcatel Timetra TiMOS SNMP/sensor.psu.status[tmnxChassisPowerSupply2Status.{#SNMPINDEX}],#1,"eq","{$PSU_CRIT_STATUS}")=1` |AVERAGE | |
 |{HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/Alcatel Timetra TiMOS SNMP/system.uptime[sysUpTime.0])<10m` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- No SNMP data collection</p> |
diff --git a/templates/net/alcatel_timetra_snmp/template_net_alcatel_timetra_snmp.yaml b/templates/net/alcatel_timetra_snmp/template_net_alcatel_timetra_snmp.yaml
index 6030d233712..15b65ef9ebc 100644
--- a/templates/net/alcatel_timetra_snmp/template_net_alcatel_timetra_snmp.yaml
+++ b/templates/net/alcatel_timetra_snmp/template_net_alcatel_timetra_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:49:58Z'
+  date: '2022-01-26T09:58:58Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -35,8 +35,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 72f8bcb4dfde4d338c31c83b72a36129
@@ -44,6 +47,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 959946f1885c4e7fbde7ab7200c60858
           name: 'ICMP loss'
@@ -54,8 +61,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 0c0a32b98df84c07acbe51caabc8c012
@@ -67,6 +77,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/Alcatel Timetra TiMOS SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 7f858a8bc36746be89b2e36608cbb643
           name: 'ICMP response time'
@@ -77,8 +94,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 06fd317938784236b3e17b2b4080925d
@@ -93,6 +113,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/Alcatel Timetra TiMOS SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 8f5bdb3fde9142a9892db396c040f8dd
           name: 'SNMP traps (fallback)'
@@ -105,8 +132,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: 0471357a58ff437e835e02175d6e6ca1
           name: 'System contact details'
@@ -128,8 +155,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: e28cb751b37e42d29be9f0295bd030b6
           name: 'CPU utilization'
@@ -144,8 +171,8 @@ zabbix_export:
             The value of sgiCpuUsage indicates the current CPU utilization for the system.
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
           triggers:
             -
               uuid: 4167b064eb19478da13531f629082ef1
@@ -154,6 +181,10 @@ zabbix_export:
               opdata: 'Current utilization: {ITEM.LASTVALUE1}'
               priority: WARNING
               description: 'CPU utilization is too high. The system might be slow to respond.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 757c85110dc34eb88265832aba8e7fbf
           name: 'System description'
@@ -176,8 +207,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 2183a57a2c904632bf813c15610765f7
           name: 'Hardware model name'
@@ -202,8 +233,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
         -
           uuid: 597b68e7ddb8482280122de489424041
           name: 'System location'
@@ -225,8 +256,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 0b1d37d4950d40c79433f47dea9677d4
           name: 'System name'
@@ -248,8 +279,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 5f11cacfd4a94cf696897b3f3fa80601
@@ -258,6 +289,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: f0df5a577f5c46689578302df065a3d6
           name: 'System object ID'
@@ -278,8 +316,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 9f1c8827a9ef4948808bac9d76add9a8
           name: 'Operating system'
@@ -304,8 +342,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: os
           triggers:
             -
               uuid: dd5dc3541a3d402c98a60b25d9e48dd6
@@ -318,6 +356,10 @@ zabbix_export:
                 -
                   name: 'System name has changed (new name: {ITEM.VALUE})'
                   expression: 'last(/Alcatel Timetra TiMOS SNMP/system.name,#1)<>last(/Alcatel Timetra TiMOS SNMP/system.name,#2) and length(last(/Alcatel Timetra TiMOS SNMP/system.name))>0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: e80e3dfbf1a447be87f1b6853c66555b
           name: Uptime
@@ -338,8 +380,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 3b6324116e5940b5aaea72adca4dbbf6
@@ -352,6 +394,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/Alcatel Timetra TiMOS SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 3f2769066a184d29afd26047039b633c
           name: 'Available memory'
@@ -370,8 +416,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 9005685cea194d7c9702f19040df7b80
           name: 'Total memory'
@@ -383,8 +429,8 @@ zabbix_export:
           description: 'Total memory in Bytes'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: f5cd1ed0f61f464f86a97485f833d832
           name: 'Used memory'
@@ -403,8 +449,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: f223ac289a99469e8861219f4254dea6
           name: 'Memory utilization'
@@ -417,8 +463,8 @@ zabbix_export:
           description: 'Memory utilization in %'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: a22f13e245b944e991c2c9850a731a3c
@@ -426,6 +472,13 @@ zabbix_export:
               name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
               priority: AVERAGE
               description: 'The system is running out of free memory.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: cbcc156906774a109dd3d0cf09c512e9
           name: 'SNMP agent availability'
@@ -442,8 +495,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 60187191b268499784a70ef1dfe058ae
@@ -456,6 +512,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/Alcatel Timetra TiMOS SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: fe7fa4ab68b8430c86a3adf6ba2fd048
@@ -490,8 +550,8 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: Inventory
+                  tag: component
+                  value: system
               trigger_prototypes:
                 -
                   uuid: ccdcfdbe1a6243949857c764aed9c9ea
@@ -500,6 +560,10 @@ zabbix_export:
                   priority: INFO
                   description: 'Device serial number has changed. Ack to close'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
         -
           uuid: 0fa1180b594e401a83927f6c20809a86
           name: 'FAN Discovery'
@@ -530,8 +594,8 @@ zabbix_export:
                 name: 'TIMETRA-CHASSIS-MIB::TmnxDeviceState'
               tags:
                 -
-                  tag: Application
-                  value: Fans
+                  tag: component
+                  value: fan
               trigger_prototypes:
                 -
                   uuid: 10f9f5cd2f1b4d09abba3ae48b482eb8
@@ -540,6 +604,13 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the fan unit'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 0caa510db5f54ee5a57c9a40c9d20140
           name: 'Network interfaces discovery'
@@ -628,8 +699,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: ddabc629599f43f494b67225ccaef4cd
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -648,8 +725,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: cc041e8f15eb48c098871bfa91c9edef
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -673,8 +756,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: abdd315e75154954a8d8323a35d42029
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -697,8 +786,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 91b4d7e0133049049efa24835e00b061
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -717,8 +812,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: be432b00cdc044c0a1190e31aecc2b2c
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -742,8 +843,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 67971f7787444822b9ee370a3cc2d3ec
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -768,8 +875,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 92ac574cd0354d9fa886cfcf0f2f048d
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -791,8 +904,14 @@ zabbix_export:
                 name: 'IF-MIB::ifOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: a4bcc6d80080415698d8fd323ff5d484
@@ -810,6 +929,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 201dd2baef0647f58fbcec0205cce318
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -833,8 +956,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           trigger_prototypes:
             -
               uuid: a9467162f7434b8e97cb6645b6a060ae
@@ -864,6 +993,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Alcatel Timetra TiMOS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/Alcatel Timetra TiMOS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/Alcatel Timetra TiMOS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/Alcatel Timetra TiMOS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 27e0b7fcaf664410962dc768e0ef7267
               expression: |
@@ -884,6 +1017,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Alcatel Timetra TiMOS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/Alcatel Timetra TiMOS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/Alcatel Timetra TiMOS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/Alcatel Timetra TiMOS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: ee8dccabf5df45b48a503320131b152e
               expression: |
@@ -903,6 +1040,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Alcatel Timetra TiMOS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/Alcatel Timetra TiMOS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/Alcatel Timetra TiMOS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/Alcatel Timetra TiMOS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: 58eba6a5a57f49608fb62b9d270e98c6
@@ -1006,8 +1150,14 @@ zabbix_export:
                 name: 'EtherLike-MIB::dot3StatsDuplexStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: e5d6ba20229044b98ee8cb33e00de8b0
@@ -1016,6 +1166,10 @@ zabbix_export:
                   priority: WARNING
                   description: 'Please check autonegotiation settings and cabling'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           preprocessing:
             -
               type: JAVASCRIPT
@@ -1062,8 +1216,8 @@ zabbix_export:
                 name: 'TIMETRA-CHASSIS-MIB::TmnxDeviceState'
               tags:
                 -
-                  tag: Application
-                  value: 'Power supply'
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: afbc2020a9f74d6abe52469ac663e057
@@ -1072,6 +1226,13 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the power supply unit for errors'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: b73b01d720c7431085657548d620f76e
               name: '#{#SNMPINDEX}: Power supply status'
@@ -1092,8 +1253,8 @@ zabbix_export:
                 name: 'TIMETRA-CHASSIS-MIB::TmnxDeviceState'
               tags:
                 -
-                  tag: Application
-                  value: 'Power supply'
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: fcbc0ef8f55146daaed6be4ccbd324e7
@@ -1102,6 +1263,13 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the power supply unit for errors'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 6382c9595cb446778d23bb273143b27c
           name: 'Temperature Discovery'
@@ -1130,8 +1298,8 @@ zabbix_export:
                 The current temperature reading in degrees celsius from this hardware component's temperature sensor.  If this component does not contain a temperature sensor, then the value -1 is returned.
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 8f478386378349e7a4e4586c5ba74c78
@@ -1142,6 +1310,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 90ba726922f74d1d971b3f07781fc035
                   expression: 'avg(/Alcatel Timetra TiMOS SNMP/sensor.temp.value[tmnxHwTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:""}'
@@ -1156,6 +1331,13 @@ zabbix_export:
                       name: '{#SNMPVALUE}: Temperature is above critical threshold: >{$TEMP_CRIT:""}'
                       expression: 'avg(/Alcatel Timetra TiMOS SNMP/sensor.temp.value[tmnxHwTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:""}'
                       recovery_expression: 'max(/Alcatel Timetra TiMOS SNMP/sensor.temp.value[tmnxHwTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:""}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 6035fc6733614ae1b4ed22c7d73466b0
                   expression: 'avg(/Alcatel Timetra TiMOS SNMP/sensor.temp.value[tmnxHwTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:""}'
@@ -1164,6 +1346,23 @@ zabbix_export:
                   name: '{#SNMPVALUE}: Temperature is too low: <{$TEMP_CRIT_LOW:""}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: alcatel
+        -
+          tag: target
+          value: alcatel-timetra
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/net/arista_snmp/template_net_arista_snmp.yaml b/templates/net/arista_snmp/template_net_arista_snmp.yaml
index 8eaa7167879..b3d6fba74da 100644
--- a/templates/net/arista_snmp/template_net_arista_snmp.yaml
+++ b/templates/net/arista_snmp/template_net_arista_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:50:04Z'
+  date: '2022-01-26T09:59:10Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -37,8 +37,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 736dc5694fc741e6bcb96e2ba27a0898
@@ -46,6 +49,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 643a2c6f8d724bd392dd97bada7d24c2
           name: 'ICMP loss'
@@ -56,8 +63,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: dfa6f280b6304bfdb0063be94f7a4c5e
@@ -69,6 +79,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/Arista SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: e731e59672be40fa8ae7aced60ed3efc
           name: 'ICMP response time'
@@ -79,8 +96,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 18aeec70f72d43ceb4994501fb36d434
@@ -95,6 +115,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/Arista SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 8954dfa9dc4445ad987f764e35c7db6e
           name: 'Get sensors'
@@ -126,8 +153,8 @@ zabbix_export:
                   return JSON.stringify(data);
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
         -
           uuid: e2d2516fb77f4e4faf13a69705d6af77
           name: 'SNMP traps (fallback)'
@@ -140,8 +167,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: 48446cefda57477eb19dfc6db23a5ee1
           name: 'System contact details'
@@ -163,8 +190,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: fde390cc8671441194fb274209a8c190
           name: 'CPU utilization'
@@ -185,8 +212,8 @@ zabbix_export:
                 - '$..[''{#CPU.UTIL}''].avg()'
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
           triggers:
             -
               uuid: 6737f0672c244e048509358d220874a6
@@ -195,6 +222,10 @@ zabbix_export:
               opdata: 'Current utilization: {ITEM.LASTVALUE1}'
               priority: WARNING
               description: 'CPU utilization is too high. The system might be slow to respond.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 861f3aef96e64cf0a68e0fc81693f118
           name: 'System description'
@@ -217,8 +248,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 55418095abea4f109476530af23e2829
           name: 'System location'
@@ -240,8 +271,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: d4538fc49f554fb6a1514cd9487a7291
           name: 'System name'
@@ -263,8 +294,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 362d455c9d9944cea7c37d58bcabc0a0
@@ -273,6 +304,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: 8f2e8b5fa0464e4d964253f361d1e033
           name: 'System object ID'
@@ -293,8 +331,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: ed9ad1ae7fba4073bb80307dbd6849cd
           name: Uptime
@@ -315,8 +353,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: e3907a8b6aba4512a24a677ed31e4362
@@ -329,6 +367,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/Arista SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: f57ed8cec3144effa6ffb2a4f604ab0b
           name: 'SNMP agent availability'
@@ -345,8 +387,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 53501c72392a4bbc8fa0f5ed086d2591
@@ -359,6 +404,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/Arista SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: 54b839c0606741bfad5c84497cf1d295
@@ -392,8 +441,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Inventory
+                  tag: component
+                  value: system
             -
               uuid: 2f25bd11644d4bd3917d6c6693e74c99
               name: '{#ENT_NAME}: Hardware serial number'
@@ -412,8 +461,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Inventory
+                  tag: component
+                  value: system
               trigger_prototypes:
                 -
                   uuid: 218209a40ec54a489738345c4485be83
@@ -422,6 +471,10 @@ zabbix_export:
                   priority: INFO
                   description: 'Device serial number has changed. Ack to close'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
         -
           uuid: c78a9f82601847338d687ed01577e958
           name: 'Fan discovery'
@@ -451,8 +504,8 @@ zabbix_export:
                 entPhySensorScale, and entPhySensorPrecision objects must also be examined.
               tags:
                 -
-                  tag: Application
-                  value: Fans
+                  tag: component
+                  value: fan
               trigger_prototypes:
                 -
                   uuid: 660fd32236464fd69409099c67478ff5
@@ -465,6 +518,10 @@ zabbix_export:
                     -
                       name: '{#SENSOR_INFO}: Fan is in critical state'
                       expression: 'count(/Arista SNMP/sensor.fan.status[entPhySensorOperStatus.{#SNMPINDEX}],#1,"eq","{$FAN_CRIT_STATUS}")=1'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: b1131f42627047ca9629693b91d9185e
                   expression: 'min(/Arista SNMP/sensor.fan.speed[entPhySensorValue.{#SNMPINDEX}],5m) > {#THRESHOLD_HI_WARN}'
@@ -479,6 +536,10 @@ zabbix_export:
                     -
                       name: '{#SENSOR_INFO}: Fan speed is above the critical threshold of {#THRESHOLD_HI_CRIT}rpm for 5m'
                       expression: 'min(/Arista SNMP/sensor.fan.speed[entPhySensorValue.{#SNMPINDEX}],5m) > {#THRESHOLD_HI_CRIT}'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: 0cd8e252a77b4c90a155e57aab963e5e
                   expression: 'max(/Arista SNMP/sensor.fan.speed[entPhySensorValue.{#SNMPINDEX}],5m) < {#THRESHOLD_LO_CRIT}'
@@ -490,6 +551,10 @@ zabbix_export:
                     -
                       name: '{#SENSOR_INFO}: Fan is in critical state'
                       expression: 'count(/Arista SNMP/sensor.fan.status[entPhySensorOperStatus.{#SNMPINDEX}],#1,"eq","{$FAN_CRIT_STATUS}")=1'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: d37c360fea9143bab6ff07699ed4acb1
                   expression: 'max(/Arista SNMP/sensor.fan.speed[entPhySensorValue.{#SNMPINDEX}],5m) < {#THRESHOLD_LO_WARN}'
@@ -504,6 +569,10 @@ zabbix_export:
                     -
                       name: '{#SENSOR_INFO}: Fan speed is below the critical threshold of {#THRESHOLD_LO_CRIT}rpm for 5m'
                       expression: 'max(/Arista SNMP/sensor.fan.speed[entPhySensorValue.{#SNMPINDEX}],5m) < {#THRESHOLD_LO_CRIT}'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: c5e6aaebbf9d467488fdfa1127a31fd7
               name: '{#SENSOR_INFO}: Fan status'
@@ -520,8 +589,8 @@ zabbix_export:
                 name: 'ENTITY-SENSORS-MIB::EntitySensorStatus'
               tags:
                 -
-                  tag: Application
-                  value: Fans
+                  tag: component
+                  value: fan
               trigger_prototypes:
                 -
                   uuid: 11dddf9f12a0423bb886808759cd429d
@@ -530,6 +599,13 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the fan unit'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
           master_item:
             key: sensors.get
           overrides:
@@ -685,8 +761,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 32217efa18d74fef8d467eb1ffdffe77
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -705,8 +787,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: bb496495e10d4ba9b4e111df5f4c212c
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -730,8 +818,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 84763d17b876499d9a7a67f93b21a2a7
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -754,8 +848,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 825e8d8d1528498ba11caa0152daa3f9
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -774,8 +874,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 9f54178529434f248bbba6eed46df8ac
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -799,8 +905,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 77a0e72b17bf4f04a813b224fba88156
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -825,8 +937,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 57006254d61a411296021ee32924cce7
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -848,8 +966,14 @@ zabbix_export:
                 name: 'IF-MIB::ifOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 11c5b8073b3540e4b0698a8db9e3c33e
@@ -867,6 +991,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 9ccd7ecb83bf4ff387b8541d807e6a69
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -890,8 +1018,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           trigger_prototypes:
             -
               uuid: 9715da7cb2404bf2a3cb3e80d4bb3bde
@@ -921,6 +1055,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Arista SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/Arista SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/Arista SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/Arista SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 32c978fecfcb42738cd179c19bcd2360
               expression: |
@@ -941,6 +1079,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Arista SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/Arista SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/Arista SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/Arista SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 47d5a599bc574ccea4baeebc3aad34f5
               expression: |
@@ -960,6 +1102,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Arista SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/Arista SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/Arista SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/Arista SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: ecce7b4f1bf844239328705e46958c85
@@ -1063,8 +1212,14 @@ zabbix_export:
                 name: 'EtherLike-MIB::dot3StatsDuplexStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: c1bddd15c68243aeb69dc47f57eb6631
@@ -1073,6 +1228,10 @@ zabbix_export:
                   priority: WARNING
                   description: 'Please check autonegotiation settings and cabling'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           preprocessing:
             -
               type: JAVASCRIPT
@@ -1119,8 +1278,8 @@ zabbix_export:
                 name: 'ENTITY-STATE-MIB::EntityOperState'
               tags:
                 -
-                  tag: Application
-                  value: 'Power supply'
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: 4faa99278cd94abaace8b09529a6efaa
@@ -1129,6 +1288,13 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the power supply unit for errors'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 50d834b15d7f4755b1ff89ddba90fa4d
           name: 'Temperature discovery'
@@ -1164,8 +1330,8 @@ zabbix_export:
                 name: 'ENTITY-SENSORS-MIB::EntitySensorStatus'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
             -
               uuid: 0f769e8ce0b647989085460beb9a2155
               name: '{#SENSOR_INFO}: Temperature'
@@ -1187,8 +1353,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 791d55e21828472e93c97d8fa4f96d26
@@ -1197,6 +1363,10 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values defined in the device.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: c65457a8a6d4427995626ff9ff12e339
                   expression: 'min(/Arista SNMP/sensor.temp.value[entPhySensorValue.{#SNMPINDEX}],5m) > {#THRESHOLD_HI_WARN}'
@@ -1208,6 +1378,10 @@ zabbix_export:
                     -
                       name: '{#SENSOR_INFO}: Temperature is above the critical threshold of {#THRESHOLD_HI_CRIT}°C for 5m'
                       expression: 'min(/Arista SNMP/sensor.temp.value[entPhySensorValue.{#SNMPINDEX}],5m) > {#THRESHOLD_HI_CRIT}'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: b521cd99d9fb4f6f9d1241ac33c01a86
                   expression: 'max(/Arista SNMP/sensor.temp.value[entPhySensorValue.{#SNMPINDEX}],5m) < {#THRESHOLD_LO_CRIT}'
@@ -1215,6 +1389,10 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values defined in the device.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: 750888bd98fa475dba03591945416b89
                   expression: 'max(/Arista SNMP/sensor.temp.value[entPhySensorValue.{#SNMPINDEX}],5m) < {#THRESHOLD_LO_WARN}'
@@ -1226,6 +1404,10 @@ zabbix_export:
                     -
                       name: '{#SENSOR_INFO}: Temperature is below the critical threshold of {#THRESHOLD_LO_CRIT}°C for 5m'
                       expression: 'max(/Arista SNMP/sensor.temp.value[entPhySensorValue.{#SNMPINDEX}],5m) < {#THRESHOLD_LO_CRIT}'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
           master_item:
             key: sensors.get
           overrides:
@@ -1335,8 +1517,11 @@ zabbix_export:
               description: 'Space utilization in % for {#FSNAME}'
               tags:
                 -
-                  tag: Application
-                  value: 'Filesystem {#FSNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 22bf8f2fc376489a9b3f65414fb10f47
               name: '{#FSNAME}: Total space'
@@ -1357,8 +1542,11 @@ zabbix_export:
                     - '{#ALLOC_UNITS}'
               tags:
                 -
-                  tag: Application
-                  value: 'Filesystem {#FSNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 967fce12f9b34723a5984d2f4c2a74f3
               name: '{#FSNAME}: Used space'
@@ -1377,8 +1565,11 @@ zabbix_export:
                     - '{#ALLOC_UNITS}'
               tags:
                 -
-                  tag: Application
-                  value: 'Filesystem {#FSNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
           trigger_prototypes:
             -
               uuid: f4bfac8d247144b3bebac7245248553e
@@ -1394,6 +1585,13 @@ zabbix_export:
                  - The disk free space is less than 5G.
                  - The disk will be full in less than 24 hours.
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
             -
               uuid: 9912ab9619ce46b88afe358ab50a2c4f
               expression: |
@@ -1414,6 +1612,13 @@ zabbix_export:
                   expression: |
                     last(/Arista SNMP/vfs.fs.pused[storageUsedPercentage.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"{#FSNAME}"} and
                     ((last(/Arista SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/Arista SNMP/vfs.fs.used[hrStorageUsed.{#SNMPINDEX}]))<5G or timeleft(/Arista SNMP/vfs.fs.pused[storageUsedPercentage.{#SNMPINDEX}],1h,100)<1d)
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
           graph_prototypes:
             -
               uuid: 9d5287bdf6cb4bbb9cada4c24b9ecd17
@@ -1487,8 +1692,8 @@ zabbix_export:
                     - '{#ALLOC_UNITS}'
               tags:
                 -
-                  tag: Application
-                  value: Memory
+                  tag: component
+                  value: memory
             -
               uuid: 520fa8a8954e4992ba18d6d2c1f18259
               name: '{#MEMNAME}: Used memory'
@@ -1507,8 +1712,8 @@ zabbix_export:
                     - '{#ALLOC_UNITS}'
               tags:
                 -
-                  tag: Application
-                  value: Memory
+                  tag: component
+                  value: memory
             -
               uuid: d85df76fd2b7409c84f77459bf037f0e
               name: '{#MEMNAME}: Memory utilization'
@@ -1521,8 +1726,8 @@ zabbix_export:
               description: 'Memory utilization in %'
               tags:
                 -
-                  tag: Application
-                  value: Memory
+                  tag: component
+                  value: memory
               trigger_prototypes:
                 -
                   uuid: 6b9010e0ad4e4549ac91a91d4bb3983a
@@ -1530,6 +1735,13 @@ zabbix_export:
                   name: '{#MEMNAME}: High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
                   priority: AVERAGE
                   description: 'The system is running out of free memory.'
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 1094490b59674fb58ca36cf6543b3bdb
@@ -1573,8 +1785,8 @@ zabbix_export:
                 entPhySensorScale, and entPhySensorPrecision objects must also be examined.
               tags:
                 -
-                  tag: Application
-                  value: Voltage
+                  tag: component
+                  value: voltage
               trigger_prototypes:
                 -
                   uuid: 1c78dea0380a4bf68b05c1323a208c3a
@@ -1583,6 +1795,10 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses voltage sensor values defined in the device.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: 08b4f59d66ea45eaa95426a27586c4bd
                   expression: 'min(/Arista SNMP/sensor.voltage.value[entPhySensorValue.{#SNMPINDEX}],5m) > {#THRESHOLD_HI_WARN}'
@@ -1594,6 +1810,10 @@ zabbix_export:
                     -
                       name: '{#SENSOR_INFO}: Voltage is above the critical threshold of {#THRESHOLD_HI_CRIT}V for 5m'
                       expression: 'min(/Arista SNMP/sensor.voltage.value[entPhySensorValue.{#SNMPINDEX}],5m) > {#THRESHOLD_HI_CRIT}'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: d2df35a764234716a286a8019e6c9411
                   expression: 'max(/Arista SNMP/sensor.voltage.value[entPhySensorValue.{#SNMPINDEX}],5m) < {#THRESHOLD_LO_CRIT}'
@@ -1601,6 +1821,10 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses voltage sensor values defined in the device.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: 481908babd3f44b3a73f3e0a628fe6d4
                   expression: 'max(/Arista SNMP/sensor.voltage.value[entPhySensorValue.{#SNMPINDEX}],5m) < {#THRESHOLD_LO_WARN}'
@@ -1612,6 +1836,10 @@ zabbix_export:
                     -
                       name: '{#SENSOR_INFO}: Voltage is below the critical threshold of {#THRESHOLD_LO_CRIT}V for 5m'
                       expression: 'max(/Arista SNMP/sensor.voltage.value[entPhySensorValue.{#SNMPINDEX}],5m) < {#THRESHOLD_LO_CRIT}'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
           master_item:
             key: sensors.get
           overrides:
@@ -1679,6 +1907,13 @@ zabbix_export:
                   value: 'Voltage is below the warning threshold'
                   status: ENABLED
                   discover: NO_DISCOVER
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: arista
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/net/brocade_fc_sw_snmp/template_net_brocade_fc_sw_snmp.yaml b/templates/net/brocade_fc_sw_snmp/template_net_brocade_fc_sw_snmp.yaml
index 9348fbf22f7..9ec79858ea7 100644
--- a/templates/net/brocade_fc_sw_snmp/template_net_brocade_fc_sw_snmp.yaml
+++ b/templates/net/brocade_fc_sw_snmp/template_net_brocade_fc_sw_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:50:09Z'
+  date: '2022-01-26T09:45:14Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -39,8 +39,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 0c73f37e7ffc4acf83a7edeb84398aba
@@ -48,6 +51,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 4ae37446cb1e4a2d95f55a41dd295bdf
           name: 'ICMP loss'
@@ -58,8 +65,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: eea2256c85764c12b1da83dd8d1a9fe3
@@ -71,6 +81,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/Brocade FC SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 4c8f61f10759487087d5942756f478b2
           name: 'ICMP response time'
@@ -81,8 +98,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 17df26093a5f42fdb19715371c85f733
@@ -97,6 +117,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/Brocade FC SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: c7e6790a311c4b4582093cd28341306a
           name: 'SNMP traps (fallback)'
@@ -109,8 +136,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: 62ae879ca6ab46aebc8655534acbba06
           name: 'System contact details'
@@ -132,8 +159,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: b17a06635cb2400f9c6d0f848fd38868
           name: 'CPU utilization'
@@ -148,8 +175,8 @@ zabbix_export:
             System's CPU usage.
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
           triggers:
             -
               uuid: 68a50684095941cb90f22fbc8d632e7a
@@ -158,6 +185,10 @@ zabbix_export:
               opdata: 'Current utilization: {ITEM.LASTVALUE1}'
               priority: WARNING
               description: 'CPU utilization is too high. The system might be slow to respond.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 8340ccd92ba940b497375aba810394a4
           name: 'System description'
@@ -180,8 +211,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: c6e2d4c076b14ed19fbcb08caa32e5be
           name: 'Firmware version'
@@ -200,8 +231,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 9c5ae10dbafb45658f25f0279a8a1934
@@ -230,8 +261,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 9939f98da99c435a9b5505e55e8abb5f
@@ -240,6 +271,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 88c5304ddeca47779b76d9806b1edc68
           name: 'System location'
@@ -261,8 +296,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: d8d912cb5c924f6587c83f08aa0c8ae1
           name: 'System name'
@@ -284,8 +319,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 0e624c73fdca490e809ffe9235cda610
@@ -294,6 +329,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: 939c63320b8e4199b87cc4759011da3c
           name: 'System object ID'
@@ -314,8 +356,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 29f1dda8042d4fd18d7da9eb95fea76c
           name: 'Overall system health status'
@@ -336,8 +378,8 @@ zabbix_export:
             name: 'SW-MIB::swOperStatus'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: b91af8b94e2047538376be9911beadee
@@ -346,6 +388,13 @@ zabbix_export:
               opdata: 'Current state: {ITEM.LASTVALUE1}'
               priority: HIGH
               description: 'Please check the device for errors'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: b17d4a2bae804c968984b763fa4562fc
               expression: 'count(/Brocade FC SNMP/system.status[swOperStatus.0],#1,"eq","{$HEALTH_WARN_STATUS:\"offline\"}")=1 or count(/Brocade FC SNMP/system.status[swOperStatus.0],#1,"eq","{$HEALTH_WARN_STATUS:\"testing\"}")=1'
@@ -357,6 +406,13 @@ zabbix_export:
                 -
                   name: 'System status is in critical state'
                   expression: 'count(/Brocade FC SNMP/system.status[swOperStatus.0],#1,"eq","{$HEALTH_CRIT_STATUS}")=1'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 237a5614cb634773853f6d5f42096773
           name: Uptime
@@ -377,8 +433,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 42bb10d788484b92ac7290e171ee28a2
@@ -391,6 +447,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/Brocade FC SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 9a8441cae4fb4c698502a20d5ce23ddf
           name: 'Memory utilization'
@@ -405,8 +465,8 @@ zabbix_export:
             Memory utilization in %
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: 1991ae08b008488380db02160b15160e
@@ -414,6 +474,13 @@ zabbix_export:
               name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
               priority: AVERAGE
               description: 'The system is running out of free memory.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 00b66dbea9464b55bbab004e0eb57c7b
           name: 'SNMP agent availability'
@@ -430,8 +497,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 1c67a764531b48f1a931a9a928a8708d
@@ -444,6 +514,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/Brocade FC SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: 721801e236e34b02b5430d115b23817e
@@ -473,8 +547,8 @@ zabbix_export:
                 The fan value will be in RPM(revolution per minute)
               tags:
                 -
-                  tag: Application
-                  value: Fans
+                  tag: component
+                  value: fan
             -
               uuid: ee2569161ad146b392bb8f331a7f7d19
               name: '{#SENSOR_INFO}: Fan status'
@@ -489,8 +563,8 @@ zabbix_export:
                 name: 'SW-MIB::swSensorStatus'
               tags:
                 -
-                  tag: Application
-                  value: Fans
+                  tag: component
+                  value: fan
               trigger_prototypes:
                 -
                   uuid: 75003433a8304644a20d11b82dcbae14
@@ -499,6 +573,13 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the fan unit'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 83e8182fd7034edca8317fa91776b6d2
                   expression: 'count(/Brocade FC SNMP/sensor.fan.status[swSensorStatus.{#SNMPINDEX}],#1,"ne","{$FAN_OK_STATUS}")=1'
@@ -510,6 +591,10 @@ zabbix_export:
                     -
                       name: '{#SENSOR_INFO}: Fan is in critical state'
                       expression: 'count(/Brocade FC SNMP/sensor.fan.status[swSensorStatus.{#SNMPINDEX}],#1,"eq","{$FAN_CRIT_STATUS}")=1'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
         -
           uuid: 58ece372fefb4881ace97a40c5fb09c2
           name: 'Network interfaces discovery'
@@ -598,8 +683,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 04b7026dd1704074b9a18e154d10ef7f
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -618,8 +709,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: efe5a3957efd4d989809db22ad9cff9d
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -643,8 +740,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: a087793253314286a0bfab36a27898bd
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -667,8 +770,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 67d8b40449a24ad28e31ef0363d8b76d
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -687,8 +796,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 3c557f4086bc455eb6185878e50b72d9
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -712,8 +827,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: de0920aa56b740ab89118016cdacbc5e
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -738,8 +859,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 1e9a9d3ea4d24922b8c4b7acc20a3c4f
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -761,8 +888,14 @@ zabbix_export:
                 name: 'IF-MIB::ifOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: e5391912a6b84c1bb41832e88df4fb96
@@ -780,6 +913,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 391fe664d0e44ed99b2b966c647e1e55
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -803,8 +940,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           trigger_prototypes:
             -
               uuid: 5a98171af6b342ab97e0c6c9de0bd589
@@ -834,6 +977,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Brocade FC SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/Brocade FC SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/Brocade FC SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/Brocade FC SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: a16b52f43a224a11861813be5a11697c
               expression: |
@@ -854,6 +1001,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Brocade FC SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/Brocade FC SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/Brocade FC SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/Brocade FC SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 9f42c5a5ed1341c1a26263642e4dabe4
               expression: |
@@ -873,6 +1024,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Brocade FC SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/Brocade FC SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/Brocade FC SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/Brocade FC SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: 0ca148aeaadd45b6bd32e9ecde4127df
@@ -947,8 +1105,8 @@ zabbix_export:
                 name: 'SW-MIB::swSensorStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Power supply'
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: 649e7344411242738d9824f861b3c49a
@@ -957,6 +1115,13 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the power supply unit for errors'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: bfe2f4085f6840da9e8d30f37bb29fdb
                   expression: 'count(/Brocade FC SNMP/sensor.psu.status[swSensorStatus.{#SNMPINDEX}],#1,"ne","{$PSU_OK_STATUS}")=1'
@@ -968,6 +1133,10 @@ zabbix_export:
                     -
                       name: '{#SENSOR_INFO}: Power supply is in critical state'
                       expression: 'count(/Brocade FC SNMP/sensor.psu.status[swSensorStatus.{#SNMPINDEX}],#1,"eq","{$PSU_CRIT_STATUS}")=1'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
         -
           uuid: efaa3e2dfb5b405d99998bd6f8a08697
           name: 'Temperature Discovery'
@@ -998,8 +1167,8 @@ zabbix_export:
                 name: 'SW-MIB::swSensorStatus'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
             -
               uuid: ee48ef951f124c569327670a2a0f2152
               name: '{#SENSOR_INFO}: Temperature'
@@ -1014,8 +1183,8 @@ zabbix_export:
                 Temperature readings of testpoint: {#SENSOR_INFO}
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 5ee4c1931e244d638b58f945f8a7565c
@@ -1026,6 +1195,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: fc68b3a0ea6643f988c26e3e735d7491
                   expression: 'avg(/Brocade FC SNMP/sensor.temp.value[swSensorValue.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:""}'
@@ -1034,6 +1210,13 @@ zabbix_export:
                   name: '{#SENSOR_INFO}: Temperature is too low: <{$TEMP_CRIT_LOW:""}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
           trigger_prototypes:
             -
               uuid: 726afdedb08848bd86ab4161cef29f42
@@ -1052,6 +1235,23 @@ zabbix_export:
                   name: '{#SENSOR_INFO}: Temperature is above critical threshold: >{$TEMP_CRIT:""}'
                   expression: 'avg(/Brocade FC SNMP/sensor.temp.value[swSensorValue.{#SNMPINDEX}],5m)>{$TEMP_CRIT:""}'
                   recovery_expression: 'max(/Brocade FC SNMP/sensor.temp.value[swSensorValue.{#SNMPINDEX}],5m)<{$TEMP_CRIT:""}-3'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: brocade
+        -
+          tag: target
+          value: brocade-fc
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/net/brocade_foundry_sw_snmp/template_net_brocade_foundry_sw_snmp.yaml b/templates/net/brocade_foundry_sw_snmp/template_net_brocade_foundry_sw_snmp.yaml
index 52bc99ea4f8..716053396bc 100644
--- a/templates/net/brocade_foundry_sw_snmp/template_net_brocade_foundry_sw_snmp.yaml
+++ b/templates/net/brocade_foundry_sw_snmp/template_net_brocade_foundry_sw_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:50:16Z'
+  date: '2022-01-26T09:47:31Z'
   groups:
     -
       uuid: 57b7ae836ca64446ba2c296389c009b7
@@ -36,8 +36,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 3e93707bfbed4541a90548f64b2dfc18
@@ -45,6 +48,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 6e20f516917f40bca4a53ed015e065d2
           name: 'ICMP loss'
@@ -55,8 +62,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 3f3500c666bb47208115b6ca43fc8458
@@ -68,6 +78,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/Brocade_Foundry Nonstackable SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: c2888004f9e84640a088f891f8b0703d
           name: 'ICMP response time'
@@ -78,8 +95,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: e1bcb2ad662f4e4fb0ff67f0f1fc39e5
@@ -94,6 +114,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/Brocade_Foundry Nonstackable SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 2d0b064b0fd74361ac1c32cdea2c1123
           name: 'SNMP traps (fallback)'
@@ -106,8 +133,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: d0561cc5be67434088c1e591a577d7e3
           name: 'System contact details'
@@ -129,8 +156,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 2083ecbada4344b4b26dba0145694d7e
           name: 'CPU utilization'
@@ -145,8 +172,8 @@ zabbix_export:
             The statistics collection of 1 minute CPU utilization.
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
           triggers:
             -
               uuid: bf59d38703f44bcb9497dcbda684b071
@@ -155,6 +182,10 @@ zabbix_export:
               opdata: 'Current utilization: {ITEM.LASTVALUE1}'
               priority: WARNING
               description: 'CPU utilization is too high. The system might be slow to respond.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 9f49220f80c04e2e98ecf3ec5fa53c2e
           name: 'System description'
@@ -177,8 +208,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 4f58884d810a416ea321dd622c876d06
           name: 'Firmware version'
@@ -199,8 +230,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: fbe1f9d9286046bbb15fe89ec1dcc87d
@@ -210,6 +241,10 @@ zabbix_export:
               priority: INFO
               description: 'Firmware version has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 7d8b9dc153c4408c99a707a9b4d57647
           name: 'Hardware serial number'
@@ -229,8 +264,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 2bb9d8927e464842a55b89be412adcc4
@@ -239,6 +274,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 3accd01dca984406990051338ce3f269
           name: 'System location'
@@ -260,8 +299,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 0d27ffcf928949188fbe1994b6b4dcbb
           name: 'System name'
@@ -283,8 +322,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: ee0c67c575cb4b01bc3733d719baac4f
@@ -293,6 +332,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: 702517f6c1024b3c8860a63c9cd57367
           name: 'System object ID'
@@ -313,8 +359,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 3a534079085747b0916da05afdfafba0
           name: Uptime
@@ -335,8 +381,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 99208318a05445518bebae305dd53d34
@@ -349,6 +395,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/Brocade_Foundry Nonstackable SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 1e1b82a4271d4e159315e74547bea34e
           name: 'Memory utilization'
@@ -365,8 +415,8 @@ zabbix_export:
             For NI platforms, refer to snAgentBrdMemoryUtil100thPercent.
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: 07bba62d70fa4e7b81f82fc44036ce6e
@@ -374,6 +424,13 @@ zabbix_export:
               name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
               priority: AVERAGE
               description: 'The system is running out of free memory.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: b782df60263e4302b83f66e920ac217f
           name: 'SNMP agent availability'
@@ -390,8 +447,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: fb3168f6539c4a55b5aab3efbcad117d
@@ -404,6 +464,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/Brocade_Foundry Nonstackable SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: cb46b61100c8456098a85b1e48644146
@@ -428,8 +492,8 @@ zabbix_export:
                 name: 'FOUNDRY-SN-AGENT-MIB::snChasFanOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: Fans
+                  tag: component
+                  value: fan
               trigger_prototypes:
                 -
                   uuid: dfb8d67a8b0c4128aff9d1643e40afc0
@@ -438,6 +502,13 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the fan unit'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 74ef51062e194213bbf61f747624313c
                   expression: 'count(/Brocade_Foundry Nonstackable SNMP/sensor.fan.status[snChasFanOperStatus.{#SNMPINDEX}],#1,"ne","{$FAN_OK_STATUS}")=1'
@@ -449,6 +520,10 @@ zabbix_export:
                     -
                       name: 'Fan {#FAN_INDEX}: Fan is in critical state'
                       expression: 'count(/Brocade_Foundry Nonstackable SNMP/sensor.fan.status[snChasFanOperStatus.{#SNMPINDEX}],#1,"eq","{$FAN_CRIT_STATUS}")=1'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
         -
           uuid: 1b7d06dba8fb4869812e95417c05ec25
           name: 'Network interfaces discovery'
@@ -537,8 +612,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: de91b80675624e889349e90fef603e9f
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -557,8 +638,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 2b169ba2d5a44d85ae78b32261cd6852
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -582,8 +669,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: eb286f99f6f1495bbff1f888dfdbfad6
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -606,8 +699,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 1e16a6f28fe3455b9c37c8d842102ace
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -626,8 +725,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 24fb27f79bfc4cde8081ffe55cf945c5
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -651,8 +756,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 2cff6fcf8aaa486aa0b7d26d71a928f1
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -677,8 +788,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 23402859e08647d8bdb39ca8f39daf3b
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -700,8 +817,14 @@ zabbix_export:
                 name: 'IF-MIB::ifOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 3455100ce855445ab3806379fbdc0bbf
@@ -719,6 +842,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 9657eee8f64d4bbe934cfb03f047caa7
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -742,8 +869,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           trigger_prototypes:
             -
               uuid: e5f54206b19f4f589229c7137365351c
@@ -773,6 +906,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Brocade_Foundry Nonstackable SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/Brocade_Foundry Nonstackable SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/Brocade_Foundry Nonstackable SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/Brocade_Foundry Nonstackable SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 093696611acd4d75b00e83ce5b11df35
               expression: |
@@ -793,6 +930,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Brocade_Foundry Nonstackable SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/Brocade_Foundry Nonstackable SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/Brocade_Foundry Nonstackable SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/Brocade_Foundry Nonstackable SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 5337b53e473248719eb502428a4bcc38
               expression: |
@@ -812,6 +953,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Brocade_Foundry Nonstackable SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/Brocade_Foundry Nonstackable SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/Brocade_Foundry Nonstackable SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/Brocade_Foundry Nonstackable SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: 96d099e3a5c142ce8c3bc1e88cb65d5e
@@ -881,8 +1029,8 @@ zabbix_export:
                 name: 'FOUNDRY-SN-AGENT-MIB::snChasPwrSupplyOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Power supply'
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: fbe256ab504b4cb98fec650972d5c41a
@@ -891,6 +1039,13 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the power supply unit for errors'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 6163e41576734f469146bc818b2856a2
                   expression: 'count(/Brocade_Foundry Nonstackable SNMP/sensor.psu.status[snChasPwrSupplyOperStatus.{#SNMPINDEX}],#1,"ne","{$PSU_OK_STATUS}")=1'
@@ -902,6 +1057,10 @@ zabbix_export:
                     -
                       name: 'PSU {#PSU_INDEX}: Power supply is in critical state'
                       expression: 'count(/Brocade_Foundry Nonstackable SNMP/sensor.psu.status[snChasPwrSupplyOperStatus.{#SNMPINDEX}],#1,"eq","{$PSU_CRIT_STATUS}")=1'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
         -
           uuid: 5b62e90cfc5549d4b189158499b3d9fb
           name: 'Temperature Discovery Chassis'
@@ -932,8 +1091,8 @@ zabbix_export:
                     - '0.5'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: cae73cf7a78f4963ab1718446ceeb6f4
@@ -944,6 +1103,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 66c4f9fd59f043a782dd8fea11b90451
                   expression: 'avg(/Brocade_Foundry Nonstackable SNMP/sensor.temp.value[snChasActualTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Chassis"}'
@@ -958,6 +1124,13 @@ zabbix_export:
                       name: 'Chassis #{#SNMPINDEX}: Temperature is above critical threshold: >{$TEMP_CRIT:"Chassis"}'
                       expression: 'avg(/Brocade_Foundry Nonstackable SNMP/sensor.temp.value[snChasActualTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Chassis"}'
                       recovery_expression: 'max(/Brocade_Foundry Nonstackable SNMP/sensor.temp.value[snChasActualTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Chassis"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 2895da8297fc457da88ea136e61fb8d9
                   expression: 'avg(/Brocade_Foundry Nonstackable SNMP/sensor.temp.value[snChasActualTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Chassis"}'
@@ -966,6 +1139,13 @@ zabbix_export:
                   name: 'Chassis #{#SNMPINDEX}: Temperature is too low: <{$TEMP_CRIT_LOW:"Chassis"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 44a84963c9d04fc5a82415602ec8db33
           name: 'Temperature Discovery'
@@ -994,8 +1174,8 @@ zabbix_export:
                     - '0.5'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: bace15be86774bb4a46ca491b3b53516
@@ -1006,6 +1186,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 3687c8a7e88949fb9953049fb0f5e54d
                   expression: 'avg(/Brocade_Foundry Nonstackable SNMP/sensor.temp.value[snAgentTempValue.{#SNMPINDEX}],5m)>{$TEMP_WARN:""}'
@@ -1020,6 +1207,13 @@ zabbix_export:
                       name: '{#SENSOR_DESCR}: Temperature is above critical threshold: >{$TEMP_CRIT:""}'
                       expression: 'avg(/Brocade_Foundry Nonstackable SNMP/sensor.temp.value[snAgentTempValue.{#SNMPINDEX}],5m)>{$TEMP_CRIT:""}'
                       recovery_expression: 'max(/Brocade_Foundry Nonstackable SNMP/sensor.temp.value[snAgentTempValue.{#SNMPINDEX}],5m)<{$TEMP_CRIT:""}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: fbe5f29b241248b4b4bff5d55fcc2180
                   expression: 'avg(/Brocade_Foundry Nonstackable SNMP/sensor.temp.value[snAgentTempValue.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:""}'
@@ -1028,6 +1222,23 @@ zabbix_export:
                   name: '{#SENSOR_DESCR}: Temperature is too low: <{$TEMP_CRIT_LOW:""}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: brocade
+        -
+          tag: target
+          value: brocade-foundry
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
@@ -2107,8 +2318,8 @@ zabbix_export:
             The statistics collection of 1 minute CPU utilization.
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
           triggers:
             -
               uuid: 7b068eb5d43846d987148f38f66b1f1a
@@ -2117,6 +2328,10 @@ zabbix_export:
               opdata: 'Current utilization: {ITEM.LASTVALUE1}'
               priority: WARNING
               description: 'CPU utilization is too high. The system might be slow to respond.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: e357f3d53b9a48a087e140b94b3aff1d
           name: 'Memory utilization'
@@ -2133,8 +2348,8 @@ zabbix_export:
             For NI platforms, refer to snAgentBrdMemoryUtil100thPercent.
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: 929046c4439741a9aa3ab00933322a86
@@ -2142,6 +2357,23 @@ zabbix_export:
               name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
               priority: AVERAGE
               description: 'The system is running out of free memory.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: brocade
+        -
+          tag: target
+          value: brocade-foundry
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
@@ -2183,8 +2415,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 06ed32e60b9d4fb387116b5bb9c1700a
@@ -2192,6 +2427,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 3e97bfa40e1547b5be3f72f9675dfc62
           name: 'ICMP loss'
@@ -2202,8 +2441,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 305f5a75aed34094a1721653ba6cafda
@@ -2215,6 +2457,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/Brocade_Foundry Stackable SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 79ca1e3ac22742d28e08c722dad1e254
           name: 'ICMP response time'
@@ -2225,8 +2474,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 6e7e8f250fbb47778405daeea7a2b852
@@ -2241,6 +2493,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/Brocade_Foundry Stackable SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 584f0625be1c40e69294dce25fc9ead6
           name: 'SNMP traps (fallback)'
@@ -2253,8 +2512,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: b973c42ae6da4707893b21f20d09ecd3
           name: 'System contact details'
@@ -2276,8 +2535,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: bfb60806299f4388bb5bfafd2c0329be
           name: 'CPU utilization'
@@ -2292,8 +2551,8 @@ zabbix_export:
             The statistics collection of 1 minute CPU utilization.
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
           triggers:
             -
               uuid: c390ed19b59a45b29f80cb95ee6e635a
@@ -2302,6 +2561,10 @@ zabbix_export:
               opdata: 'Current utilization: {ITEM.LASTVALUE1}'
               priority: WARNING
               description: 'CPU utilization is too high. The system might be slow to respond.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 11f6230e5f2945aab338c958f38ce9d3
           name: 'System description'
@@ -2324,8 +2587,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 5c17e0d80c354391b339142f2a973886
           name: 'Firmware version'
@@ -2346,8 +2609,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 891b6945b3ae4625bf77a16985219015
@@ -2357,6 +2620,10 @@ zabbix_export:
               priority: INFO
               description: 'Firmware version has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 99be144849104b3cad296b2f21355e93
           name: 'System location'
@@ -2378,8 +2645,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 7af427adf5ad451894ae1e6af72c1890
           name: 'System name'
@@ -2401,8 +2668,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 1e455a8b19994e9a9f9147d4c3abfa59
@@ -2411,6 +2678,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: 886dd0ed732c49118f012a402b4a5f45
           name: 'System object ID'
@@ -2431,8 +2705,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: c32cf75496ce40e5b3d06a049fa3205d
           name: Uptime
@@ -2453,8 +2727,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 0fd4a268d6d34a2d925a97babe365b65
@@ -2467,6 +2741,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/Brocade_Foundry Stackable SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 631268898edf40908c9d1dd75ed4eef8
           name: 'Memory utilization'
@@ -2483,8 +2761,8 @@ zabbix_export:
             For NI platforms, refer to snAgentBrdMemoryUtil100thPercent.
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: 18623226ce15406488bc99f075cf2590
@@ -2492,6 +2770,13 @@ zabbix_export:
               name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
               priority: AVERAGE
               description: 'The system is running out of free memory.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: a25878004da548e9824321fe0f55955e
           name: 'SNMP agent availability'
@@ -2508,8 +2793,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: a4bb03ba3e4645fdb7ecab56ddde776f
@@ -2522,6 +2810,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/Brocade_Foundry Stackable SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: 88f67d02cd484dfb841f5f841c3e0bd6
@@ -2552,8 +2844,8 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: Inventory
+                  tag: component
+                  value: system
               trigger_prototypes:
                 -
                   uuid: 0144f409ccfd421cb382031cbed8a037
@@ -2562,6 +2854,10 @@ zabbix_export:
                   priority: INFO
                   description: 'Device serial number has changed. Ack to close'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
         -
           uuid: a192b69e71684d9381ca48b5453a2d8b
           name: 'FAN Discovery'
@@ -2585,8 +2881,8 @@ zabbix_export:
                 name: 'FOUNDRY-SN-AGENT-MIB::snChasFanOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: Fans
+                  tag: component
+                  value: fan
               trigger_prototypes:
                 -
                   uuid: 10f683ff42054948bad36cc52f9c968e
@@ -2595,6 +2891,13 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the fan unit'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 821381a387194c7ca4e4ddd1cf734a4c
                   expression: 'count(/Brocade_Foundry Stackable SNMP/sensor.fan.status[snChasFan2OperStatus.{#SNMPINDEX}],#1,"ne","{$FAN_OK_STATUS}")=1'
@@ -2606,6 +2909,10 @@ zabbix_export:
                     -
                       name: 'Unit {#FAN_UNIT} Fan {#FAN_INDEX}: Fan is in critical state'
                       expression: 'count(/Brocade_Foundry Stackable SNMP/sensor.fan.status[snChasFan2OperStatus.{#SNMPINDEX}],#1,"eq","{$FAN_CRIT_STATUS}")=1'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
         -
           uuid: 3a38811553e5456f9d3cc842c5bd3809
           name: 'Network interfaces discovery'
@@ -2694,8 +3001,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: c73aaba921794ec3bd0b8783047dca07
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -2714,8 +3027,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 3cc7e079ba25461c887fc976664311ba
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -2739,8 +3058,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: d310f098ff6f4704b974028707c0350b
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -2763,8 +3088,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 3628163a8ecc43e98b81b91e9f6b51a0
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -2783,8 +3114,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 05eab5a457df403d89e76f7fc20689e4
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -2808,8 +3145,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 65b44b69e0524cec94c36469987e2fec
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -2834,8 +3177,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: cdba234cfd6f475d8a67528a677b79a0
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -2857,8 +3206,14 @@ zabbix_export:
                 name: 'IF-MIB::ifOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 4c175f17331942ae8342b0abf43f8fe2
@@ -2876,6 +3231,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 4c8df33c9eb748bd90ea7053c5aa11ce
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -2899,8 +3258,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           trigger_prototypes:
             -
               uuid: 8a83aadcd4474f8d99a4712c2f49e737
@@ -2930,6 +3295,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Brocade_Foundry Stackable SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/Brocade_Foundry Stackable SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/Brocade_Foundry Stackable SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/Brocade_Foundry Stackable SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: a1ec6d8bc0644db9be849d79e9f24ea1
               expression: |
@@ -2950,6 +3319,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Brocade_Foundry Stackable SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/Brocade_Foundry Stackable SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/Brocade_Foundry Stackable SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/Brocade_Foundry Stackable SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: acba5651b6dd4ed29166698a4faed7f8
               expression: |
@@ -2969,6 +3342,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Brocade_Foundry Stackable SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/Brocade_Foundry Stackable SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/Brocade_Foundry Stackable SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/Brocade_Foundry Stackable SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: 6367b40612f94d9b9a3b2d4276268190
@@ -3038,8 +3418,8 @@ zabbix_export:
                 name: 'FOUNDRY-SN-AGENT-MIB::snChasPwrSupplyOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Power supply'
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: b2b78ace5fc748129fd73ae4283802a6
@@ -3048,6 +3428,13 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the power supply unit for errors'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: d7d0b3a51e2d4737938d310ba6c4a9c9
                   expression: 'count(/Brocade_Foundry Stackable SNMP/sensor.psu.status[snChasPwrSupply2OperStatus.{#SNMPINDEX}],#1,"ne","{$PSU_OK_STATUS}")=1'
@@ -3059,6 +3446,10 @@ zabbix_export:
                     -
                       name: 'Unit {#PSU_UNIT} PSU {#PSU_INDEX}: Power supply is in critical state'
                       expression: 'count(/Brocade_Foundry Stackable SNMP/sensor.psu.status[snChasPwrSupply2OperStatus.{#SNMPINDEX}],#1,"eq","{$PSU_CRIT_STATUS}")=1'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
         -
           uuid: e78f4dcfd112442f8b053f1eb0a28741
           name: 'Stack Discovery'
@@ -3088,8 +3479,8 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: Inventory
+                  tag: component
+                  value: system
         -
           uuid: c700d182f3e041d3b31076984100a402
           name: 'Temperature Discovery'
@@ -3118,8 +3509,8 @@ zabbix_export:
                     - '0.5'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: e1a63b2ebef549ebbd95b307feee8b8d
@@ -3130,6 +3521,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: c1e348e8a5f24100a5b29a840a43dca9
                   expression: 'avg(/Brocade_Foundry Stackable SNMP/sensor.temp.value[snAgentTemp2Value.{#SNMPINDEX}],5m)>{$TEMP_WARN:""}'
@@ -3144,6 +3542,13 @@ zabbix_export:
                       name: '{#SENSOR_DESCR}: Temperature is above critical threshold: >{$TEMP_CRIT:""}'
                       expression: 'avg(/Brocade_Foundry Stackable SNMP/sensor.temp.value[snAgentTemp2Value.{#SNMPINDEX}],5m)>{$TEMP_CRIT:""}'
                       recovery_expression: 'max(/Brocade_Foundry Stackable SNMP/sensor.temp.value[snAgentTemp2Value.{#SNMPINDEX}],5m)<{$TEMP_CRIT:""}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 722ee93a637643e9b3cff31e5ea5151d
                   expression: 'avg(/Brocade_Foundry Stackable SNMP/sensor.temp.value[snAgentTemp2Value.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:""}'
@@ -3152,6 +3557,23 @@ zabbix_export:
                   name: '{#SENSOR_DESCR}: Temperature is too low: <{$TEMP_CRIT_LOW:""}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: brocade
+        -
+          tag: target
+          value: brocade-foundry
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/net/cisco/cisco_asav_snmp/template_net_cisco_asav_snmp.yaml b/templates/net/cisco/cisco_asav_snmp/template_net_cisco_asav_snmp.yaml
index 482cbace450..bdbd8ec5b25 100644
--- a/templates/net/cisco/cisco_asav_snmp/template_net_cisco_asav_snmp.yaml
+++ b/templates/net/cisco/cisco_asav_snmp/template_net_cisco_asav_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-17T06:24:09Z'
+  date: '2022-01-26T09:45:46Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -25,7 +25,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/418396-discussion-thread-for-official-zabbix-templates-for-cisco
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: 'Templates/Network devices'
@@ -53,8 +53,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
         -
           uuid: 2d4a058787a141629a33ab98194055f2
           name: 'Cisco ASAv: Location'
@@ -77,8 +77,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
         -
           uuid: c2e63e282bcd4fd09a80f1be95c089d4
           name: 'Cisco ASAv: System description'
@@ -105,8 +105,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
         -
           uuid: d20d56dccd494060a4bc130f2951a610
           name: 'Cisco ASAv: Host name'
@@ -130,8 +130,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
         -
           uuid: 526b1a118bab4c948af0935197a659f6
           name: 'Cisco ASAv: Uptime'
@@ -154,8 +154,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 7fcf46583d2b42f4be6758e85784f28f
@@ -164,6 +164,10 @@ zabbix_export:
               priority: INFO
               description: 'Uptime is less than 10 minutes'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 33e87e5fe2774f1fabb93553e782aaa0
           name: 'Cisco ASAv: SNMP agent availability'
@@ -179,8 +183,11 @@ zabbix_export:
                 - 1h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: application
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 9ee945a0b0b942d7a7e3fcf218f0e82f
@@ -189,6 +196,10 @@ zabbix_export:
               opdata: 'Current state: {ITEM.LASTVALUE1}'
               priority: WARNING
               description: 'SNMP is not available for polling. Please check device connectivity and SNMP settings.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: 0469f5b40a77457f9447512ed2e75f5e
@@ -215,8 +226,8 @@ zabbix_export:
                 and increases the value range to (0..100).
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
               trigger_prototypes:
                 -
                   uuid: 2e90218795b94ee8b3c01dd79d2dd8b3
@@ -225,6 +236,10 @@ zabbix_export:
                   opdata: 'Current utilization: {ITEM.LASTVALUE1}'
                   priority: WARNING
                   description: 'CPU utilization is too high. The system might be slow to respond.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: c3d95f2670f346cda44b3def5a835379
@@ -258,8 +273,8 @@ zabbix_export:
                 Reference: http://www.cisco.com/c/en/us/support/docs/ip/simple-network-management-protocol-snmp/15216-contiguous-memory.html
               tags:
                 -
-                  tag: Application
-                  value: Memory
+                  tag: component
+                  value: memory
             -
               uuid: a34b4279d8ac40ec8f2d6577ebaa4280
               name: 'Cisco ASAv: {#SNMPVALUE} Used memory'
@@ -274,8 +289,8 @@ zabbix_export:
                 Reference: http://www.cisco.com/c/en/us/support/docs/ip/simple-network-management-protocol-snmp/15216-contiguous-memory.html
               tags:
                 -
-                  tag: Application
-                  value: Memory
+                  tag: component
+                  value: memory
             -
               uuid: d67342c8a8124b1b89ef5ec36684b2a7
               name: 'Cisco ASAv: {#SNMPVALUE} Memory utilization'
@@ -288,8 +303,8 @@ zabbix_export:
               description: 'Memory utilization in %'
               tags:
                 -
-                  tag: Application
-                  value: Memory
+                  tag: component
+                  value: memory
               trigger_prototypes:
                 -
                   uuid: 688975747f664a15a3bca9dd3e1e0b01
@@ -297,6 +312,13 @@ zabbix_export:
                   name: 'Cisco ASAv: High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
                   priority: AVERAGE
                   description: 'The system is running out of free memory.'
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 388a69f2dfad42ac934d3f09c5e0efd1
@@ -367,7 +389,13 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
+                  tag: component
+                  value: interface
+                -
+                  tag: description
+                  value: '{#CISCO.IF.DESC}'
+                -
+                  tag: interface
                   value: '{#CISCO.IF.NAME}'
             -
               uuid: 17f768ffe6604c678e15bb2538cb8cc5
@@ -388,7 +416,13 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
+                  tag: component
+                  value: interface
+                -
+                  tag: description
+                  value: '{#CISCO.IF.DESC}'
+                -
+                  tag: interface
                   value: '{#CISCO.IF.NAME}'
             -
               uuid: 01c5f157fc6140149dec01f512babadd
@@ -412,7 +446,13 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
+                  tag: component
+                  value: interface
+                -
+                  tag: description
+                  value: '{#CISCO.IF.DESC}'
+                -
+                  tag: interface
                   value: '{#CISCO.IF.NAME}'
             -
               uuid: 263e253c378f4928ad5c5f6fd0ce1cbe
@@ -434,7 +474,13 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
+                  tag: component
+                  value: interface
+                -
+                  tag: description
+                  value: '{#CISCO.IF.DESC}'
+                -
+                  tag: interface
                   value: '{#CISCO.IF.NAME}'
             -
               uuid: 9479f382e7e943e0aa560396d3a4db40
@@ -457,7 +503,13 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
+                  tag: component
+                  value: interface
+                -
+                  tag: description
+                  value: '{#CISCO.IF.DESC}'
+                -
+                  tag: interface
                   value: '{#CISCO.IF.NAME}'
             -
               uuid: 443ce01bb9b04e69a936ec8fb9636720
@@ -482,7 +534,13 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
+                  tag: component
+                  value: interface
+                -
+                  tag: description
+                  value: '{#CISCO.IF.DESC}'
+                -
+                  tag: interface
                   value: '{#CISCO.IF.NAME}'
             -
               uuid: 900bf66a4a7f411f9d9ce231daa8d8a8
@@ -504,7 +562,13 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
+                  tag: component
+                  value: interface
+                -
+                  tag: description
+                  value: '{#CISCO.IF.DESC}'
+                -
+                  tag: interface
                   value: '{#CISCO.IF.NAME}'
             -
               uuid: d7564be184564d06abb1f7a718bdf134
@@ -529,7 +593,13 @@ zabbix_export:
                     - 'return +parseFloat(value).toFixed(0);'
               tags:
                 -
-                  tag: Application
+                  tag: component
+                  value: interface
+                -
+                  tag: description
+                  value: '{#CISCO.IF.DESC}'
+                -
+                  tag: interface
                   value: '{#CISCO.IF.NAME}'
             -
               uuid: ceb3a35e289043668d0087255de5c79b
@@ -550,7 +620,13 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
+                  tag: component
+                  value: interface
+                -
+                  tag: description
+                  value: '{#CISCO.IF.DESC}'
+                -
+                  tag: interface
                   value: '{#CISCO.IF.NAME}'
             -
               uuid: 8d51a019f3634b079c2115ccb063840c
@@ -573,7 +649,13 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
+                  tag: component
+                  value: interface
+                -
+                  tag: description
+                  value: '{#CISCO.IF.DESC}'
+                -
+                  tag: interface
                   value: '{#CISCO.IF.NAME}'
               trigger_prototypes:
                 -
@@ -591,6 +673,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 8a97ed7804f042c7b6767f72bcf9a504
               name: 'Cisco ASAv: {#CISCO.IF.NAME} Outgoing broadcast packets'
@@ -612,7 +698,13 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
+                  tag: component
+                  value: interface
+                -
+                  tag: description
+                  value: '{#CISCO.IF.DESC}'
+                -
+                  tag: interface
                   value: '{#CISCO.IF.NAME}'
             -
               uuid: c0918a1acaa049e786a356c25c7dd654
@@ -636,7 +728,13 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
+                  tag: component
+                  value: interface
+                -
+                  tag: description
+                  value: '{#CISCO.IF.DESC}'
+                -
+                  tag: interface
                   value: '{#CISCO.IF.NAME}'
             -
               uuid: 8e9c4d99c0d649e79e2f7f64d91789bf
@@ -662,7 +760,13 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
+                  tag: component
+                  value: interface
+                -
+                  tag: description
+                  value: '{#CISCO.IF.DESC}'
+                -
+                  tag: interface
                   value: '{#CISCO.IF.NAME}'
             -
               uuid: 1439162918d842ab92f4fca35c32279f
@@ -685,7 +789,13 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
+                  tag: component
+                  value: interface
+                -
+                  tag: description
+                  value: '{#CISCO.IF.DESC}'
+                -
+                  tag: interface
                   value: '{#CISCO.IF.NAME}'
             -
               uuid: 559d5ddae7744b19b32993174ef06918
@@ -710,7 +820,13 @@ zabbix_export:
                     - 'return +parseFloat(value).toFixed(0);'
               tags:
                 -
-                  tag: Application
+                  tag: component
+                  value: interface
+                -
+                  tag: description
+                  value: '{#CISCO.IF.DESC}'
+                -
+                  tag: interface
                   value: '{#CISCO.IF.NAME}'
           graph_prototypes:
             -
@@ -840,7 +956,10 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
+                  tag: component
+                  value: physical
+                -
+                  tag: physical
                   value: '{#CISCO.ASAV.PHYS.NAME}'
             -
               uuid: a63fe0420f2e446ca10094fbf04ee4a8
@@ -866,7 +985,10 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
+                  tag: component
+                  value: physical
+                -
+                  tag: physical
                   value: '{#CISCO.ASAV.PHYS.NAME}'
             -
               uuid: 862f2607838647b3b173d113e531c931
@@ -899,7 +1021,10 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
+                  tag: component
+                  value: physical
+                -
+                  tag: physical
                   value: '{#CISCO.ASAV.PHYS.NAME}'
             -
               uuid: d64c4765f78847cc8071913c5454f433
@@ -931,7 +1056,10 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
+                  tag: component
+                  value: physical
+                -
+                  tag: physical
                   value: '{#CISCO.ASAV.PHYS.NAME}'
             -
               uuid: 73739a08da634cd09b857a7512166d7b
@@ -959,7 +1087,10 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
+                  tag: component
+                  value: physical
+                -
+                  tag: physical
                   value: '{#CISCO.ASAV.PHYS.NAME}'
             -
               uuid: 21da0a63b5344b099ab21932a4a65dc6
@@ -994,7 +1125,10 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
+                  tag: component
+                  value: physical
+                -
+                  tag: physical
                   value: '{#CISCO.ASAV.PHYS.NAME}'
             -
               uuid: 9962cc7467c14221bee66a2f17aba12b
@@ -1024,7 +1158,10 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
+                  tag: component
+                  value: physical
+                -
+                  tag: physical
                   value: '{#CISCO.ASAV.PHYS.NAME}'
               trigger_prototypes:
                 -
@@ -1034,6 +1171,10 @@ zabbix_export:
                   priority: INFO
                   description: '{#CISCO.ASAV.PHYS.NAME} serial number has changed. Ack to close'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 698a7613f08048b48d7aad4ad5285562
               name: 'Cisco ASAv: {#CISCO.ASAV.PHYS.NAME} Software revision'
@@ -1062,7 +1203,10 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
+                  tag: component
+                  value: physical
+                -
+                  tag: physical
                   value: '{#CISCO.ASAV.PHYS.NAME}'
         -
           uuid: b49543c7150a4e258645b4b076b2454a
@@ -1092,7 +1236,13 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
+                  tag: component
+                  value: session
+                -
+                  tag: session-index
+                  value: '{#CISCO.CRAS.INDEX}'
+                -
+                  tag: session-user
                   value: '{#CISCO.CRAS.USER}'
             -
               uuid: 3071310f4f0e4c14bcf47d07a05568cc
@@ -1112,7 +1262,13 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
+                  tag: component
+                  value: session
+                -
+                  tag: session-index
+                  value: '{#CISCO.CRAS.INDEX}'
+                -
+                  tag: session-user
                   value: '{#CISCO.CRAS.USER}'
             -
               uuid: 47c84fde7b47415d96d461c28da50526
@@ -1134,7 +1290,13 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
+                  tag: component
+                  value: session
+                -
+                  tag: session-index
+                  value: '{#CISCO.CRAS.INDEX}'
+                -
+                  tag: session-user
                   value: '{#CISCO.CRAS.USER}'
             -
               uuid: 901b8473e8054e929a55dd3e5d507d5d
@@ -1156,7 +1318,13 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
+                  tag: component
+                  value: session
+                -
+                  tag: session-index
+                  value: '{#CISCO.CRAS.INDEX}'
+                -
+                  tag: session-user
                   value: '{#CISCO.CRAS.USER}'
             -
               uuid: 452348005b1c4b7db194afcf3c95473d
@@ -1178,7 +1346,13 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
+                  tag: component
+                  value: session
+                -
+                  tag: session-index
+                  value: '{#CISCO.CRAS.INDEX}'
+                -
+                  tag: session-user
                   value: '{#CISCO.CRAS.USER}'
             -
               uuid: c25050519610453baf3e69042fe77cf0
@@ -1198,7 +1372,13 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
+                  tag: component
+                  value: session
+                -
+                  tag: session-index
+                  value: '{#CISCO.CRAS.INDEX}'
+                -
+                  tag: session-user
                   value: '{#CISCO.CRAS.USER}'
             -
               uuid: 63ea7737e7534608b60744ec3b82ffae
@@ -1220,7 +1400,13 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
+                  tag: component
+                  value: session
+                -
+                  tag: session-index
+                  value: '{#CISCO.CRAS.INDEX}'
+                -
+                  tag: session-user
                   value: '{#CISCO.CRAS.USER}'
             -
               uuid: c7a05da2f7d84743851e7d628d1e9838
@@ -1247,7 +1433,13 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
+                  tag: component
+                  value: session
+                -
+                  tag: session-index
+                  value: '{#CISCO.CRAS.INDEX}'
+                -
+                  tag: session-user
                   value: '{#CISCO.CRAS.USER}'
             -
               uuid: c71e07de9083472a982a827061496d5a
@@ -1274,7 +1466,13 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
+                  tag: component
+                  value: session
+                -
+                  tag: session-index
+                  value: '{#CISCO.CRAS.INDEX}'
+                -
+                  tag: session-user
                   value: '{#CISCO.CRAS.USER}'
             -
               uuid: de873aa34ad64f3d91e11d6999950692
@@ -1295,7 +1493,13 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
+                  tag: component
+                  value: session
+                -
+                  tag: session-index
+                  value: '{#CISCO.CRAS.INDEX}'
+                -
+                  tag: session-user
                   value: '{#CISCO.CRAS.USER}'
           graph_prototypes:
             -
@@ -1313,6 +1517,16 @@ zabbix_export:
                   item:
                     host: 'Cisco ASAv SNMP'
                     key: 'cisco.asav.session.out.traffic[{#SNMPINDEX}]'
+      tags:
+        -
+          tag: class
+          value: application
+        -
+          tag: target
+          value: cisco
+        -
+          tag: target
+          value: cisco-asav
       macros:
         -
           macro: '{$CISCO.LLD.FILTER.IF.ADMIN.MATCHES}'
diff --git a/templates/net/cisco/cisco_catalyst_3750_24fs_snmp/template_net_cisco_catalyst_3750_24fs_snmp.yaml b/templates/net/cisco/cisco_catalyst_3750_24fs_snmp/template_net_cisco_catalyst_3750_24fs_snmp.yaml
index 70ab823d0cc..557cd00ee75 100644
--- a/templates/net/cisco/cisco_catalyst_3750_24fs_snmp/template_net_cisco_catalyst_3750_24fs_snmp.yaml
+++ b/templates/net/cisco/cisco_catalyst_3750_24fs_snmp/template_net_cisco_catalyst_3750_24fs_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-17T06:24:20Z'
+  date: '2022-01-26T09:58:04Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -24,7 +24,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/418396-discussion-thread-for-official-zabbix-templates-for-cisco
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: 'Templates/Network devices'
@@ -39,8 +39,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: b0507a7333384bd5bf251fe238a538ad
@@ -48,6 +51,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 5804e615ec714a85ab3bf8128f92d0fc
           name: 'ICMP loss'
@@ -58,8 +65,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 089e23bcb4bb41f992947a6970555394
@@ -71,6 +81,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/Cisco Catalyst 3750V2-24FS SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 02403547a7714c94ba442d09ba91a1be
           name: 'ICMP response time'
@@ -81,8 +98,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: d5449d68d76e49ad9b7c052abff255e2
@@ -97,6 +117,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/Cisco Catalyst 3750V2-24FS SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 80fe62cf4b2b4b96a077f23ff40d9baf
           name: 'SNMP traps (fallback)'
@@ -109,8 +136,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 0bcb970099c0429a9254c88d94d3f27d
           name: 'System contact details'
@@ -132,8 +159,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 6a1b8a292e9448329b538c0c6c47317b
           name: 'System description'
@@ -156,8 +183,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: e7b500dbdd044fd2a6213496422d4540
           name: 'Hardware model name'
@@ -177,8 +204,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
         -
           uuid: 7f1f5522eab7406ea8dfce09cb84d39d
           name: 'Hardware serial number'
@@ -198,8 +225,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: ef94f8295a2946b9a266afc6c9a5c5c9
@@ -208,6 +235,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: cb5e9fc216ca46f885562169ed67a612
           name: 'System location'
@@ -229,8 +260,8 @@ zabbix_export:
                 - 1h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: c79c23799ba248e0b35a086a7503646b
           name: 'System name'
@@ -252,8 +283,8 @@ zabbix_export:
                 - 1h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 0d48c5e2b30f4f08b3cec8c89c05d52d
@@ -262,6 +293,10 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: f4d399a9cb884067a8303799b6ddfca4
           name: 'System object ID'
@@ -281,8 +316,8 @@ zabbix_export:
                 - 1h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: bf04928736ed4d3c855d8e0718cdfa1f
           name: 'Operating system'
@@ -307,8 +342,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 77433856d157408d98c72d964fdbf045
@@ -322,6 +357,10 @@ zabbix_export:
                 -
                   name: 'System name has changed (new name: {ITEM.VALUE})'
                   expression: 'last(/Cisco Catalyst 3750V2-24FS SNMP/system.name,#1)<>last(/Cisco Catalyst 3750V2-24FS SNMP/system.name,#2) and length(last(/Cisco Catalyst 3750V2-24FS SNMP/system.name))>0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 3001dec3d8564a4e83e25e557c6d1336
           name: Uptime
@@ -341,8 +380,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 6e105d2b8a2c43cc8841abb6995941ba
@@ -351,6 +390,10 @@ zabbix_export:
               priority: WARNING
               description: 'Uptime is less than 10 minutes'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 1fe8d0559b794a47a78fccde9156b694
           name: 'SNMP agent availability'
@@ -361,8 +404,8 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 4ebd3dd755dd4b1dae2509842d0b7117
@@ -371,6 +414,10 @@ zabbix_export:
               opdata: 'Current state: {ITEM.LASTVALUE1}'
               priority: WARNING
               description: 'SNMP is not available for polling. Please check device connectivity and SNMP settings.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: fd02edfd2bdb43a3b02495722e01b462
@@ -403,8 +450,11 @@ zabbix_export:
                 Reference: http://www.cisco.com/c/en/us/support/docs/ip/simple-network-management-protocol-snmp/15215-collect-cpu-util-snmp.html
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
+                -
+                  tag: cpu-index
+                  value: '{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: a825aa92b31c4460bef20469afead397
@@ -413,6 +463,13 @@ zabbix_export:
                   opdata: 'Current utilization: {ITEM.LASTVALUE1}'
                   priority: WARNING
                   description: 'CPU utilization is too high. The system might be slow to respond.'
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 00035facb3f3457fb24582f664c2401d
@@ -465,8 +522,11 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: Inventory
+                  tag: component
+                  value: serial-number
+                -
+                  tag: entity
+                  value: '{#ENT_NAME}'
               trigger_prototypes:
                 -
                   uuid: b715f039d7874915aacd687e87661588
@@ -474,6 +534,10 @@ zabbix_export:
                   name: '{#ENT_NAME}: Device has been replaced (new serial number received)'
                   priority: INFO
                   description: 'Device serial number has changed. Ack to close'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
         -
           uuid: 3c2e82ee5eff4bceafeec77e63120b08
           name: 'FAN discovery'
@@ -497,8 +561,11 @@ zabbix_export:
                 name: 'CISCO-ENVMON-MIB::CiscoEnvMonState'
               tags:
                 -
-                  tag: Application
-                  value: Fans
+                  tag: component
+                  value: fan
+                -
+                  tag: fan
+                  value: '{#SNMPVALUE}'
               trigger_prototypes:
                 -
                   uuid: 03a372d275194f8cae61786a38a7fb96
@@ -507,6 +574,13 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the fan unit'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 65bc040110534b6ab0544cb1866288ab
                   expression: 'last(/Cisco Catalyst 3750V2-24FS SNMP/sensor.fan.status[{#SNMPINDEX}])=2'
@@ -518,6 +592,13 @@ zabbix_export:
                     -
                       name: '{#SNMPVALUE}: Fan is in critical state'
                       expression: 'last(/Cisco Catalyst 3750V2-24FS SNMP/sensor.fan.status[{#SNMPINDEX}])=3 or last(/Cisco Catalyst 3750V2-24FS SNMP/sensor.fan.status[{#SNMPINDEX}])=4'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: bfcf962374c14dc2805b39bf00987f3c
           name: 'Memory discovery'
@@ -544,8 +625,11 @@ zabbix_export:
                 Reference: http://www.cisco.com/c/en/us/support/docs/ip/simple-network-management-protocol-snmp/15216-contiguous-memory.html
               tags:
                 -
-                  tag: Application
-                  value: Memory
+                  tag: component
+                  value: memory
+                -
+                  tag: memory
+                  value: '{#SNMPVALUE}'
             -
               uuid: 446338a14fcf4ba99e72902821ae9c44
               name: '{#SNMPVALUE}: Used memory'
@@ -561,8 +645,11 @@ zabbix_export:
                 Reference: http://www.cisco.com/c/en/us/support/docs/ip/simple-network-management-protocol-snmp/15216-contiguous-memory.html
               tags:
                 -
-                  tag: Application
-                  value: Memory
+                  tag: component
+                  value: memory
+                -
+                  tag: memory
+                  value: '{#SNMPVALUE}'
             -
               uuid: 000ba7ca09814368aae61f3f08fb740e
               name: '{#SNMPVALUE}: Memory utilization'
@@ -575,8 +662,11 @@ zabbix_export:
               description: 'Memory utilization in %'
               tags:
                 -
-                  tag: Application
-                  value: Memory
+                  tag: component
+                  value: memory
+                -
+                  tag: memory
+                  value: '{#SNMPVALUE}'
               trigger_prototypes:
                 -
                   uuid: fc434ae6fdff4ec0b20400750571b786
@@ -584,6 +674,13 @@ zabbix_export:
                   name: '{#SNMPVALUE}: High memory utilization ( >{$MEMORY.UTIL.MAX}% for 5m)'
                   priority: AVERAGE
                   description: 'The system is running out of free memory.'
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 4c4a6a5124eb4cc0b32de032f4e9e3db
@@ -684,8 +781,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: 20da38b76f1a4b418b6a965cf973b30a
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -703,8 +806,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: ac2ed3537a1744bd91abb32acb45181c
@@ -719,6 +828,10 @@ zabbix_export:
                     -
                       name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                       expression: '{$IFCONTROL:"{#IFNAME}"}=1 and (last(/Cisco Catalyst 3750V2-24FS SNMP/net.if.status[{#SNMPINDEX}])=2)'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: e21895be99254fe49cfd654a576da912
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -741,8 +854,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: ace9c36c517a47dfa1ece694d6c10883
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -764,8 +883,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: 6fbeb22aa8384ba5a7d246ef6a749aff
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -783,8 +908,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 4e96fef6da19403eb125c67947ceadee
@@ -799,6 +930,10 @@ zabbix_export:
                     -
                       name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                       expression: '{$IFCONTROL:"{#IFNAME}"}=1 and (last(/Cisco Catalyst 3750V2-24FS SNMP/net.if.status[{#SNMPINDEX}])=2)'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 943c994ad06a4193a840e2734465ad01
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -821,8 +956,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: 66348f674b9143f48ea7ef829c220845
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -845,8 +986,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: 1f73344515564398b4f17ea531285deb
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -872,8 +1019,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 1086cb4f3a6a46c399fe221ffd538037
@@ -885,6 +1038,10 @@ zabbix_export:
                     This trigger expression works as follows:
                     1. Can be triggered if operations status is down.
                     2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: f2d27d63c05a479f893f0a8ad9447747
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -906,8 +1063,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
           trigger_prototypes:
             -
               uuid: 6c5a9334ff7d437c91c0f76da988cade
@@ -935,6 +1098,10 @@ zabbix_export:
                 -
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and (last(/Cisco Catalyst 3750V2-24FS SNMP/net.if.status[{#SNMPINDEX}])=2)'
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 5f4de3462234401d826a4a7bab16402f
               expression: |
@@ -950,6 +1117,10 @@ zabbix_export:
                 -
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and (last(/Cisco Catalyst 3750V2-24FS SNMP/net.if.status[{#SNMPINDEX}])=2)'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 13ac4bfd49a749b7ba49cdbf531939b1
               expression: |
@@ -965,6 +1136,10 @@ zabbix_export:
                 -
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and (last(/Cisco Catalyst 3750V2-24FS SNMP/net.if.status[{#SNMPINDEX}])=2)'
+              tags:
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: 00ed7485a75e4192979c950b279593d8
@@ -1069,8 +1244,14 @@ zabbix_export:
                 name: 'EtherLike-MIB::dot3StatsDuplexStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 75341985cb654533b4ef67cbdd9333a9
@@ -1078,6 +1259,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): In half-duplex mode'
                   priority: WARNING
                   description: 'Please check autonegotiation settings and cabling'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: fd7b48d3e3124526918cbe23e6980e4d
           name: 'PSU discovery'
@@ -1101,8 +1286,11 @@ zabbix_export:
                 name: 'CISCO-ENVMON-MIB::CiscoEnvMonState'
               tags:
                 -
-                  tag: Application
-                  value: 'Power supply'
+                  tag: component
+                  value: power
+                -
+                  tag: power-supply
+                  value: '{#SNMPVALUE}'
               trigger_prototypes:
                 -
                   uuid: d64945a4f2f74909a10f9cc448f26a02
@@ -1111,6 +1299,10 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the power supply unit for errors'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
                 -
                   uuid: aaf5b05767f24a9bb87753a519140673
                   expression: 'last(/Cisco Catalyst 3750V2-24FS SNMP/sensor.psu.status[{#SNMPINDEX}])=2'
@@ -1122,6 +1314,10 @@ zabbix_export:
                     -
                       name: '{#SNMPVALUE}: Power supply is in critical state'
                       expression: 'last(/Cisco Catalyst 3750V2-24FS SNMP/sensor.psu.status[{#SNMPINDEX}])=3 or last(/Cisco Catalyst 3750V2-24FS SNMP/sensor.psu.status[{#SNMPINDEX}])=4'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
         -
           uuid: 5d7f7f4b585d4702922efffecd0ea00b
           name: 'Temperature discovery'
@@ -1148,8 +1344,11 @@ zabbix_export:
                 name: 'CISCO-ENVMON-MIB::CiscoEnvMonState'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
+                -
+                  tag: sensor
+                  value: '{#SNMPVALUE}'
               trigger_prototypes:
                 -
                   uuid: 3d307edd9bc54aa2890bebe3ded250c2
@@ -1158,6 +1357,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor state'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 24000d852b014ae7828eab26451257c1
                   expression: 'last(/Cisco Catalyst 3750V2-24FS SNMP/sensor.temp.status[{#SNMPINDEX}])=2'
@@ -1169,6 +1375,13 @@ zabbix_export:
                     -
                       name: '{#SNMPVALUE}: Temperature is in critical state'
                       expression: 'last(/Cisco Catalyst 3750V2-24FS SNMP/sensor.temp.status[{#SNMPINDEX}])=3 or last(/Cisco Catalyst 3750V2-24FS SNMP/sensor.temp.status[{#SNMPINDEX}])=4'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: ad48c4102a784c8c8d22825235710831
               name: '{#SNMPVALUE}: Temperature'
@@ -1184,8 +1397,11 @@ zabbix_export:
                 The current measurement of the test point being instrumented.
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
+                -
+                  tag: sensor
+                  value: '{#SNMPVALUE}'
               trigger_prototypes:
                 -
                   uuid: 8c7c804c7b274cf4a17090086ee0f8a0
@@ -1196,6 +1412,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 0cdb1f1c7e7848bfba2368395d2c03e5
                   expression: 'avg(/Cisco Catalyst 3750V2-24FS SNMP/sensor.temp.value[{#SNMPINDEX}],5m)>{$TEMP_WARN:"{#SNMPVALUE}"}'
@@ -1210,6 +1433,13 @@ zabbix_export:
                       name: '{#SNMPVALUE}: Temperature is above critical threshold: >{$TEMP_CRIT:"{#SNMPVALUE}"}'
                       expression: 'avg(/Cisco Catalyst 3750V2-24FS SNMP/sensor.temp.value[{#SNMPINDEX}],5m)>{$TEMP_CRIT:"{#SNMPVALUE}"}'
                       recovery_expression: 'max(/Cisco Catalyst 3750V2-24FS SNMP/sensor.temp.value[{#SNMPINDEX}],5m)<{$TEMP_CRIT:"{#SNMPVALUE}"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: eac4504f0d45457fa325f40e6ab585a2
                   expression: 'avg(/Cisco Catalyst 3750V2-24FS SNMP/sensor.temp.value[{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"{#SNMPVALUE}"}'
@@ -1218,6 +1448,26 @@ zabbix_export:
                   name: '{#SNMPVALUE}: Temperature is too low: <{$TEMP_CRIT_LOW:"{#SNMPVALUE}"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: cisco
+        -
+          tag: target
+          value: cisco-catalyst
+        -
+          tag: target
+          value: cisco-catalyst-3750v2-24fs
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/net/cisco/cisco_catalyst_3750_24ps_snmp/template_net_cisco_catalyst_3750_24ps_snmp.yaml b/templates/net/cisco/cisco_catalyst_3750_24ps_snmp/template_net_cisco_catalyst_3750_24ps_snmp.yaml
index 7b8fc1be134..cc78a2c93f1 100644
--- a/templates/net/cisco/cisco_catalyst_3750_24ps_snmp/template_net_cisco_catalyst_3750_24ps_snmp.yaml
+++ b/templates/net/cisco/cisco_catalyst_3750_24ps_snmp/template_net_cisco_catalyst_3750_24ps_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-17T07:22:56Z'
+  date: '2022-01-26T09:47:39Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -24,7 +24,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/418396-discussion-thread-for-official-zabbix-templates-for-cisco
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: 'Templates/Network devices'
@@ -39,8 +39,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: e66bcbef8f1d45fc8bc5d64e5dc848dc
@@ -48,6 +51,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: c40980a878c94c3db61f80e206b890ec
           name: 'ICMP loss'
@@ -58,8 +65,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 20ee878da19f4d758e4372c6c918c773
@@ -71,6 +81,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/Cisco Catalyst 3750V2-24PS SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: d1c2bc9cee7046c2a17f876dce1f063f
           name: 'ICMP response time'
@@ -81,8 +98,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 0facff81f25c43869e86a0541f0e3ecd
@@ -97,6 +117,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/Cisco Catalyst 3750V2-24PS SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 612f59e4d582463bb386046a1d4342da
           name: 'SNMP traps (fallback)'
@@ -109,8 +136,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 582260ed2f2d4f419651bc526e41b733
           name: 'System contact details'
@@ -132,8 +159,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 956ce9527d604b4493d52815799590ca
           name: 'System description'
@@ -156,8 +183,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: fb4df28cb44941e5b39348afe421a2ad
           name: 'Hardware model name'
@@ -177,8 +204,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
         -
           uuid: 664548f83e924a8aaa125579f230d0e9
           name: 'Hardware serial number'
@@ -198,8 +225,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 052fb88fae1349d5b9a5fa5bcf24d0fa
@@ -208,6 +235,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: b6d1ee7b8b3e42e380f6aa44bf39c008
           name: 'System location'
@@ -229,8 +260,8 @@ zabbix_export:
                 - 1h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 2f5f5b376c034f439ae19ed24e4d8bc5
           name: 'System name'
@@ -252,8 +283,8 @@ zabbix_export:
                 - 1h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: a678341d899846158fea2deb57f923cf
@@ -262,6 +293,10 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: d791eebac4884924b7f40c08174aef00
           name: 'System object ID'
@@ -281,8 +316,8 @@ zabbix_export:
                 - 1h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 2c7c4907dfdd46d18321f80b00152771
           name: 'Operating system'
@@ -307,8 +342,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 3e5d53072021491bb2af276aff3e1a0b
@@ -322,6 +357,10 @@ zabbix_export:
                 -
                   name: 'System name has changed (new name: {ITEM.VALUE})'
                   expression: 'last(/Cisco Catalyst 3750V2-24PS SNMP/system.name,#1)<>last(/Cisco Catalyst 3750V2-24PS SNMP/system.name,#2) and length(last(/Cisco Catalyst 3750V2-24PS SNMP/system.name))>0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: a9070d15765c4acaa856dde8ece57340
           name: Uptime
@@ -341,8 +380,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: a9633d3df8724c7cba6dfc6ec790c1fd
@@ -351,6 +390,10 @@ zabbix_export:
               priority: WARNING
               description: 'Uptime is less than 10 minutes'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 92d5d0c598674f20a0228cc66a433e84
           name: 'SNMP agent availability'
@@ -361,8 +404,8 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 0f2d48a1529c4ae49d58d466ed3a76e7
@@ -371,6 +414,10 @@ zabbix_export:
               opdata: 'Current state: {ITEM.LASTVALUE1}'
               priority: WARNING
               description: 'SNMP is not available for polling. Please check device connectivity and SNMP settings.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: 8635e89e60fd4c65a47a6da2bf3c072d
@@ -403,8 +450,11 @@ zabbix_export:
                 Reference: http://www.cisco.com/c/en/us/support/docs/ip/simple-network-management-protocol-snmp/15215-collect-cpu-util-snmp.html
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
+                -
+                  tag: cpu-index
+                  value: '{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 471acd7fa3ad4040aba27535905bfe63
@@ -413,6 +463,13 @@ zabbix_export:
                   opdata: 'Current utilization: {ITEM.LASTVALUE1}'
                   priority: WARNING
                   description: 'CPU utilization is too high. The system might be slow to respond.'
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: ab67e338f5784971b7b5a1cac20097fb
@@ -465,8 +522,11 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: Inventory
+                  tag: component
+                  value: serial-number
+                -
+                  tag: entity
+                  value: '{#ENT_NAME}'
               trigger_prototypes:
                 -
                   uuid: 70aca80b5a8d414686967b104d301023
@@ -474,6 +534,10 @@ zabbix_export:
                   name: '{#ENT_NAME}: Device has been replaced (new serial number received)'
                   priority: INFO
                   description: 'Device serial number has changed. Ack to close'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
         -
           uuid: 235f74f154bc422482f524b9a4c08125
           name: 'FAN discovery'
@@ -497,8 +561,11 @@ zabbix_export:
                 name: 'CISCO-ENVMON-MIB::CiscoEnvMonState'
               tags:
                 -
-                  tag: Application
-                  value: Fans
+                  tag: component
+                  value: fan
+                -
+                  tag: fan
+                  value: '{#SNMPVALUE}'
               trigger_prototypes:
                 -
                   uuid: e2b72d874d4f48e79aab3a6d514663b4
@@ -507,6 +574,13 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the fan unit'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: d4bf389614f54be08ffd8d010e480da6
                   expression: 'last(/Cisco Catalyst 3750V2-24PS SNMP/sensor.fan.status[{#SNMPINDEX}])=2'
@@ -518,6 +592,13 @@ zabbix_export:
                     -
                       name: '{#SNMPVALUE}: Fan is in critical state'
                       expression: 'last(/Cisco Catalyst 3750V2-24PS SNMP/sensor.fan.status[{#SNMPINDEX}])=3 or last(/Cisco Catalyst 3750V2-24PS SNMP/sensor.fan.status[{#SNMPINDEX}])=4'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 86589a8d54cb4cfc81c38a6eeac05b80
           name: 'Memory discovery'
@@ -544,8 +625,11 @@ zabbix_export:
                 Reference: http://www.cisco.com/c/en/us/support/docs/ip/simple-network-management-protocol-snmp/15216-contiguous-memory.html
               tags:
                 -
-                  tag: Application
-                  value: Memory
+                  tag: component
+                  value: memory
+                -
+                  tag: memory
+                  value: '{#SNMPVALUE}'
             -
               uuid: 73a46e97c57e4fca912e74a7253e21f6
               name: '{#SNMPVALUE}: Used memory'
@@ -561,8 +645,11 @@ zabbix_export:
                 Reference: http://www.cisco.com/c/en/us/support/docs/ip/simple-network-management-protocol-snmp/15216-contiguous-memory.html
               tags:
                 -
-                  tag: Application
-                  value: Memory
+                  tag: component
+                  value: memory
+                -
+                  tag: memory
+                  value: '{#SNMPVALUE}'
             -
               uuid: 50638b5c78584c99978c6b57bec520d4
               name: '{#SNMPVALUE}: Memory utilization'
@@ -575,8 +662,11 @@ zabbix_export:
               description: 'Memory utilization in %'
               tags:
                 -
-                  tag: Application
-                  value: Memory
+                  tag: component
+                  value: memory
+                -
+                  tag: memory
+                  value: '{#SNMPVALUE}'
               trigger_prototypes:
                 -
                   uuid: 918cf48b69d545dbb9f177fa1440f4cb
@@ -584,6 +674,13 @@ zabbix_export:
                   name: '{#SNMPVALUE}: High memory utilization ( >{$MEMORY.UTIL.MAX}% for 5m)'
                   priority: AVERAGE
                   description: 'The system is running out of free memory.'
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: e86ef2331d1644ca80b28f0855a7a7e9
@@ -684,8 +781,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: 677b9af6e45e42c1bc59772453778de2
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -703,8 +806,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: df6bfacc52e1487d9f359c23545ceb84
@@ -719,6 +828,10 @@ zabbix_export:
                     -
                       name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                       expression: '{$IFCONTROL:"{#IFNAME}"}=1 and (last(/Cisco Catalyst 3750V2-24PS SNMP/net.if.status[{#SNMPINDEX}])=2)'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: d745a153bdd443afb3b6c690a6cb1834
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -741,8 +854,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: e000bdb0549747b98ef9ef824ead399d
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -764,8 +883,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: bf863b01e546466e9f7516435fd34631
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -783,8 +908,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: aa49d99c77d64e31ad2369d09e547cab
@@ -799,6 +930,10 @@ zabbix_export:
                     -
                       name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                       expression: '{$IFCONTROL:"{#IFNAME}"}=1 and (last(/Cisco Catalyst 3750V2-24PS SNMP/net.if.status[{#SNMPINDEX}])=2)'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 8b9edde24248456f902880625e33e289
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -821,8 +956,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: fa0715f32e7441958e1d555efe7ccc9f
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -845,8 +986,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: 94183e5ed20f4f5495162b696097fd70
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -872,8 +1019,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 41d6b4a9fde546ae88005efdef1f4525
@@ -885,6 +1038,10 @@ zabbix_export:
                     This trigger expression works as follows:
                     1. Can be triggered if operations status is down.
                     2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 27b0676374f847ad8330028e62b7b6af
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -906,8 +1063,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
           trigger_prototypes:
             -
               uuid: d6aaa83ed4744ef982a177b77fb1f2c4
@@ -935,6 +1098,10 @@ zabbix_export:
                 -
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and (last(/Cisco Catalyst 3750V2-24PS SNMP/net.if.status[{#SNMPINDEX}])=2)'
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 9e3e50611ef242b0b200c0a6343f4c5c
               expression: |
@@ -950,6 +1117,10 @@ zabbix_export:
                 -
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and (last(/Cisco Catalyst 3750V2-24PS SNMP/net.if.status[{#SNMPINDEX}])=2)'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 7c624697cd7b41d682b5856a3040737e
               expression: |
@@ -965,6 +1136,10 @@ zabbix_export:
                 -
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and (last(/Cisco Catalyst 3750V2-24PS SNMP/net.if.status[{#SNMPINDEX}])=2)'
+              tags:
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: f277c62e4c614924a79715beae06a63b
@@ -1069,8 +1244,14 @@ zabbix_export:
                 name: 'EtherLike-MIB::dot3StatsDuplexStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: df8eb5498b8a41709db02b742fa24d6a
@@ -1078,6 +1259,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): In half-duplex mode'
                   priority: WARNING
                   description: 'Please check autonegotiation settings and cabling'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 400dddbb882445af9e7b986bc4529908
           name: 'PSU discovery'
@@ -1101,8 +1286,11 @@ zabbix_export:
                 name: 'CISCO-ENVMON-MIB::CiscoEnvMonState'
               tags:
                 -
-                  tag: Application
-                  value: 'Power supply'
+                  tag: component
+                  value: power
+                -
+                  tag: power-supply
+                  value: '{#SNMPVALUE}'
               trigger_prototypes:
                 -
                   uuid: 1d509ec30e8349538d9d2b2447b70253
@@ -1111,6 +1299,10 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the power supply unit for errors'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
                 -
                   uuid: 4ef4e09de93e4cfbb2aab4f22e78c223
                   expression: 'last(/Cisco Catalyst 3750V2-24PS SNMP/sensor.psu.status[{#SNMPINDEX}])=2'
@@ -1122,6 +1314,10 @@ zabbix_export:
                     -
                       name: '{#SNMPVALUE}: Power supply is in critical state'
                       expression: 'last(/Cisco Catalyst 3750V2-24PS SNMP/sensor.psu.status[{#SNMPINDEX}])=3 or last(/Cisco Catalyst 3750V2-24PS SNMP/sensor.psu.status[{#SNMPINDEX}])=4'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
         -
           uuid: b4eb58fb8820452d89447b786cee3361
           name: 'Temperature discovery'
@@ -1148,8 +1344,11 @@ zabbix_export:
                 name: 'CISCO-ENVMON-MIB::CiscoEnvMonState'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
+                -
+                  tag: sensor
+                  value: '{#SNMPVALUE}'
               trigger_prototypes:
                 -
                   uuid: 506c98e9c29247cba7c58ca343c6fdf4
@@ -1158,6 +1357,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor state'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: d6b91f3e280c4d0fa3df0bf3fedd9183
                   expression: 'last(/Cisco Catalyst 3750V2-24PS SNMP/sensor.temp.status[{#SNMPINDEX}])=2'
@@ -1169,6 +1375,13 @@ zabbix_export:
                     -
                       name: '{#SNMPVALUE}: Temperature is in critical state'
                       expression: 'last(/Cisco Catalyst 3750V2-24PS SNMP/sensor.temp.status[{#SNMPINDEX}])=3 or last(/Cisco Catalyst 3750V2-24PS SNMP/sensor.temp.status[{#SNMPINDEX}])=4'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 44a96489bbfc4245b8fe0ffee74e0c96
               name: '{#SNMPVALUE}: Temperature'
@@ -1184,8 +1397,11 @@ zabbix_export:
                 The current measurement of the test point being instrumented.
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
+                -
+                  tag: sensor
+                  value: '{#SNMPVALUE}'
               trigger_prototypes:
                 -
                   uuid: 63e41d0fe43c4daa8fd2e4eee6e4ed8a
@@ -1196,6 +1412,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: cc09047db63a435e816e560c2007b43a
                   expression: 'avg(/Cisco Catalyst 3750V2-24PS SNMP/sensor.temp.value[{#SNMPINDEX}],5m)>{$TEMP_WARN:"{#SNMPVALUE}"}'
@@ -1210,6 +1433,13 @@ zabbix_export:
                       name: '{#SNMPVALUE}: Temperature is above critical threshold: >{$TEMP_CRIT:"{#SNMPVALUE}"}'
                       expression: 'avg(/Cisco Catalyst 3750V2-24PS SNMP/sensor.temp.value[{#SNMPINDEX}],5m)>{$TEMP_CRIT:"{#SNMPVALUE}"}'
                       recovery_expression: 'max(/Cisco Catalyst 3750V2-24PS SNMP/sensor.temp.value[{#SNMPINDEX}],5m)<{$TEMP_CRIT:"{#SNMPVALUE}"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 156a35b375ff4978a2b98f38785897a5
                   expression: 'avg(/Cisco Catalyst 3750V2-24PS SNMP/sensor.temp.value[{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"{#SNMPVALUE}"}'
@@ -1218,6 +1448,26 @@ zabbix_export:
                   name: '{#SNMPVALUE}: Temperature is too low: <{$TEMP_CRIT_LOW:"{#SNMPVALUE}"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: cisco
+        -
+          tag: target
+          value: cisco-catalyst
+        -
+          tag: target
+          value: cisco-catalyst-3750v2-24ps
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/net/cisco/cisco_catalyst_3750_24ts_snmp/template_net_cisco_catalyst_3750_24ts_snmp.yaml b/templates/net/cisco/cisco_catalyst_3750_24ts_snmp/template_net_cisco_catalyst_3750_24ts_snmp.yaml
index b3da85daa20..9bc340f5af1 100644
--- a/templates/net/cisco/cisco_catalyst_3750_24ts_snmp/template_net_cisco_catalyst_3750_24ts_snmp.yaml
+++ b/templates/net/cisco/cisco_catalyst_3750_24ts_snmp/template_net_cisco_catalyst_3750_24ts_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-17T07:23:03Z'
+  date: '2022-01-26T09:48:06Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -24,7 +24,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/418396-discussion-thread-for-official-zabbix-templates-for-cisco
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: 'Templates/Network devices'
@@ -39,8 +39,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: e536d08729024bbcbe51f63ac1074796
@@ -48,6 +51,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 56b5f81de3c34f2aa9acd399dd212d62
           name: 'ICMP loss'
@@ -58,8 +65,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 63bdfa05fcbe455db4dbb28ae333292a
@@ -71,6 +81,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/Cisco Catalyst 3750V2-24TS SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: d34fc050448e4c48b303bf8c75c50060
           name: 'ICMP response time'
@@ -81,8 +98,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 79b80f4faa30401c8aa260a7bc961f9c
@@ -97,6 +117,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/Cisco Catalyst 3750V2-24TS SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: c7a43b6281384161b6e1f28840d55aa1
           name: 'SNMP traps (fallback)'
@@ -109,8 +136,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 7f563d184760420080849d161bf373f6
           name: 'System contact details'
@@ -132,8 +159,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 74af4fbc07284c9eb9d4a913fd5e7b2b
           name: 'System description'
@@ -156,8 +183,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: a7cf2f68a1c842e081deec4a16410071
           name: 'Hardware model name'
@@ -177,8 +204,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
         -
           uuid: 6d9b2e70dd61424f8f0ffebf89d20853
           name: 'Hardware serial number'
@@ -198,8 +225,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: be325325a6bd4cf4ae1312b4488af80d
@@ -208,6 +235,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: cc4aa80bbd2d49f9bca23b305399f0fa
           name: 'System location'
@@ -229,8 +260,8 @@ zabbix_export:
                 - 1h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 726fa93646ad429789dcec2fbfabc6ff
           name: 'System name'
@@ -252,8 +283,8 @@ zabbix_export:
                 - 1h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: d19bce317a4b4ab19485a183d446dcc7
@@ -262,6 +293,10 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 5e7cd491cf664de0b5046cd011186a0e
           name: 'System object ID'
@@ -281,8 +316,8 @@ zabbix_export:
                 - 1h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 89971d6753ce4d98b68a70bf26f4b99e
           name: 'Operating system'
@@ -307,8 +342,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: c139de21caf94d4b9c2d60977d4756f7
@@ -322,6 +357,10 @@ zabbix_export:
                 -
                   name: 'System name has changed (new name: {ITEM.VALUE})'
                   expression: 'last(/Cisco Catalyst 3750V2-24TS SNMP/system.name,#1)<>last(/Cisco Catalyst 3750V2-24TS SNMP/system.name,#2) and length(last(/Cisco Catalyst 3750V2-24TS SNMP/system.name))>0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: ecc18617c57a44bb96a565f450d569ac
           name: Uptime
@@ -341,8 +380,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 86484c0d62e94532af4202267369f8bf
@@ -351,6 +390,10 @@ zabbix_export:
               priority: WARNING
               description: 'Uptime is less than 10 minutes'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 0951ddc53a2847b8ba816a5e4de9da2f
           name: 'SNMP agent availability'
@@ -361,8 +404,8 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: d78318493148438abca20fed768d4ced
@@ -371,6 +414,10 @@ zabbix_export:
               opdata: 'Current state: {ITEM.LASTVALUE1}'
               priority: WARNING
               description: 'SNMP is not available for polling. Please check device connectivity and SNMP settings.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: a525aec08c6945fda4cad224232825a9
@@ -403,8 +450,11 @@ zabbix_export:
                 Reference: http://www.cisco.com/c/en/us/support/docs/ip/simple-network-management-protocol-snmp/15215-collect-cpu-util-snmp.html
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
+                -
+                  tag: cpu-index
+                  value: '{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 6f039b9bfb00495ebe5e5eba56d25099
@@ -413,6 +463,13 @@ zabbix_export:
                   opdata: 'Current utilization: {ITEM.LASTVALUE1}'
                   priority: WARNING
                   description: 'CPU utilization is too high. The system might be slow to respond.'
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: e032e542ed064edc8a5b5a297a0f4839
@@ -465,8 +522,11 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: Inventory
+                  tag: component
+                  value: serial-number
+                -
+                  tag: entity
+                  value: '{#ENT_NAME}'
               trigger_prototypes:
                 -
                   uuid: 3e621db566ef4b5da2a3b0f5ee65ae81
@@ -474,6 +534,10 @@ zabbix_export:
                   name: '{#ENT_NAME}: Device has been replaced (new serial number received)'
                   priority: INFO
                   description: 'Device serial number has changed. Ack to close'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
         -
           uuid: c204b466541d475c959d2613a848f03a
           name: 'FAN discovery'
@@ -497,8 +561,11 @@ zabbix_export:
                 name: 'CISCO-ENVMON-MIB::CiscoEnvMonState'
               tags:
                 -
-                  tag: Application
-                  value: Fans
+                  tag: component
+                  value: fan
+                -
+                  tag: fan
+                  value: '{#SNMPVALUE}'
               trigger_prototypes:
                 -
                   uuid: f299241a1a3c4fde965b3a2b6a3b31d6
@@ -507,6 +574,13 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the fan unit'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: a4021a6d44fb439fa04b160b7cea2bca
                   expression: 'last(/Cisco Catalyst 3750V2-24TS SNMP/sensor.fan.status[{#SNMPINDEX}])=2'
@@ -518,6 +592,13 @@ zabbix_export:
                     -
                       name: '{#SNMPVALUE}: Fan is in critical state'
                       expression: 'last(/Cisco Catalyst 3750V2-24TS SNMP/sensor.fan.status[{#SNMPINDEX}])=3 or last(/Cisco Catalyst 3750V2-24TS SNMP/sensor.fan.status[{#SNMPINDEX}])=4'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: bcde2f961af64c0eb27ec663577c60e1
           name: 'Memory discovery'
@@ -544,8 +625,11 @@ zabbix_export:
                 Reference: http://www.cisco.com/c/en/us/support/docs/ip/simple-network-management-protocol-snmp/15216-contiguous-memory.html
               tags:
                 -
-                  tag: Application
-                  value: Memory
+                  tag: component
+                  value: memory
+                -
+                  tag: memory
+                  value: '{#SNMPVALUE}'
             -
               uuid: e48d2527e378472ab060592a6b303484
               name: '{#SNMPVALUE}: Used memory'
@@ -561,8 +645,11 @@ zabbix_export:
                 Reference: http://www.cisco.com/c/en/us/support/docs/ip/simple-network-management-protocol-snmp/15216-contiguous-memory.html
               tags:
                 -
-                  tag: Application
-                  value: Memory
+                  tag: component
+                  value: memory
+                -
+                  tag: memory
+                  value: '{#SNMPVALUE}'
             -
               uuid: c4b89f27f4534408a7fbe72110ce86de
               name: '{#SNMPVALUE}: Memory utilization'
@@ -575,8 +662,11 @@ zabbix_export:
               description: 'Memory utilization in %'
               tags:
                 -
-                  tag: Application
-                  value: Memory
+                  tag: component
+                  value: memory
+                -
+                  tag: memory
+                  value: '{#SNMPVALUE}'
               trigger_prototypes:
                 -
                   uuid: a88d7a734efc40868d3fbeda307c4e1f
@@ -584,6 +674,13 @@ zabbix_export:
                   name: '{#SNMPVALUE}: High memory utilization ( >{$MEMORY.UTIL.MAX}% for 5m)'
                   priority: AVERAGE
                   description: 'The system is running out of free memory.'
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 25de5d0bebc34c5d9bdf8e181c53588c
@@ -684,8 +781,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: 02a607faaaf0494097e25a81d850d646
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -703,8 +806,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: a5f11bbeceb9418f86b1130ccb6942ec
@@ -719,6 +828,10 @@ zabbix_export:
                     -
                       name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                       expression: '{$IFCONTROL:"{#IFNAME}"}=1 and (last(/Cisco Catalyst 3750V2-24TS SNMP/net.if.status[{#SNMPINDEX}])=2)'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 8b26f84549f14a91935b85b133e8b85b
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -741,8 +854,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: 6afb99d2489a4e4fa6ed329d3b140e99
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -764,8 +883,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: b58d6657f5e14788829ff03f04bd1ac9
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -783,8 +908,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 5182e3b82c044374a6f14f9a06fa0f24
@@ -799,6 +930,10 @@ zabbix_export:
                     -
                       name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                       expression: '{$IFCONTROL:"{#IFNAME}"}=1 and (last(/Cisco Catalyst 3750V2-24TS SNMP/net.if.status[{#SNMPINDEX}])=2)'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: fc23b72b6e0c4b0a9d5c9828f25cc43b
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -821,8 +956,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: a69f1d2e284a4d468d7226a68560405f
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -845,8 +986,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: 9a2539d5137645cc868d80c6543b2a32
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -872,8 +1019,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: cb577e04f0a94508a10656c5f276d4e0
@@ -885,6 +1038,10 @@ zabbix_export:
                     This trigger expression works as follows:
                     1. Can be triggered if operations status is down.
                     2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: f286f2bafa3e4d17a74842fff0a86dcf
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -906,8 +1063,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
           trigger_prototypes:
             -
               uuid: 46d96d2815a04b32b00ed4ef6104fedc
@@ -935,6 +1098,10 @@ zabbix_export:
                 -
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and (last(/Cisco Catalyst 3750V2-24TS SNMP/net.if.status[{#SNMPINDEX}])=2)'
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 5af679006aaa40acbe01987ab15088ae
               expression: |
@@ -950,6 +1117,10 @@ zabbix_export:
                 -
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and (last(/Cisco Catalyst 3750V2-24TS SNMP/net.if.status[{#SNMPINDEX}])=2)'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: e0b4ab67e80a4dbdb3d60246b8830228
               expression: |
@@ -965,6 +1136,10 @@ zabbix_export:
                 -
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and (last(/Cisco Catalyst 3750V2-24TS SNMP/net.if.status[{#SNMPINDEX}])=2)'
+              tags:
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: 6be27bc4e258470bb324ef8f90295e92
@@ -1069,8 +1244,14 @@ zabbix_export:
                 name: 'EtherLike-MIB::dot3StatsDuplexStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 45b5778869124558b3265d6d7275c186
@@ -1078,6 +1259,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): In half-duplex mode'
                   priority: WARNING
                   description: 'Please check autonegotiation settings and cabling'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 742411a65e7f4b5fafc47e861ab8bd23
           name: 'PSU discovery'
@@ -1101,8 +1286,11 @@ zabbix_export:
                 name: 'CISCO-ENVMON-MIB::CiscoEnvMonState'
               tags:
                 -
-                  tag: Application
-                  value: 'Power supply'
+                  tag: component
+                  value: power
+                -
+                  tag: power-supply
+                  value: '{#SNMPVALUE}'
               trigger_prototypes:
                 -
                   uuid: 23fc241ca9d6438bb1688c77688fd1ed
@@ -1111,6 +1299,10 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the power supply unit for errors'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
                 -
                   uuid: c6ed26fb555642c9b25564ec13fcf920
                   expression: 'last(/Cisco Catalyst 3750V2-24TS SNMP/sensor.psu.status[{#SNMPINDEX}])=2'
@@ -1122,6 +1314,10 @@ zabbix_export:
                     -
                       name: '{#SNMPVALUE}: Power supply is in critical state'
                       expression: 'last(/Cisco Catalyst 3750V2-24TS SNMP/sensor.psu.status[{#SNMPINDEX}])=3 or last(/Cisco Catalyst 3750V2-24TS SNMP/sensor.psu.status[{#SNMPINDEX}])=4'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
         -
           uuid: 595c88262f2f48c99d16f22ab7d70aac
           name: 'Temperature discovery'
@@ -1148,8 +1344,11 @@ zabbix_export:
                 name: 'CISCO-ENVMON-MIB::CiscoEnvMonState'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
+                -
+                  tag: sensor
+                  value: '{#SNMPVALUE}'
               trigger_prototypes:
                 -
                   uuid: 1820c365ad55416e995d4d978063e4a1
@@ -1158,6 +1357,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor state'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 0b7e6f3085a0404ebb64c33828c9c920
                   expression: 'last(/Cisco Catalyst 3750V2-24TS SNMP/sensor.temp.status[{#SNMPINDEX}])=2'
@@ -1169,6 +1375,13 @@ zabbix_export:
                     -
                       name: '{#SNMPVALUE}: Temperature is in critical state'
                       expression: 'last(/Cisco Catalyst 3750V2-24TS SNMP/sensor.temp.status[{#SNMPINDEX}])=3 or last(/Cisco Catalyst 3750V2-24TS SNMP/sensor.temp.status[{#SNMPINDEX}])=4'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 16a4c905660349aaaddf52573916e187
               name: '{#SNMPVALUE}: Temperature'
@@ -1184,8 +1397,11 @@ zabbix_export:
                 The current measurement of the test point being instrumented.
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
+                -
+                  tag: sensor
+                  value: '{#SNMPVALUE}'
               trigger_prototypes:
                 -
                   uuid: 4c3501ee0c5b4af48306f040988d427a
@@ -1196,6 +1412,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 34b7d1a255a4408fac4d299eedc215b9
                   expression: 'avg(/Cisco Catalyst 3750V2-24TS SNMP/sensor.temp.value[{#SNMPINDEX}],5m)>{$TEMP_WARN:"{#SNMPVALUE}"}'
@@ -1210,6 +1433,13 @@ zabbix_export:
                       name: '{#SNMPVALUE}: Temperature is above critical threshold: >{$TEMP_CRIT:"{#SNMPVALUE}"}'
                       expression: 'avg(/Cisco Catalyst 3750V2-24TS SNMP/sensor.temp.value[{#SNMPINDEX}],5m)>{$TEMP_CRIT:"{#SNMPVALUE}"}'
                       recovery_expression: 'max(/Cisco Catalyst 3750V2-24TS SNMP/sensor.temp.value[{#SNMPINDEX}],5m)<{$TEMP_CRIT:"{#SNMPVALUE}"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: b9b8577c9f114d4c8546169e5a63a915
                   expression: 'avg(/Cisco Catalyst 3750V2-24TS SNMP/sensor.temp.value[{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"{#SNMPVALUE}"}'
@@ -1218,6 +1448,26 @@ zabbix_export:
                   name: '{#SNMPVALUE}: Temperature is too low: <{$TEMP_CRIT_LOW:"{#SNMPVALUE}"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: cisco
+        -
+          tag: target
+          value: cisco-catalyst
+        -
+          tag: target
+          value: cisco-catalyst-3750v2-24ts
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/net/cisco/cisco_catalyst_3750_48ps_snmp/template_net_cisco_catalyst_3750_48ps_snmp.yaml b/templates/net/cisco/cisco_catalyst_3750_48ps_snmp/template_net_cisco_catalyst_3750_48ps_snmp.yaml
index 24af0e435d5..6637b3c375a 100644
--- a/templates/net/cisco/cisco_catalyst_3750_48ps_snmp/template_net_cisco_catalyst_3750_48ps_snmp.yaml
+++ b/templates/net/cisco/cisco_catalyst_3750_48ps_snmp/template_net_cisco_catalyst_3750_48ps_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-17T07:23:11Z'
+  date: '2022-01-26T09:57:53Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -24,7 +24,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/418396-discussion-thread-for-official-zabbix-templates-for-cisco
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: 'Templates/Network devices'
@@ -39,8 +39,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 01901a212f7c4fd2976f8ab89ad7eb68
@@ -48,6 +51,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 3a6fdbfbbf7c4944a24e22e93aabf0e3
           name: 'ICMP loss'
@@ -58,8 +65,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 20104e6a8abe4b0e9bdd32325d506d9c
@@ -71,6 +81,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/Cisco Catalyst 3750V2-48PS SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 80efc7d77e314e97953cc75b5ae43e92
           name: 'ICMP response time'
@@ -81,8 +98,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 21b7cefe750048fba80e026afecebcfd
@@ -97,6 +117,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/Cisco Catalyst 3750V2-48PS SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 2c44173959284d7db1d2a745c68fa0a3
           name: 'SNMP traps (fallback)'
@@ -109,8 +136,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: b3ac05facd4349fc8e573525f3fdb239
           name: 'System contact details'
@@ -132,8 +159,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: f21c4e4de69342a68ca060a52fe071d6
           name: 'System description'
@@ -156,8 +183,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 2a0f9c29094f4a72ab66813c931d35ee
           name: 'Hardware model name'
@@ -177,8 +204,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
         -
           uuid: 487fc626eb5e4629a0585210153ebbd1
           name: 'Hardware serial number'
@@ -198,8 +225,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: a11a364406534a838c99f89c4136eb5b
@@ -208,6 +235,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 679e63af2b3548c48b278da7356ae8ed
           name: 'System location'
@@ -229,8 +260,8 @@ zabbix_export:
                 - 1h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 5d51ca0ffadf4e4599390aa9a4644426
           name: 'System name'
@@ -252,8 +283,8 @@ zabbix_export:
                 - 1h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: b881ec6269d54e25810ed2ec2dfe3385
@@ -262,6 +293,10 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 2d49036582724a19b5cd5006360be8d2
           name: 'System object ID'
@@ -281,8 +316,8 @@ zabbix_export:
                 - 1h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 5852aecfbfbe429097c660d8a1ce47ee
           name: 'Operating system'
@@ -307,8 +342,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: cc0071c5d3074123a77ebddd7dd8583c
@@ -322,6 +357,10 @@ zabbix_export:
                 -
                   name: 'System name has changed (new name: {ITEM.VALUE})'
                   expression: 'last(/Cisco Catalyst 3750V2-48PS SNMP/system.name,#1)<>last(/Cisco Catalyst 3750V2-48PS SNMP/system.name,#2) and length(last(/Cisco Catalyst 3750V2-48PS SNMP/system.name))>0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 54ff117dbac14916aee823e247bff23f
           name: Uptime
@@ -341,8 +380,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 904571e51fbc4cd0a3a25800e16ec495
@@ -351,6 +390,10 @@ zabbix_export:
               priority: WARNING
               description: 'Uptime is less than 10 minutes'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 642cee0c23134982adc4dfc486a63843
           name: 'SNMP agent availability'
@@ -361,8 +404,8 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 90d5894323074dc8bcd57b212cdbf398
@@ -371,6 +414,10 @@ zabbix_export:
               opdata: 'Current state: {ITEM.LASTVALUE1}'
               priority: WARNING
               description: 'SNMP is not available for polling. Please check device connectivity and SNMP settings.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: a55dd3dac1d74fdea664fbccbce717cc
@@ -403,8 +450,11 @@ zabbix_export:
                 Reference: http://www.cisco.com/c/en/us/support/docs/ip/simple-network-management-protocol-snmp/15215-collect-cpu-util-snmp.html
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
+                -
+                  tag: cpu-index
+                  value: '{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: f3318a22b4ff436f9021dbd181ecee58
@@ -413,6 +463,13 @@ zabbix_export:
                   opdata: 'Current utilization: {ITEM.LASTVALUE1}'
                   priority: WARNING
                   description: 'CPU utilization is too high. The system might be slow to respond.'
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 54afe104c5dc41f18b6cee29e505463c
@@ -465,8 +522,11 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: Inventory
+                  tag: component
+                  value: serial-number
+                -
+                  tag: entity
+                  value: '{#ENT_NAME}'
               trigger_prototypes:
                 -
                   uuid: b1087409b7c84ad5b587e6f6fc37dfe0
@@ -474,6 +534,10 @@ zabbix_export:
                   name: '{#ENT_NAME}: Device has been replaced (new serial number received)'
                   priority: INFO
                   description: 'Device serial number has changed. Ack to close'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
         -
           uuid: a13d58f913b24056bc2f0e770657d1be
           name: 'FAN discovery'
@@ -497,8 +561,11 @@ zabbix_export:
                 name: 'CISCO-ENVMON-MIB::CiscoEnvMonState'
               tags:
                 -
-                  tag: Application
-                  value: Fans
+                  tag: component
+                  value: fan
+                -
+                  tag: fan
+                  value: '{#SNMPVALUE}'
               trigger_prototypes:
                 -
                   uuid: 9c0112ed996944768a717e15554aaa21
@@ -507,6 +574,13 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the fan unit'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 98dd9b3bf65e418aa86f7a927910f847
                   expression: 'last(/Cisco Catalyst 3750V2-48PS SNMP/sensor.fan.status[{#SNMPINDEX}])=2'
@@ -518,6 +592,13 @@ zabbix_export:
                     -
                       name: '{#SNMPVALUE}: Fan is in critical state'
                       expression: 'last(/Cisco Catalyst 3750V2-48PS SNMP/sensor.fan.status[{#SNMPINDEX}])=3 or last(/Cisco Catalyst 3750V2-48PS SNMP/sensor.fan.status[{#SNMPINDEX}])=4'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 637a377b92854de1a0c05f53a2a88851
           name: 'Memory discovery'
@@ -544,8 +625,11 @@ zabbix_export:
                 Reference: http://www.cisco.com/c/en/us/support/docs/ip/simple-network-management-protocol-snmp/15216-contiguous-memory.html
               tags:
                 -
-                  tag: Application
-                  value: Memory
+                  tag: component
+                  value: memory
+                -
+                  tag: memory
+                  value: '{#SNMPVALUE}'
             -
               uuid: 0f037e9121254776a84158ce1090ac80
               name: '{#SNMPVALUE}: Used memory'
@@ -561,8 +645,11 @@ zabbix_export:
                 Reference: http://www.cisco.com/c/en/us/support/docs/ip/simple-network-management-protocol-snmp/15216-contiguous-memory.html
               tags:
                 -
-                  tag: Application
-                  value: Memory
+                  tag: component
+                  value: memory
+                -
+                  tag: memory
+                  value: '{#SNMPVALUE}'
             -
               uuid: 926ffaaf890240be8d3632fe60b17c93
               name: '{#SNMPVALUE}: Memory utilization'
@@ -575,8 +662,11 @@ zabbix_export:
               description: 'Memory utilization in %'
               tags:
                 -
-                  tag: Application
-                  value: Memory
+                  tag: component
+                  value: memory
+                -
+                  tag: memory
+                  value: '{#SNMPVALUE}'
               trigger_prototypes:
                 -
                   uuid: 14f0fcd6447746d2af5de080c36e9888
@@ -584,6 +674,13 @@ zabbix_export:
                   name: '{#SNMPVALUE}: High memory utilization ( >{$MEMORY.UTIL.MAX}% for 5m)'
                   priority: AVERAGE
                   description: 'The system is running out of free memory.'
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 2d34cc29f3f24decb910e5e99bad064a
@@ -684,8 +781,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: 4880d42b5c034fbaa07b5ccb3e74a3ae
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -703,8 +806,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 67573956247a4c29935889db09fba7e4
@@ -719,6 +828,10 @@ zabbix_export:
                     -
                       name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                       expression: '{$IFCONTROL:"{#IFNAME}"}=1 and (last(/Cisco Catalyst 3750V2-48PS SNMP/net.if.status[{#SNMPINDEX}])=2)'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: e5e3c7c9d2904b19a7e8f0fe39d881db
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -741,8 +854,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: 6d0a3f00c7494655b8c67d6f257be372
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -764,8 +883,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: ce74da47f48e426a9364f92f58d50693
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -783,8 +908,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 80dc2a94be5d49d59b643b3c07dfe6fd
@@ -799,6 +930,10 @@ zabbix_export:
                     -
                       name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                       expression: '{$IFCONTROL:"{#IFNAME}"}=1 and (last(/Cisco Catalyst 3750V2-48PS SNMP/net.if.status[{#SNMPINDEX}])=2)'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: a5efeed06f5f45d18e58517fb39323e8
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -821,8 +956,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: bc137542c8e14308bec44ac90469e8d0
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -845,8 +986,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: f13cc69469844cbdad4f2eac0e7f045e
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -872,8 +1019,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 2ac6c68151b04e9489b0bff5f6277ec6
@@ -885,6 +1038,10 @@ zabbix_export:
                     This trigger expression works as follows:
                     1. Can be triggered if operations status is down.
                     2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 7bf551e444994cdaa08f208c10b89860
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -906,8 +1063,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
           trigger_prototypes:
             -
               uuid: b67a022f435741e59278d79bc873dcaa
@@ -935,6 +1098,10 @@ zabbix_export:
                 -
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and (last(/Cisco Catalyst 3750V2-48PS SNMP/net.if.status[{#SNMPINDEX}])=2)'
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: bf1ed5348e3c48388f099f4d8cdec4f8
               expression: |
@@ -950,6 +1117,10 @@ zabbix_export:
                 -
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and (last(/Cisco Catalyst 3750V2-48PS SNMP/net.if.status[{#SNMPINDEX}])=2)'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 76bbbff26fcc406ba497f24dd23c07c8
               expression: |
@@ -965,6 +1136,10 @@ zabbix_export:
                 -
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and (last(/Cisco Catalyst 3750V2-48PS SNMP/net.if.status[{#SNMPINDEX}])=2)'
+              tags:
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: bc8d1b63791943aabb62d861a86e2754
@@ -1069,8 +1244,14 @@ zabbix_export:
                 name: 'EtherLike-MIB::dot3StatsDuplexStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 4819114a72df4cd5ac093402e7799afa
@@ -1078,6 +1259,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): In half-duplex mode'
                   priority: WARNING
                   description: 'Please check autonegotiation settings and cabling'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 60431e4af4764ee694973a0ed13b2898
           name: 'PSU discovery'
@@ -1101,8 +1286,11 @@ zabbix_export:
                 name: 'CISCO-ENVMON-MIB::CiscoEnvMonState'
               tags:
                 -
-                  tag: Application
-                  value: 'Power supply'
+                  tag: component
+                  value: power
+                -
+                  tag: power-supply
+                  value: '{#SNMPVALUE}'
               trigger_prototypes:
                 -
                   uuid: 8509b77831764bc3943b5fc65a8de0a7
@@ -1111,6 +1299,10 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the power supply unit for errors'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
                 -
                   uuid: 4cdeb02663604279ac2d725cd16ee289
                   expression: 'last(/Cisco Catalyst 3750V2-48PS SNMP/sensor.psu.status[{#SNMPINDEX}])=2'
@@ -1122,6 +1314,10 @@ zabbix_export:
                     -
                       name: '{#SNMPVALUE}: Power supply is in critical state'
                       expression: 'last(/Cisco Catalyst 3750V2-48PS SNMP/sensor.psu.status[{#SNMPINDEX}])=3 or last(/Cisco Catalyst 3750V2-48PS SNMP/sensor.psu.status[{#SNMPINDEX}])=4'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
         -
           uuid: 84a4865dabb8489a9981eb02de238837
           name: 'Temperature discovery'
@@ -1148,8 +1344,11 @@ zabbix_export:
                 name: 'CISCO-ENVMON-MIB::CiscoEnvMonState'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
+                -
+                  tag: sensor
+                  value: '{#SNMPVALUE}'
               trigger_prototypes:
                 -
                   uuid: c4ed5c08530041ad8c9c14033d792f56
@@ -1158,6 +1357,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor state'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: b4b4b88fcbe74e8b9c525cd2a6ace143
                   expression: 'last(/Cisco Catalyst 3750V2-48PS SNMP/sensor.temp.status[{#SNMPINDEX}])=2'
@@ -1169,6 +1375,13 @@ zabbix_export:
                     -
                       name: '{#SNMPVALUE}: Temperature is in critical state'
                       expression: 'last(/Cisco Catalyst 3750V2-48PS SNMP/sensor.temp.status[{#SNMPINDEX}])=3 or last(/Cisco Catalyst 3750V2-48PS SNMP/sensor.temp.status[{#SNMPINDEX}])=4'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 957a69769a7d4d27930d82feb359b3d5
               name: '{#SNMPVALUE}: Temperature'
@@ -1184,8 +1397,11 @@ zabbix_export:
                 The current measurement of the test point being instrumented.
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
+                -
+                  tag: sensor
+                  value: '{#SNMPVALUE}'
               trigger_prototypes:
                 -
                   uuid: d1918e0df0ae4b3ab22067142f7c0538
@@ -1196,6 +1412,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 468eaf7a831d4b2699e8be1939916f56
                   expression: 'avg(/Cisco Catalyst 3750V2-48PS SNMP/sensor.temp.value[{#SNMPINDEX}],5m)>{$TEMP_WARN:"{#SNMPVALUE}"}'
@@ -1210,6 +1433,13 @@ zabbix_export:
                       name: '{#SNMPVALUE}: Temperature is above critical threshold: >{$TEMP_CRIT:"{#SNMPVALUE}"}'
                       expression: 'avg(/Cisco Catalyst 3750V2-48PS SNMP/sensor.temp.value[{#SNMPINDEX}],5m)>{$TEMP_CRIT:"{#SNMPVALUE}"}'
                       recovery_expression: 'max(/Cisco Catalyst 3750V2-48PS SNMP/sensor.temp.value[{#SNMPINDEX}],5m)<{$TEMP_CRIT:"{#SNMPVALUE}"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: acac81a3c0b04e889f9bae2e40dd9caf
                   expression: 'avg(/Cisco Catalyst 3750V2-48PS SNMP/sensor.temp.value[{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"{#SNMPVALUE}"}'
@@ -1218,6 +1448,26 @@ zabbix_export:
                   name: '{#SNMPVALUE}: Temperature is too low: <{$TEMP_CRIT_LOW:"{#SNMPVALUE}"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: cisco
+        -
+          tag: target
+          value: cisco-catalyst
+        -
+          tag: target
+          value: cisco-catalyst-3750v2-48ps
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/net/cisco/cisco_catalyst_3750_48ts_snmp/template_net_cisco_catalyst_3750_48ts_snmp.yaml b/templates/net/cisco/cisco_catalyst_3750_48ts_snmp/template_net_cisco_catalyst_3750_48ts_snmp.yaml
index d4c58b335d0..fe49fb57056 100644
--- a/templates/net/cisco/cisco_catalyst_3750_48ts_snmp/template_net_cisco_catalyst_3750_48ts_snmp.yaml
+++ b/templates/net/cisco/cisco_catalyst_3750_48ts_snmp/template_net_cisco_catalyst_3750_48ts_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-17T07:32:40Z'
+  date: '2022-01-26T09:54:39Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -24,7 +24,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/418396-discussion-thread-for-official-zabbix-templates-for-cisco
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: 'Templates/Network devices'
@@ -39,8 +39,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 1dd6a211f5e54351a2d4a0854e66fdba
@@ -48,6 +51,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: a88b7bcaa2174a76b09031993ee48fb4
           name: 'ICMP loss'
@@ -58,8 +65,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 669ae230efe84f76be95f3ac0eac1102
@@ -71,6 +81,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/Cisco Catalyst 3750V2-48TS SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 906ca6fa0cf64000bac2efbc0f5dc7f9
           name: 'ICMP response time'
@@ -81,8 +98,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 391b3ac9e1b746c8824af721c472df7b
@@ -97,6 +117,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/Cisco Catalyst 3750V2-48TS SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: bc9c48b56cc6405c8256566d4768903a
           name: 'SNMP traps (fallback)'
@@ -109,8 +136,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 19896943dda74f798241c176b1f4fc4f
           name: 'System contact details'
@@ -132,8 +159,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: c4bd78d5e1f442128eddcdf4ea22d4b3
           name: 'System description'
@@ -156,8 +183,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 58642d7727964ba48f41bc33cfb6ef37
           name: 'Hardware model name'
@@ -177,8 +204,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
         -
           uuid: 7fa7b4e4803e4eed932c176afed56cd5
           name: 'Hardware serial number'
@@ -198,8 +225,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: f63ea5e9c33f465985259c3c8d27a12a
@@ -208,6 +235,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 213f54a3c23c40aa8693169efd8c0d82
           name: 'System location'
@@ -229,8 +260,8 @@ zabbix_export:
                 - 1h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 7e325f94720f4b29ad83a741a3735fa1
           name: 'System name'
@@ -252,8 +283,8 @@ zabbix_export:
                 - 1h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 55ff869f6acb4f2daddf5c855aa3d76d
@@ -262,6 +293,10 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 2fce50826a7d498abe4ca628021fb9ac
           name: 'System object ID'
@@ -281,8 +316,8 @@ zabbix_export:
                 - 1h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 0d55299054304e658dc036f234727c73
           name: 'Operating system'
@@ -307,8 +342,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 6724cfef1df145fdb0e6e2cfb35bc890
@@ -322,6 +357,10 @@ zabbix_export:
                 -
                   name: 'System name has changed (new name: {ITEM.VALUE})'
                   expression: 'last(/Cisco Catalyst 3750V2-48TS SNMP/system.name,#1)<>last(/Cisco Catalyst 3750V2-48TS SNMP/system.name,#2) and length(last(/Cisco Catalyst 3750V2-48TS SNMP/system.name))>0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: d33f3f14dfff49d88269706ab464e2b9
           name: Uptime
@@ -341,8 +380,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 2f1841fb315041a2a437886dc6c23814
@@ -351,6 +390,10 @@ zabbix_export:
               priority: WARNING
               description: 'Uptime is less than 10 minutes'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 82c87e2ade594f68abc4861e4d328a16
           name: 'SNMP agent availability'
@@ -361,8 +404,8 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: da0596afe59b455bb503a0b2dea1cebe
@@ -371,6 +414,10 @@ zabbix_export:
               opdata: 'Current state: {ITEM.LASTVALUE1}'
               priority: WARNING
               description: 'SNMP is not available for polling. Please check device connectivity and SNMP settings.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: f472cb3505b34f14b84bc1ce69f66b29
@@ -403,8 +450,11 @@ zabbix_export:
                 Reference: http://www.cisco.com/c/en/us/support/docs/ip/simple-network-management-protocol-snmp/15215-collect-cpu-util-snmp.html
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
+                -
+                  tag: cpu-index
+                  value: '{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 194c2d8b74c94717a037ce22c31a50e6
@@ -413,6 +463,13 @@ zabbix_export:
                   opdata: 'Current utilization: {ITEM.LASTVALUE1}'
                   priority: WARNING
                   description: 'CPU utilization is too high. The system might be slow to respond.'
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: af1ac970bce54108bec634e986711c65
@@ -465,8 +522,11 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: Inventory
+                  tag: component
+                  value: serial-number
+                -
+                  tag: entity
+                  value: '{#ENT_NAME}'
               trigger_prototypes:
                 -
                   uuid: 7dc178a7bced4003b51b599459e41047
@@ -475,6 +535,10 @@ zabbix_export:
                   priority: INFO
                   description: 'Device serial number has changed. Ack to close'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
         -
           uuid: 4972e929a2e84bc1bf37f8844aa640d2
           name: 'FAN discovery'
@@ -498,8 +562,11 @@ zabbix_export:
                 name: 'CISCO-ENVMON-MIB::CiscoEnvMonState'
               tags:
                 -
-                  tag: Application
-                  value: Fans
+                  tag: component
+                  value: fan
+                -
+                  tag: fan
+                  value: '{#SNMPVALUE}'
               trigger_prototypes:
                 -
                   uuid: 16d0712d6e1f4cb18a65d4cc7e11a8df
@@ -508,6 +575,13 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the fan unit'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 42ad0109072e404eb47daaf17236d805
                   expression: 'last(/Cisco Catalyst 3750V2-48TS SNMP/sensor.fan.status[{#SNMPINDEX}])=2'
@@ -519,6 +593,13 @@ zabbix_export:
                     -
                       name: '{#SNMPVALUE}: Fan is in critical state'
                       expression: 'last(/Cisco Catalyst 3750V2-48TS SNMP/sensor.fan.status[{#SNMPINDEX}])=3 or last(/Cisco Catalyst 3750V2-48TS SNMP/sensor.fan.status[{#SNMPINDEX}])=4'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: d5c08c7436a44b74b35c4dd5be5c308a
           name: 'Memory discovery'
@@ -545,8 +626,11 @@ zabbix_export:
                 Reference: http://www.cisco.com/c/en/us/support/docs/ip/simple-network-management-protocol-snmp/15216-contiguous-memory.html
               tags:
                 -
-                  tag: Application
-                  value: Memory
+                  tag: component
+                  value: memory
+                -
+                  tag: memory
+                  value: '{#SNMPVALUE}'
             -
               uuid: 5317e1db040846728cf05f3b7fe5dcab
               name: '{#SNMPVALUE}: Used memory'
@@ -562,8 +646,11 @@ zabbix_export:
                 Reference: http://www.cisco.com/c/en/us/support/docs/ip/simple-network-management-protocol-snmp/15216-contiguous-memory.html
               tags:
                 -
-                  tag: Application
-                  value: Memory
+                  tag: component
+                  value: memory
+                -
+                  tag: memory
+                  value: '{#SNMPVALUE}'
             -
               uuid: 9120f609d03f44c68c5c34177745422c
               name: '{#SNMPVALUE}: Memory utilization'
@@ -576,8 +663,11 @@ zabbix_export:
               description: 'Memory utilization in %'
               tags:
                 -
-                  tag: Application
-                  value: Memory
+                  tag: component
+                  value: memory
+                -
+                  tag: memory
+                  value: '{#SNMPVALUE}'
               trigger_prototypes:
                 -
                   uuid: 8cf907c229fa4c4c86c1f06e65facef8
@@ -585,6 +675,13 @@ zabbix_export:
                   name: '{#SNMPVALUE}: High memory utilization ( >{$MEMORY.UTIL.MAX}% for 5m)'
                   priority: AVERAGE
                   description: 'The system is running out of free memory.'
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 5d8987ea729748048c3fb5381c6930aa
@@ -685,8 +782,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: 216cd11617ce4fcb9551cbada0189919
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -704,8 +807,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: f4fa2946c04d4bdbabc9be4b492cf5f0
@@ -721,6 +830,10 @@ zabbix_export:
                     -
                       name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                       expression: '{$IFCONTROL:"{#IFNAME}"}=1 and (last(/Cisco Catalyst 3750V2-48TS SNMP/net.if.status[{#SNMPINDEX}])=2)'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 9dfdb09ca395486b9b71f1e3d74b8f5a
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -743,8 +856,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: 69fffa684b344774877ccb05e80fa0ab
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -766,8 +885,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: ce6a12b2553d456b87738efeb43ca849
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -785,8 +910,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: a14d914fa1404daab227b6d22e71ea69
@@ -802,6 +933,10 @@ zabbix_export:
                     -
                       name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                       expression: '{$IFCONTROL:"{#IFNAME}"}=1 and (last(/Cisco Catalyst 3750V2-48TS SNMP/net.if.status[{#SNMPINDEX}])=2)'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: eee4285b410f470f82e05c8f0cbc97b5
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -824,8 +959,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: b95c3c8730434b58a1a03c661c767901
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -848,8 +989,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: 28cb37005e6c46eaa636b5de0b7b5c8d
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -875,8 +1022,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 77b810108caa4ae6bd8d8bff06acddb2
@@ -889,6 +1042,10 @@ zabbix_export:
                     1. Can be triggered if operations status is down.
                     2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 73d4de02c2e84a75acd66e33d98f6180
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -910,8 +1067,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
           trigger_prototypes:
             -
               uuid: 4eae529fc032412d957f1e0d04261867
@@ -940,6 +1103,10 @@ zabbix_export:
                 -
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and (last(/Cisco Catalyst 3750V2-48TS SNMP/net.if.status[{#SNMPINDEX}])=2)'
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 4e1ee888558346faa54c02b85d320170
               expression: |
@@ -956,6 +1123,10 @@ zabbix_export:
                 -
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and (last(/Cisco Catalyst 3750V2-48TS SNMP/net.if.status[{#SNMPINDEX}])=2)'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 7623796067224187b6f692c8b6cbd398
               expression: |
@@ -972,6 +1143,10 @@ zabbix_export:
                 -
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and (last(/Cisco Catalyst 3750V2-48TS SNMP/net.if.status[{#SNMPINDEX}])=2)'
+              tags:
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: 2f07fa8de9f94fdfab762af30d7ac17a
@@ -1076,8 +1251,14 @@ zabbix_export:
                 name: 'EtherLike-MIB::dot3StatsDuplexStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: a1217d320897464da4bb9a67f669460f
@@ -1086,6 +1267,10 @@ zabbix_export:
                   priority: WARNING
                   description: 'Please check autonegotiation settings and cabling'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: d2658fe23d274233accf16090273118f
           name: 'PSU discovery'
@@ -1109,8 +1294,11 @@ zabbix_export:
                 name: 'CISCO-ENVMON-MIB::CiscoEnvMonState'
               tags:
                 -
-                  tag: Application
-                  value: 'Power supply'
+                  tag: component
+                  value: power
+                -
+                  tag: power-supply
+                  value: '{#SNMPVALUE}'
               trigger_prototypes:
                 -
                   uuid: 56fced6c99ba44ab9fb5268d946a385b
@@ -1119,6 +1307,10 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the power supply unit for errors'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
                 -
                   uuid: 6962e5851f244e9cb9d87763637a20f3
                   expression: 'last(/Cisco Catalyst 3750V2-48TS SNMP/sensor.psu.status[{#SNMPINDEX}])=2'
@@ -1130,6 +1322,10 @@ zabbix_export:
                     -
                       name: '{#SNMPVALUE}: Power supply is in critical state'
                       expression: 'last(/Cisco Catalyst 3750V2-48TS SNMP/sensor.psu.status[{#SNMPINDEX}])=3 or last(/Cisco Catalyst 3750V2-48TS SNMP/sensor.psu.status[{#SNMPINDEX}])=4'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
         -
           uuid: ab60f4a103254b2c87f260014ecd1a28
           name: 'Temperature discovery'
@@ -1156,8 +1352,11 @@ zabbix_export:
                 name: 'CISCO-ENVMON-MIB::CiscoEnvMonState'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
+                -
+                  tag: sensor
+                  value: '{#SNMPVALUE}'
               trigger_prototypes:
                 -
                   uuid: e4844779a080455e9691bdc705227a28
@@ -1166,6 +1365,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor state'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 120dd2434317447d8ee6708d5c1221e3
                   expression: 'last(/Cisco Catalyst 3750V2-48TS SNMP/sensor.temp.status[{#SNMPINDEX}])=2'
@@ -1177,6 +1383,13 @@ zabbix_export:
                     -
                       name: '{#SNMPVALUE}: Temperature is in critical state'
                       expression: 'last(/Cisco Catalyst 3750V2-48TS SNMP/sensor.temp.status[{#SNMPINDEX}])=3 or last(/Cisco Catalyst 3750V2-48TS SNMP/sensor.temp.status[{#SNMPINDEX}])=4'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 92864c59d4b34a979dc465824c3ef1b2
               name: '{#SNMPVALUE}: Temperature'
@@ -1192,8 +1405,11 @@ zabbix_export:
                 The current measurement of the test point being instrumented.
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
+                -
+                  tag: sensor
+                  value: '{#SNMPVALUE}'
               trigger_prototypes:
                 -
                   uuid: 6cecb3ad6e7640cc84b03e3b3943ad07
@@ -1204,6 +1420,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 6f5d1c3f3c804b6ba17486db5e6e8037
                   expression: 'avg(/Cisco Catalyst 3750V2-48TS SNMP/sensor.temp.value[{#SNMPINDEX}],5m)>{$TEMP_WARN:"{#SNMPVALUE}"}'
@@ -1218,6 +1441,13 @@ zabbix_export:
                       name: '{#SNMPVALUE}: Temperature is above critical threshold: >{$TEMP_CRIT:"{#SNMPVALUE}"}'
                       expression: 'avg(/Cisco Catalyst 3750V2-48TS SNMP/sensor.temp.value[{#SNMPINDEX}],5m)>{$TEMP_CRIT:"{#SNMPVALUE}"}'
                       recovery_expression: 'max(/Cisco Catalyst 3750V2-48TS SNMP/sensor.temp.value[{#SNMPINDEX}],5m)<{$TEMP_CRIT:"{#SNMPVALUE}"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: ed406cbc4b08446991c610c902574cac
                   expression: 'avg(/Cisco Catalyst 3750V2-48TS SNMP/sensor.temp.value[{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"{#SNMPVALUE}"}'
@@ -1226,6 +1456,26 @@ zabbix_export:
                   name: '{#SNMPVALUE}: Temperature is too low: <{$TEMP_CRIT_LOW:"{#SNMPVALUE}"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: cisco
+        -
+          tag: target
+          value: cisco-catalyst
+        -
+          tag: target
+          value: cisco-catalyst-3750v2-48ts
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/net/cisco/cisco_snmp/README.md b/templates/net/cisco/cisco_snmp/README.md
index 0a59dc577c6..9f7be4492a3 100644
--- a/templates/net/cisco/cisco_snmp/README.md
+++ b/templates/net/cisco/cisco_snmp/README.md
@@ -426,7 +426,7 @@ There are no template links in this template.
 |Interface {#IFNAME}({#IFALIAS}): Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p><p>3. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{$IFCONTROL:"{#IFNAME}"}=1 and last(/Cisco IOS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/Cisco IOS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/Cisco IOS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))`<p>Recovery expression:</p>`last(/Cisco IOS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0` |AVERAGE |<p>Manual close: YES</p> |
 |Interface {#IFNAME}({#IFALIAS}): High bandwidth usage (>{$IF.UTIL.MAX:"{#IFNAME}"}%) |<p>The network interface utilization is close to its estimated maximum bandwidth.</p> |`(avg(/Cisco IOS SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/Cisco IOS SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) or avg(/Cisco IOS SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/Cisco IOS SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])) and last(/Cisco IOS SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0`<p>Recovery expression:</p>`avg(/Cisco IOS SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/Cisco IOS SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) and avg(/Cisco IOS SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/Cisco IOS SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |Interface {#IFNAME}({#IFALIAS}): High error rate (>{$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) |<p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p> |`min(/Cisco IOS SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"} or min(/Cisco IOS SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`max(/Cisco IOS SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8 and max(/Cisco IOS SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
-|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/Cisco IOS SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/Cisco IOS SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/Cisco IOS SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/Cisco IOS SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/Cisco IOS SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/Cisco IOS SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/Cisco IOS SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/Cisco IOS SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/Cisco IOS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2) `<p>Recovery expression:</p>`(change(/Cisco IOS SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/Cisco IOS SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/Cisco IOS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2) ` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/Cisco IOS SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/Cisco IOS SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/Cisco IOS SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/Cisco IOS SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/Cisco IOS SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/Cisco IOS SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/Cisco IOS SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/Cisco IOS SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/Cisco IOS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2)`<p>Recovery expression:</p>`(change(/Cisco IOS SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/Cisco IOS SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/Cisco IOS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2)` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |{#SENSOR_INFO}: Power supply is in critical state |<p>Please check the power supply unit for errors</p> |`count(/Cisco IOS SNMP/sensor.psu.status[ciscoEnvMonSupplyState.{#SNMPINDEX}],#1,"eq","{$PSU_CRIT_STATUS:\"critical\"}")=1 or count(/Cisco IOS SNMP/sensor.psu.status[ciscoEnvMonSupplyState.{#SNMPINDEX}],#1,"eq","{$PSU_CRIT_STATUS:\"shutdown\"}")=1` |AVERAGE | |
 |{#SENSOR_INFO}: Power supply is in warning state |<p>Please check the power supply unit for errors</p> |`count(/Cisco IOS SNMP/sensor.psu.status[ciscoEnvMonSupplyState.{#SNMPINDEX}],#1,"eq","{$PSU_WARN_STATUS:\"warning\"}")=1 or count(/Cisco IOS SNMP/sensor.psu.status[ciscoEnvMonSupplyState.{#SNMPINDEX}],#1,"eq","{$PSU_WARN_STATUS:\"notFunctioning\"}")=1` |WARNING |<p>**Depends on**:</p><p>- {#SENSOR_INFO}: Power supply is in critical state</p> |
 |{HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/Cisco IOS SNMP/system.uptime[sysUpTime.0])<10m` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- No SNMP data collection</p> |
@@ -571,7 +571,7 @@ There are no template links in this template.
 |Interface {#IFNAME}({#IFALIAS}): Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p><p>3. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{$IFCONTROL:"{#IFNAME}"}=1 and last(/Cisco IOS versions 12.0_3_T-12.2_3.5 SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/Cisco IOS versions 12.0_3_T-12.2_3.5 SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/Cisco IOS versions 12.0_3_T-12.2_3.5 SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))`<p>Recovery expression:</p>`last(/Cisco IOS versions 12.0_3_T-12.2_3.5 SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0` |AVERAGE |<p>Manual close: YES</p> |
 |Interface {#IFNAME}({#IFALIAS}): High bandwidth usage (>{$IF.UTIL.MAX:"{#IFNAME}"}%) |<p>The network interface utilization is close to its estimated maximum bandwidth.</p> |`(avg(/Cisco IOS versions 12.0_3_T-12.2_3.5 SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/Cisco IOS versions 12.0_3_T-12.2_3.5 SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) or avg(/Cisco IOS versions 12.0_3_T-12.2_3.5 SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/Cisco IOS versions 12.0_3_T-12.2_3.5 SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])) and last(/Cisco IOS versions 12.0_3_T-12.2_3.5 SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0`<p>Recovery expression:</p>`avg(/Cisco IOS versions 12.0_3_T-12.2_3.5 SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/Cisco IOS versions 12.0_3_T-12.2_3.5 SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) and avg(/Cisco IOS versions 12.0_3_T-12.2_3.5 SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/Cisco IOS versions 12.0_3_T-12.2_3.5 SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |Interface {#IFNAME}({#IFALIAS}): High error rate (>{$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) |<p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p> |`min(/Cisco IOS versions 12.0_3_T-12.2_3.5 SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"} or min(/Cisco IOS versions 12.0_3_T-12.2_3.5 SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`max(/Cisco IOS versions 12.0_3_T-12.2_3.5 SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8 and max(/Cisco IOS versions 12.0_3_T-12.2_3.5 SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
-|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/Cisco IOS versions 12.0_3_T-12.2_3.5 SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/Cisco IOS versions 12.0_3_T-12.2_3.5 SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/Cisco IOS versions 12.0_3_T-12.2_3.5 SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/Cisco IOS versions 12.0_3_T-12.2_3.5 SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/Cisco IOS versions 12.0_3_T-12.2_3.5 SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/Cisco IOS versions 12.0_3_T-12.2_3.5 SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/Cisco IOS versions 12.0_3_T-12.2_3.5 SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/Cisco IOS versions 12.0_3_T-12.2_3.5 SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/Cisco IOS versions 12.0_3_T-12.2_3.5 SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2) `<p>Recovery expression:</p>`(change(/Cisco IOS versions 12.0_3_T-12.2_3.5 SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/Cisco IOS versions 12.0_3_T-12.2_3.5 SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/Cisco IOS versions 12.0_3_T-12.2_3.5 SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2) ` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/Cisco IOS versions 12.0_3_T-12.2_3.5 SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/Cisco IOS versions 12.0_3_T-12.2_3.5 SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/Cisco IOS versions 12.0_3_T-12.2_3.5 SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/Cisco IOS versions 12.0_3_T-12.2_3.5 SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/Cisco IOS versions 12.0_3_T-12.2_3.5 SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/Cisco IOS versions 12.0_3_T-12.2_3.5 SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/Cisco IOS versions 12.0_3_T-12.2_3.5 SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/Cisco IOS versions 12.0_3_T-12.2_3.5 SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/Cisco IOS versions 12.0_3_T-12.2_3.5 SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2)`<p>Recovery expression:</p>`(change(/Cisco IOS versions 12.0_3_T-12.2_3.5 SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/Cisco IOS versions 12.0_3_T-12.2_3.5 SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/Cisco IOS versions 12.0_3_T-12.2_3.5 SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2)` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |{#SENSOR_INFO}: Power supply is in critical state |<p>Please check the power supply unit for errors</p> |`count(/Cisco IOS versions 12.0_3_T-12.2_3.5 SNMP/sensor.psu.status[ciscoEnvMonSupplyState.{#SNMPINDEX}],#1,"eq","{$PSU_CRIT_STATUS:\"critical\"}")=1 or count(/Cisco IOS versions 12.0_3_T-12.2_3.5 SNMP/sensor.psu.status[ciscoEnvMonSupplyState.{#SNMPINDEX}],#1,"eq","{$PSU_CRIT_STATUS:\"shutdown\"}")=1` |AVERAGE | |
 |{#SENSOR_INFO}: Power supply is in warning state |<p>Please check the power supply unit for errors</p> |`count(/Cisco IOS versions 12.0_3_T-12.2_3.5 SNMP/sensor.psu.status[ciscoEnvMonSupplyState.{#SNMPINDEX}],#1,"eq","{$PSU_WARN_STATUS:\"warning\"}")=1 or count(/Cisco IOS versions 12.0_3_T-12.2_3.5 SNMP/sensor.psu.status[ciscoEnvMonSupplyState.{#SNMPINDEX}],#1,"eq","{$PSU_WARN_STATUS:\"notFunctioning\"}")=1` |WARNING |<p>**Depends on**:</p><p>- {#SENSOR_INFO}: Power supply is in critical state</p> |
 |{HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/Cisco IOS versions 12.0_3_T-12.2_3.5 SNMP/system.uptime[sysUpTime.0])<10m` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- No SNMP data collection</p> |
diff --git a/templates/net/cisco/cisco_snmp/template_net_cisco_snmp.yaml b/templates/net/cisco/cisco_snmp/template_net_cisco_snmp.yaml
index b3b0bf13dba..9327102d769 100644
--- a/templates/net/cisco/cisco_snmp/template_net_cisco_snmp.yaml
+++ b/templates/net/cisco/cisco_snmp/template_net_cisco_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:42:16Z'
+  date: '2022-01-26T09:55:23Z'
   groups:
     -
       uuid: 57b7ae836ca64446ba2c296389c009b7
@@ -47,8 +47,8 @@ zabbix_export:
                 name: 'CISCO-ENVMON-MIB::CiscoEnvMonState'
               tags:
                 -
-                  tag: Application
-                  value: Fans
+                  tag: component
+                  value: fan
               trigger_prototypes:
                 -
                   uuid: a9f5e9e2a65143298910e354e832bf2f
@@ -57,6 +57,13 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the fan unit'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 58cf2c24afd74e5cb048557e8e52138e
                   expression: 'count(/Cisco CISCO-ENVMON-MIB SNMP/sensor.fan.status[ciscoEnvMonFanState.{#SNMPINDEX}],#1,"eq","{$FAN_WARN_STATUS:\"warning\"}")=1 or count(/Cisco CISCO-ENVMON-MIB SNMP/sensor.fan.status[ciscoEnvMonFanState.{#SNMPINDEX}],#1,"eq","{$FAN_WARN_STATUS:\"notFunctioning\"}")=1'
@@ -68,6 +75,13 @@ zabbix_export:
                     -
                       name: '{#SENSOR_INFO}: Fan is in critical state'
                       expression: 'count(/Cisco CISCO-ENVMON-MIB SNMP/sensor.fan.status[ciscoEnvMonFanState.{#SNMPINDEX}],#1,"eq","{$FAN_CRIT_STATUS:\"critical\"}")=1 or count(/Cisco CISCO-ENVMON-MIB SNMP/sensor.fan.status[ciscoEnvMonFanState.{#SNMPINDEX}],#1,"eq","{$FAN_CRIT_STATUS:\"shutdown\"}")=1'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 932817396a5b47f29af28e439711ef59
           name: 'PSU Discovery'
@@ -91,8 +105,8 @@ zabbix_export:
                 name: 'CISCO-ENVMON-MIB::CiscoEnvMonState'
               tags:
                 -
-                  tag: Application
-                  value: 'Power supply'
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: 5796e1e85ea949d0b86ce83f5daae958
@@ -101,6 +115,13 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the power supply unit for errors'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 93892fed243f4f0b8c26ab67fa6e1800
                   expression: 'count(/Cisco CISCO-ENVMON-MIB SNMP/sensor.psu.status[ciscoEnvMonSupplyState.{#SNMPINDEX}],#1,"eq","{$PSU_WARN_STATUS:\"warning\"}")=1 or count(/Cisco CISCO-ENVMON-MIB SNMP/sensor.psu.status[ciscoEnvMonSupplyState.{#SNMPINDEX}],#1,"eq","{$PSU_WARN_STATUS:\"notFunctioning\"}")=1'
@@ -112,6 +133,13 @@ zabbix_export:
                     -
                       name: '{#SENSOR_INFO}: Power supply is in critical state'
                       expression: 'count(/Cisco CISCO-ENVMON-MIB SNMP/sensor.psu.status[ciscoEnvMonSupplyState.{#SNMPINDEX}],#1,"eq","{$PSU_CRIT_STATUS:\"critical\"}")=1 or count(/Cisco CISCO-ENVMON-MIB SNMP/sensor.psu.status[ciscoEnvMonSupplyState.{#SNMPINDEX}],#1,"eq","{$PSU_CRIT_STATUS:\"shutdown\"}")=1'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: e61bb682818b4f31a669acd31335160c
           name: 'Temperature Discovery'
@@ -139,8 +167,8 @@ zabbix_export:
                 name: 'CISCO-ENVMON-MIB::CiscoEnvMonState'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
             -
               uuid: 4859221e53d7485485db1c9060d7f705
               name: '{#SNMPVALUE}: Temperature'
@@ -155,8 +183,8 @@ zabbix_export:
                 The current measurement of the test point being instrumented.
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 2bb01154728b47c69514f7399f3bfabc
@@ -166,6 +194,13 @@ zabbix_export:
                   name: '{#SNMPVALUE}: Temperature is too low: <{$TEMP_CRIT_LOW:"{#SNMPVALUE}"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
           trigger_prototypes:
             -
               uuid: f356f7fbc2de423db3bac09bc4683ae2
@@ -181,6 +216,13 @@ zabbix_export:
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
               description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 2c151dd93b7f4096b9eb6c73c315ffec
               expression: |
@@ -203,6 +245,13 @@ zabbix_export:
                     or
                     last(/Cisco CISCO-ENVMON-MIB SNMP/sensor.temp.status[ciscoEnvMonTemperatureState.{#SNMPINDEX}])={$TEMP_DISASTER_STATUS}
                   recovery_expression: 'max(/Cisco CISCO-ENVMON-MIB SNMP/sensor.temp.value[ciscoEnvMonTemperatureValue.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"{#SNMPVALUE}"}-3'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
       macros:
         -
           macro: '{$FAN_CRIT_STATUS:"critical"}'
@@ -315,8 +364,8 @@ zabbix_export:
                 Reference: http://www.cisco.com/c/en/us/support/docs/ip/simple-network-management-protocol-snmp/15216-contiguous-memory.html
               tags:
                 -
-                  tag: Application
-                  value: Memory
+                  tag: component
+                  value: memory
             -
               uuid: 32d6bbb06c624f9e9a236fb53507948c
               name: '{#SNMPVALUE}: Used memory'
@@ -331,8 +380,8 @@ zabbix_export:
                 Reference: http://www.cisco.com/c/en/us/support/docs/ip/simple-network-management-protocol-snmp/15216-contiguous-memory.html
               tags:
                 -
-                  tag: Application
-                  value: Memory
+                  tag: component
+                  value: memory
             -
               uuid: 5065203cb8244befadc54cdb004d4b40
               name: '{#SNMPVALUE}: Memory utilization'
@@ -345,8 +394,8 @@ zabbix_export:
               description: 'Memory utilization in %'
               tags:
                 -
-                  tag: Application
-                  value: Memory
+                  tag: component
+                  value: memory
               trigger_prototypes:
                 -
                   uuid: 74c44bdc890f467cb1a8cdc175a54a76
@@ -354,6 +403,13 @@ zabbix_export:
                   name: '{#SNMPVALUE}: High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
                   priority: AVERAGE
                   description: 'The system is running out of free memory.'
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 754f4378d0fb43c288e891285efee8a5
@@ -420,8 +476,8 @@ zabbix_export:
                 Reference: http://www.cisco.com/c/en/us/support/docs/ip/simple-network-management-protocol-snmp/15215-collect-cpu-util-snmp.html
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
               trigger_prototypes:
                 -
                   uuid: be863abc1e3440a9bd35c4db77f83961
@@ -430,6 +486,10 @@ zabbix_export:
                   opdata: 'Current utilization: {ITEM.LASTVALUE1}'
                   priority: WARNING
                   description: 'CPU utilization is too high. The system might be slow to respond.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 8e045ff24e564afc9a55d4bd08529d22
@@ -492,8 +552,8 @@ zabbix_export:
                 Reference: http://www.cisco.com/c/en/us/support/docs/ip/simple-network-management-protocol-snmp/15215-collect-cpu-util-snmp.html
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
               trigger_prototypes:
                 -
                   uuid: 52d3b9d4d52e4f289221f4b5ade177d7
@@ -502,6 +562,10 @@ zabbix_export:
                   opdata: 'Current utilization: {ITEM.LASTVALUE1}'
                   priority: WARNING
                   description: 'CPU utilization is too high. The system might be slow to respond.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 6fed03a2555949178f96550fcdb449ca
@@ -554,8 +618,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
         -
           uuid: 3b54e3692fe643e99704767f9a58a1c2
           name: 'Hardware serial number'
@@ -575,8 +639,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 4100a7125272484c81c4f599eff82793
@@ -585,6 +649,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 51b1c178adff415bbe36a4363d6e06c1
           name: 'Operating system'
@@ -609,8 +677,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: os
           triggers:
             -
               uuid: e417e0edd4eb417d99816dd9cf4f20e9
@@ -619,6 +687,10 @@ zabbix_export:
               priority: INFO
               description: 'Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
       discovery_rules:
         -
           uuid: 0908cfd197214f6c8092bbd426ef83bf
@@ -657,8 +729,8 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: Inventory
+                  tag: component
+                  value: system
               trigger_prototypes:
                 -
                   uuid: ff15aaac7c4947b6a07a38dec4d1466d
@@ -667,6 +739,10 @@ zabbix_export:
                   priority: INFO
                   description: 'Device serial number has changed. Ack to close'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
     -
       uuid: 1bb42fbdb9054645a62ff81f14ba3b99
       template: 'Cisco IOS prior to 12.0_3_T SNMP'
@@ -696,8 +772,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: fd317d3e8d3d45bf97322b8578f30c04
@@ -705,6 +784,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 2af7b5f79fc44d7d992b0bf6277c12bb
           name: 'ICMP loss'
@@ -715,8 +798,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 3576c96601ef40abbeedbde11768141a
@@ -728,6 +814,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/Cisco IOS prior to 12.0_3_T SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 1afa1e8ca21c430598845806bbf0e7a2
           name: 'ICMP response time'
@@ -738,8 +831,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 2941d30058b14d52bd9a723889c8be26
@@ -754,6 +850,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/Cisco IOS prior to 12.0_3_T SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 53eb0288c9e54490942cedd4ce5f376e
           name: 'SNMP traps (fallback)'
@@ -766,8 +869,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: bba5be8b3fa54bfbb354b7a2c20fd353
           name: 'System contact details'
@@ -789,8 +892,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 693b0c779f574d869f47b44c4b3ecd58
           name: 'CPU utilization'
@@ -807,8 +910,8 @@ zabbix_export:
             Reference: http://www.cisco.com/c/en/us/support/docs/ip/simple-network-management-protocol-snmp/15215-collect-cpu-util-snmp.html
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
           triggers:
             -
               uuid: 74773fc279864e7daf89cffe9cb2067c
@@ -817,6 +920,10 @@ zabbix_export:
               opdata: 'Current utilization: {ITEM.LASTVALUE1}'
               priority: WARNING
               description: 'CPU utilization is too high. The system might be slow to respond.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 495b26e876a04819a02cf22eaba04e0b
           name: 'System description'
@@ -839,8 +946,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: b5121a382d0245f0906bba4530a82ac4
           name: 'Hardware model name'
@@ -860,8 +967,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
         -
           uuid: 5934a35b54464f66ab19152ca393b882
           name: 'Hardware serial number'
@@ -881,8 +988,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: d53c0d22a67544cf8a2fcd2c8de4d4eb
@@ -891,6 +998,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 30df666e80bd4875ac761306781061da
           name: 'System location'
@@ -912,8 +1023,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 2e55e75a7baa4195b012e750bac90dcb
           name: 'System name'
@@ -935,8 +1046,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 33b42b1aa448408fa3fb5aadf7375cf8
@@ -945,6 +1056,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: cc6e5a6e4f604b639815d9397264c6af
           name: 'System object ID'
@@ -965,8 +1083,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 70ef7ce7561640b7bc6b5d30235c0ecc
           name: 'Operating system'
@@ -991,8 +1109,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: os
           triggers:
             -
               uuid: abe57415ff574b878a2ce2a318be86ee
@@ -1005,6 +1123,10 @@ zabbix_export:
                 -
                   name: 'System name has changed (new name: {ITEM.VALUE})'
                   expression: 'last(/Cisco IOS prior to 12.0_3_T SNMP/system.name,#1)<>last(/Cisco IOS prior to 12.0_3_T SNMP/system.name,#2) and length(last(/Cisco IOS prior to 12.0_3_T SNMP/system.name))>0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 7ecd28b73c0f43a98c3a58467b1cbdc7
           name: Uptime
@@ -1025,8 +1147,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: f278b8b4eb784107a6d8d3e8437e8a66
@@ -1039,6 +1161,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/Cisco IOS prior to 12.0_3_T SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 5a156e9ca10c49bbb87cf3de1b686cff
           name: 'SNMP agent availability'
@@ -1055,8 +1181,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 86d8603903504287b07a25530c8eda2b
@@ -1069,6 +1198,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/Cisco IOS prior to 12.0_3_T SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: fbeef9c16d9d45b7a5c50f530a697f76
@@ -1107,8 +1240,8 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: Inventory
+                  tag: component
+                  value: system
               trigger_prototypes:
                 -
                   uuid: e8c328ad70a146219a8ae62f101cfc00
@@ -1117,6 +1250,10 @@ zabbix_export:
                   priority: INFO
                   description: 'Device serial number has changed. Ack to close'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
         -
           uuid: 109cd000cd044e4096bf98dbf57b72d1
           name: 'FAN Discovery'
@@ -1140,8 +1277,8 @@ zabbix_export:
                 name: 'CISCO-ENVMON-MIB::CiscoEnvMonState'
               tags:
                 -
-                  tag: Application
-                  value: Fans
+                  tag: component
+                  value: fan
               trigger_prototypes:
                 -
                   uuid: ddd7015dd3204514beea29edc45c3cd4
@@ -1150,6 +1287,13 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the fan unit'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 4eb7ea3405d74740a12095a07d91d48f
                   expression: 'count(/Cisco IOS prior to 12.0_3_T SNMP/sensor.fan.status[ciscoEnvMonFanState.{#SNMPINDEX}],#1,"eq","{$FAN_WARN_STATUS:\"warning\"}")=1 or count(/Cisco IOS prior to 12.0_3_T SNMP/sensor.fan.status[ciscoEnvMonFanState.{#SNMPINDEX}],#1,"eq","{$FAN_WARN_STATUS:\"notFunctioning\"}")=1'
@@ -1161,6 +1305,13 @@ zabbix_export:
                     -
                       name: '{#SENSOR_INFO}: Fan is in critical state'
                       expression: 'count(/Cisco IOS prior to 12.0_3_T SNMP/sensor.fan.status[ciscoEnvMonFanState.{#SNMPINDEX}],#1,"eq","{$FAN_CRIT_STATUS:\"critical\"}")=1 or count(/Cisco IOS prior to 12.0_3_T SNMP/sensor.fan.status[ciscoEnvMonFanState.{#SNMPINDEX}],#1,"eq","{$FAN_CRIT_STATUS:\"shutdown\"}")=1'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 727adcf658d141ff9e45744107a58c38
           name: 'Memory Discovery'
@@ -1186,8 +1337,8 @@ zabbix_export:
                 Reference: http://www.cisco.com/c/en/us/support/docs/ip/simple-network-management-protocol-snmp/15216-contiguous-memory.html
               tags:
                 -
-                  tag: Application
-                  value: Memory
+                  tag: component
+                  value: memory
             -
               uuid: 25471f4acc4348bf978792fcfaff6acc
               name: '{#SNMPVALUE}: Used memory'
@@ -1202,8 +1353,8 @@ zabbix_export:
                 Reference: http://www.cisco.com/c/en/us/support/docs/ip/simple-network-management-protocol-snmp/15216-contiguous-memory.html
               tags:
                 -
-                  tag: Application
-                  value: Memory
+                  tag: component
+                  value: memory
             -
               uuid: 9a03c1b1c6ae42e5ab1886c172b2e3ac
               name: '{#SNMPVALUE}: Memory utilization'
@@ -1216,8 +1367,8 @@ zabbix_export:
               description: 'Memory utilization in %'
               tags:
                 -
-                  tag: Application
-                  value: Memory
+                  tag: component
+                  value: memory
               trigger_prototypes:
                 -
                   uuid: 8793ba7767cc415a80a6a206aaf01f11
@@ -1225,6 +1376,13 @@ zabbix_export:
                   name: '{#SNMPVALUE}: High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
                   priority: AVERAGE
                   description: 'The system is running out of free memory.'
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: dd0520d162fe4230900d33472944677f
@@ -1261,8 +1419,8 @@ zabbix_export:
                 name: 'CISCO-ENVMON-MIB::CiscoEnvMonState'
               tags:
                 -
-                  tag: Application
-                  value: 'Power supply'
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: fc4b6f155d3646c3bb8b27d35c18604b
@@ -1271,6 +1429,13 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the power supply unit for errors'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 58e9514d75f84c989b052cfd76ceed4a
                   expression: 'count(/Cisco IOS prior to 12.0_3_T SNMP/sensor.psu.status[ciscoEnvMonSupplyState.{#SNMPINDEX}],#1,"eq","{$PSU_WARN_STATUS:\"warning\"}")=1 or count(/Cisco IOS prior to 12.0_3_T SNMP/sensor.psu.status[ciscoEnvMonSupplyState.{#SNMPINDEX}],#1,"eq","{$PSU_WARN_STATUS:\"notFunctioning\"}")=1'
@@ -1282,6 +1447,13 @@ zabbix_export:
                     -
                       name: '{#SENSOR_INFO}: Power supply is in critical state'
                       expression: 'count(/Cisco IOS prior to 12.0_3_T SNMP/sensor.psu.status[ciscoEnvMonSupplyState.{#SNMPINDEX}],#1,"eq","{$PSU_CRIT_STATUS:\"critical\"}")=1 or count(/Cisco IOS prior to 12.0_3_T SNMP/sensor.psu.status[ciscoEnvMonSupplyState.{#SNMPINDEX}],#1,"eq","{$PSU_CRIT_STATUS:\"shutdown\"}")=1'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 73d10f48886443248f7d2d9167fcfee5
           name: 'Temperature Discovery'
@@ -1309,8 +1481,8 @@ zabbix_export:
                 name: 'CISCO-ENVMON-MIB::CiscoEnvMonState'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
             -
               uuid: ea0d56dd49104257ba6c14ce3bdb753a
               name: '{#SNMPVALUE}: Temperature'
@@ -1325,8 +1497,8 @@ zabbix_export:
                 The current measurement of the test point being instrumented.
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 716dee103c9f4e9da5f83d6cc338617d
@@ -1336,6 +1508,13 @@ zabbix_export:
                   name: '{#SNMPVALUE}: Temperature is too low: <{$TEMP_CRIT_LOW:"{#SNMPVALUE}"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
           trigger_prototypes:
             -
               uuid: 82fa9473dc7d49d4a3a230ef6238cd2c
@@ -1351,6 +1530,13 @@ zabbix_export:
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
               description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: a0199088767f43c0990f5ac8793267b1
               expression: |
@@ -1373,6 +1559,26 @@ zabbix_export:
                     or
                     last(/Cisco IOS prior to 12.0_3_T SNMP/sensor.temp.status[ciscoEnvMonTemperatureState.{#SNMPINDEX}])={$TEMP_DISASTER_STATUS}
                   recovery_expression: 'max(/Cisco IOS prior to 12.0_3_T SNMP/sensor.temp.value[ciscoEnvMonTemperatureValue.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"{#SNMPVALUE}"}-3'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: cisco
+        -
+          tag: target
+          value: cisco-prior
+        -
+          tag: target
+          value: cisco-prior-12.0-3-t
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
@@ -1520,8 +1726,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 77e52d690bc043e389ad8d705dbb86b9
@@ -1529,6 +1738,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 0c081f94e6094ad29e1fbc2a3424bedb
           name: 'ICMP loss'
@@ -1539,8 +1752,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 62b3c0a2654f4372a1bad40a0fd2898d
@@ -1552,6 +1768,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/Cisco IOS SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: dab9ef1df04d403faa4910bf51559035
           name: 'ICMP response time'
@@ -1562,8 +1785,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 1ba34b5e344147d5b27431906037bc04
@@ -1578,6 +1804,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/Cisco IOS SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 8684622dc8d446f0b17ba7687d47b09d
           name: 'SNMP traps (fallback)'
@@ -1590,8 +1823,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: 622767f4dbab49039c63990e4fc58eaa
           name: 'System contact details'
@@ -1613,8 +1846,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: ae8e0ecf937c4a9492fe67cc5cd07d6f
           name: 'System description'
@@ -1637,8 +1870,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: a8062a554b8d447f81f7b9ef3229c7e9
           name: 'Hardware model name'
@@ -1658,8 +1891,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
         -
           uuid: 223fd2fe9699419c824ae310f1c8a631
           name: 'Hardware serial number'
@@ -1679,8 +1912,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 7d1460eaf7ad46fd8a1b5df3c20051ba
@@ -1689,6 +1922,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 361ca9979352405a9dfb9bc13e542a2f
           name: 'System location'
@@ -1710,8 +1947,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 2ddace242ffe487a8641e035cf04dcdd
           name: 'System name'
@@ -1733,8 +1970,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 2105744d4efd4a239c5b6ab615746a40
@@ -1743,6 +1980,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: 290d095f8fbc4cd1aa5ed3d304434f4b
           name: 'System object ID'
@@ -1763,8 +2007,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 5fe7bc2d46a748d3ace7d1dd0de8127b
           name: 'Operating system'
@@ -1789,8 +2033,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: os
           triggers:
             -
               uuid: 2d97173405594074bfe2cc6f3d0cae70
@@ -1803,6 +2047,10 @@ zabbix_export:
                 -
                   name: 'System name has changed (new name: {ITEM.VALUE})'
                   expression: 'last(/Cisco IOS SNMP/system.name,#1)<>last(/Cisco IOS SNMP/system.name,#2) and length(last(/Cisco IOS SNMP/system.name))>0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: fe1dbb23a8794ce9ae3f6c37e63082f8
           name: Uptime
@@ -1823,8 +2071,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: b98092ddf87247ff91710e2f310dbfb9
@@ -1837,6 +2085,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/Cisco IOS SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: cf9bd75166704b2f93446ece0c2d0fab
           name: 'SNMP agent availability'
@@ -1853,8 +2105,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: df7c9ed5d3164e73a792f82ecad6ba13
@@ -1867,6 +2122,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/Cisco IOS SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: f7404c15a9dc497b8e67ab014ca43890
@@ -1898,8 +2157,8 @@ zabbix_export:
                 Reference: http://www.cisco.com/c/en/us/support/docs/ip/simple-network-management-protocol-snmp/15215-collect-cpu-util-snmp.html
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
               trigger_prototypes:
                 -
                   uuid: 89b292f6748f49fa8b0f23f5378944b2
@@ -1908,6 +2167,10 @@ zabbix_export:
                   opdata: 'Current utilization: {ITEM.LASTVALUE1}'
                   priority: WARNING
                   description: 'CPU utilization is too high. The system might be slow to respond.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: e93fccb08b3a4150b986a54eaccbd1c5
@@ -1958,8 +2221,8 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: Inventory
+                  tag: component
+                  value: system
               trigger_prototypes:
                 -
                   uuid: e5477e6803974060ba3ce8a131d97d40
@@ -1968,6 +2231,10 @@ zabbix_export:
                   priority: INFO
                   description: 'Device serial number has changed. Ack to close'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
         -
           uuid: 98eebfb8ed28460c8e5982af61f18931
           name: 'FAN Discovery'
@@ -1991,8 +2258,8 @@ zabbix_export:
                 name: 'CISCO-ENVMON-MIB::CiscoEnvMonState'
               tags:
                 -
-                  tag: Application
-                  value: Fans
+                  tag: component
+                  value: fan
               trigger_prototypes:
                 -
                   uuid: e64b0790509c4a21b7ead959fa1b7951
@@ -2001,6 +2268,13 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the fan unit'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 33207a0c65e14a5d9355690c8d9d54e2
                   expression: 'count(/Cisco IOS SNMP/sensor.fan.status[ciscoEnvMonFanState.{#SNMPINDEX}],#1,"eq","{$FAN_WARN_STATUS:\"warning\"}")=1 or count(/Cisco IOS SNMP/sensor.fan.status[ciscoEnvMonFanState.{#SNMPINDEX}],#1,"eq","{$FAN_WARN_STATUS:\"notFunctioning\"}")=1'
@@ -2012,6 +2286,13 @@ zabbix_export:
                     -
                       name: '{#SENSOR_INFO}: Fan is in critical state'
                       expression: 'count(/Cisco IOS SNMP/sensor.fan.status[ciscoEnvMonFanState.{#SNMPINDEX}],#1,"eq","{$FAN_CRIT_STATUS:\"critical\"}")=1 or count(/Cisco IOS SNMP/sensor.fan.status[ciscoEnvMonFanState.{#SNMPINDEX}],#1,"eq","{$FAN_CRIT_STATUS:\"shutdown\"}")=1'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: d7144482448b4bb5b4f59f18365ecb04
           name: 'Memory Discovery'
@@ -2037,8 +2318,8 @@ zabbix_export:
                 Reference: http://www.cisco.com/c/en/us/support/docs/ip/simple-network-management-protocol-snmp/15216-contiguous-memory.html
               tags:
                 -
-                  tag: Application
-                  value: Memory
+                  tag: component
+                  value: memory
             -
               uuid: 58e8eeb2ddf74c6e86e02845f0d38784
               name: '{#SNMPVALUE}: Used memory'
@@ -2053,8 +2334,8 @@ zabbix_export:
                 Reference: http://www.cisco.com/c/en/us/support/docs/ip/simple-network-management-protocol-snmp/15216-contiguous-memory.html
               tags:
                 -
-                  tag: Application
-                  value: Memory
+                  tag: component
+                  value: memory
             -
               uuid: 5407d019461f45b895663de105d75298
               name: '{#SNMPVALUE}: Memory utilization'
@@ -2067,8 +2348,8 @@ zabbix_export:
               description: 'Memory utilization in %'
               tags:
                 -
-                  tag: Application
-                  value: Memory
+                  tag: component
+                  value: memory
               trigger_prototypes:
                 -
                   uuid: ee300a1f9f644bdbb545bd65d59d4837
@@ -2076,6 +2357,13 @@ zabbix_export:
                   name: '{#SNMPVALUE}: High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
                   priority: AVERAGE
                   description: 'The system is running out of free memory.'
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 9b18855195cc45a8a84550544bc6d7e7
@@ -2177,8 +2465,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 1cdd9e77a6f9420da700b903e2fc0966
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -2197,8 +2491,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 22cb1c9d188c4274a4f9ac815832fc21
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -2222,8 +2522,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 75182ac83419420194cf34c4e5f92a62
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -2246,8 +2552,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: c31a98b3b9784cd699b5d0dadbc3dc4a
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -2266,8 +2578,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 973dbf88a72d4f5897bb199b5d41941a
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -2291,8 +2609,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: e24cccb1e89446268b30830ac01d59f8
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -2317,8 +2641,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 6ecd6a8ec5fa487c836adb69e72915e7
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -2340,8 +2670,14 @@ zabbix_export:
                 name: 'IF-MIB::ifOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 6bf13b6cac1b438bbfe384a746646597
@@ -2359,6 +2695,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 51e3b46e009944d594fd4bdadeac83aa
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -2382,8 +2722,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           trigger_prototypes:
             -
               uuid: 3783d41e790f4d1e9ebb7340d82edc1f
@@ -2413,6 +2759,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Cisco IOS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/Cisco IOS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/Cisco IOS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/Cisco IOS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 17a07d8b87c04874bfbf12009e1da65f
               expression: |
@@ -2433,6 +2783,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Cisco IOS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/Cisco IOS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/Cisco IOS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/Cisco IOS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 0c1c6f8fc17849a68a12813389da6373
               expression: |
@@ -2452,6 +2806,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Cisco IOS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/Cisco IOS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/Cisco IOS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/Cisco IOS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: 171ff5fe2b1543aa869ab56f800b52a5
@@ -2555,8 +2916,14 @@ zabbix_export:
                 name: 'EtherLike-MIB::dot3StatsDuplexStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 251a80d2f6824e33b8edfca94e0f335d
@@ -2565,6 +2932,10 @@ zabbix_export:
                   priority: WARNING
                   description: 'Please check autonegotiation settings and cabling'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           preprocessing:
             -
               type: JAVASCRIPT
@@ -2606,8 +2977,8 @@ zabbix_export:
                 name: 'CISCO-ENVMON-MIB::CiscoEnvMonState'
               tags:
                 -
-                  tag: Application
-                  value: 'Power supply'
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: 3068fc8f0b0749d4b76d97d7f500e36d
@@ -2616,6 +2987,13 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the power supply unit for errors'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 194444afb5d143a0a0734120e26066e4
                   expression: 'count(/Cisco IOS SNMP/sensor.psu.status[ciscoEnvMonSupplyState.{#SNMPINDEX}],#1,"eq","{$PSU_WARN_STATUS:\"warning\"}")=1 or count(/Cisco IOS SNMP/sensor.psu.status[ciscoEnvMonSupplyState.{#SNMPINDEX}],#1,"eq","{$PSU_WARN_STATUS:\"notFunctioning\"}")=1'
@@ -2627,6 +3005,13 @@ zabbix_export:
                     -
                       name: '{#SENSOR_INFO}: Power supply is in critical state'
                       expression: 'count(/Cisco IOS SNMP/sensor.psu.status[ciscoEnvMonSupplyState.{#SNMPINDEX}],#1,"eq","{$PSU_CRIT_STATUS:\"critical\"}")=1 or count(/Cisco IOS SNMP/sensor.psu.status[ciscoEnvMonSupplyState.{#SNMPINDEX}],#1,"eq","{$PSU_CRIT_STATUS:\"shutdown\"}")=1'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 2751c1ff3f334145971aa400440631fe
           name: 'Temperature Discovery'
@@ -2654,8 +3039,8 @@ zabbix_export:
                 name: 'CISCO-ENVMON-MIB::CiscoEnvMonState'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
             -
               uuid: c1fb8e8099ed496a9af8d3e36d6d3c8b
               name: '{#SNMPVALUE}: Temperature'
@@ -2670,8 +3055,8 @@ zabbix_export:
                 The current measurement of the test point being instrumented.
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 64888770ef6a44089593e78d4d2c528d
@@ -2681,6 +3066,13 @@ zabbix_export:
                   name: '{#SNMPVALUE}: Temperature is too low: <{$TEMP_CRIT_LOW:"{#SNMPVALUE}"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
           trigger_prototypes:
             -
               uuid: 95f562a5b2fb4e17b091eaed07c77d4a
@@ -2696,6 +3088,13 @@ zabbix_export:
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
               description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 5809893fb23a452ebad327c595322619
               expression: |
@@ -2718,6 +3117,23 @@ zabbix_export:
                     or
                     last(/Cisco IOS SNMP/sensor.temp.status[ciscoEnvMonTemperatureState.{#SNMPINDEX}])={$TEMP_DISASTER_STATUS}
                   recovery_expression: 'max(/Cisco IOS SNMP/sensor.temp.value[ciscoEnvMonTemperatureValue.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"{#SNMPVALUE}"}-3'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: cisco
+        -
+          tag: target
+          value: cisco-ios
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
@@ -3834,8 +4250,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: f6fae61d08644d5fa3929f526aee34e4
@@ -3843,6 +4262,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 39baf182f6724813a951b25f6ff5aab4
           name: 'ICMP loss'
@@ -3853,8 +4276,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 5c7eae9701be4661a34bbcdb99c094fe
@@ -3866,6 +4292,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/Cisco IOS versions 12.0_3_T-12.2_3.5 SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 85748657f67e45189256e7704c6e7a9c
           name: 'ICMP response time'
@@ -3876,8 +4309,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 9aebe4a1cfa34c5d92178abc8a6ce06e
@@ -3892,6 +4328,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/Cisco IOS versions 12.0_3_T-12.2_3.5 SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 0f50837172ad475d9d5a27c95be19ab2
           name: 'SNMP traps (fallback)'
@@ -3904,8 +4347,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: 22406c415a0a4f6bbd9d44707631f42c
           name: 'System contact details'
@@ -3927,8 +4370,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 5a37d2e4f308475c932a6bb856d0ffb4
           name: 'System description'
@@ -3951,8 +4394,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 12b69d0a3b844906a950bcedcbb8b9b8
           name: 'Hardware model name'
@@ -3972,8 +4415,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
         -
           uuid: 991021da67c84f96a76154078c45f3be
           name: 'Hardware serial number'
@@ -3993,8 +4436,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 78723249679b4a288861f4ad8621fd77
@@ -4003,6 +4446,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: d8ed796e88f3478ea72d95ddcc68f9ed
           name: 'System location'
@@ -4024,8 +4471,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: a26d3babf5674a5e9d9afff94518e6c6
           name: 'System name'
@@ -4047,8 +4494,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 3e09d5d308e449a4974393650b33e64d
@@ -4057,6 +4504,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: da41d408448d4b1aa323e0046ff97598
           name: 'System object ID'
@@ -4077,8 +4531,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: cf4af497970a415aa45aa66b2ba48115
           name: 'Operating system'
@@ -4103,8 +4557,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: os
           triggers:
             -
               uuid: df85813bb6af4accab8d5191cd452329
@@ -4117,6 +4571,10 @@ zabbix_export:
                 -
                   name: 'System name has changed (new name: {ITEM.VALUE})'
                   expression: 'last(/Cisco IOS versions 12.0_3_T-12.2_3.5 SNMP/system.name,#1)<>last(/Cisco IOS versions 12.0_3_T-12.2_3.5 SNMP/system.name,#2) and length(last(/Cisco IOS versions 12.0_3_T-12.2_3.5 SNMP/system.name))>0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 182fd7bfd7b74331b9f3cf8f4a7646cb
           name: Uptime
@@ -4137,8 +4595,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 806f54999d064eb68a3f46a0d84ee4df
@@ -4151,6 +4609,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/Cisco IOS versions 12.0_3_T-12.2_3.5 SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 92fa54c5c28b4244b0d22c9041064d15
           name: 'SNMP agent availability'
@@ -4167,8 +4629,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 778749b260bb45c3a926d6bb49c07257
@@ -4181,6 +4646,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/Cisco IOS versions 12.0_3_T-12.2_3.5 SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: 1d8d76707b1049cabfda668257c257b6
@@ -4216,8 +4685,8 @@ zabbix_export:
                 Reference: http://www.cisco.com/c/en/us/support/docs/ip/simple-network-management-protocol-snmp/15215-collect-cpu-util-snmp.html
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
               trigger_prototypes:
                 -
                   uuid: b964834d4f6549c7ae0f0c0c2646dfbc
@@ -4226,6 +4695,10 @@ zabbix_export:
                   opdata: 'Current utilization: {ITEM.LASTVALUE1}'
                   priority: WARNING
                   description: 'CPU utilization is too high. The system might be slow to respond.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 9e61506351cf4f16be21dcbed8875293
@@ -4276,8 +4749,8 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: Inventory
+                  tag: component
+                  value: system
               trigger_prototypes:
                 -
                   uuid: 75ee6ab1f0c84946a4f4d6e87007ec25
@@ -4286,6 +4759,10 @@ zabbix_export:
                   priority: INFO
                   description: 'Device serial number has changed. Ack to close'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
         -
           uuid: 0906581023f54a0b95102288e8ed4714
           name: 'FAN Discovery'
@@ -4309,8 +4786,8 @@ zabbix_export:
                 name: 'CISCO-ENVMON-MIB::CiscoEnvMonState'
               tags:
                 -
-                  tag: Application
-                  value: Fans
+                  tag: component
+                  value: fan
               trigger_prototypes:
                 -
                   uuid: 907502bbdeee45bbbfb84d43c2dc4f20
@@ -4319,6 +4796,13 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the fan unit'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 4b2a4eb4cb2a43758048cc05d63f37a4
                   expression: 'count(/Cisco IOS versions 12.0_3_T-12.2_3.5 SNMP/sensor.fan.status[ciscoEnvMonFanState.{#SNMPINDEX}],#1,"eq","{$FAN_WARN_STATUS:\"warning\"}")=1 or count(/Cisco IOS versions 12.0_3_T-12.2_3.5 SNMP/sensor.fan.status[ciscoEnvMonFanState.{#SNMPINDEX}],#1,"eq","{$FAN_WARN_STATUS:\"notFunctioning\"}")=1'
@@ -4330,6 +4814,13 @@ zabbix_export:
                     -
                       name: '{#SENSOR_INFO}: Fan is in critical state'
                       expression: 'count(/Cisco IOS versions 12.0_3_T-12.2_3.5 SNMP/sensor.fan.status[ciscoEnvMonFanState.{#SNMPINDEX}],#1,"eq","{$FAN_CRIT_STATUS:\"critical\"}")=1 or count(/Cisco IOS versions 12.0_3_T-12.2_3.5 SNMP/sensor.fan.status[ciscoEnvMonFanState.{#SNMPINDEX}],#1,"eq","{$FAN_CRIT_STATUS:\"shutdown\"}")=1'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 4831ae0d8acc47e7bb9c3a4a94678472
           name: 'Memory Discovery'
@@ -4355,8 +4846,8 @@ zabbix_export:
                 Reference: http://www.cisco.com/c/en/us/support/docs/ip/simple-network-management-protocol-snmp/15216-contiguous-memory.html
               tags:
                 -
-                  tag: Application
-                  value: Memory
+                  tag: component
+                  value: memory
             -
               uuid: 260d3d59256040fd808d5d4c6a549d07
               name: '{#SNMPVALUE}: Used memory'
@@ -4371,8 +4862,8 @@ zabbix_export:
                 Reference: http://www.cisco.com/c/en/us/support/docs/ip/simple-network-management-protocol-snmp/15216-contiguous-memory.html
               tags:
                 -
-                  tag: Application
-                  value: Memory
+                  tag: component
+                  value: memory
             -
               uuid: fb17d61634254c108d98ea28f5c5fb54
               name: '{#SNMPVALUE}: Memory utilization'
@@ -4385,8 +4876,8 @@ zabbix_export:
               description: 'Memory utilization in %'
               tags:
                 -
-                  tag: Application
-                  value: Memory
+                  tag: component
+                  value: memory
               trigger_prototypes:
                 -
                   uuid: 0f8d70ef5e704483a49d7b635e74dfc6
@@ -4394,6 +4885,13 @@ zabbix_export:
                   name: '{#SNMPVALUE}: High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
                   priority: AVERAGE
                   description: 'The system is running out of free memory.'
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: bf9a1faae91243b18133486b0421314b
@@ -4495,8 +4993,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: a2c7793712e549cbad6e37da30754b58
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -4515,8 +5019,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: a77450c8292a483b86e72156af6e7ec7
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -4540,8 +5050,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 33e86cf0c2374d0d932a8e3c9b6ebf1a
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -4564,8 +5080,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 6960110871dd40f89f344ab90cdb03f9
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -4584,8 +5106,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: fe427d3bbef7420880906cc52c07c706
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -4609,8 +5137,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: c03404b9c68749b3bef5de34a8815cce
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -4635,8 +5169,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: ec072a91a34244d5ba434f592e9cb72d
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -4658,8 +5198,14 @@ zabbix_export:
                 name: 'IF-MIB::ifOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: c99f0efcc30749e79cce0efe2fdd574f
@@ -4677,6 +5223,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 6dec04a0c0fc453ebc103e28daea731d
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -4700,8 +5250,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           trigger_prototypes:
             -
               uuid: 60809b6c94d74e34b5f29525d77c75b5
@@ -4731,6 +5287,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Cisco IOS versions 12.0_3_T-12.2_3.5 SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/Cisco IOS versions 12.0_3_T-12.2_3.5 SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/Cisco IOS versions 12.0_3_T-12.2_3.5 SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/Cisco IOS versions 12.0_3_T-12.2_3.5 SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 21d475be7fa24ba2b946e4ec31371df5
               expression: |
@@ -4751,6 +5311,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Cisco IOS versions 12.0_3_T-12.2_3.5 SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/Cisco IOS versions 12.0_3_T-12.2_3.5 SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/Cisco IOS versions 12.0_3_T-12.2_3.5 SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/Cisco IOS versions 12.0_3_T-12.2_3.5 SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 5a2bc4c9bf344948a52ce256daa1258e
               expression: |
@@ -4770,6 +5334,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Cisco IOS versions 12.0_3_T-12.2_3.5 SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/Cisco IOS versions 12.0_3_T-12.2_3.5 SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/Cisco IOS versions 12.0_3_T-12.2_3.5 SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/Cisco IOS versions 12.0_3_T-12.2_3.5 SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: fc6dd0ab86e7496d9b43103c13ba6a65
@@ -4839,8 +5410,8 @@ zabbix_export:
                 name: 'CISCO-ENVMON-MIB::CiscoEnvMonState'
               tags:
                 -
-                  tag: Application
-                  value: 'Power supply'
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: 7c5269ac98e847f28da8d3d97e52a28e
@@ -4849,6 +5420,13 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the power supply unit for errors'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 616059e289694181aea6a076ecb093c1
                   expression: 'count(/Cisco IOS versions 12.0_3_T-12.2_3.5 SNMP/sensor.psu.status[ciscoEnvMonSupplyState.{#SNMPINDEX}],#1,"eq","{$PSU_WARN_STATUS:\"warning\"}")=1 or count(/Cisco IOS versions 12.0_3_T-12.2_3.5 SNMP/sensor.psu.status[ciscoEnvMonSupplyState.{#SNMPINDEX}],#1,"eq","{$PSU_WARN_STATUS:\"notFunctioning\"}")=1'
@@ -4860,6 +5438,13 @@ zabbix_export:
                     -
                       name: '{#SENSOR_INFO}: Power supply is in critical state'
                       expression: 'count(/Cisco IOS versions 12.0_3_T-12.2_3.5 SNMP/sensor.psu.status[ciscoEnvMonSupplyState.{#SNMPINDEX}],#1,"eq","{$PSU_CRIT_STATUS:\"critical\"}")=1 or count(/Cisco IOS versions 12.0_3_T-12.2_3.5 SNMP/sensor.psu.status[ciscoEnvMonSupplyState.{#SNMPINDEX}],#1,"eq","{$PSU_CRIT_STATUS:\"shutdown\"}")=1'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: eb482b3a03b74dc494632be0728f953b
           name: 'Temperature Discovery'
@@ -4887,8 +5472,8 @@ zabbix_export:
                 name: 'CISCO-ENVMON-MIB::CiscoEnvMonState'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
             -
               uuid: 7c68ab13b881467e863b28776c0da571
               name: '{#SNMPVALUE}: Temperature'
@@ -4903,8 +5488,8 @@ zabbix_export:
                 The current measurement of the test point being instrumented.
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 67fad9e835f9466ab368bbdad6544e7e
@@ -4914,6 +5499,13 @@ zabbix_export:
                   name: '{#SNMPVALUE}: Temperature is too low: <{$TEMP_CRIT_LOW:"{#SNMPVALUE}"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
           trigger_prototypes:
             -
               uuid: f138f708723a4ca49b21cb992798da7f
@@ -4929,6 +5521,13 @@ zabbix_export:
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
               description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 281f7afca6ed4d3bb866430ec89e862e
               expression: |
@@ -4951,6 +5550,26 @@ zabbix_export:
                     or
                     last(/Cisco IOS versions 12.0_3_T-12.2_3.5 SNMP/sensor.temp.status[ciscoEnvMonTemperatureState.{#SNMPINDEX}])={$TEMP_DISASTER_STATUS}
                   recovery_expression: 'max(/Cisco IOS versions 12.0_3_T-12.2_3.5 SNMP/sensor.temp.value[ciscoEnvMonTemperatureValue.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"{#SNMPVALUE}"}-3'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: cisco
+        -
+          tag: target
+          value: cisco-ios
+        -
+          tag: target
+          value: cisco-ios-12.0-12.2
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
@@ -6055,8 +6674,8 @@ zabbix_export:
             Reference: http://www.cisco.com/c/en/us/support/docs/ip/simple-network-management-protocol-snmp/15215-collect-cpu-util-snmp.html
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
           triggers:
             -
               uuid: 0833b9a8f2ba4c009ca038cc409236d8
@@ -6065,6 +6684,10 @@ zabbix_export:
               opdata: 'Current utilization: {ITEM.LASTVALUE1}'
               priority: WARNING
               description: 'CPU utilization is too high. The system might be slow to respond.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/net/dell_force_s_series_snmp/template_net_dell_force_s_series_snmp.yaml b/templates/net/dell_force_s_series_snmp/template_net_dell_force_s_series_snmp.yaml
index f2113dd4a5a..47fb4e030b4 100644
--- a/templates/net/dell_force_s_series_snmp/template_net_dell_force_s_series_snmp.yaml
+++ b/templates/net/dell_force_s_series_snmp/template_net_dell_force_s_series_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:42:20Z'
+  date: '2022-01-26T09:52:42Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -34,8 +34,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: f186488b337f4b1b8971992e8118d9cc
@@ -43,6 +46,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: ef0432ffcf0546bf82177193866861cf
           name: 'ICMP loss'
@@ -53,8 +60,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 46798adec54c47a38cb599773767a2a7
@@ -66,6 +76,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/Dell Force S-Series SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 9b56a2a725bf4632bc28c6a5d0c3d64b
           name: 'ICMP response time'
@@ -76,8 +93,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 04828676081147b4bfad0ad03385986e
@@ -92,6 +112,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/Dell Force S-Series SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: ba8178338b0e41ac97b0265f98b90770
           name: 'SNMP traps (fallback)'
@@ -104,8 +131,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: d4df70f2c5f04ad2b7f1b4e8ab9a9993
           name: 'System contact details'
@@ -127,8 +154,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 804476e771374e22b8767f90f271654a
           name: 'System description'
@@ -151,8 +178,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: f3d1970fc4404b4fa50a855433681105
           name: 'System location'
@@ -174,8 +201,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: a36cccdaf24c4e82801ebb44eaa5e25a
           name: 'System name'
@@ -197,8 +224,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 2dc35c5813b042fd96f2ebc53f565799
@@ -207,6 +234,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: 651059497914431f827ad82a982e139b
           name: 'System object ID'
@@ -227,8 +261,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 26a0a117545f4b17986f0b48996fec47
           name: Uptime
@@ -249,8 +283,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 4246a064d33f428c8441491402ae8090
@@ -263,6 +297,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/Dell Force S-Series SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 7ce4f98cdc6741bbb03f6e2ea03432c4
           name: 'SNMP agent availability'
@@ -279,8 +317,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: da99689aa1394d17af5008e5678915bc
@@ -293,6 +334,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/Dell Force S-Series SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: f35cb754ebd748b7842c67461264f48d
@@ -318,8 +363,8 @@ zabbix_export:
                 name: 'F10-S-SERIES-CHASSIS-MIB::chSysFanTrayOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: Fans
+                  tag: component
+                  value: fan
               trigger_prototypes:
                 -
                   uuid: aecc6fdd58404347b3074b0c1db63f09
@@ -328,6 +373,13 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the fan unit'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: a53271304dcf418aa5afdaa145436b70
                   expression: 'count(/Dell Force S-Series SNMP/sensor.fan.status[chSysFanTrayOperStatus.{#SNMPINDEX}],#1,"ne","{$FAN_OK_STATUS}")=1'
@@ -339,6 +391,10 @@ zabbix_export:
                     -
                       name: 'Fan {#SNMPVALUE}: Fan is in critical state'
                       expression: 'count(/Dell Force S-Series SNMP/sensor.fan.status[chSysFanTrayOperStatus.{#SNMPINDEX}],#1,"eq","{$FAN_CRIT_STATUS}")=1'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
         -
           uuid: ff38ddf97a2a47c88ad93d590dedc22a
           name: 'CPU and Memory and Flash Discovery'
@@ -361,8 +417,8 @@ zabbix_export:
                 CPU utilization in percentage for last 1 minute.
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
               trigger_prototypes:
                 -
                   uuid: 002c0f19cfe54fe08da2183654752470
@@ -371,6 +427,10 @@ zabbix_export:
                   opdata: 'Current utilization: {ITEM.LASTVALUE1}'
                   priority: WARNING
                   description: 'CPU utilization is too high. The system might be slow to respond.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 3571d6508f07442983936fdcc2ba733f
               name: '#{#SNMPINDEX}: Memory utilization'
@@ -385,8 +445,8 @@ zabbix_export:
                 Total memory usage in percentage.
               tags:
                 -
-                  tag: Application
-                  value: Memory
+                  tag: component
+                  value: memory
               trigger_prototypes:
                 -
                   uuid: 41baaaa2eb6246b7982ac76928fbd0f8
@@ -394,6 +454,13 @@ zabbix_export:
                   name: '#{#SNMPINDEX}: High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
                   priority: AVERAGE
                   description: 'The system is running out of free memory.'
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: d5ec0b9ce1f04b0abd0b4bfe6aa28f6b
@@ -507,8 +574,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 5a61f0168e034e8baf6794cf5cc5ce70
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -527,8 +600,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 19e183dbf814471e885f2fef4b84e759
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -552,8 +631,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 26135962ebd246ce82b3d101e7eb92a4
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -576,8 +661,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: e3b1efbafa204424b0a61cf877ad168b
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -596,8 +687,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 6994853a31054989b1e0fc25420f88b1
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -621,8 +718,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: cd36f7b9176349d1a5b69c7eef672986
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -647,8 +750,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: cf571531ada84121a94e1084070560c0
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -670,8 +779,14 @@ zabbix_export:
                 name: 'IF-MIB::ifOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: b7b55335f42b4ace8434588bc70f7e60
@@ -689,6 +804,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: ec1b53ae24ff443083ab691e1826734f
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -712,8 +831,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           trigger_prototypes:
             -
               uuid: f4903edf173f470482174ee9937cbb32
@@ -743,6 +868,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Dell Force S-Series SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/Dell Force S-Series SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/Dell Force S-Series SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/Dell Force S-Series SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: e85a287c2e0e48e19cb43bf74d3f3535
               expression: |
@@ -763,6 +892,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Dell Force S-Series SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/Dell Force S-Series SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/Dell Force S-Series SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/Dell Force S-Series SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 00d2988bdd084719ba781562920d20fa
               expression: |
@@ -782,6 +915,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Dell Force S-Series SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/Dell Force S-Series SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/Dell Force S-Series SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/Dell Force S-Series SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: 2841f46964a74c56b5d16233c924bc58
@@ -885,8 +1025,14 @@ zabbix_export:
                 name: 'EtherLike-MIB::dot3StatsDuplexStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: edc143c44b2d465cac94c4cf0fb588a6
@@ -895,6 +1041,10 @@ zabbix_export:
                   priority: WARNING
                   description: 'Please check autonegotiation settings and cabling'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           preprocessing:
             -
               type: JAVASCRIPT
@@ -938,8 +1088,8 @@ zabbix_export:
                 name: 'F10-S-SERIES-CHASSIS-MIB::chSysPowerSupplyOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Power supply'
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: 764f08ab7a29481fa73a63ae256ff154
@@ -948,6 +1098,13 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the power supply unit for errors'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: a7d4ac882ec24cce9839c6012c7fa562
                   expression: 'count(/Dell Force S-Series SNMP/sensor.psu.status[chSysPowerSupplyOperStatus.{#SNMPINDEX}],#1,"ne","{$PSU_OK_STATUS}")=1'
@@ -959,6 +1116,10 @@ zabbix_export:
                     -
                       name: 'PSU {#SNMPVALUE}: Power supply is in critical state'
                       expression: 'count(/Dell Force S-Series SNMP/sensor.psu.status[chSysPowerSupplyOperStatus.{#SNMPINDEX}],#1,"eq","{$PSU_CRIT_STATUS}")=1'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
         -
           uuid: a619474b839642f69e583a2c63e8b4ba
           name: 'Stack Unit Discovery'
@@ -981,8 +1142,8 @@ zabbix_export:
                 The temperature of the unit.
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: dc1064de6a6b4533be812e590b96927b
@@ -993,6 +1154,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: f4d0a2c0b1a9468990e1f6dbfef1ab75
                   expression: 'avg(/Dell Force S-Series SNMP/sensor.temp.value[chStackUnitTemp.{#SNMPINDEX}],5m)>{$TEMP_WARN:""}'
@@ -1007,6 +1175,13 @@ zabbix_export:
                       name: 'Device {#SNMPVALUE}: Temperature is above critical threshold: >{$TEMP_CRIT:""}'
                       expression: 'avg(/Dell Force S-Series SNMP/sensor.temp.value[chStackUnitTemp.{#SNMPINDEX}],5m)>{$TEMP_CRIT:""}'
                       recovery_expression: 'max(/Dell Force S-Series SNMP/sensor.temp.value[chStackUnitTemp.{#SNMPINDEX}],5m)<{$TEMP_CRIT:""}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: f1bbf02af05041ef95ff80ff18fc02a7
                   expression: 'avg(/Dell Force S-Series SNMP/sensor.temp.value[chStackUnitTemp.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:""}'
@@ -1015,6 +1190,13 @@ zabbix_export:
                   name: 'Device {#SNMPVALUE}: Temperature is too low: <{$TEMP_CRIT_LOW:""}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: d6e3d7bb74b84e0c895a1b1b740f0e14
               name: '#{#SNMPVALUE}: Hardware model name'
@@ -1035,8 +1217,8 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: Inventory
+                  tag: component
+                  value: system
             -
               uuid: eb6853c30dd04581b2e362d7747b40b5
               name: '#{#SNMPVALUE}: Hardware serial number'
@@ -1057,8 +1239,8 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: Inventory
+                  tag: component
+                  value: system
               trigger_prototypes:
                 -
                   uuid: 6f02e903dab24bf294015f43e0b52504
@@ -1067,6 +1249,10 @@ zabbix_export:
                   priority: INFO
                   description: 'Device serial number has changed. Ack to close'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: bd68fcd8247744cb8c10e3dfc699bc7f
               name: '#{#SNMPVALUE}: Hardware version(revision)'
@@ -1087,8 +1273,8 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: Inventory
+                  tag: component
+                  value: system
             -
               uuid: 67cce945315e426f9b12456fe95a6c1a
               name: '#{#SNMPVALUE}: Operating system'
@@ -1109,8 +1295,8 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: Inventory
+                  tag: component
+                  value: os
               trigger_prototypes:
                 -
                   uuid: 66049aa1d7cb45ebac1fe5292c309ba2
@@ -1123,6 +1309,20 @@ zabbix_export:
                     -
                       name: 'System name has changed (new name: {ITEM.VALUE})'
                       expression: 'last(/Dell Force S-Series SNMP/system.name,#1)<>last(/Dell Force S-Series SNMP/system.name,#2) and length(last(/Dell Force S-Series SNMP/system.name))>0'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: dell
+        -
+          tag: target
+          value: force-s-series
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
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 697f325c16f..bc9c52f33f4 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.0'
-  date: '2022-01-18T20:42:25Z'
+  date: '2022-01-26T09:47:21Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -14,12 +14,13 @@ zabbix_export:
         Template D-Link DES 7200
         
         MIBs used:
+        ENTITY-MIBdescription has changed
+        IF-MIB
         MY-PROCESS-MIB
         SNMPv2-MIB
         MY-MEMORY-MIB
         ENTITY-MIB
         MY-SYSTEM-MIB
-        IF-MIB
         
         Template tooling version used: 0.41
       groups:
@@ -36,8 +37,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: a568e0a3c0074e6dbad92890067976f3
@@ -45,6 +49,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: d18c1a0dbab64f238e82025d2c27b392
           name: 'ICMP loss'
@@ -55,8 +63,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 12dea4dbaa3c4ef1a53456090ae3eb0e
@@ -68,6 +79,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/D-Link DES 7200 SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 117fec4f68ad4782a0b0407bc465a31b
           name: 'ICMP response time'
@@ -78,8 +96,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 88f2c517c1ba4f7881491a4b2b7f7ad0
@@ -94,6 +115,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/D-Link DES 7200 SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 2a3acf94555d457d8837c6e75abbbf34
           name: 'SNMP traps (fallback)'
@@ -106,8 +134,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: aba1f89a56504dde9d0d6a60bafa9552
           name: 'System contact details'
@@ -129,8 +157,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: ec0e7cc71b39447087f580569559a6d6
           name: 'CPU utilization'
@@ -145,8 +173,8 @@ zabbix_export:
             CPU utilization in %
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
           triggers:
             -
               uuid: 6e12ba6b60b94ec6bf531b4bb234dc80
@@ -155,6 +183,10 @@ zabbix_export:
               opdata: 'Current utilization: {ITEM.LASTVALUE1}'
               priority: WARNING
               description: 'CPU utilization is too high. The system might be slow to respond.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 26752257ad0f4bc58f678c247524c4cc
           name: 'System description'
@@ -177,8 +209,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: c48928c7392d472d950804ee30936f0f
           name: 'Firmware version'
@@ -189,7 +221,7 @@ zabbix_export:
           history: 2w
           trends: '0'
           value_type: CHAR
-          description: 'MIB: ENTITY-MIB'
+          description: 'MIB: ENTITY-MIBdescription has changed'
           preprocessing:
             -
               type: DISCARD_UNCHANGED_HEARTBEAT
@@ -197,8 +229,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 7d8f92f3c5df4b5091f49e07e50fae44
@@ -208,6 +240,10 @@ zabbix_export:
               priority: INFO
               description: 'Firmware version has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 9461071bb9fa44909aa181779c894a7b
           name: 'Hardware model name'
@@ -231,8 +267,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
         -
           uuid: fd86860f9ebc42b1970a845b7940daed
           name: 'Hardware version(revision)'
@@ -251,8 +287,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
         -
           uuid: 64e931125c274e788b2f68dcb21725d8
           name: 'System location'
@@ -274,8 +310,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: fcf0be13144245568817543cfc47c006
           name: 'System name'
@@ -297,8 +333,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 0c7a629e028e489c89647bf3ca51850e
@@ -307,6 +343,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: f50184058d4549a1be9bae19c0743a84
           name: 'System object ID'
@@ -327,8 +370,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 8d31f35a9d8842f086a123014bfd27ad
           name: 'Operating system'
@@ -348,8 +391,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: os
           triggers:
             -
               uuid: 01ca34ebe7a94ed3b3e5ee8320ebce73
@@ -362,6 +405,10 @@ zabbix_export:
                 -
                   name: 'System name has changed (new name: {ITEM.VALUE})'
                   expression: 'last(/D-Link DES 7200 SNMP/system.name,#1)<>last(/D-Link DES 7200 SNMP/system.name,#2) and length(last(/D-Link DES 7200 SNMP/system.name))>0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: fb250daeb7e643f4b2f78ede9e26b8ec
           name: Uptime
@@ -382,8 +429,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 6b200163bfcd4899a82bcf98aa026aa2
@@ -396,6 +443,10 @@ zabbix_export:
                 -
                   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'
@@ -412,8 +463,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: dc5b0dda2d684665a5444e39db5e2257
@@ -426,6 +480,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/D-Link DES 7200 SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: 5e0940a9219c4d3094c85777e89c63a6
@@ -449,8 +507,8 @@ zabbix_export:
                 name: 'MY-SYSTEM-MIB::mySystemFanIsNormal'
               tags:
                 -
-                  tag: Application
-                  value: Fans
+                  tag: component
+                  value: fan
               trigger_prototypes:
                 -
                   uuid: a5cb052573394829877fdc6bf3d501c0
@@ -459,6 +517,13 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the fan unit'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 80a71c76148f4408993f4d2fba2aac4c
           name: 'Memory Discovery'
@@ -481,8 +546,8 @@ zabbix_export:
                 This is the memory pool utilization currently.
               tags:
                 -
-                  tag: Application
-                  value: Memory
+                  tag: component
+                  value: memory
               trigger_prototypes:
                 -
                   uuid: fd484f9b3a6a414fb2bba47d5804cc62
@@ -490,6 +555,13 @@ zabbix_export:
                   name: '{#SNMPINDEX}: High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
                   priority: AVERAGE
                   description: 'The system is running out of free memory.'
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: b1d8dafbce0c4b6abc0ad18f2a91d1e3
@@ -591,8 +663,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: afc0471bfc314108b01544fac5acd62e
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -611,8 +689,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: ad7d24d91cb94c44849ecb6452f8015d
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -636,8 +720,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 42fd86abfb7542ef98d1aa38a2b2296a
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -660,8 +750,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 85c4804fcef04f8d8dc5d85c0e304144
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -680,8 +776,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 663d3019261746c8893449dbc68facca
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -705,8 +807,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: aa85e35f21e2466798b15f98ac95837c
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -731,8 +839,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: bca43e91bec842b6b0c29b9ce55eb1a2
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -754,8 +868,14 @@ zabbix_export:
                 name: 'IF-MIB::ifOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 8d5d2b10f5c541d9858b124ca3ea23aa
@@ -773,6 +893,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: fb1305c657c34021adbc6e260d880495
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -796,8 +920,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           trigger_prototypes:
             -
               uuid: 04d35a5ff5d34caf91f354b76677f78e
@@ -827,6 +957,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/D-Link DES 7200 SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/D-Link DES 7200 SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/D-Link DES 7200 SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/D-Link DES 7200 SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 76191d56356c4f389e3b7ca182ac28b2
               expression: |
@@ -847,6 +981,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/D-Link DES 7200 SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/D-Link DES 7200 SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/D-Link DES 7200 SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/D-Link DES 7200 SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: d9f6f23364c54fd1984fe049a4fc16e4
               expression: |
@@ -866,6 +1004,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/D-Link DES 7200 SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/D-Link DES 7200 SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/D-Link DES 7200 SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/D-Link DES 7200 SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: 688599e428b04777be52f49a860d8ba6
@@ -934,8 +1079,8 @@ zabbix_export:
                 name: 'MY-SYSTEM-MIB::mySystemFanIsNormal'
               tags:
                 -
-                  tag: Application
-                  value: 'Power supply'
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: 4cc6f58430374fc4b2f1bced4e2097f6
@@ -944,6 +1089,13 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the power supply unit for errors'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: d596adf697c1431cbe1244fe2737ca55
           name: 'Temperature Discovery'
@@ -966,8 +1118,8 @@ zabbix_export:
                 Return the current temperature of the FastSwitch.The temperature display is not supported for the current temperature returns to 0.
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: b675df20392d458f9a53dace6bde978a
@@ -978,6 +1130,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 8486ed430ee24b13b65786e5b4857684
                   expression: 'avg(/D-Link DES 7200 SNMP/sensor.temp.value[mySystemTemperatureCurrent.{#SNMPINDEX}],5m)>{$TEMP_WARN:""}'
@@ -992,6 +1151,13 @@ zabbix_export:
                       name: '{#SNMPVALUE}: Temperature is above critical threshold: >{$TEMP_CRIT:""}'
                       expression: 'avg(/D-Link DES 7200 SNMP/sensor.temp.value[mySystemTemperatureCurrent.{#SNMPINDEX}],5m)>{$TEMP_CRIT:""}'
                       recovery_expression: 'max(/D-Link DES 7200 SNMP/sensor.temp.value[mySystemTemperatureCurrent.{#SNMPINDEX}],5m)<{$TEMP_CRIT:""}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: ef5a9113e96d4cc095d384cbeeef9bc5
                   expression: 'avg(/D-Link DES 7200 SNMP/sensor.temp.value[mySystemTemperatureCurrent.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:""}'
@@ -1000,6 +1166,23 @@ zabbix_export:
                   name: '{#SNMPVALUE}: Temperature is too low: <{$TEMP_CRIT_LOW:""}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: des7200
+        -
+          tag: target
+          value: dlink
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/net/dlink_des_snmp/template_net_dlink_des_snmp.yaml b/templates/net/dlink_des_snmp/template_net_dlink_des_snmp.yaml
index a493058e1de..b17f7b748c3 100644
--- a/templates/net/dlink_des_snmp/template_net_dlink_des_snmp.yaml
+++ b/templates/net/dlink_des_snmp/template_net_dlink_des_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:42:30Z'
+  date: '2022-01-26T10:22:23Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -42,8 +42,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 5d134da7ad044ab591e1b96e1dca1641
@@ -51,6 +54,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 1c2d54095100404c8e03b179f5df1761
           name: 'ICMP loss'
@@ -61,8 +68,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 9c48d97b5d4a4668ad382e1d0d9c8e87
@@ -74,6 +84,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/D-Link DES_DGS Switch SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 3f66e84f94254655add99a1152225df7
           name: 'ICMP response time'
@@ -84,8 +101,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 3959884457a7420a9a9007c550d9b886
@@ -100,6 +120,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/D-Link DES_DGS Switch SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: c7c836a53c134dcda931ef9dba401f35
           name: 'SNMP traps (fallback)'
@@ -112,8 +139,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: 29ee9181892b49a081299688f8c47798
           name: 'System contact details'
@@ -135,8 +162,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 9d265ce34e9344c6875497e7ed0ebc89
           name: 'CPU utilization'
@@ -151,8 +178,8 @@ zabbix_export:
             The unit of time is 1 minute. The value will be between 0% (idle) and 100%(very busy).
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
           triggers:
             -
               uuid: 621c4933fd9c4b78aae1eedada7ffedf
@@ -161,6 +188,10 @@ zabbix_export:
               opdata: 'Current utilization: {ITEM.LASTVALUE1}'
               priority: WARNING
               description: 'CPU utilization is too high. The system might be slow to respond.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 188e1d65459f40a48c3bc0f444024a00
           name: 'System description'
@@ -183,8 +214,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 8e6d4c6568c54aeeb745c5ba43945174
           name: 'Firmware version'
@@ -203,8 +234,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 40a2ad291ded4bf9bc72adc2b8653b98
@@ -214,6 +245,10 @@ zabbix_export:
               priority: INFO
               description: 'Firmware version has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: cc6cdf26ee0f4c5682c956c0ac741898
           name: 'Hardware model name'
@@ -237,8 +272,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
         -
           uuid: 3dd0e86421b5410f9c34680650a0d9a5
           name: 'Hardware serial number'
@@ -260,8 +295,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 3aa2e47f4b8145b8a5e4f67b0987ca2b
@@ -270,6 +305,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 06e2bd7f602140f49685ae8dbfa44660
           name: 'Hardware version(revision)'
@@ -288,8 +327,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
         -
           uuid: 22473cfba211477ab8fbbb52c814de0d
           name: 'System location'
@@ -311,8 +350,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 38d68b0f6cd4445b966ead7e7301ae86
           name: 'System name'
@@ -334,8 +373,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 91e1a9f579c64954a89b6efbf6b523dd
@@ -344,6 +383,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: 5697ce18530b44f5a7e342344ecfe89a
           name: 'System object ID'
@@ -364,8 +410,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 5ca0653d792d42d1aebba51b36d5cf31
           name: Uptime
@@ -386,8 +432,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 7a51877b860a479da9bc9f02ee36e01f
@@ -400,6 +446,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/D-Link DES_DGS Switch SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 459f95874d194c7da40752f0336034be
           name: 'SNMP agent availability'
@@ -416,8 +466,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 2b56c7cfef454441863d2f7cc01a330f
@@ -430,6 +483,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/D-Link DES_DGS Switch SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: 8e7fe508f2ee4304a6097cabaf93b44f
@@ -466,8 +523,8 @@ zabbix_export:
                 name: 'EQUIPMENT-MIB::swFanStatus'
               tags:
                 -
-                  tag: Application
-                  value: Fans
+                  tag: component
+                  value: fan
               trigger_prototypes:
                 -
                   uuid: e8cb2d8bc3ee44c58c5111d3ead41d1b
@@ -476,6 +533,13 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the fan unit'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 0e1d87089c084979ade1f58cdedd42f8
           name: 'Memory Discovery'
@@ -498,8 +562,8 @@ zabbix_export:
                 The percentage of used DRAM memory of the total DRAM memory available.The value will be between 0%(idle) and 100%(very busy)
               tags:
                 -
-                  tag: Application
-                  value: Memory
+                  tag: component
+                  value: memory
               trigger_prototypes:
                 -
                   uuid: 29352d2cb80f47d98ca6c6d6d366a29f
@@ -507,6 +571,13 @@ zabbix_export:
                   name: '#{#SNMPVALUE}: High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
                   priority: AVERAGE
                   description: 'The system is running out of free memory.'
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 769bb6f6d6cd455fbbcd1e75e44d24ec
@@ -608,8 +679,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 05ac64b0b74e4e048bbf86c077f23d40
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -628,8 +705,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: b80ca5f6547b42cba3b873fe58448988
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -653,8 +736,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: b2eafe0414924c82879bf9f389e7936f
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -677,8 +766,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 151f1946a56d4ce7b7fe30d2e92f97ef
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -697,8 +792,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: e9ff8b57e89c4dc787f35ea8dd9c3040
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -722,8 +823,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: fd5324614a554b20bead9a9300c3b800
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -748,8 +855,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: b3f4568fbaed497aaf2ebcbfc1a385a6
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -771,8 +884,14 @@ zabbix_export:
                 name: 'IF-MIB::ifOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 6a8f2b5cd5ec4b8a9e5d35f551a756e0
@@ -790,6 +909,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 2c8eadb9d69f4adb833f01bed8e18531
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -813,8 +936,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           trigger_prototypes:
             -
               uuid: e645a0cf5e4f47a5af03f0108070d4e4
@@ -844,6 +973,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/D-Link DES_DGS Switch SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/D-Link DES_DGS Switch SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/D-Link DES_DGS Switch SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/D-Link DES_DGS Switch SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 8afaa3fc79404673880795d7d7dbabd8
               expression: |
@@ -864,6 +997,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/D-Link DES_DGS Switch SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/D-Link DES_DGS Switch SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/D-Link DES_DGS Switch SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/D-Link DES_DGS Switch SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 28ae5085f4ab432ea281658f1439ada1
               expression: |
@@ -883,6 +1020,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/D-Link DES_DGS Switch SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/D-Link DES_DGS Switch SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/D-Link DES_DGS Switch SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/D-Link DES_DGS Switch SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: 5742d0a3c579424e951c8b48f626fe4e
@@ -986,8 +1130,14 @@ zabbix_export:
                 name: 'EtherLike-MIB::dot3StatsDuplexStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: d68607dce04f429ab8cd7e8adb5b60f1
@@ -996,6 +1146,10 @@ zabbix_export:
                   priority: WARNING
                   description: 'Please check autonegotiation settings and cabling'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           preprocessing:
             -
               type: JAVASCRIPT
@@ -1051,8 +1205,8 @@ zabbix_export:
                 name: 'EQUIPMENT-MIB::swPowerStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Power supply'
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: aabaa197e62649cd929353f131c3fa00
@@ -1061,6 +1215,13 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the power supply unit for errors'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 17702e5430f943fc9ebeefdbdd363e58
           name: 'Temperature Discovery'
@@ -1083,8 +1244,8 @@ zabbix_export:
                 The shelf current temperature.
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 0cbd0c61e07245af863a19f296f38195
@@ -1095,6 +1256,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: bc0c87dbf83e49dab264e9f2bf1bb418
                   expression: 'avg(/D-Link DES_DGS Switch SNMP/sensor.temp.value[swTemperatureCurrent.{#SNMPINDEX}],5m)>{$TEMP_WARN:""}'
@@ -1109,6 +1277,13 @@ zabbix_export:
                       name: '#{#SNMPVALUE}: Temperature is above critical threshold: >{$TEMP_CRIT:""}'
                       expression: 'avg(/D-Link DES_DGS Switch SNMP/sensor.temp.value[swTemperatureCurrent.{#SNMPINDEX}],5m)>{$TEMP_CRIT:""}'
                       recovery_expression: 'max(/D-Link DES_DGS Switch SNMP/sensor.temp.value[swTemperatureCurrent.{#SNMPINDEX}],5m)<{$TEMP_CRIT:""}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 8d93aea3774d4a3bbd98127273c648d1
                   expression: 'avg(/D-Link DES_DGS Switch SNMP/sensor.temp.value[swTemperatureCurrent.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:""}'
@@ -1117,6 +1292,23 @@ zabbix_export:
                   name: '#{#SNMPVALUE}: Temperature is too low: <{$TEMP_CRIT_LOW:""}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: des-dgs
+        -
+          tag: target
+          value: dlink
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/net/extreme_snmp/template_net_extreme_snmp.yaml b/templates/net/extreme_snmp/template_net_extreme_snmp.yaml
index bf59aefd59a..d05b353850a 100644
--- a/templates/net/extreme_snmp/template_net_extreme_snmp.yaml
+++ b/templates/net/extreme_snmp/template_net_extreme_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:42:34Z'
+  date: '2022-01-26T09:43:53Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -36,8 +36,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 445766fc99c1480eac4d3d403c3ede2b
@@ -45,6 +48,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: bd39116401f249008d21e4109a34c6c7
           name: 'ICMP loss'
@@ -55,8 +62,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: fb0abe322fd644b4bb3c1255d564bb47
@@ -68,6 +78,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/Extreme EXOS SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: c59f57d99c7045b6920e26c8c1b58e52
           name: 'ICMP response time'
@@ -78,8 +95,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: d29defd9360c489a892821989eeda10c
@@ -94,6 +114,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/Extreme EXOS SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: b17bfccc91f1489fb9f85d719ca19d70
           name: 'Device: Temperature status'
@@ -110,8 +137,8 @@ zabbix_export:
             name: 'EXTREME-SYSTEM-MIB::extremeOverTemperatureAlarm'
           tags:
             -
-              tag: Application
-              value: Temperature
+              tag: component
+              value: temperature
         -
           uuid: 2e8384090e304767bc6bba60d822e223
           name: 'Device: Temperature'
@@ -127,8 +154,8 @@ zabbix_export:
             Reference: https://gtacknowledge.extremenetworks.com/articles/Q_A/Does-EXOS-support-temperature-polling-via-SNMP-on-all-nodes-in-a-stack
           tags:
             -
-              tag: Application
-              value: Temperature
+              tag: component
+              value: temperature
           triggers:
             -
               uuid: 54362c94be0243ffb907905def0ad06a
@@ -147,6 +174,13 @@ zabbix_export:
                     or
                     last(/Extreme EXOS SNMP/sensor.temp.status[extremeOverTemperatureAlarm.0])={$TEMP_CRIT_STATUS}
                   recovery_expression: 'max(/Extreme EXOS SNMP/sensor.temp.value[extremeCurrentTemperature.0],5m)<{$TEMP_CRIT:""}-3'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 91a10b28c7a14dd09110448a28a328f9
               expression: 'avg(/Extreme EXOS SNMP/sensor.temp.value[extremeCurrentTemperature.0],5m)<{$TEMP_CRIT_LOW:""}'
@@ -155,6 +189,13 @@ zabbix_export:
               name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:""}'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: da2bc25bb40642feaaff04b1cd5f85a0
           name: 'SNMP traps (fallback)'
@@ -167,8 +208,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: aa2eb0947ea34b2bbb739d6025d914ea
           name: 'System contact details'
@@ -190,8 +231,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: fd93c5fb3e054f84b052d7f682a87655
           name: 'CPU utilization'
@@ -206,8 +247,8 @@ zabbix_export:
             Total CPU utlization (percentage) as of last sampling.
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
           triggers:
             -
               uuid: a77bbfe0755f4901b67a7957805bc566
@@ -216,6 +257,10 @@ zabbix_export:
               opdata: 'Current utilization: {ITEM.LASTVALUE1}'
               priority: WARNING
               description: 'CPU utilization is too high. The system might be slow to respond.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: e23764de0cda451d959e73ca0ea211ae
           name: 'System description'
@@ -238,8 +283,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 7f6260a568644e89ba87ccca63102357
           name: 'Firmware version'
@@ -258,8 +303,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: dd9fbc501f9047fd8fae9dfd741e3778
@@ -269,6 +314,10 @@ zabbix_export:
               priority: INFO
               description: 'Firmware version has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 42ec93c3013d428c9f72fe721ea46db5
           name: 'Hardware model name'
@@ -288,8 +337,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
         -
           uuid: 93882ec52eed40778858e52dc7153093
           name: 'Hardware serial number'
@@ -309,8 +358,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: db1760a34c884b1aa36e4fc4639791dd
@@ -319,6 +368,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 8ec263e1593e48d18b3e50f215e94196
           name: 'Hardware version(revision)'
@@ -337,8 +390,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
         -
           uuid: d8c7f5611f544299a95eedc0c80cedb5
           name: 'System location'
@@ -360,8 +413,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 7345ee5a5db545a9a5bb90ab5626a2aa
           name: 'System name'
@@ -383,8 +436,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 2923c342e8474e3ea3d7411c104a6988
@@ -393,6 +446,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: 041115a5c3f44c8c9a9e1e0c7bc7203e
           name: 'System object ID'
@@ -413,8 +473,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 0ba6360ecf4c4487a249e3efabca2e0c
           name: 'Operating system'
@@ -438,8 +498,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: os
           triggers:
             -
               uuid: af6a823b8f2d4fddae970828d0a3a9c9
@@ -452,6 +512,10 @@ zabbix_export:
                 -
                   name: 'System name has changed (new name: {ITEM.VALUE})'
                   expression: 'last(/Extreme EXOS SNMP/system.name,#1)<>last(/Extreme EXOS SNMP/system.name,#2) and length(last(/Extreme EXOS SNMP/system.name))>0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 92f8e91c4d2c423984cb14440bc83328
           name: Uptime
@@ -472,8 +536,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: bb967f81aaad4a00ae7916ea80574ae0
@@ -486,6 +550,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/Extreme EXOS SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 62a022d402c24da29c1aa7cb0eb64244
           name: 'SNMP agent availability'
@@ -502,8 +570,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: ecc42656a3d845ee8ad42d0fe45319c2
@@ -516,6 +587,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/Extreme EXOS SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: 1ed41878ed4a455c8a3871169225b8f6
@@ -537,8 +612,8 @@ zabbix_export:
                 The speed (RPM) of a cooling fan in the fantray {#SNMPVALUE}
               tags:
                 -
-                  tag: Application
-                  value: Fans
+                  tag: component
+                  value: fan
             -
               uuid: 601afb1fdc4744b29c2e52a260ccecfd
               name: 'Fan {#SNMPVALUE}: Fan status'
@@ -555,8 +630,8 @@ zabbix_export:
                 name: 'EXTREME-SYSTEM-MIB::extremeFanOperational'
               tags:
                 -
-                  tag: Application
-                  value: Fans
+                  tag: component
+                  value: fan
               trigger_prototypes:
                 -
                   uuid: bd0c753f33c441a0bf4567f8b81186d6
@@ -565,6 +640,13 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the fan unit'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 53af0f95ffe243c394c273a1bc2857a3
           name: 'Memory Discovery'
@@ -591,8 +673,8 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Memory
+                  tag: component
+                  value: memory
             -
               uuid: b22ba07a208d41788d0fb33074125ffd
               name: '#{#SNMPVALUE}: Total memory'
@@ -611,8 +693,8 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Memory
+                  tag: component
+                  value: memory
             -
               uuid: 830ec2341dc64980be35d87141a31b67
               name: '#{#SNMPVALUE}: Memory utilization'
@@ -625,8 +707,8 @@ zabbix_export:
               description: 'Memory utilization in %'
               tags:
                 -
-                  tag: Application
-                  value: Memory
+                  tag: component
+                  value: memory
               trigger_prototypes:
                 -
                   uuid: 50733fd8b4a641708e3a90292f182f20
@@ -634,6 +716,13 @@ zabbix_export:
                   name: '#{#SNMPVALUE}: High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
                   priority: AVERAGE
                   description: 'The system is running out of free memory.'
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 672315e9b8dc4858be7a991bed4f06fc
@@ -753,8 +842,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 26f5e3bec06048c598d76c47b3260813
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -773,8 +868,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 2ec7bfa7073e471bb2f7941bff97f2fd
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -798,8 +899,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 4dac28ac2be748d5a2bba7bf92550c2b
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -822,8 +929,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 2ed84c7b80eb4c94b02c91154f1f9736
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -842,8 +955,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: e40f4821891c45318a732b1aae222382
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -867,8 +986,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 5014332a57b8479fa0638f275e2e0992
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -893,8 +1018,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 058b94a177e646829c37a96c83829aa1
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -916,8 +1047,14 @@ zabbix_export:
                 name: 'IF-MIB::ifOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 706148cec9f24e81a96f44484d3829d3
@@ -935,6 +1072,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: e6e5a562e7ce418aaecff58b4aef7b3e
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -958,8 +1099,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           trigger_prototypes:
             -
               uuid: eb704d12b7ef450a85a805392adb2e6b
@@ -989,6 +1136,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Extreme EXOS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/Extreme EXOS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/Extreme EXOS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/Extreme EXOS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: f61f3c59c1aa488d9ef19a67d46fb5e8
               expression: |
@@ -1009,6 +1160,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Extreme EXOS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/Extreme EXOS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/Extreme EXOS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/Extreme EXOS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: ccf92f29e2564c0bbef6baf6daf93d86
               expression: |
@@ -1028,6 +1183,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Extreme EXOS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/Extreme EXOS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/Extreme EXOS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/Extreme EXOS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: 910004d1f3354f80bf57a36efc1b7156
@@ -1131,8 +1293,14 @@ zabbix_export:
                 name: 'EtherLike-MIB::dot3StatsDuplexStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: f82c0234ebbd4f2686ce97642f7bbcf8
@@ -1141,6 +1309,10 @@ zabbix_export:
                   priority: WARNING
                   description: 'Please check autonegotiation settings and cabling'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           preprocessing:
             -
               type: JAVASCRIPT
@@ -1184,8 +1356,8 @@ zabbix_export:
                 name: 'EXTREME-SYSTEM-MIB::extremePowerSupplyStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Power supply'
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: 710f1bf31381470f9a13c45f887bda4e
@@ -1194,6 +1366,23 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the power supply unit for errors'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: exos
+        -
+          tag: target
+          value: extreme
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
@@ -2277,6 +2466,13 @@ zabbix_export:
       opdata: 'Current value: {ITEM.LASTVALUE1}'
       priority: HIGH
       description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+      tags:
+        -
+          tag: scope
+          value: availability
+        -
+          tag: scope
+          value: performance
   graphs:
     -
       uuid: 9dc8bc10d4044889bd53c56f1da45c60
diff --git a/templates/net/f5_bigip_snmp/template_net_f5_bigip_snmp.yaml b/templates/net/f5_bigip_snmp/template_net_f5_bigip_snmp.yaml
index c25e5b22643..d48407b4b1f 100644
--- a/templates/net/f5_bigip_snmp/template_net_f5_bigip_snmp.yaml
+++ b/templates/net/f5_bigip_snmp/template_net_f5_bigip_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-10T07:56:32Z'
+  date: '2022-01-26T10:44:41Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -16,7 +16,7 @@ zabbix_export:
         F5-BIGIP-LOCAL-MIB
         F5-BIGIP-SYSTEM-MIB
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: 'Templates/Network devices'
@@ -44,8 +44,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
         -
           uuid: 0f7ecc11f860443582eb6dbe64b2bbb6
           name: 'F5 BIG-IP: Failover status'
@@ -65,8 +65,8 @@ zabbix_export:
             name: 'SNMP sysCmFailoverStatusId'
           tags:
             -
-              tag: Application
-              value: Cluster
+              tag: component
+              value: cluster
           triggers:
             -
               uuid: f93a7ff7cc614c0b84789f325ebb662b
@@ -75,6 +75,10 @@ zabbix_export:
               opdata: '{ITEM.LASTVALUE}'
               priority: WARNING
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 8ce387e2d78e42bfa6180b4b22096468
           name: 'F5 BIG-IP: Location'
@@ -97,8 +101,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
         -
           uuid: d9bf23e66ae347eb8f6f58867cdc3ca7
           name: 'F5 BIG-IP: Hardware model name'
@@ -125,8 +129,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
         -
           uuid: 97d896e7b8ed422caf9c4ebf053bb8d9
           name: 'F5 BIG-IP: Host name'
@@ -150,8 +154,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
         -
           uuid: 3d7299dcbfee4b4a8b39bbf8daa4a077
           name: 'F5 BIG-IP: Product build'
@@ -172,8 +176,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
         -
           uuid: 065a6b42397e40c3874cf4176bd0fa6b
           name: 'F5 BIG-IP: Product build date'
@@ -194,8 +198,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
         -
           uuid: 5b3c2a650f474a6da05262dc5b3634a9
           name: 'F5 BIG-IP: Product edition'
@@ -216,8 +220,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
         -
           uuid: dd91be3044a2465781af744dc45dd06f
           name: 'F5 BIG-IP: Product name'
@@ -238,8 +242,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
         -
           uuid: b670cf1b43d84b8784acfeaca1f01320
           name: 'F5 BIG-IP: Product version'
@@ -260,8 +264,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
         -
           uuid: a80409ff52bf4fe183a68ed257279db5
           name: 'F5 BIG-IP: Chassis serial number'
@@ -283,8 +287,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
           triggers:
             -
               uuid: 8a55167ddebb43f2ac8f6d028aef87c2
@@ -293,6 +297,10 @@ zabbix_export:
               priority: INFO
               description: 'Chassis serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 46bf5611d32340fdb9129966cca2c5da
           name: 'F5 BIG-IP: Sync Status'
@@ -317,8 +325,8 @@ zabbix_export:
             name: 'SNMP sysCmSyncStatusId'
           tags:
             -
-              tag: Application
-              value: Cluster
+              tag: component
+              value: cluster
           triggers:
             -
               uuid: 098fe258e8cc4216b0c1800913ba8e18
@@ -328,6 +336,10 @@ zabbix_export:
               priority: WARNING
               description: 'Changes have been made on the device not sync to the device group, requires user intervention'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: eb3517626c6d425f9b88a2bc35641ab6
               expression: 'last(/F5 Big-IP SNMP/bigip.syncstatus)=4'
@@ -336,6 +348,10 @@ zabbix_export:
               priority: WARNING
               description: 'The device is inconsistent with the device group, requires user intervention'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 78d6c13d575a41a8b160bd4e2c0bea7b
           name: 'F5 BIG-IP: TCP connections, CLOSE-WAIT/LAST-ACK'
@@ -348,8 +364,8 @@ zabbix_export:
             The number of current TCP connections in CLOSE-WAIT/LAST-ACK.
           tags:
             -
-              tag: Application
-              value: 'TCP/UDP stat'
+              tag: component
+              value: network
         -
           uuid: e28c1bfcd63e4a5c8394680886395669
           name: 'F5 BIG-IP: TCP connections, FIN-WAIT-1/CLOSING'
@@ -362,8 +378,8 @@ zabbix_export:
             The number of current TCP connections in FIN-WAIT-1/CLOSING.
           tags:
             -
-              tag: Application
-              value: 'TCP/UDP stat'
+              tag: component
+              value: network
         -
           uuid: 69576083e02c486998512c58ab2a6371
           name: 'F5 BIG-IP: TCP connections, FIN-WAIT-2'
@@ -376,8 +392,8 @@ zabbix_export:
             The number of current TCP connections in FIN-WAIT-2.
           tags:
             -
-              tag: Application
-              value: 'TCP/UDP stat'
+              tag: component
+              value: network
         -
           uuid: b58bae7e2e4f403ba7bce846ccf5228e
           name: 'F5 BIG-IP: Open TCP connections'
@@ -390,8 +406,8 @@ zabbix_export:
             The number of current open TCP connections.
           tags:
             -
-              tag: Application
-              value: 'TCP/UDP stat'
+              tag: component
+              value: network
         -
           uuid: bd3982fd369142878ffb9530656556e3
           name: 'F5 BIG-IP: TCP connections, TIME-WAIT'
@@ -404,8 +420,8 @@ zabbix_export:
             The number of current TCP connections in TIME-WAIT.
           tags:
             -
-              tag: Application
-              value: 'TCP/UDP stat'
+              tag: component
+              value: network
         -
           uuid: 843e855fb10f4cb0be81953dd8dbb87e
           name: 'F5 BIG-IP: Open UDP connections'
@@ -418,15 +434,16 @@ zabbix_export:
             The number of current open UDP connections.
           tags:
             -
-              tag: Application
-              value: 'TCP/UDP stat'
+              tag: component
+              value: network
         -
           uuid: efb83b0cb4864b249ecf61b2f81ec468
           name: 'F5 BIG-IP: Uptime'
           type: SNMP_AGENT
           snmp_oid: .1.3.6.1.4.1.3375.2.1.6.6.0
           key: bigip.uptime
-          history: 7d
+          delay: 30s
+          history: 2w
           trends: 0d
           units: uptime
           description: |
@@ -439,8 +456,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 551fd3b77d144ed58f138865e4862901
@@ -449,6 +466,10 @@ zabbix_export:
               priority: INFO
               description: 'Uptime is less than 10 minutes'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: c91416602a9c451ca0eb959073f65fb0
           name: 'F5 BIG-IP: SNMP agent availability'
@@ -464,8 +485,8 @@ zabbix_export:
                 - 1h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: network
           triggers:
             -
               uuid: 9ec4425af8dd4cf59dcb3146e6a8263c
@@ -474,6 +495,10 @@ zabbix_export:
               opdata: 'Current state: {ITEM.LASTVALUE1}'
               priority: WARNING
               description: 'SNMP is not available for polling. Please check device connectivity and SNMP settings.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: 9368bf7cbf0742e5af8e0b1200200a15
@@ -506,8 +531,11 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: sensor
+                -
+                  tag: component
+                  value: temperature
           graph_prototypes:
             -
               uuid: 1b43fb6913274a34ab6ad122d5db38ba
@@ -549,8 +577,11 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: Voltage
+                  tag: component
+                  value: sensor
+                -
+                  tag: component
+                  value: voltage
             -
               uuid: 1c0bf38bb0d3473cae285704ccd3ee0b
               name: 'F5 BIG-IP: Voltage [{#VOLT.INDEX}]: Value'
@@ -576,8 +607,11 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: Voltage
+                  tag: component
+                  value: sensor
+                -
+                  tag: component
+                  value: voltage
           graph_prototypes:
             -
               uuid: b5b1a26c3c9043d79eff63272c3e4b8d
@@ -617,8 +651,11 @@ zabbix_export:
                 The expiration date of the certificate in unix time.
               tags:
                 -
-                  tag: Application
-                  value: Security
+                  tag: certificate
+                  value: '{#CERT.NAME}'
+                -
+                  tag: component
+                  value: certificate
               trigger_prototypes:
                 -
                   uuid: 015ce3f5d10749aca1d871a1d26c51c5
@@ -627,6 +664,10 @@ zabbix_export:
                   opdata: 'Expires: {ITEM.VALUE}'
                   priority: WARNING
                   description: 'Please check certificate'
+                  tags:
+                    -
+                      tag: scope
+                      value: security
         -
           uuid: 1bab90f9f015432c817cabebb98453af
           name: 'Chassis fan discovery'
@@ -658,8 +699,11 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: Fans
+                  tag: component
+                  value: fan
+                -
+                  tag: component
+                  value: sensor
             -
               uuid: 13b1890ae83547d482c9130ea0ccf876
               name: 'F5 BIG-IP: FAN [{#FAN.INDEX}]: Status'
@@ -683,8 +727,11 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: Fans
+                  tag: component
+                  value: fan
+                -
+                  tag: component
+                  value: sensor
               trigger_prototypes:
                 -
                   uuid: 546745f6edf7470896d5bf251d760dfe
@@ -692,12 +739,20 @@ zabbix_export:
                   name: 'F5 BIG-IP: Fan[{#FAN.INDEX}] is in critical state'
                   priority: AVERAGE
                   description: 'Please check the fan unit'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: d20c56720aa54efba37f5fcdfdde0225
                   expression: 'last(/F5 Big-IP SNMP/bigip.chassis.fan.status[{#FAN.INDEX}])=2'
                   name: 'F5 BIG-IP: Fan[{#FAN.INDEX}] is not present'
                   priority: INFO
                   description: 'Please check the fan unit'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
           graph_prototypes:
             -
               uuid: f0a043ed6fb249e489f143350b681a63
@@ -745,8 +800,8 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Power supply'
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: 1e85cee65875477b85f74aedba6e86c9
@@ -754,12 +809,20 @@ zabbix_export:
                   name: 'F5 BIG-IP: Power supply [{#POWER.INDEX}] is in critical state'
                   priority: HIGH
                   description: 'Please check the power supply unit'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: 84469f28c4bf47f790a85b9f1f37cff0
                   expression: 'last(/F5 Big-IP SNMP/bigip.chassis.power.status[{#POWER.INDEX}])=2'
                   name: 'F5 BIG-IP: Power supply [{#POWER.INDEX}] is not present'
                   priority: INFO
                   description: 'Please check the power supply unit'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
           preprocessing:
             -
               type: DISCARD_UNCHANGED_HEARTBEAT
@@ -796,8 +859,11 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: sensor
+                -
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 452167aafe594e3faa3748e6dc470fb1
@@ -805,6 +871,10 @@ zabbix_export:
                   name: 'F5 BIG-IP: Chassis temperature ({ITEM.LASTVALUE}) of sensor {#TEMP.INDEX} exceeds threshold of {$BIGIP.TEMP.HIGH} °C'
                   opdata: '{ITEM.LASTVALUE}'
                   priority: HIGH
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: 00c0212fcb8049309bf0b3de2b2363b4
                   expression: 'last(/F5 Big-IP SNMP/bigip.chassis.temp.value[{#TEMP.INDEX}])>{$BIGIP.TEMP.WARN}'
@@ -815,6 +885,10 @@ zabbix_export:
                     -
                       name: 'F5 BIG-IP: Chassis temperature ({ITEM.LASTVALUE}) of sensor {#TEMP.INDEX} exceeds threshold of {$BIGIP.TEMP.HIGH} °C'
                       expression: 'last(/F5 Big-IP SNMP/bigip.chassis.temp.value[{#TEMP.INDEX}])>{$BIGIP.TEMP.HIGH}'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
           graph_prototypes:
             -
               uuid: ceea250c715948f3907290738451c328
@@ -853,8 +927,14 @@ zabbix_export:
                 The average time spent by the specified processor doing nothing for the associated host in the last one minute.
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
+                -
+                  tag: cpu-id
+                  value: '{#CPU.ID}'
+                -
+                  tag: host-id
+                  value: '{#HOST.ID}'
             -
               uuid: 12acd2da83b04353aca2bd3cff842c97
               name: 'F5 BIG-IP: Host [{#HOST.ID}] CPU{#CPU.ID}: Idle, avg 5m'
@@ -869,8 +949,14 @@ zabbix_export:
                 The average time spent by the specified processor doing nothing for the associated host in the last five minutes.
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
+                -
+                  tag: cpu-id
+                  value: '{#CPU.ID}'
+                -
+                  tag: host-id
+                  value: '{#HOST.ID}'
             -
               uuid: dd169e972fe041cca93020b8a942a4d2
               name: 'F5 BIG-IP: Host [{#HOST.ID}] CPU{#CPU.ID}: Idle, avg 5s'
@@ -885,8 +971,14 @@ zabbix_export:
                 The average time spent by the specified processor doing nothing for the associated host in the last five seconds.
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
+                -
+                  tag: cpu-id
+                  value: '{#CPU.ID}'
+                -
+                  tag: host-id
+                  value: '{#HOST.ID}'
             -
               uuid: 808a6933a1834291b80d0cb072dded09
               name: 'F5 BIG-IP: Host [{#HOST.ID}] CPU{#CPU.ID}: IO wait, avg 1m'
@@ -901,8 +993,14 @@ zabbix_export:
                 The average time spent by the specified processor waiting for external I/O to complete for the associated host in the last one minute.
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
+                -
+                  tag: cpu-id
+                  value: '{#CPU.ID}'
+                -
+                  tag: host-id
+                  value: '{#HOST.ID}'
             -
               uuid: 6144e3ca25ac4f998559b860d059c385
               name: 'F5 BIG-IP: Host [{#HOST.ID}] CPU{#CPU.ID}: IO wait, avg 5m'
@@ -917,8 +1015,14 @@ zabbix_export:
                 The average time spent by the specified processor waiting for external I/O to complete for the associated host in the last five minutes.
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
+                -
+                  tag: cpu-id
+                  value: '{#CPU.ID}'
+                -
+                  tag: host-id
+                  value: '{#HOST.ID}'
             -
               uuid: b4715714c727483fb3ca6004a829ac46
               name: 'F5 BIG-IP: Host [{#HOST.ID}] CPU{#CPU.ID}: IO wait, avg 5s'
@@ -933,8 +1037,14 @@ zabbix_export:
                 The average time spent by the specified processor waiting for external I/O to complete for the associated host in the last five seconds.
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
+                -
+                  tag: cpu-id
+                  value: '{#CPU.ID}'
+                -
+                  tag: host-id
+                  value: '{#HOST.ID}'
             -
               uuid: 9f0f6dabac314744809a60161592a89f
               name: 'F5 BIG-IP: Host [{#HOST.ID}] CPU{#CPU.ID}: IRQ, avg 1m'
@@ -949,8 +1059,14 @@ zabbix_export:
                 The average time spent by the specified processor servicing hardware interrupts for the associated host in the last one minute.
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
+                -
+                  tag: cpu-id
+                  value: '{#CPU.ID}'
+                -
+                  tag: host-id
+                  value: '{#HOST.ID}'
             -
               uuid: f3d8ac2412ee4f0b88f264e590e278cb
               name: 'F5 BIG-IP: Host [{#HOST.ID}] CPU{#CPU.ID}: IRQ, avg 5m'
@@ -965,8 +1081,14 @@ zabbix_export:
                 The average time spent by the specified processor servicing hardware interrupts for the associated host in the last five minutes.
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
+                -
+                  tag: cpu-id
+                  value: '{#CPU.ID}'
+                -
+                  tag: host-id
+                  value: '{#HOST.ID}'
             -
               uuid: 7bc53c5f9a7148759d426e8e5fd7f358
               name: 'F5 BIG-IP: Host [{#HOST.ID}] CPU{#CPU.ID}: IRQ, avg 5s'
@@ -981,8 +1103,14 @@ zabbix_export:
                 The average time spent by the specified processor servicing hardware interrupts for the associated host in the last five seconds.
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
+                -
+                  tag: cpu-id
+                  value: '{#CPU.ID}'
+                -
+                  tag: host-id
+                  value: '{#HOST.ID}'
             -
               uuid: b74f502d97f54041a4c129f5993e0967
               name: 'F5 BIG-IP: Host [{#HOST.ID}] CPU{#CPU.ID}: Nice, avg 1m'
@@ -997,8 +1125,14 @@ zabbix_export:
                 The average time spent by the specified processor running niced processes for the associated host in the last one minute.
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
+                -
+                  tag: cpu-id
+                  value: '{#CPU.ID}'
+                -
+                  tag: host-id
+                  value: '{#HOST.ID}'
             -
               uuid: bf51a4638db443a083ec19b934a6a915
               name: 'F5 BIG-IP: Host [{#HOST.ID}] CPU{#CPU.ID}: Nice, avg 5m'
@@ -1013,8 +1147,14 @@ zabbix_export:
                 The average time spent by the specified processor running niced processes for the associated host in the last five minutes.
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
+                -
+                  tag: cpu-id
+                  value: '{#CPU.ID}'
+                -
+                  tag: host-id
+                  value: '{#HOST.ID}'
             -
               uuid: 0046e43000b7477ea410970884829e5c
               name: 'F5 BIG-IP: Host [{#HOST.ID}] CPU{#CPU.ID}: Nice, avg 5s'
@@ -1029,8 +1169,14 @@ zabbix_export:
                 The average time spent by the specified processor running niced processes for the associated host in the last five seconds.
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
+                -
+                  tag: cpu-id
+                  value: '{#CPU.ID}'
+                -
+                  tag: host-id
+                  value: '{#HOST.ID}'
             -
               uuid: f2b1962e10b04dc28a124b91b7e9a235
               name: 'F5 BIG-IP: Host [{#HOST.ID}] CPU{#CPU.ID}: Soft IRQ, avg 1m'
@@ -1045,8 +1191,14 @@ zabbix_export:
                 The average time spent by the specified processor servicing soft interrupts for the associated host in the last one minute.
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
+                -
+                  tag: cpu-id
+                  value: '{#CPU.ID}'
+                -
+                  tag: host-id
+                  value: '{#HOST.ID}'
             -
               uuid: 56f459510e444326bba84ab12c4c232c
               name: 'F5 BIG-IP: Host [{#HOST.ID}] CPU{#CPU.ID}: Soft IRQ, avg 5m'
@@ -1061,8 +1213,14 @@ zabbix_export:
                 The average time spent by the specified processor servicing soft interrupts for the associated host in the last five minutes.
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
+                -
+                  tag: cpu-id
+                  value: '{#CPU.ID}'
+                -
+                  tag: host-id
+                  value: '{#HOST.ID}'
             -
               uuid: 8a6c086c524c4f5c93e66f9f453ed767
               name: 'F5 BIG-IP: Host [{#HOST.ID}] CPU{#CPU.ID}: Soft IRQ, avg 5s'
@@ -1077,8 +1235,14 @@ zabbix_export:
                 The average time spent by the specified processor servicing soft interrupts for the associated host in the last five seconds.
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
+                -
+                  tag: cpu-id
+                  value: '{#CPU.ID}'
+                -
+                  tag: host-id
+                  value: '{#HOST.ID}'
             -
               uuid: 62e59d3a63014976a6c052ef259dbbc1
               name: 'F5 BIG-IP: Host [{#HOST.ID}] CPU{#CPU.ID}: Stolen, avg 1m'
@@ -1093,8 +1257,14 @@ zabbix_export:
                 The average time 'stolen' from the specified processor for the associated host in the last one minute.
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
+                -
+                  tag: cpu-id
+                  value: '{#CPU.ID}'
+                -
+                  tag: host-id
+                  value: '{#HOST.ID}'
             -
               uuid: 757178b5d85041959609de5d38d93f20
               name: 'F5 BIG-IP: Host [{#HOST.ID}] CPU{#CPU.ID}: Stolen, avg 1s)'
@@ -1109,8 +1279,14 @@ zabbix_export:
                 The average time 'stolen' from the specified processor for the associated host in the last five seconds.
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
+                -
+                  tag: cpu-id
+                  value: '{#CPU.ID}'
+                -
+                  tag: host-id
+                  value: '{#HOST.ID}'
             -
               uuid: c229331551284955befbed59fedae445
               name: 'F5 BIG-IP: Host [{#HOST.ID}] CPU{#CPU.ID}: Stolen, avg 5m'
@@ -1125,8 +1301,14 @@ zabbix_export:
                 The average time 'stolen' from the specified processor for the associated host in the last five minutes.
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
+                -
+                  tag: cpu-id
+                  value: '{#CPU.ID}'
+                -
+                  tag: host-id
+                  value: '{#HOST.ID}'
             -
               uuid: 20a60cec7a50457a9c6c5a5e318b53e2
               name: 'F5 BIG-IP: Host [{#HOST.ID}] CPU{#CPU.ID}: System, avg 1m'
@@ -1141,8 +1323,14 @@ zabbix_export:
                 The average time spent by the specified processor servicing system calls for the associated host in the last one minute.
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
+                -
+                  tag: cpu-id
+                  value: '{#CPU.ID}'
+                -
+                  tag: host-id
+                  value: '{#HOST.ID}'
             -
               uuid: 9dc919dcc789473db23f989943f9a759
               name: 'F5 BIG-IP: Host [{#HOST.ID}] CPU{#CPU.ID}: System, avg 5m'
@@ -1157,8 +1345,14 @@ zabbix_export:
                 The average time spent by the specified processor servicing system calls for the associated host in the last five minutes.
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
+                -
+                  tag: cpu-id
+                  value: '{#CPU.ID}'
+                -
+                  tag: host-id
+                  value: '{#HOST.ID}'
             -
               uuid: 8b1bd4e936c149cfa44d8cf5d88bee4b
               name: 'F5 BIG-IP: Host [{#HOST.ID}] CPU{#CPU.ID}: System, avg 5s'
@@ -1173,8 +1367,14 @@ zabbix_export:
                 The average time spent by the specified processor servicing system calls for the associated host in the last five seconds.
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
+                -
+                  tag: cpu-id
+                  value: '{#CPU.ID}'
+                -
+                  tag: host-id
+                  value: '{#HOST.ID}'
             -
               uuid: e8f3b63e951d4de0b845647bcdd1524f
               name: 'F5 BIG-IP: Host [{#HOST.ID}] CPU{#CPU.ID}: Usage ratio, avg 1m'
@@ -1198,8 +1398,14 @@ zabbix_export:
                 iowait:sysMultiHostCpuIowait1m
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
+                -
+                  tag: cpu-id
+                  value: '{#CPU.ID}'
+                -
+                  tag: host-id
+                  value: '{#HOST.ID}'
             -
               uuid: 46e78b7f00904778abf5160fff93670a
               name: 'F5 BIG-IP: Host [{#HOST.ID}] CPU{#CPU.ID}: Usage ratio, avg 5m'
@@ -1223,8 +1429,14 @@ zabbix_export:
                 iowait:sysMultiHostCpuIowait5m
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
+                -
+                  tag: cpu-id
+                  value: '{#CPU.ID}'
+                -
+                  tag: host-id
+                  value: '{#HOST.ID}'
               trigger_prototypes:
                 -
                   uuid: 1163080e05d3433f884773fe1ee0271a
@@ -1234,6 +1446,10 @@ zabbix_export:
                   name: 'F5 BIG-IP: High CPU utilization (over {$BIGIP.CPU.UTIL.WARN.MAX}% for 5m)'
                   priority: WARNING
                   description: 'CPU utilization is too high. The system might be slow to respond.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: e0e3bbd21d3e434c80e7bb1969388b27
               name: 'F5 BIG-IP: Host [{#HOST.ID}] CPU{#CPU.ID}: Usage ratio, avg 5s'
@@ -1257,8 +1473,14 @@ zabbix_export:
                 iowait:sysMultiHostCpuIowait5s
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
+                -
+                  tag: cpu-id
+                  value: '{#CPU.ID}'
+                -
+                  tag: host-id
+                  value: '{#HOST.ID}'
             -
               uuid: beaece1c9eaa41768e7c05993d2f4b3b
               name: 'F5 BIG-IP: Host [{#HOST.ID}] CPU{#CPU.ID}: User, avg 1m'
@@ -1273,8 +1495,14 @@ zabbix_export:
                 The average time spent by the specified processor in user context for the associated host in the last one minute.
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
+                -
+                  tag: cpu-id
+                  value: '{#CPU.ID}'
+                -
+                  tag: host-id
+                  value: '{#HOST.ID}'
             -
               uuid: 7344ae137ef94f80a99865057c105d96
               name: 'F5 BIG-IP: Host [{#HOST.ID}] CPU{#CPU.ID}: User, avg 5m'
@@ -1289,8 +1517,14 @@ zabbix_export:
                 The average time spent by the specified processor in user context for the associated host in the last five minutes.
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
+                -
+                  tag: cpu-id
+                  value: '{#CPU.ID}'
+                -
+                  tag: host-id
+                  value: '{#HOST.ID}'
             -
               uuid: 61176fa2de794fcf90f1eef2ead10df6
               name: 'F5 BIG-IP: Host [{#HOST.ID}] CPU{#CPU.ID}: User, avg 5s'
@@ -1305,8 +1539,14 @@ zabbix_export:
                 The average time spent by the specified processor in user context for the associated host in the last five seconds.
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
+                -
+                  tag: cpu-id
+                  value: '{#CPU.ID}'
+                -
+                  tag: host-id
+                  value: '{#HOST.ID}'
           graph_prototypes:
             -
               uuid: 64c251a6b0384d2ea7d5b498c7fe6422
@@ -1479,8 +1719,11 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: fan
+                -
+                  tag: component
+                  value: sensor
             -
               uuid: 03bd45f8a7004fd3a3d8b361a37547d3
               name: 'F5 BIG-IP: Sensor [{#CPU.SENSOR.SLOT}:{#CPU.SENSOR.INDEX}]: Name'
@@ -1501,8 +1744,11 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: name
+                -
+                  tag: component
+                  value: sensor
             -
               uuid: 1ffd09c7d99843b88e259de3614d003a
               name: 'F5 BIG-IP: Sensor [{#CPU.SENSOR.SLOT}:{#CPU.SENSOR.INDEX}]: Temperature'
@@ -1525,8 +1771,11 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: sensor
+                -
+                  tag: component
+                  value: temperature
           graph_prototypes:
             -
               uuid: 714b13fd29ec47009f183d44ddaa8df6
@@ -1586,8 +1835,11 @@ zabbix_export:
                 The number of bytes in the specified partition.
               tags:
                 -
-                  tag: Application
-                  value: 'Mount point [{#PART.NAME}]'
+                  tag: component
+                  value: storage
+                -
+                  tag: mount-point
+                  value: '{#PART.NAME}'
             -
               uuid: 8fd4ee3dc199419189daf478ff2dc01d
               name: 'F5 BIG-IP: Mount point [{#PART.NAME}]: Free blocks'
@@ -1601,8 +1853,11 @@ zabbix_export:
                 The number of free blocks in the specified partition.
               tags:
                 -
-                  tag: Application
-                  value: 'Mount point [{#PART.NAME}]'
+                  tag: component
+                  value: storage
+                -
+                  tag: mount-point
+                  value: '{#PART.NAME}'
             -
               uuid: 5c0724be667946f192a46cc2a0584971
               name: 'F5 BIG-IP: Mount point [{#PART.NAME}]: Free nodes'
@@ -1616,8 +1871,11 @@ zabbix_export:
                 The number of free file nodes in the specified partition.
               tags:
                 -
-                  tag: Application
-                  value: 'Mount point [{#PART.NAME}]'
+                  tag: component
+                  value: storage
+                -
+                  tag: mount-point
+                  value: '{#PART.NAME}'
             -
               uuid: 50d267f74f9c476fac23884828f5275f
               name: 'F5 BIG-IP: Mount point [{#PART.NAME}]: Total blocks'
@@ -1631,8 +1889,11 @@ zabbix_export:
                 The number of total blocks in the specified partition.
               tags:
                 -
-                  tag: Application
-                  value: 'Mount point [{#PART.NAME}]'
+                  tag: component
+                  value: storage
+                -
+                  tag: mount-point
+                  value: '{#PART.NAME}'
             -
               uuid: 49cd22a896d941a2b55f3ba6e95698b4
               name: 'F5 BIG-IP: Mount point [{#PART.NAME}]: Total nodes'
@@ -1646,8 +1907,11 @@ zabbix_export:
                 The number of total file nodes in the specified partition.
               tags:
                 -
-                  tag: Application
-                  value: 'Mount point [{#PART.NAME}]'
+                  tag: component
+                  value: storage
+                -
+                  tag: mount-point
+                  value: '{#PART.NAME}'
           trigger_prototypes:
             -
               uuid: 32b87997dc0b4967bdb158f1dc0baad2
@@ -1658,6 +1922,10 @@ zabbix_export:
               priority: WARNING
               description: 'The system is running out of free space.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
           graph_prototypes:
             -
               uuid: ed63eb409eb2497bb9dc7721ac789022
@@ -1707,8 +1975,8 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: Memory
+                  tag: component
+                  value: memory
             -
               uuid: e01e3283d37a4ae09d62fbc679cc4dee
               name: 'F5 BIG-IP: Host [{#HOST.ID}]: Total swap'
@@ -1723,8 +1991,8 @@ zabbix_export:
                 The total swap in bytes for the specified host.
               tags:
                 -
-                  tag: Application
-                  value: Memory
+                  tag: component
+                  value: memory
             -
               uuid: d1ebd77bd2bc4d24b45b32eb6cda6722
               name: 'F5 BIG-IP: Host [{#HOST.ID}]: Total memory'
@@ -1739,8 +2007,8 @@ zabbix_export:
                 The total host memory in bytes for the specified host.
               tags:
                 -
-                  tag: Application
-                  value: Memory
+                  tag: component
+                  value: memory
             -
               uuid: 6c73ea2e54594a1ab6edbdc6de30f711
               name: 'F5 BIG-IP: Host [{#HOST.ID}]: Used other non-TMM memory'
@@ -1760,8 +2028,8 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: Memory
+                  tag: component
+                  value: memory
             -
               uuid: 3a9d6f2815644a4f93e008ccacbdb290
               name: 'F5 BIG-IP: Host [{#HOST.ID}]: Used swap'
@@ -1781,8 +2049,8 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: Memory
+                  tag: component
+                  value: memory
             -
               uuid: d5af8fa1079b4c0aa47b98e25a184af3
               name: 'F5 BIG-IP: Host [{#HOST.ID}]: Used memory'
@@ -1802,8 +2070,8 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: Memory
+                  tag: component
+                  value: memory
           trigger_prototypes:
             -
               uuid: e72f446075214129ab1d6269fcd87051
@@ -1813,6 +2081,10 @@ zabbix_export:
               name: 'F5 BIG-IP: High memory utilization in host [{#HOST.ID}] (over {$BIGIP.MEMORY.UTIL.WARN.MAX}%)'
               priority: WARNING
               description: 'The system is running out of free memory.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 5cf3e1f819ee46f49ba89156c53274ec
               expression: 'last(/F5 Big-IP SNMP/bigip.memory.used.swap[{#HOST.ID}])/last(/F5 Big-IP SNMP/bigip.memory.total.swap[{#HOST.ID}])*100>{$BIGIP.SWAP.UTIL.WARN.MAX}'
@@ -1821,6 +2093,10 @@ zabbix_export:
               name: 'F5 BIG-IP: High swap utilization in host [{#HOST.ID}] (over {$BIGIP.SWAP.UTIL.WARN.MAX}%)'
               priority: WARNING
               description: 'The system is running out of free swap memory.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
           graph_prototypes:
             -
               uuid: 3414dd36b37e434f9c28eacc0e8c58b9
@@ -1883,8 +2159,11 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: Modules
+                  tag: component
+                  value: module
+                -
+                  tag: module
+                  value: '{#MODULE.NAME}'
             -
               uuid: eaeb7bc1225b48689124c373b04fc56f
               name: 'F5 BIG-IP: Module [{#MODULE.NAME}]: Disk ratio'
@@ -1902,8 +2181,11 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: Modules
+                  tag: component
+                  value: module
+                -
+                  tag: module
+                  value: '{#MODULE.NAME}'
             -
               uuid: b384a7e297f844c89cc40c486e0c69db
               name: 'F5 BIG-IP: Module [{#MODULE.NAME}]: Memory ratio'
@@ -1921,8 +2203,11 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: Modules
+                  tag: component
+                  value: module
+                -
+                  tag: module
+                  value: '{#MODULE.NAME}'
             -
               uuid: 36dbc22d430e477ab2105323ad8b0850
               name: 'F5 BIG-IP: Module [{#MODULE.NAME}]: Provision level'
@@ -1944,8 +2229,11 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: Modules
+                  tag: component
+                  value: module
+                -
+                  tag: module
+                  value: '{#MODULE.NAME}'
           graph_prototypes:
             -
               uuid: cfc1606bfbdd40b095620e32e646e2fd
@@ -2000,8 +2288,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface [{#IF.NAME}]'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IF.NAME}'
             -
               uuid: 1ddb57921289497fb2c2e4f047f58c02
               name: 'F5 BIG-IP: Interface [{#IF.NAME}]: Incoming traffic, rate'
@@ -2024,8 +2318,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface [{#IF.NAME}]'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IF.NAME}'
             -
               uuid: 45342d637fa440f8b73968a14bf39374
               name: 'F5 BIG-IP: Interface [{#IF.NAME}]: Incoming packet drops'
@@ -2043,8 +2343,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface [{#IF.NAME}]'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IF.NAME}'
             -
               uuid: 5bc37dde99024866a2a5f97fbce15c2f
               name: 'F5 BIG-IP: Interface [{#IF.NAME}]: Incoming packet error'
@@ -2063,8 +2369,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface [{#IF.NAME}]'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IF.NAME}'
             -
               uuid: 8aaff266f1b74a81a3eba46d321eb524
               name: 'F5 BIG-IP: Interface [{#IF.NAME}]: Incoming multicast packet, rate'
@@ -2087,8 +2399,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface [{#IF.NAME}]'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IF.NAME}'
             -
               uuid: 40e811829adc4715af4e10d223be3bc5
               name: 'F5 BIG-IP: Interface [{#IF.NAME}]: Incoming packet, rate'
@@ -2111,8 +2429,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface [{#IF.NAME}]'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IF.NAME}'
             -
               uuid: 202717aa54194cf882c86640e73b17af
               name: 'F5 BIG-IP: Interface [{#IF.NAME}]: Incoming QnQ packet, rate'
@@ -2135,8 +2459,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface [{#IF.NAME}]'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IF.NAME}'
             -
               uuid: c98f48ddf6bc46f39ab9aec6cc249fa4
               name: 'F5 BIG-IP: Interface [{#IF.NAME}]: Outgoing traffic, rate'
@@ -2159,8 +2489,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface [{#IF.NAME}]'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IF.NAME}'
             -
               uuid: b19203459ac842e2b96eee75b6754eac
               name: 'F5 BIG-IP: Interface [{#IF.NAME}]: Outgoing packet drops'
@@ -2179,8 +2515,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface [{#IF.NAME}]'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IF.NAME}'
             -
               uuid: 1496879429724a6daee4b97fa162419b
               name: 'F5 BIG-IP: Interface [{#IF.NAME}]: Outgoing packet error'
@@ -2200,8 +2542,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface [{#IF.NAME}]'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IF.NAME}'
             -
               uuid: 8ecd6a8dd5fa43c8b87a94119aac90b9
               name: 'F5 BIG-IP: Interface [{#IF.NAME}]: Outgoing multicast packet, rate'
@@ -2224,8 +2572,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface [{#IF.NAME}]'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IF.NAME}'
             -
               uuid: fd4416466734469b85eec03c8e69185c
               name: 'F5 BIG-IP: Interface [{#IF.NAME}]: Outgoing packet, rate'
@@ -2248,8 +2602,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface [{#IF.NAME}]'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IF.NAME}'
             -
               uuid: a4cb060cc3854aab9715c85174cc4933
               name: 'F5 BIG-IP: Interface [{#IF.NAME}]: Outgoing QnQ packet, rate'
@@ -2272,8 +2632,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface [{#IF.NAME}]'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IF.NAME}'
             -
               uuid: 93a1107cb0ea44078f2ac04a7dc9e941
               name: 'F5 BIG-IP: Interface [{#IF.NAME}]: Pause state'
@@ -2297,14 +2663,24 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface [{#IF.NAME}]'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IF.NAME}'
           trigger_prototypes:
             -
               uuid: 2d9214768b684ba880703d738ac52099
               expression: 'last(/F5 Big-IP SNMP/bigip.net.in.error[{#IF.NAME}])>last(/F5 Big-IP SNMP/bigip.net.in.error[{#IF.NAME}],#2) or last(/F5 Big-IP SNMP/bigip.net.out.error[{#IF.NAME}])>last(/F5 Big-IP SNMP/bigip.net.out.error[{#IF.NAME}],#2)'
               name: 'F5 BIG-IP: There are errors on the network interface ({#IF.NAME})'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
           graph_prototypes:
             -
               uuid: f784ab335a314bd7b328c0fe5053f5f7
@@ -2379,8 +2755,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Node [{#NODE.NAME}]'
+                  tag: component
+                  value: network
+                -
+                  tag: component
+                  value: node
+                -
+                  tag: node
+                  value: '{#NODE.NAME}'
             -
               uuid: 9530c81b45c24ddda2440e2589964d28
               name: 'F5 BIG-IP: Node [{#NODE.NAME}]: Incoming traffic, rate'
@@ -2404,8 +2786,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Node [{#NODE.NAME}]'
+                  tag: component
+                  value: network
+                -
+                  tag: component
+                  value: node
+                -
+                  tag: node
+                  value: '{#NODE.NAME}'
             -
               uuid: 8e7ae014ea73489b81de960acad301b8
               name: 'F5 BIG-IP: Node [{#NODE.NAME}]: Incoming packet, rate'
@@ -2429,8 +2817,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Node [{#NODE.NAME}]'
+                  tag: component
+                  value: network
+                -
+                  tag: component
+                  value: node
+                -
+                  tag: node
+                  value: '{#NODE.NAME}'
             -
               uuid: 88ec665ad6eb43e88a3625b50e130e82
               name: 'F5 BIG-IP: Node [{#NODE.NAME}]: Outgoing traffic, rate'
@@ -2454,8 +2848,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Node [{#NODE.NAME}]'
+                  tag: component
+                  value: network
+                -
+                  tag: component
+                  value: node
+                -
+                  tag: node
+                  value: '{#NODE.NAME}'
             -
               uuid: 077bb28cd8a1429fb564786e7d150dbc
               name: 'F5 BIG-IP: Node [{#NODE.NAME}]: Outgoing packet, rate'
@@ -2479,8 +2879,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Node [{#NODE.NAME}]'
+                  tag: component
+                  value: network
+                -
+                  tag: component
+                  value: node
+                -
+                  tag: node
+                  value: '{#NODE.NAME}'
             -
               uuid: 5a0278f4cfd04611895207d9b7f3b13c
               name: 'F5 BIG-IP: Node [{#NODE.NAME}]: Current sessions'
@@ -2499,8 +2905,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Node [{#NODE.NAME}]'
+                  tag: component
+                  value: network
+                -
+                  tag: component
+                  value: node
+                -
+                  tag: node
+                  value: '{#NODE.NAME}'
             -
               uuid: 15129cb2af84466d8c58641854ad0b54
               name: 'F5 BIG-IP: Node [{#NODE.NAME}]: Connections hit a rate limit'
@@ -2520,8 +2932,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Node [{#NODE.NAME}]'
+                  tag: component
+                  value: network
+                -
+                  tag: component
+                  value: node
+                -
+                  tag: node
+                  value: '{#NODE.NAME}'
             -
               uuid: 6be4c0fd41d6459db5acd6c33461c7f9
               name: 'F5 BIG-IP: Node [{#NODE.NAME}]: Duration of exceeding rate limit'
@@ -2542,8 +2960,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Node [{#NODE.NAME}]'
+                  tag: component
+                  value: network
+                -
+                  tag: component
+                  value: node
+                -
+                  tag: node
+                  value: '{#NODE.NAME}'
           graph_prototypes:
             -
               uuid: 920bf6830fae4d168a3d9fc772a8f25c
@@ -2613,8 +3037,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Pool [{#POOL.NAME}]'
+                  tag: component
+                  value: network
+                -
+                  tag: component
+                  value: pool
+                -
+                  tag: pool
+                  value: '{#POOL.NAME}'
               trigger_prototypes:
                 -
                   uuid: 0b6e708075684cbab0d8c598f3467e0c
@@ -2626,6 +3056,10 @@ zabbix_export:
                     -
                       name: 'F5 BIG-IP: Pool {#POOL.NAME} is not enabled in some capacity: {ITEM.VALUE1}'
                       expression: 'count(/F5 Big-IP SNMP/bigip.pool.enabled[{#POOL.NAME}],120m,"ne","1")>4'
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
             -
               uuid: 391d21a1a44d49d4beb219b726e0f55e
               name: 'F5 BIG-IP: Pool [{#POOL.NAME}]: Status enabled'
@@ -2650,8 +3084,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Pool [{#POOL.NAME}]'
+                  tag: component
+                  value: network
+                -
+                  tag: component
+                  value: pool
+                -
+                  tag: pool
+                  value: '{#POOL.NAME}'
               trigger_prototypes:
                 -
                   uuid: 4d0431e2c4934f37be7302ffedd69e8a
@@ -2659,6 +3099,10 @@ zabbix_export:
                   name: 'F5 BIG-IP: Pool {#POOL.NAME} is not enabled in some capacity: {ITEM.VALUE1}'
                   opdata: '{ITEM.LASTVALUE}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
             -
               uuid: 0c53c6f3ab9e49b688a8e97252471ded
               name: 'F5 BIG-IP: Pool [{#POOL.NAME}]: Current connections'
@@ -2677,8 +3121,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Pool [{#POOL.NAME}]'
+                  tag: component
+                  value: network
+                -
+                  tag: component
+                  value: pool
+                -
+                  tag: pool
+                  value: '{#POOL.NAME}'
             -
               uuid: e6daed4f364c463dba542948b2272296
               name: 'F5 BIG-IP: Pool [{#POOL.NAME}]: Incoming traffic, rate'
@@ -2702,8 +3152,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Pool [{#POOL.NAME}]'
+                  tag: component
+                  value: network
+                -
+                  tag: component
+                  value: pool
+                -
+                  tag: pool
+                  value: '{#POOL.NAME}'
             -
               uuid: b65e8d23fa3b4129936f0f3d7034c8a4
               name: 'F5 BIG-IP: Pool [{#POOL.NAME}]: Incoming packet, rate'
@@ -2727,8 +3183,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Pool [{#POOL.NAME}]'
+                  tag: component
+                  value: network
+                -
+                  tag: component
+                  value: pool
+                -
+                  tag: pool
+                  value: '{#POOL.NAME}'
             -
               uuid: 6c58f56d63e34166b02ad7c31271e2bb
               name: 'F5 BIG-IP: Pool [{#POOL.NAME}]: Outgoing traffic, rate'
@@ -2752,8 +3214,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Pool [{#POOL.NAME}]'
+                  tag: component
+                  value: network
+                -
+                  tag: component
+                  value: pool
+                -
+                  tag: pool
+                  value: '{#POOL.NAME}'
             -
               uuid: e432732fc4dd478892c6d4bab3fbd11c
               name: 'F5 BIG-IP: Pool [{#POOL.NAME}]: Outgoing packet, rate'
@@ -2777,8 +3245,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Pool [{#POOL.NAME}]'
+                  tag: component
+                  value: network
+                -
+                  tag: component
+                  value: pool
+                -
+                  tag: pool
+                  value: '{#POOL.NAME}'
             -
               uuid: 068028e704f049b4b3daae524fe16d27
               name: 'F5 BIG-IP: Pool [{#POOL.NAME}]: Current sessions'
@@ -2797,8 +3271,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Pool [{#POOL.NAME}]'
+                  tag: component
+                  value: network
+                -
+                  tag: component
+                  value: pool
+                -
+                  tag: pool
+                  value: '{#POOL.NAME}'
             -
               uuid: 6bacc7e284f14aa7804f69c8b2f744d4
               name: 'F5 BIG-IP: Pool [{#POOL.NAME}]: Age of the oldest queue entry'
@@ -2822,8 +3302,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Pool [{#POOL.NAME}]'
+                  tag: component
+                  value: network
+                -
+                  tag: component
+                  value: pool
+                -
+                  tag: pool
+                  value: '{#POOL.NAME}'
             -
               uuid: 44ad195489cd46be87ae8cc029bcb480
               name: 'F5 BIG-IP: Pool [{#POOL.NAME}]: Queue'
@@ -2842,8 +3328,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Pool [{#POOL.NAME}]'
+                  tag: component
+                  value: network
+                -
+                  tag: component
+                  value: pool
+                -
+                  tag: pool
+                  value: '{#POOL.NAME}'
           graph_prototypes:
             -
               uuid: a077af6d72a447a99a35f2daa8b0205e
@@ -2906,8 +3398,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Virtual server [{#VSERVER.NAME}]'
+                  tag: component
+                  value: network
+                -
+                  tag: component
+                  value: virtual-server
+                -
+                  tag: virtual-server
+                  value: '{#VSERVER.NAME}'
             -
               uuid: 206503cc777a4156a29f0687d8fb5a7c
               name: 'F5 BIG-IP: Virtual server [{#VSERVER.NAME}]: Incoming traffic, rate'
@@ -2931,8 +3429,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Virtual server [{#VSERVER.NAME}]'
+                  tag: component
+                  value: network
+                -
+                  tag: component
+                  value: virtual-server
+                -
+                  tag: virtual-server
+                  value: '{#VSERVER.NAME}'
             -
               uuid: d8a36a30d99c44ca9b7172a5b66e74d6
               name: 'F5 BIG-IP: Virtual server [{#VSERVER.NAME}]: Incoming packet, rate'
@@ -2956,8 +3460,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Virtual server [{#VSERVER.NAME}]'
+                  tag: component
+                  value: network
+                -
+                  tag: component
+                  value: virtual-server
+                -
+                  tag: virtual-server
+                  value: '{#VSERVER.NAME}'
             -
               uuid: efeb720fb7e44d068572d59eff947bc6
               name: 'F5 BIG-IP: Virtual server [{#VSERVER.NAME}]: Outgoing traffic, rate'
@@ -2981,8 +3491,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Virtual server [{#VSERVER.NAME}]'
+                  tag: component
+                  value: network
+                -
+                  tag: component
+                  value: virtual-server
+                -
+                  tag: virtual-server
+                  value: '{#VSERVER.NAME}'
             -
               uuid: bd588ea58eb4420085691046fa0a1e3b
               name: 'F5 BIG-IP: Virtual server [{#VSERVER.NAME}]: Outgoing packet, rate'
@@ -3006,8 +3522,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Virtual server [{#VSERVER.NAME}]'
+                  tag: component
+                  value: network
+                -
+                  tag: component
+                  value: virtual-server
+                -
+                  tag: virtual-server
+                  value: '{#VSERVER.NAME}'
             -
               uuid: 01352ac9b6c24f13a6ceebac666026cb
               name: 'F5 BIG-IP: Virtual server [{#VSERVER.NAME}]: Connections hit a rate limit'
@@ -3027,8 +3549,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Virtual server [{#VSERVER.NAME}]'
+                  tag: component
+                  value: network
+                -
+                  tag: component
+                  value: virtual-server
+                -
+                  tag: virtual-server
+                  value: '{#VSERVER.NAME}'
             -
               uuid: baa7718513a54ae4a7bd669f9b652521
               name: 'F5 BIG-IP: Virtual server [{#VSERVER.NAME}]: Duration of exceeding rate limit'
@@ -3048,8 +3576,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Virtual server [{#VSERVER.NAME}]'
+                  tag: component
+                  value: network
+                -
+                  tag: component
+                  value: virtual-server
+                -
+                  tag: virtual-server
+                  value: '{#VSERVER.NAME}'
             -
               uuid: 3e97e22368b84674a9720c3f076503c5
               name: 'F5 BIG-IP: Virtual server [{#VSERVER.NAME}]: Usage ratio, avg 1m'
@@ -3069,8 +3603,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Virtual server [{#VSERVER.NAME}]'
+                  tag: component
+                  value: network
+                -
+                  tag: component
+                  value: virtual-server
+                -
+                  tag: virtual-server
+                  value: '{#VSERVER.NAME}'
             -
               uuid: 2c8c5e0e53e34e4ebc84ed9e5a8c4bd9
               name: 'F5 BIG-IP: Virtual server [{#VSERVER.NAME}]: Usage ratio, avg 5m'
@@ -3090,8 +3630,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Virtual server [{#VSERVER.NAME}]'
+                  tag: component
+                  value: network
+                -
+                  tag: component
+                  value: virtual-server
+                -
+                  tag: virtual-server
+                  value: '{#VSERVER.NAME}'
             -
               uuid: d6079ebaebbb40d09386e2b1abcbe987
               name: 'F5 BIG-IP: Virtual server [{#VSERVER.NAME}]: Usage ratio, avg 5s'
@@ -3111,8 +3657,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Virtual server [{#VSERVER.NAME}]'
+                  tag: component
+                  value: network
+                -
+                  tag: component
+                  value: virtual-server
+                -
+                  tag: virtual-server
+                  value: '{#VSERVER.NAME}'
           graph_prototypes:
             -
               uuid: b49ee8a27f634c238317663d7cc9d426
@@ -3169,6 +3721,16 @@ zabbix_export:
               type: DISCARD_UNCHANGED_HEARTBEAT
               parameters:
                 - 6h
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: big-ip
+        -
+          tag: target
+          value: f5
       macros:
         -
           macro: '{$BIGIP.CERT.MIN}'
diff --git a/templates/net/generic_snmp/template_net_generic_snmp.yaml b/templates/net/generic_snmp/template_net_generic_snmp.yaml
index 1234707762e..876322b4f7a 100644
--- a/templates/net/generic_snmp/template_net_generic_snmp.yaml
+++ b/templates/net/generic_snmp/template_net_generic_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:42:44Z'
+  date: '2022-01-26T09:58:47Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -33,8 +33,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: d08cae0e7fa54dfea41449f0adabe05d
@@ -42,6 +45,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 06c6f4c60f9b4db0afa2886ad70507af
           name: 'ICMP loss'
@@ -52,8 +59,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: d70eb18878114ae69e5f5f95f4b898cc
@@ -65,6 +75,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/Network Generic Device SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 29f84e5b82b748a5b08475dd45ade97a
           name: 'ICMP response time'
@@ -75,8 +92,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 09bcfc7a9e3d45d99d37b56a404df610
@@ -91,6 +111,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/Network Generic Device SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 4dad4c7dc007426ebb4b36439b64a55b
           name: 'SNMP traps (fallback)'
@@ -103,8 +130,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: 300812c78b9d4aeb82940d97ccee1d9e
           name: 'System contact details'
@@ -126,8 +153,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: c4996515da9e41728fb94c5134489e7b
           name: 'System description'
@@ -150,8 +177,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 9bf103c35b284fc7ba9f7b4968006cd9
           name: 'System location'
@@ -173,8 +200,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: adb55c04903d4c37a9ccecc78ac877d5
           name: 'System name'
@@ -196,8 +223,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 5f11afa80f534add85dd03e06466fbc9
@@ -206,6 +233,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: 9d2e3e58dc4543d3b5df8ded3c2a4d90
           name: 'System object ID'
@@ -226,8 +260,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 9b2549a4c09a4b0d9112aed011b03583
           name: Uptime
@@ -248,8 +282,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 536fafc0bb664fcb8b4c8acc18fe5c29
@@ -262,6 +296,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/Network Generic Device SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 28e7a457abdf42c3a647642b3c4964e0
           name: 'SNMP agent availability'
@@ -278,8 +316,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: d534ea9f1ad34633bdd361f20733b749
@@ -292,6 +333,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/Network Generic Device SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: 12e011a176284ab4807c2285768b0470
@@ -372,8 +417,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFDESCR}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: bf2f604e912f4d15999a7931eea58d93
               name: 'Interface {#IFDESCR}: Inbound packets with errors'
@@ -392,8 +443,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFDESCR}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 34a3f71da7fb4896be8bda4b8840577d
               name: 'Interface {#IFDESCR}: Bits received'
@@ -417,8 +474,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFDESCR}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: b7cb1f80962a46fe97ce1af186530eb3
               name: 'Interface {#IFDESCR}: Outbound packets discarded'
@@ -441,8 +504,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFDESCR}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: f51311b11b53440f9256ef01ed14ddf0
               name: 'Interface {#IFDESCR}: Outbound packets with errors'
@@ -461,8 +530,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFDESCR}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 2097ef34441343f291ce2bf160ba280f
               name: 'Interface {#IFDESCR}: Bits sent'
@@ -486,8 +561,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFDESCR}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 5a9cd6719c794d16bb53ab5c422cc619
               name: 'Interface {#IFDESCR}: Speed'
@@ -508,8 +589,14 @@ zabbix_export:
                 For a sub-layer which has no concept of bandwidth, this object should be zero.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFDESCR}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 6808335d9cbf44f0ba21fc6a1f146ae7
               name: 'Interface {#IFDESCR}: Operational status'
@@ -531,8 +618,14 @@ zabbix_export:
                 name: 'IF-MIB::ifOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFDESCR}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 9b5fdc0da9fa49918b3986d1eee02cfc
@@ -550,6 +643,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 251413125851440a81acaeab7b1632d5
               name: 'Interface {#IFDESCR}: Interface type'
@@ -573,8 +670,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFDESCR}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           trigger_prototypes:
             -
               uuid: f06a612448bc4cc2b0b5641708e9153a
@@ -604,6 +707,10 @@ zabbix_export:
                   name: 'Interface {#IFDESCR}: Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Network Generic Device SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/Network Generic Device SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/Network Generic Device SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/Network Generic Device SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: e0b02506b47145a8bde6a19890a2e32b
               expression: |
@@ -624,6 +731,10 @@ zabbix_export:
                   name: 'Interface {#IFDESCR}: Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Network Generic Device SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/Network Generic Device SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/Network Generic Device SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/Network Generic Device SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 1a2e2ea2ecf047a68168bdcceb8d1e39
               expression: |
@@ -643,6 +754,10 @@ zabbix_export:
                   name: 'Interface {#IFDESCR}: Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Network Generic Device SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/Network Generic Device SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/Network Generic Device SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/Network Generic Device SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: 22241d9edde64631a50cea85c11f4433
@@ -746,8 +861,14 @@ zabbix_export:
                 name: 'EtherLike-MIB::dot3StatsDuplexStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 58acb95392e845bdb2a7064af0228208
@@ -756,6 +877,10 @@ zabbix_export:
                   priority: WARNING
                   description: 'Please check autonegotiation settings and cabling'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           preprocessing:
             -
               type: JAVASCRIPT
@@ -774,6 +899,13 @@ zabbix_export:
                       });
                   });
                   return JSON.stringify(data);
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: generic
       macros:
         -
           macro: '{$ICMP_LOSS_WARN}'
diff --git a/templates/net/hp_hh3c_snmp/template_net_hp_hh3c_snmp.yaml b/templates/net/hp_hh3c_snmp/template_net_hp_hh3c_snmp.yaml
index 12437ff1dab..14b785f60d4 100644
--- a/templates/net/hp_hh3c_snmp/template_net_hp_hh3c_snmp.yaml
+++ b/templates/net/hp_hh3c_snmp/template_net_hp_hh3c_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:42:49Z'
+  date: '2022-01-26T09:50:54Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -41,8 +41,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 1bd6a4748e29498e99ccd3b23d83cdf7
@@ -50,6 +53,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 49b86b6d17394b859b02ea79c6d28b30
           name: 'ICMP loss'
@@ -60,8 +67,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: d41edaea369d40d2944af72a3ee76850
@@ -73,6 +83,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/HP Comware HH3C SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 1560f8f1509040a783e4149845ce38a3
           name: 'ICMP response time'
@@ -83,8 +100,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 2698115b6f014e8cbdb11c2d5eeb8f08
@@ -99,6 +119,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/HP Comware HH3C SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: fa164b01a218494dab454126b4f561a9
           name: 'SNMP traps (fallback)'
@@ -111,8 +138,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: 6f340c49d4364b8096a49c3fa52e2745
           name: 'System contact details'
@@ -134,8 +161,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 85e404c0181143f28b1187acb08cfa04
           name: 'System description'
@@ -158,8 +185,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 3e4feed03de941c98e88e17b3e81b5e4
           name: 'System location'
@@ -181,8 +208,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: b57179ad3e5f41f5805e93ff9e68d631
           name: 'System name'
@@ -204,8 +231,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: cf1d0aa58a194904902899dbba814514
@@ -214,6 +241,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: 72139a34e0cf4357b86a52cf8430ee8c
           name: 'System object ID'
@@ -234,8 +268,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: ac039d3041cc439eb1c3184ed78554d0
           name: Uptime
@@ -256,8 +290,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: c1372deba2b148f4ac8be6493f0b9868
@@ -270,6 +304,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/HP Comware HH3C SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: c407deea6e0f41b18d84ccbe7fcbca63
           name: 'SNMP agent availability'
@@ -286,8 +324,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: bc6e9c399c3d4d43aaeb5a1b03deb7d4
@@ -300,6 +341,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/HP Comware HH3C SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: ab903dd9cb4b49daba7a1bb0c2c65a1f
@@ -333,8 +378,8 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: Inventory
+                  tag: component
+                  value: system
               trigger_prototypes:
                 -
                   uuid: 17e0f72418f4432d852b5c39ddf675bd
@@ -344,6 +389,10 @@ zabbix_export:
                   priority: INFO
                   description: 'Firmware version has changed. Ack to close'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: cc241e313bde48e1bd23f3eefb667439
               name: '{#ENT_NAME}: Hardware model name'
@@ -362,8 +411,8 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: Inventory
+                  tag: component
+                  value: system
             -
               uuid: 9ebc80e149fc4db7a4fb7df2322aad86
               name: '{#ENT_NAME}: Hardware serial number'
@@ -382,8 +431,8 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: Inventory
+                  tag: component
+                  value: system
               trigger_prototypes:
                 -
                   uuid: d3633f4584344570a1c0570f0b082590
@@ -392,6 +441,10 @@ zabbix_export:
                   priority: INFO
                   description: 'Device serial number has changed. Ack to close'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: a63db3df3939447397df5bf9a58edde1
               name: '{#ENT_NAME}: Hardware version(revision)'
@@ -410,8 +463,8 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: Inventory
+                  tag: component
+                  value: system
             -
               uuid: a54f57e58f494300b99161b1fb8f2edf
               name: '{#ENT_NAME}: Operating system'
@@ -430,8 +483,8 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: Inventory
+                  tag: component
+                  value: os
               trigger_prototypes:
                 -
                   uuid: 9e6cccf7daec4405ac3bb1a27670fcee
@@ -444,6 +497,10 @@ zabbix_export:
                     -
                       name: 'System name has changed (new name: {ITEM.VALUE})'
                       expression: 'last(/HP Comware HH3C SNMP/system.name,#1)<>last(/HP Comware HH3C SNMP/system.name,#2) and length(last(/HP Comware HH3C SNMP/system.name))>0'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
         -
           uuid: fdd2fcda49ab4f00861f1a2dcee1dcad
           name: 'FAN Discovery'
@@ -476,8 +533,8 @@ zabbix_export:
                 name: 'HH3C-ENTITY-EXT-MIB::hh3cEntityExtErrorStatus'
               tags:
                 -
-                  tag: Application
-                  value: Fans
+                  tag: component
+                  value: fan
               trigger_prototypes:
                 -
                   uuid: b0821c8e75e14e53906c3a3f209a2785
@@ -486,6 +543,13 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the fan unit'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 268421e66ba94cecac8fdeac7dfbffbb
           name: 'Module Discovery'
@@ -522,8 +586,8 @@ zabbix_export:
                 is not sensible with the number of CPU on the entity
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
               trigger_prototypes:
                 -
                   uuid: 37a4a248c89240fe82c5fd6622123aa0
@@ -532,6 +596,10 @@ zabbix_export:
                   opdata: 'Current utilization: {ITEM.LASTVALUE1}'
                   priority: WARNING
                   description: 'CPU utilization is too high. The system might be slow to respond.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 3021126f556f4c62b335c8108ba1cff1
               name: '{#MODULE_NAME}: Memory utilization'
@@ -547,8 +615,8 @@ zabbix_export:
                 percent of memory are used.
               tags:
                 -
-                  tag: Application
-                  value: Memory
+                  tag: component
+                  value: memory
               trigger_prototypes:
                 -
                   uuid: e8d3cb45afea4cbd935c9ea668746260
@@ -556,6 +624,13 @@ zabbix_export:
                   name: '{#MODULE_NAME}: High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
                   priority: AVERAGE
                   description: 'The system is running out of free memory.'
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 2f7801aa39bd486bb9d2ff751c98559b
@@ -669,8 +744,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 442bc76f9f4441f6b3c7ff60b9359e2b
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -689,8 +770,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: ac12b0e85f3b49239838c6625d62d8a9
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -714,8 +801,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: ed6e19e8821349f380a3c0d4fdd2f4e0
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -738,8 +831,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: d077353aafbb43678bed7dba795923ce
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -758,8 +857,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: e76bb270115240d8b0fdb17b1b010418
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -783,8 +888,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 61b52d6ce511476a8baeaf302476e831
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -809,8 +920,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 4391767dc38e4f4fbc1cd2dc186beb82
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -832,8 +949,14 @@ zabbix_export:
                 name: 'IF-MIB::ifOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: d0a5ea31836946f28abe357440ebdbea
@@ -851,6 +974,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 2733e5694b544bb98ff981b2ed8371ec
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -874,8 +1001,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           trigger_prototypes:
             -
               uuid: b672a06043664dafa8f69d7d530a8723
@@ -905,6 +1038,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/HP Comware HH3C SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/HP Comware HH3C SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/HP Comware HH3C SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/HP Comware HH3C SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 98c74ed2d41941218802f4c472331f46
               expression: |
@@ -925,6 +1062,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/HP Comware HH3C SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/HP Comware HH3C SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/HP Comware HH3C SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/HP Comware HH3C SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: d7d8ad2b63ac41e6b84852c312c2a8d9
               expression: |
@@ -944,6 +1085,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/HP Comware HH3C SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/HP Comware HH3C SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/HP Comware HH3C SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/HP Comware HH3C SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: 220602812c8e4507a236a945fe3ec539
@@ -1047,8 +1195,14 @@ zabbix_export:
                 name: 'EtherLike-MIB::dot3StatsDuplexStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 0ff624a6250b431498e4747678149e4b
@@ -1057,6 +1211,10 @@ zabbix_export:
                   priority: WARNING
                   description: 'Please check autonegotiation settings and cabling'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           preprocessing:
             -
               type: JAVASCRIPT
@@ -1108,8 +1266,8 @@ zabbix_export:
                 name: 'HH3C-ENTITY-EXT-MIB::hh3cEntityExtErrorStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Power supply'
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: 0c3cb88352e2417fb2b80bb78448fb35
@@ -1118,6 +1276,13 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the power supply unit for errors'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 14606d314fc24002a0a4cda2fa009d45
           name: 'Temperature Discovery'
@@ -1156,8 +1321,8 @@ zabbix_export:
                 The temperature for the {#SNMPVALUE}.
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: bbad03018e8e408c952cca2615b4eab3
@@ -1168,6 +1333,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: cda6a4e305fe41239462d2f85acc5590
                   expression: 'avg(/HP Comware HH3C SNMP/sensor.temp.value[hh3cEntityExtTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:""}'
@@ -1182,6 +1354,13 @@ zabbix_export:
                       name: '{#SNMPVALUE}: Temperature is above critical threshold: >{$TEMP_CRIT:""}'
                       expression: 'avg(/HP Comware HH3C SNMP/sensor.temp.value[hh3cEntityExtTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:""}'
                       recovery_expression: 'max(/HP Comware HH3C SNMP/sensor.temp.value[hh3cEntityExtTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:""}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 340a9c397bff4ac5a37a2ada9d0c1e69
                   expression: 'avg(/HP Comware HH3C SNMP/sensor.temp.value[hh3cEntityExtTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:""}'
@@ -1190,6 +1369,23 @@ zabbix_export:
                   name: '{#SNMPVALUE}: Temperature is too low: <{$TEMP_CRIT_LOW:""}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: hp
+        -
+          tag: target
+          value: hp-comware
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/net/hp_hpn_snmp/template_net_hp_hpn_snmp.yaml b/templates/net/hp_hpn_snmp/template_net_hp_hpn_snmp.yaml
index 01d4874be9b..3bc0238b90c 100644
--- a/templates/net/hp_hpn_snmp/template_net_hp_hpn_snmp.yaml
+++ b/templates/net/hp_hpn_snmp/template_net_hp_hpn_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:42:53Z'
+  date: '2022-01-26T09:45:30Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -39,8 +39,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 8fb33a256deb49a096b287493285e300
@@ -48,6 +51,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 722e38d7a1bd433192616664cc2824f8
           name: 'ICMP loss'
@@ -58,8 +65,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 589e13a6ab084dd4b7d1456f7707f44d
@@ -71,6 +81,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/HP Enterprise Switch SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 93f693245d3848afb6c89881cede42c1
           name: 'ICMP response time'
@@ -81,8 +98,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 75bdd8a0cd664815aa3e4fa54d4f0b97
@@ -97,6 +117,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/HP Enterprise Switch SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: b7530ee6104342319b0cad986a3a4daf
           name: 'SNMP traps (fallback)'
@@ -109,8 +136,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: 1397f0fc832e47daa39308585f260152
           name: 'System contact details'
@@ -132,8 +159,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 083172af308e401a99a662f615a5b450
           name: 'CPU utilization'
@@ -149,8 +176,8 @@ zabbix_export:
             Reference: http://h20564.www2.hpe.com/hpsc/doc/public/display?docId=emr_na-c02597344&sp4ts.oid=51079
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
           triggers:
             -
               uuid: 883e49e933bd4cfda0e7dde774604a0a
@@ -159,6 +186,10 @@ zabbix_export:
               opdata: 'Current utilization: {ITEM.LASTVALUE1}'
               priority: WARNING
               description: 'CPU utilization is too high. The system might be slow to respond.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 31211351783648bc9c727205c0273a4b
           name: 'System description'
@@ -181,8 +212,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: dadf12eb4c0a42bf9504e15bc4fe6d7c
           name: 'Firmware version'
@@ -207,8 +238,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: a9dcdf4129d041eca8dadc8bfbc455ee
@@ -218,6 +249,10 @@ zabbix_export:
               priority: INFO
               description: 'Firmware version has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 12d7d4a915714166b2c0a48733235ac1
           name: 'Hardware serial number'
@@ -237,8 +272,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 6b9b9b0d1ff24074bb344d04efe53444
@@ -247,6 +282,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: ad2dc1149eb546309657928b944c49fb
           name: 'System location'
@@ -268,8 +307,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: ba7fd7afad3f4b76bdfedc8c6c3a24ac
           name: 'System name'
@@ -291,8 +330,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 63f6f85bfed94821a8339c46544dde0e
@@ -301,6 +340,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: 74fd9c1bd546497aa20b9af09b951e98
           name: 'System object ID'
@@ -321,8 +367,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 02e67b092ccf478ba13537ba6471f3fd
           name: Uptime
@@ -343,8 +389,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 1395e02bc63e48daa779b8b685e91868
@@ -357,6 +403,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/HP Enterprise Switch SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: af855c1e75304c26b11a86c2a86f08f2
           name: 'SNMP agent availability'
@@ -373,8 +423,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: d64df6c48ce44bbcafcdd60a3102b41c
@@ -387,6 +440,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/HP Enterprise Switch SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: 4d827ed3c2a6436d9ea453ef1568d47e
@@ -420,8 +477,8 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: Inventory
+                  tag: component
+                  value: system
             -
               uuid: baffe9cf11744c2286592a35934fb5b0
               name: '{#ENT_NAME}: Hardware version(revision)'
@@ -440,8 +497,8 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: Inventory
+                  tag: component
+                  value: system
         -
           uuid: ebc407e29b1f4575b50ca7bfb3a2abc8
           name: 'FAN Discovery'
@@ -478,8 +535,8 @@ zabbix_export:
                 name: 'HP-ICF-CHASSIS::hpicfSensorStatus'
               tags:
                 -
-                  tag: Application
-                  value: Fans
+                  tag: component
+                  value: fan
               trigger_prototypes:
                 -
                   uuid: 4fba6383ed4c4cd89b349a5dfccb7909
@@ -488,6 +545,13 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the fan unit'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 6cf626561b33468cb1e2c9e590334c4b
                   expression: 'count(/HP Enterprise Switch SNMP/sensor.fan.status[hpicfSensorStatus.{#SNMPINDEX}],#1,"eq","{$FAN_WARN_STATUS:\"warning\"}")=1'
@@ -499,6 +563,13 @@ zabbix_export:
                     -
                       name: '{#ENT_DESCR}: Fan is in critical state'
                       expression: 'count(/HP Enterprise Switch SNMP/sensor.fan.status[hpicfSensorStatus.{#SNMPINDEX}],#1,"eq","{$FAN_CRIT_STATUS:\"bad\"}")=1'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: e175ffc9f7db4714bc99450e86a3963f
           name: 'Memory Discovery'
@@ -521,8 +592,8 @@ zabbix_export:
                 The number of available (unallocated) bytes.
               tags:
                 -
-                  tag: Application
-                  value: Memory
+                  tag: component
+                  value: memory
             -
               uuid: 1b6f6b3a06d44ff088a5ac0336ad995b
               name: '#{#SNMPVALUE}: Total memory'
@@ -536,8 +607,8 @@ zabbix_export:
                 The number of currently installed bytes.
               tags:
                 -
-                  tag: Application
-                  value: Memory
+                  tag: component
+                  value: memory
             -
               uuid: a724e90409b746068c4765dbbcfaf70d
               name: '#{#SNMPVALUE}: Used memory'
@@ -551,8 +622,8 @@ zabbix_export:
                 The number of currently allocated bytes.
               tags:
                 -
-                  tag: Application
-                  value: Memory
+                  tag: component
+                  value: memory
             -
               uuid: 7167b10eb27548b8b48b7dc2881b82dd
               name: '#{#SNMPVALUE}: Memory utilization'
@@ -565,8 +636,8 @@ zabbix_export:
               description: 'Memory utilization in %'
               tags:
                 -
-                  tag: Application
-                  value: Memory
+                  tag: component
+                  value: memory
               trigger_prototypes:
                 -
                   uuid: 4fe0382fdee141adac03788c8810e387
@@ -574,6 +645,13 @@ zabbix_export:
                   name: '#{#SNMPVALUE}: High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
                   priority: AVERAGE
                   description: 'The system is running out of free memory.'
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: aebb1527b1264e319bce23354c4ff200
@@ -693,8 +771,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 93e0dfe819ba4e7593a55fb3e25493da
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -713,8 +797,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 97b4ae057fcb43eebc64cea1830354b5
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -738,8 +828,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 1cc76ff8008c443a8c6f65fd7f44c465
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -762,8 +858,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 5cd2334dd4c544f9b0a506a143cfb79a
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -782,8 +884,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 59f3f55d93024c02b234561bb0cfe5a6
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -807,8 +915,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 46b37fed488f4028ad8937ddb9edacad
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -833,8 +947,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 6b0829277ef74410aa8d39a07d4336a5
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -856,8 +976,14 @@ zabbix_export:
                 name: 'IF-MIB::ifOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 8f16d1db51ce4dceb0ed8753b74e8b7f
@@ -875,6 +1001,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 60791f5d3f864b5ca4f08de9540b8fca
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -898,8 +1028,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           trigger_prototypes:
             -
               uuid: 97e6d8236ec04a7a91269819c89b2622
@@ -929,6 +1065,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/HP Enterprise Switch SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/HP Enterprise Switch SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/HP Enterprise Switch SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/HP Enterprise Switch SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 0f14cdc1b43a4325ba256645573a0905
               expression: |
@@ -949,6 +1089,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/HP Enterprise Switch SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/HP Enterprise Switch SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/HP Enterprise Switch SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/HP Enterprise Switch SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 61797acc8cb642038b1875a198d0a740
               expression: |
@@ -968,6 +1112,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/HP Enterprise Switch SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/HP Enterprise Switch SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/HP Enterprise Switch SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/HP Enterprise Switch SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: 79cf619c4c4947a2be6bd0d1440d3ca9
@@ -1071,8 +1222,14 @@ zabbix_export:
                 name: 'EtherLike-MIB::dot3StatsDuplexStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 1b117ed66a0c4b098606d1179e21f3f0
@@ -1081,6 +1238,10 @@ zabbix_export:
                   priority: WARNING
                   description: 'Please check autonegotiation settings and cabling'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           preprocessing:
             -
               type: JAVASCRIPT
@@ -1135,8 +1296,8 @@ zabbix_export:
                 name: 'HP-ICF-CHASSIS::hpicfSensorStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Power supply'
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: 81553d4157ce4c938c25b9403c5e572a
@@ -1145,6 +1306,13 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the power supply unit for errors'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: aeb31d4c3958433c9a0105f79156094a
                   expression: 'count(/HP Enterprise Switch SNMP/sensor.psu.status[hpicfSensorStatus.{#SNMPINDEX}],#1,"eq","{$PSU_WARN_STATUS:\"warning\"}")=1'
@@ -1156,6 +1324,13 @@ zabbix_export:
                     -
                       name: '{#ENT_DESCR}: Power supply is in critical state'
                       expression: 'count(/HP Enterprise Switch SNMP/sensor.psu.status[hpicfSensorStatus.{#SNMPINDEX}],#1,"eq","{$PSU_CRIT_STATUS:\"bad\"}")=1'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 5039f958791e40dbb19e16359dad0898
           name: 'Temperature Discovery'
@@ -1192,8 +1367,8 @@ zabbix_export:
                 entPhySensorScale, and entPhySensorPrecision objects must also be examined.
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 5d0d743c7f5449f4a429845ab3894d19
@@ -1204,6 +1379,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: b549cc5016884818bf416c415618171f
                   expression: 'avg(/HP Enterprise Switch SNMP/sensor.temp.value[entPhySensorValue.{#SNMPINDEX}],5m)>{$TEMP_WARN:""}'
@@ -1218,6 +1400,13 @@ zabbix_export:
                       name: '{#SENSOR_INFO}: Temperature is above critical threshold: >{$TEMP_CRIT:""}'
                       expression: 'avg(/HP Enterprise Switch SNMP/sensor.temp.value[entPhySensorValue.{#SNMPINDEX}],5m)>{$TEMP_CRIT:""}'
                       recovery_expression: 'max(/HP Enterprise Switch SNMP/sensor.temp.value[entPhySensorValue.{#SNMPINDEX}],5m)<{$TEMP_CRIT:""}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: a4294d3ad024438aaba4234811d65582
                   expression: 'avg(/HP Enterprise Switch SNMP/sensor.temp.value[entPhySensorValue.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:""}'
@@ -1226,6 +1415,13 @@ zabbix_export:
                   name: '{#SENSOR_INFO}: Temperature is too low: <{$TEMP_CRIT_LOW:""}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 8e9738236f3a4f5eb29df85a46e82326
           name: 'Temp Status Discovery'
@@ -1262,8 +1458,18 @@ zabbix_export:
                 name: 'HP-ICF-CHASSIS::hpicfSensorStatus'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: hp
+        -
+          tag: target
+          value: hp-enterprise
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/net/huawei_snmp/template_net_huawei_snmp.yaml b/templates/net/huawei_snmp/template_net_huawei_snmp.yaml
index 4e492549048..0fcdd71910d 100644
--- a/templates/net/huawei_snmp/template_net_huawei_snmp.yaml
+++ b/templates/net/huawei_snmp/template_net_huawei_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:42:58Z'
+  date: '2022-01-26T09:45:55Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -35,8 +35,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 49df55106af2439eb79e66caa2717ec9
@@ -44,6 +47,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: ee1ee4ce3b3a4545bd407ecc3e428049
           name: 'ICMP loss'
@@ -54,8 +61,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: b7ca2b5273be4f50b5c20b422a534868
@@ -67,6 +77,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/Huawei VRP SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 4f3bda2c7ab84a418bde7602cf0d608d
           name: 'ICMP response time'
@@ -77,8 +94,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: c322fda29bab4f99a0ea204814390551
@@ -93,6 +113,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/Huawei VRP SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 023b4403df464029a1493c53a0122d6f
           name: 'SNMP traps (fallback)'
@@ -105,8 +132,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: 9aba5f7df03b4904869e0043dc73b9ae
           name: 'System contact details'
@@ -128,8 +155,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 034cdbc177c346e0b49791250b8bf66d
           name: 'System description'
@@ -152,8 +179,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 78041d1a10ed4cb6b89a77bc1478b009
           name: 'System location'
@@ -175,8 +202,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 3fad2aa468c2492a89b28bdbffd00c6c
           name: 'System name'
@@ -198,8 +225,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 740f78d69b20405da79525365fdc29fe
@@ -208,6 +235,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: a5e66466550f44a4b1d2137c751e9009
           name: 'System object ID'
@@ -228,8 +262,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: e9dd0d849aaa499da9e2ef9e21ccd50e
           name: Uptime
@@ -250,8 +284,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: c8c41677f4ba463b90cea501e9112483
@@ -264,6 +298,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/Huawei VRP SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 291fbe54d7c845bb9ec5b080be084612
           name: 'SNMP agent availability'
@@ -280,8 +318,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: cefe56d564434018b6a31c196cc7eb55
@@ -294,6 +335,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/Huawei VRP SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: 40ceaa1bc97342c18e6af3e0b931a08b
@@ -317,8 +362,8 @@ zabbix_export:
                 name: 'HUAWEI-ENTITY-EXTENT-MIB::hwEntityFanState'
               tags:
                 -
-                  tag: Application
-                  value: Fans
+                  tag: component
+                  value: fan
               trigger_prototypes:
                 -
                   uuid: ba459f7ce17a4f71a46fa1a0337f0f89
@@ -327,6 +372,13 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the fan unit'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: df877d1d7c9f44b5917b47aa474bbd2f
           name: 'Entity Discovery'
@@ -359,8 +411,8 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: Inventory
+                  tag: component
+                  value: system
         -
           uuid: 597d528e3de944a5807ff37a97763a7e
           name: 'MPU Discovery'
@@ -390,8 +442,8 @@ zabbix_export:
                 The temperature for the {#SNMPVALUE}.
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: d28db9267b9d488f8f359dd7d14d2ac1
@@ -402,6 +454,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: c54c36491adf4a488d11f2538b337129
                   expression: 'avg(/Huawei VRP SNMP/sensor.temp.value[hwEntityTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:""}'
@@ -416,6 +475,13 @@ zabbix_export:
                       name: '{#ENT_NAME}: Temperature is above critical threshold: >{$TEMP_CRIT:""}'
                       expression: 'avg(/Huawei VRP SNMP/sensor.temp.value[hwEntityTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:""}'
                       recovery_expression: 'max(/Huawei VRP SNMP/sensor.temp.value[hwEntityTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:""}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 7b2cffb3ad47440d8b79b39958794ed9
                   expression: 'avg(/Huawei VRP SNMP/sensor.temp.value[hwEntityTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:""}'
@@ -424,6 +490,13 @@ zabbix_export:
                   name: '{#ENT_NAME}: Temperature is too low: <{$TEMP_CRIT_LOW:""}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 6fae73ea06ff4e99956085fb807d75ae
               name: '{#ENT_NAME}: CPU utilization'
@@ -439,8 +512,8 @@ zabbix_export:
                 Reference: http://support.huawei.com/enterprise/KnowledgebaseReadAction.action?contentId=KB1000090234
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
               trigger_prototypes:
                 -
                   uuid: 66bfe7805cae4447a32a6e5877e1231b
@@ -449,6 +522,10 @@ zabbix_export:
                   opdata: 'Current utilization: {ITEM.LASTVALUE1}'
                   priority: WARNING
                   description: 'CPU utilization is too high. The system might be slow to respond.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: d7e128d526c14d1bb5519090104f0e04
               name: '{#ENT_NAME}: Hardware serial number'
@@ -467,8 +544,8 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: Inventory
+                  tag: component
+                  value: system
               trigger_prototypes:
                 -
                   uuid: e379ca4d50a3434e82841e8884a84656
@@ -477,6 +554,10 @@ zabbix_export:
                   priority: INFO
                   description: 'Device serial number has changed. Ack to close'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 110646e0177f4fbe840f6ba2d1d2afc4
               name: '{#ENT_NAME}: Hardware version(revision)'
@@ -495,8 +576,8 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: Inventory
+                  tag: component
+                  value: system
             -
               uuid: 4472c8f94cd241468c851283f9854730
               name: '{#ENT_NAME}: Operating system'
@@ -515,8 +596,8 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: Inventory
+                  tag: component
+                  value: os
               trigger_prototypes:
                 -
                   uuid: 698067d647424c96addeb3c9f960dd07
@@ -529,6 +610,10 @@ zabbix_export:
                     -
                       name: 'System name has changed (new name: {ITEM.VALUE})'
                       expression: 'last(/Huawei VRP SNMP/system.name,#1)<>last(/Huawei VRP SNMP/system.name,#2) and length(last(/Huawei VRP SNMP/system.name))>0'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 6215b7e957884516a350f8a7038c7d3e
               name: '{#ENT_NAME}: Memory utilization'
@@ -544,8 +629,8 @@ zabbix_export:
                 Reference: http://support.huawei.com/enterprise/KnowledgebaseReadAction.action?contentId=KB1000090234
               tags:
                 -
-                  tag: Application
-                  value: Memory
+                  tag: component
+                  value: memory
               trigger_prototypes:
                 -
                   uuid: 2d93533c7cc74dc9a85e280605e21e7d
@@ -553,6 +638,13 @@ zabbix_export:
                   name: '{#ENT_NAME}: High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
                   priority: AVERAGE
                   description: 'The system is running out of free memory.'
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 29cf1159b56b4cf086a980609efaf046
@@ -666,8 +758,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: d21e9fec64c54fd19605f8a8ba230211
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -686,8 +784,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: e5323fadbfbe4773ab450312a2c29164
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -711,8 +815,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: c5bc13495caf4a208b21bcd0a515a19d
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -735,8 +845,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 9291e8cfc58a4c029ff339bae4892faf
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -755,8 +871,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 998389bdf381441e92ddd597272002fa
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -780,8 +902,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: c45208952a8f43e7a4ac90dbc9bf2eac
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -806,8 +934,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 1659d815112945478585fceef9318e68
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -829,8 +963,14 @@ zabbix_export:
                 name: 'IF-MIB::ifOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: b67a4949e886409b89537338f657570e
@@ -848,6 +988,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: f6135b96b3584060b3a605312748edf4
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -871,8 +1015,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           trigger_prototypes:
             -
               uuid: 675512801cb5498887b8411c5afd5f0c
@@ -902,6 +1052,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Huawei VRP SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/Huawei VRP SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/Huawei VRP SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/Huawei VRP SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 9ebcd822aa6a4fb493c74c4d4759510b
               expression: |
@@ -922,6 +1076,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Huawei VRP SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/Huawei VRP SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/Huawei VRP SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/Huawei VRP SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 609c079cc7fd486fb4c938acd1c8b47f
               expression: |
@@ -941,6 +1099,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Huawei VRP SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/Huawei VRP SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/Huawei VRP SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/Huawei VRP SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: 2a0d7c12dc4146399cda6b80a1b75f26
@@ -1044,8 +1209,14 @@ zabbix_export:
                 name: 'EtherLike-MIB::dot3StatsDuplexStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 5f275f483fca402ba8f9aa485398d85b
@@ -1054,6 +1225,10 @@ zabbix_export:
                   priority: WARNING
                   description: 'Please check autonegotiation settings and cabling'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           preprocessing:
             -
               type: JAVASCRIPT
@@ -1072,6 +1247,16 @@ zabbix_export:
                       });
                   });
                   return JSON.stringify(data);
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: huawei
+        -
+          tag: target
+          value: huawei-vrp
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/net/intel_qlogic_infiniband_snmp/template_net_intel_qlogic_infiniband_snmp.yaml b/templates/net/intel_qlogic_infiniband_snmp/template_net_intel_qlogic_infiniband_snmp.yaml
index e748e6d9f40..a01f60fc98f 100644
--- a/templates/net/intel_qlogic_infiniband_snmp/template_net_intel_qlogic_infiniband_snmp.yaml
+++ b/templates/net/intel_qlogic_infiniband_snmp/template_net_intel_qlogic_infiniband_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:43:03Z'
+  date: '2022-01-26T09:49:19Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -33,8 +33,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: a3a6c95c0a32405d81b1bc7690f1bd1f
@@ -42,6 +45,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 81af3843a1e44469affca02640f22b77
           name: 'ICMP loss'
@@ -52,8 +59,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 9c78f78339724840b7ab6db4c62f5aa0
@@ -65,6 +75,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/Intel_Qlogic Infiniband SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 771d21b9c40b426d97eff54c6ac5227e
           name: 'ICMP response time'
@@ -75,8 +92,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 3c5e0b2660764386ac162ed5d2778a56
@@ -91,6 +111,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/Intel_Qlogic Infiniband SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 5bb2ef0f72244294bcc469710a0a1225
           name: 'SNMP traps (fallback)'
@@ -103,8 +130,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: 8570bf70c217434cb40b9efa74d7e070
           name: 'System contact details'
@@ -126,8 +153,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 1c17fbf4b11b45f087668eefa9438341
           name: 'System description'
@@ -150,8 +177,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 9cfafe1389af4e569886c5acd8d95de9
           name: 'Firmware version'
@@ -175,8 +202,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 1ca7574040da41a3bf416daa8172d952
@@ -186,6 +213,10 @@ zabbix_export:
               priority: INFO
               description: 'Firmware version has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 656086e221e84a9a90cc16855f564571
           name: 'Hardware model name'
@@ -210,8 +241,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
         -
           uuid: d1ee46aa709d43919ae3727e4d55af42
           name: 'System location'
@@ -233,8 +264,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 7f06f097558d4ef3801207031e660756
           name: 'System name'
@@ -256,8 +287,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: cfcabcb7d9ca4fd59ed79775bcf059bb
@@ -266,6 +297,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: c4c4e044967a432a829ca88d8dcd8c2e
           name: 'System object ID'
@@ -286,8 +324,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: db4c4bc058b147a293b12f8737e42a53
           name: Uptime
@@ -308,8 +346,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 20166f9c8d5448a494b6b578471df8cc
@@ -322,6 +360,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/Intel_Qlogic Infiniband SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: a182c41cf58b465895ff677ca96e5b65
           name: 'SNMP agent availability'
@@ -338,8 +380,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: ccbd4c4da58f4b72a82371c2f3eaf4e1
@@ -352,6 +397,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/Intel_Qlogic Infiniband SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: 74e3c6efb7f24ffaa2b59c3518d37b32
@@ -378,8 +427,8 @@ zabbix_export:
                 name: 'ICS-CHASSIS-MIB::icsChassisFanOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: Fans
+                  tag: component
+                  value: fan
               trigger_prototypes:
                 -
                   uuid: 7ceeb8d2ec314fc1b8dbe9746e9a667a
@@ -388,6 +437,13 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the fan unit'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 10fcb5ff857448bf88ebfb02d1bea505
           name: 'Network interfaces discovery'
@@ -476,8 +532,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 8a6b75dab396460b85b2b0a5c545a163
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -496,8 +558,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: ab73df14ab8d4d00994d0fad4abe0cf2
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -521,8 +589,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 7edbc6d440c94857818fed946ee74ef0
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -545,8 +619,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: ae4ac83054d344d6be098d4c70c9cbf7
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -565,8 +645,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 88f432e3c475431c8295497d68ec904b
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -590,8 +676,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: ae55937ae3084131b58263805ba6d3ad
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -616,8 +708,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: a0818a565e9e4ac69312a04b69de9c95
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -639,8 +737,14 @@ zabbix_export:
                 name: 'IF-MIB::ifOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 18cef8eb4ade4e15bd04ad476e95a185
@@ -658,6 +762,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: f979174f556c4906825d9373f60f22ab
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -681,8 +789,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           trigger_prototypes:
             -
               uuid: ead4b546caa5429197d566010e3a4a43
@@ -712,6 +826,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Intel_Qlogic Infiniband SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/Intel_Qlogic Infiniband SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/Intel_Qlogic Infiniband SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/Intel_Qlogic Infiniband SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 9d5d70c272a641c0ae63aca365cdb103
               expression: |
@@ -732,6 +850,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Intel_Qlogic Infiniband SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/Intel_Qlogic Infiniband SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/Intel_Qlogic Infiniband SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/Intel_Qlogic Infiniband SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: fba9e43d9fcb43fb9cf5128f1287ac7c
               expression: |
@@ -751,6 +873,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Intel_Qlogic Infiniband SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/Intel_Qlogic Infiniband SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/Intel_Qlogic Infiniband SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/Intel_Qlogic Infiniband SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: 148e429035204c199b146850c94dae71
@@ -830,8 +959,8 @@ zabbix_export:
                 name: 'ICS-CHASSIS-MIB::icsChassisPowerSupplyOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Power supply'
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: 1d0c9610cd984124bb7fed812e9edb16
@@ -840,6 +969,13 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the power supply unit for errors'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 7ae4943842ea491c899ce0f84210e202
                   expression: 'count(/Intel_Qlogic Infiniband SNMP/sensor.psu.status[icsChassisPowerSupplyEntry.{#SNMPINDEX}],#1,"eq","{$PSU_WARN_STATUS}")=1'
@@ -851,6 +987,13 @@ zabbix_export:
                     -
                       name: '{#SNMPVALUE}: Power supply is in critical state'
                       expression: 'count(/Intel_Qlogic Infiniband SNMP/sensor.psu.status[icsChassisPowerSupplyEntry.{#SNMPINDEX}],#1,"eq","{$PSU_CRIT_STATUS}")=1'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 9c408be55f0b4b1384191275f1b624a8
           name: 'Temperature Discovery'
@@ -883,8 +1026,8 @@ zabbix_export:
                 name: 'ICS-CHASSIS-MIB::icsChassisSensorSlotOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
             -
               uuid: 943a4862c1e34cc1a30364a2677b327b
               name: '{#SENSOR_INFO}: Temperature'
@@ -899,8 +1042,8 @@ zabbix_export:
                 The current value read from the sensor.
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 03e351b056504735b02da8c37dad6bf0
@@ -910,6 +1053,13 @@ zabbix_export:
                   name: '{#SENSOR_INFO}: Temperature is too low: <{$TEMP_CRIT_LOW:""}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
           trigger_prototypes:
             -
               uuid: 61c220a2ae9a4074baf4051214679e77
@@ -923,6 +1073,13 @@ zabbix_export:
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
               description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: d6f38aebdcde46e688350b40d5cbe85b
               expression: |
@@ -943,6 +1100,13 @@ zabbix_export:
                     or
                     last(/Intel_Qlogic Infiniband SNMP/sensor.temp.status[icsChassisSensorSlotOperStatus.{#SNMPINDEX}])={$TEMP_CRIT_STATUS}
                   recovery_expression: 'max(/Intel_Qlogic Infiniband SNMP/sensor.temp.value[icsChassisSensorSlotValue.{#SNMPINDEX}],5m)<{$TEMP_CRIT:""}-3'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 1b369978fa354767834598c87c0df1e0
           name: 'Unit Discovery'
@@ -977,8 +1141,8 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: Inventory
+                  tag: component
+                  value: system
               trigger_prototypes:
                 -
                   uuid: 90778aeb97244258a830e89eeb263e54
@@ -987,6 +1151,20 @@ zabbix_export:
                   priority: INFO
                   description: 'Device serial number has changed. Ack to close'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: intel
+        -
+          tag: target
+          value: qlogic-infiniband
       macros:
         -
           macro: '{$FAN_CRIT_STATUS}'
diff --git a/templates/net/juniper_snmp/template_net_juniper_snmp.yaml b/templates/net/juniper_snmp/template_net_juniper_snmp.yaml
index 29eb66353cb..70f5e64f204 100644
--- a/templates/net/juniper_snmp/template_net_juniper_snmp.yaml
+++ b/templates/net/juniper_snmp/template_net_juniper_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:43:07Z'
+  date: '2022-01-26T09:52:52Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -35,8 +35,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: d90e80fd900246dcab90447ee2a6a7a1
@@ -44,6 +47,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 3a1c4412bb9340169827209df2554a50
           name: 'ICMP loss'
@@ -54,8 +61,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: d3911ede372e4eb3b89b30e8e340a716
@@ -67,6 +77,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/Juniper SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: ad350f912d2f4ead90aacdefa245cdf3
           name: 'ICMP response time'
@@ -77,8 +94,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 751d9855903f4f00b674b511fe992121
@@ -93,6 +113,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/Juniper SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: e5470bc511a5499e9b8dc8bf4de8f054
           name: 'SNMP traps (fallback)'
@@ -105,8 +132,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: b8583eaf0353493ba18e751c9355dfa7
           name: 'System contact details'
@@ -128,8 +155,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: ca8d30d561184ff4bf1b4ef07feb7302
           name: 'System description'
@@ -152,8 +179,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 7a472141ebcf4816bffe9bb49f003db6
           name: 'Hardware model name'
@@ -175,8 +202,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
         -
           uuid: b836efdbd3ac4becac319030250c1beb
           name: 'Hardware serial number'
@@ -198,8 +225,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 9f1f3316ed6f4d50a4c9f71a15f35d50
@@ -208,6 +235,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 7a0062fa788c4abdbeb83df30276a0fd
           name: 'System location'
@@ -229,8 +260,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 87d8d5844b044be1a2a3261f98116fb0
           name: 'System name'
@@ -252,8 +283,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 97157acd882944e29d6fb9fa1a2d9506
@@ -262,6 +293,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: ebfd8c6f87d3401197bb8d9835206878
           name: 'System object ID'
@@ -282,8 +320,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 414a29c595b2439dacb15b4fa0734ab4
           name: 'Overall system health status'
@@ -308,8 +346,8 @@ zabbix_export:
             name: 'JUNIPER-ALARM-MIB::jnxRedAlarmState'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 1190bb9c05424ac5a0052bd191c274f2
@@ -318,6 +356,13 @@ zabbix_export:
               opdata: 'Current state: {ITEM.LASTVALUE1}'
               priority: HIGH
               description: 'Please check the device for errors'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 24cd5862c2de4cbaad0b3bbce7f26a65
           name: 'Operating system'
@@ -342,8 +387,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: os
           triggers:
             -
               uuid: 9249511ecf4a4a2d952aa0c4fe55a5d0
@@ -356,6 +401,10 @@ zabbix_export:
                 -
                   name: 'System name has changed (new name: {ITEM.VALUE})'
                   expression: 'last(/Juniper SNMP/system.name,#1)<>last(/Juniper SNMP/system.name,#2) and length(last(/Juniper SNMP/system.name))>0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: bd29b0df96ac4b93bbd0746257d3601d
           name: Uptime
@@ -376,8 +425,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 23e25e580543411ab8ffc2a4c1ca3c54
@@ -390,6 +439,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/Juniper SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 80ff69518e07493aac6059e1009d9a9f
           name: 'SNMP agent availability'
@@ -406,8 +459,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 417527b3749c4a1c891d761c0978fb2e
@@ -420,6 +476,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/Juniper SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: 3ce46d56008248cf960c6bf689ea7c0b
@@ -453,8 +513,8 @@ zabbix_export:
                 Reference: http://kb.juniper.net/library/CUSTOMERSERVICE/GLOBAL_JTAC/BK26199/SRX%20SNMP%20Monitoring%20Guide_v1.1.pdf
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
               trigger_prototypes:
                 -
                   uuid: 248c49bc4f47437b9b91e20b57da197d
@@ -463,6 +523,10 @@ zabbix_export:
                   opdata: 'Current utilization: {ITEM.LASTVALUE1}'
                   priority: WARNING
                   description: 'CPU utilization is too high. The system might be slow to respond.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: f60e29b4392e4a3e882a4175e618890c
               name: '{#SNMPVALUE}: Memory utilization'
@@ -478,8 +542,8 @@ zabbix_export:
                 Reference: http://kb.juniper.net/library/CUSTOMERSERVICE/GLOBAL_JTAC/BK26199/SRX%20SNMP%20Monitoring%20Guide_v1.1.pdf
               tags:
                 -
-                  tag: Application
-                  value: Memory
+                  tag: component
+                  value: memory
               trigger_prototypes:
                 -
                   uuid: ab1f3dcba55d41da974c3ac60ca5b8f2
@@ -487,6 +551,13 @@ zabbix_export:
                   name: '{#SNMPVALUE}: High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
                   priority: AVERAGE
                   description: 'The system is running out of free memory.'
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 7cc53c92b6be4fc59d2928e73f6fe8c3
@@ -535,8 +606,8 @@ zabbix_export:
                 name: 'JUNIPER-ALARM-MIB::jnxOperatingState'
               tags:
                 -
-                  tag: Application
-                  value: Fans
+                  tag: component
+                  value: fan
               trigger_prototypes:
                 -
                   uuid: f8f1dee0b0ff465d98c6f6bcdfaff17f
@@ -545,6 +616,13 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the fan unit'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: aa36adb11a874374a739d96a2f9a0b3d
           name: 'PSU Discovery'
@@ -571,8 +649,8 @@ zabbix_export:
                 name: 'JUNIPER-ALARM-MIB::jnxOperatingState'
               tags:
                 -
-                  tag: Application
-                  value: 'Power supply'
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: e577226331f6483fbd1e414bb7d365f7
@@ -581,6 +659,13 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the power supply unit for errors'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: e28a9bc06ada4427a7e135aa41c4f76b
           name: 'Temperature discovery'
@@ -612,8 +697,8 @@ zabbix_export:
                 The temperature in Celsius (degrees C) of {#SENSOR_INFO}
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: c82ca2b550f540b7a4c8f9548e15cfb0
@@ -624,6 +709,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 51113c80e4bd46de8ea247e0bd3b19dd
                   expression: 'avg(/Juniper SNMP/sensor.temp.value[jnxOperatingTemp.{#SNMPINDEX}],5m)>{$TEMP_WARN:""}'
@@ -638,6 +730,13 @@ zabbix_export:
                       name: '{#SENSOR_INFO}: Temperature is above critical threshold: >{$TEMP_CRIT:""}'
                       expression: 'avg(/Juniper SNMP/sensor.temp.value[jnxOperatingTemp.{#SNMPINDEX}],5m)>{$TEMP_CRIT:""}'
                       recovery_expression: 'max(/Juniper SNMP/sensor.temp.value[jnxOperatingTemp.{#SNMPINDEX}],5m)<{$TEMP_CRIT:""}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 35b56753b2424f0989ca09cb67f7d9a3
                   expression: 'avg(/Juniper SNMP/sensor.temp.value[jnxOperatingTemp.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:""}'
@@ -646,6 +745,13 @@ zabbix_export:
                   name: '{#SENSOR_INFO}: Temperature is too low: <{$TEMP_CRIT_LOW:""}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 8ec2a60b8bfe43e7b9227042da1cf2ac
           name: 'Network interfaces discovery'
@@ -734,8 +840,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 3d94079eddb141ceac3b6a134168e422
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -754,8 +866,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 0cde648550284243a078965f165a069a
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -779,8 +897,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: d440b154c6194043a657fca8c4ed3179
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -803,8 +927,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: e9ed9d3d6b8b4340b7f1e22ca066a61d
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -823,8 +953,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 9c2bd3364f984af498b7bedbccc23c77
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -848,8 +984,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 339529dba51f4ae5abe508a2461e0e71
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -874,8 +1016,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 51cda26d008e458790fd722a95072814
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -897,8 +1045,14 @@ zabbix_export:
                 name: 'IF-MIB::ifOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: c993121dca984691bd2cdf0d41c318b4
@@ -916,6 +1070,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 68dd9241092f4f2994d6e5d53cec96b7
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -939,8 +1097,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           trigger_prototypes:
             -
               uuid: faabf122af7e4cca8fdc6e57060b2e69
@@ -970,6 +1134,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Juniper SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/Juniper SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/Juniper SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/Juniper SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: f937622c6f7540579a60328398430f00
               expression: |
@@ -990,6 +1158,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Juniper SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/Juniper SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/Juniper SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/Juniper SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 5731e4345a544b45b6a70a71284b878d
               expression: |
@@ -1009,6 +1181,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Juniper SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/Juniper SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/Juniper SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/Juniper SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: bdb09ef524a34b65aaee2c574cd77bde
@@ -1112,8 +1291,14 @@ zabbix_export:
                 name: 'EtherLike-MIB::dot3StatsDuplexStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: a2f686bf06cc4e0a8aa24675abd5d557
@@ -1122,6 +1307,10 @@ zabbix_export:
                   priority: WARNING
                   description: 'Please check autonegotiation settings and cabling'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           preprocessing:
             -
               type: JAVASCRIPT
@@ -1140,6 +1329,13 @@ zabbix_export:
                       });
                   });
                   return JSON.stringify(data);
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: juniper
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/net/mellanox_snmp/template_net_mellanox_snmp.yaml b/templates/net/mellanox_snmp/template_net_mellanox_snmp.yaml
index 895e9ba8813..4c62e1af1eb 100644
--- a/templates/net/mellanox_snmp/template_net_mellanox_snmp.yaml
+++ b/templates/net/mellanox_snmp/template_net_mellanox_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-10T07:57:02Z'
+  date: '2022-01-26T09:50:15Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -21,7 +21,7 @@ zabbix_export:
         ENTITY-MIB
         IF-MIB
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: 'Templates/Network devices'
@@ -36,8 +36,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: fe4c81a386814dfa80ffc76e1b7da9a1
@@ -45,6 +48,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 50e85be3969447c58fcfeca5d9a1a9bb
           name: 'ICMP loss'
@@ -55,12 +62,15 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 52b307324c37481693d419df236cbbd7
-              expression: 'min(/Mellanox SNMP/icmppingloss,5m)>{$ICMP.LOSS.WARN} and min(/Mellanox SNMP/icmppingloss,5m)<100'
+              expression: 'min(/Mellanox SNMP/icmppingloss,5m)>{$ICMP_LOSS_WARN} and min(/Mellanox SNMP/icmppingloss,5m)<100'
               name: 'High ICMP ping loss'
               opdata: 'Loss: {ITEM.LASTVALUE1}'
               priority: WARNING
@@ -68,6 +78,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/Mellanox SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 7567e999d75442379066babdc9b50894
           name: 'ICMP response time'
@@ -78,22 +95,32 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 39a9cff305074e1a8b7c6ed0c526fda9
-              expression: 'avg(/Mellanox SNMP/icmppingsec,5m)>{$ICMP.RESPONSE_TIME.WARN}'
+              expression: 'avg(/Mellanox SNMP/icmppingsec,5m)>{$ICMP_RESPONSE_TIME_WARN}'
               name: 'High ICMP ping response time'
               opdata: 'Value: {ITEM.LASTVALUE1}'
               priority: WARNING
               dependencies:
                 -
                   name: 'High ICMP ping loss'
-                  expression: 'min(/Mellanox SNMP/icmppingloss,5m)>{$ICMP.LOSS.WARN} and min(/Mellanox SNMP/icmppingloss,5m)<100'
+                  expression: 'min(/Mellanox SNMP/icmppingloss,5m)>{$ICMP_LOSS_WARN} and min(/Mellanox SNMP/icmppingloss,5m)<100'
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/Mellanox SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 0cb8aadeb5554583a65c3496cfed2c1b
           name: 'SNMP traps (fallback)'
@@ -106,8 +133,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: f62a8b653c3d44d09864a4a4c910aeb1
           name: 'System contact details'
@@ -129,8 +156,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: c33470549bda45e88ecb8ded7d0b5e87
           name: 'CPU utilization'
@@ -151,8 +178,8 @@ zabbix_export:
                 - '$..[''{#CPU.UTIL}''].avg()'
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
           triggers:
             -
               uuid: 26913093ab414fe69ff157102ae54796
@@ -161,6 +188,10 @@ zabbix_export:
               opdata: 'Current utilization: {ITEM.LASTVALUE1}'
               priority: WARNING
               description: 'CPU utilization is too high. The system might be slow to respond.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 64c4f3e890ec4c29be07ba2d06345534
           name: 'System description'
@@ -183,8 +214,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: e0d2149e1a114f3a971c324673beae2f
           name: 'System location'
@@ -206,8 +237,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: f63d1f71a97e45b0ab5716299ef298ea
           name: 'System name'
@@ -229,8 +260,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: ff7ad0676a774cf49a4568e752dd916b
@@ -239,6 +270,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: f1535f45138b472c945e231a9beb9cc5
           name: 'System object ID'
@@ -259,8 +297,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: d7f06d23f6b14677b5183f2cc94fc10d
           name: Uptime
@@ -281,8 +319,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 667856dcaad04a108cb0a5150e825a50
@@ -295,6 +333,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/Mellanox SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: aba117057e824b6789fca847cae9e0fc
           name: 'SNMP agent availability'
@@ -311,8 +353,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 6e476399963a414a847c4c514055bf43
@@ -325,6 +370,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/Mellanox SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: 55a44fb2235f4e25b960422338674193
@@ -358,8 +407,8 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: Inventory
+                  tag: component
+                  value: system
             -
               uuid: 9f2e2fd678e94554be29654a5746099f
               name: '{#ENT_NAME}: Hardware serial number'
@@ -378,8 +427,8 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: Inventory
+                  tag: component
+                  value: system
               trigger_prototypes:
                 -
                   uuid: 585db2b2a42b4eb09770ca2241a557d0
@@ -388,6 +437,10 @@ zabbix_export:
                   priority: INFO
                   description: 'Device serial number has changed. Ack to close'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
           preprocessing:
             -
               type: DISCARD_UNCHANGED_HEARTBEAT
@@ -423,8 +476,8 @@ zabbix_export:
                 entPhySensorScale, and entPhySensorPrecision objects must also be examined.
               tags:
                 -
-                  tag: Application
-                  value: Fans
+                  tag: component
+                  value: fan
             -
               uuid: 401d26902e6f4080ab2b0123d95a08ba
               name: '{#SENSOR_INFO}: Fan status'
@@ -441,16 +494,23 @@ zabbix_export:
                 name: 'ENTITY-SENSORS-MIB::EntitySensorStatus'
               tags:
                 -
-                  tag: Application
-                  value: Fans
+                  tag: component
+                  value: fan
               trigger_prototypes:
                 -
                   uuid: de81ef4f2c3f4f44a745a1fa1f179784
-                  expression: 'count(/Mellanox SNMP/sensor.fan.status[entPhySensorOperStatus.{#SNMPINDEX}],#1,"eq","{$FAN.STATUS.CRIT}")=1'
+                  expression: 'count(/Mellanox SNMP/sensor.fan.status[entPhySensorOperStatus.{#SNMPINDEX}],#1,"eq","{$FAN_CRIT_STATUS}")=1'
                   name: '{#SENSOR_INFO}: Fan is in critical state'
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the fan unit'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
           preprocessing:
             -
               type: JAVASCRIPT
@@ -553,8 +613,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: c625b20266a04a1ba0421b4a64629dcc
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -573,8 +639,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 262f5aa5582441ecb93fd7df6a59a76d
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -598,8 +670,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: b7c510be904e4d06830ae13a16bc9668
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -622,8 +700,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 67b4b6520bbd45fd96d78a5942b54c09
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -642,8 +726,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 8e149281afb742758a00b699a281a584
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -667,8 +757,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: ddbde55ce98f465a8973d60b1ecb0f8c
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -693,8 +789,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 6a1429de015640768d2cdd2adc4b09d7
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -716,8 +818,14 @@ zabbix_export:
                 name: 'IF-MIB::ifOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 46918cfc713a4b1da7eed32cead0070b
@@ -735,6 +843,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 7ecba23625b64d94873b938ebbce500b
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -758,8 +870,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           trigger_prototypes:
             -
               uuid: 2dc62fe3cd624e2ba99caa9ff94273f6
@@ -789,6 +907,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Mellanox SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/Mellanox SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/Mellanox SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/Mellanox SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 20e8f28ebc304ba185d475dbba51c4b8
               expression: |
@@ -809,6 +931,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Mellanox SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/Mellanox SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/Mellanox SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/Mellanox SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 6740479821cd49c199c345dd736a11f7
               expression: |
@@ -828,6 +954,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Mellanox SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/Mellanox SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/Mellanox SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/Mellanox SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: cabe6db1b71f42d9bc3cef730221a14b
@@ -907,8 +1040,8 @@ zabbix_export:
                 name: 'ENTITY-STATE-MIB::EntityOperState'
               tags:
                 -
-                  tag: Application
-                  value: 'Power supply'
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: 5d2d688ad68343ff8884c11e9d233b98
@@ -917,6 +1050,13 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the power supply unit for errors'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
           preprocessing:
             -
               type: DISCARD_UNCHANGED_HEARTBEAT
@@ -961,8 +1101,8 @@ zabbix_export:
                 name: 'ENTITY-SENSORS-MIB::EntitySensorStatus'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
             -
               uuid: ffe7f6dff12f4b4ba24ddc28c6d1182b
               name: '{#SENSOR_INFO}: Temperature'
@@ -984,8 +1124,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 7259bdafbe7f4227999d7365a99e536d
@@ -996,6 +1136,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 7bfa2bd0177940f4aff8dc95867ceb44
                   expression: 'avg(/Mellanox SNMP/sensor.temp.value[entPhySensorValue.{#SNMPINDEX}],5m)<{$TEMP.MIN.CRIT:"{#SENSOR_INFO}"}'
@@ -1004,6 +1151,13 @@ zabbix_export:
                   name: '{#SENSOR_INFO}: Temperature is too low: <{$TEMP.MIN.CRIT:"{#SENSOR_INFO}"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
           trigger_prototypes:
             -
               uuid: 352650536eef4858be1437a720712932
@@ -1022,6 +1176,13 @@ zabbix_export:
                   name: '{#SENSOR_INFO}: Temperature is above critical threshold: >{$TEMP.MAX.CRIT:"{#SENSOR_INFO}"}'
                   expression: 'avg(/Mellanox SNMP/sensor.temp.value[entPhySensorValue.{#SNMPINDEX}],5m)>{$TEMP.MAX.CRIT:"{#SENSOR_INFO}"}'
                   recovery_expression: 'max(/Mellanox SNMP/sensor.temp.value[entPhySensorValue.{#SNMPINDEX}],5m)<{$TEMP.MAX.CRIT:"{#SENSOR_INFO}"}-3'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
           preprocessing:
             -
               type: JAVASCRIPT
@@ -1078,8 +1239,11 @@ zabbix_export:
               description: 'Space utilization in % for {#FSNAME}'
               tags:
                 -
-                  tag: Application
-                  value: 'Filesystem {#FSNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 1a743f5b617f4800b5b2b9672f34693c
               name: '{#FSNAME}: Total space'
@@ -1100,8 +1264,11 @@ zabbix_export:
                     - '{#ALLOC_UNITS}'
               tags:
                 -
-                  tag: Application
-                  value: 'Filesystem {#FSNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 82fadd771c3040c9ba001a9a40a83163
               name: '{#FSNAME}: Used space'
@@ -1120,8 +1287,11 @@ zabbix_export:
                     - '{#ALLOC_UNITS}'
               tags:
                 -
-                  tag: Application
-                  value: 'Filesystem {#FSNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
           trigger_prototypes:
             -
               uuid: f1eb2ddb27d24cd99d8aba4485dfeeb9
@@ -1137,6 +1307,13 @@ zabbix_export:
                  - The disk free space is less than 5G.
                  - The disk will be full in less than 24 hours.
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
             -
               uuid: b2e084f280434a3a8291e5dc691dfd7b
               expression: |
@@ -1157,6 +1334,13 @@ zabbix_export:
                   expression: |
                     last(/Mellanox SNMP/vfs.fs.pused[storageUsedPercentage.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"{#FSNAME}"} and
                     ((last(/Mellanox SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/Mellanox SNMP/vfs.fs.used[hrStorageUsed.{#SNMPINDEX}]))<5G or timeleft(/Mellanox SNMP/vfs.fs.pused[storageUsedPercentage.{#SNMPINDEX}],1h,100)<1d)
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
           graph_prototypes:
             -
               uuid: 323ae8e8795543958fe6affc78a3853c
@@ -1235,8 +1419,8 @@ zabbix_export:
                     - '{#ALLOC_UNITS}'
               tags:
                 -
-                  tag: Application
-                  value: Memory
+                  tag: component
+                  value: memory
             -
               uuid: e661062e7fcb45968ca1e9a1306f4848
               name: '{#MEMNAME}: Used memory'
@@ -1255,8 +1439,8 @@ zabbix_export:
                     - '{#ALLOC_UNITS}'
               tags:
                 -
-                  tag: Application
-                  value: Memory
+                  tag: component
+                  value: memory
             -
               uuid: cedea4befd6a47b8983eff5dee9feed9
               name: '{#MEMNAME}: Memory utilization'
@@ -1269,8 +1453,8 @@ zabbix_export:
               description: 'Memory utilization in %'
               tags:
                 -
-                  tag: Application
-                  value: Memory
+                  tag: component
+                  value: memory
               trigger_prototypes:
                 -
                   uuid: 912430a103414c6eb9c8e55c45246f48
@@ -1278,6 +1462,13 @@ zabbix_export:
                   name: '{#MEMNAME}: High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
                   priority: AVERAGE
                   description: 'The system is running out of free memory.'
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: bc2042eaf8244d28891e6d71414847da
@@ -1296,12 +1487,19 @@ zabbix_export:
               type: DISCARD_UNCHANGED_HEARTBEAT
               parameters:
                 - 6h
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: mellanox
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
           value: '90'
         -
-          macro: '{$FAN.STATUS.CRIT}'
+          macro: '{$FAN_CRIT_STATUS}'
           value: '3'
           description: 'The critical value of the FAN sensor for trigger expression.'
         -
@@ -1311,6 +1509,12 @@ zabbix_export:
           macro: '{$ICMP.RESPONSE_TIME.WARN}'
           value: '0.15'
         -
+          macro: '{$ICMP_LOSS_WARN}'
+          value: '20'
+        -
+          macro: '{$ICMP_RESPONSE_TIME_WARN}'
+          value: '0.15'
+        -
           macro: '{$IF.ERRORS.WARN}'
           value: '2'
         -
diff --git a/templates/net/mikrotik/mikrotik_CCR1009-7G-1C-1S+PC_snmp/README.md b/templates/net/mikrotik/mikrotik_CCR1009-7G-1C-1S+PC_snmp/README.md
index 50cf5e1ec72..0ab04066732 100644
--- a/templates/net/mikrotik/mikrotik_CCR1009-7G-1C-1S+PC_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_CCR1009-7G-1C-1S+PC_snmp/README.md
@@ -71,7 +71,7 @@ There are no template links in this template.
 |Network interfaces discovery |<p>Discovering interfaces from IF-MIB.</p> |SNMP |net.if.discovery<p>**Filter**:</p>AND <p>- {#IFADMINSTATUS} MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.MATCHES}`</p><p>- {#IFADMINSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.NOT_MATCHES}`</p><p>- {#IFOPERSTATUS} MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.MATCHES}`</p><p>- {#IFOPERSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.NOT_MATCHES}`</p><p>- {#IFNAME} MATCHES_REGEX `{$NET.IF.IFNAME.MATCHES}`</p><p>- {#IFNAME} NOT_MATCHES_REGEX `{$NET.IF.IFNAME.NOT_MATCHES}`</p><p>- {#IFDESCR} MATCHES_REGEX `{$NET.IF.IFDESCR.MATCHES}`</p><p>- {#IFDESCR} NOT_MATCHES_REGEX `{$NET.IF.IFDESCR.NOT_MATCHES}`</p><p>- {#IFALIAS} MATCHES_REGEX `{$NET.IF.IFALIAS.MATCHES}`</p><p>- {#IFALIAS} NOT_MATCHES_REGEX `{$NET.IF.IFALIAS.NOT_MATCHES}`</p><p>- {#IFTYPE} MATCHES_REGEX `{$NET.IF.IFTYPE.MATCHES}`</p><p>- {#IFTYPE} NOT_MATCHES_REGEX `{$NET.IF.IFTYPE.NOT_MATCHES}`</p> |
 |Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 |Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
-|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
 
 ## Items collected
 
@@ -137,14 +137,14 @@ There are no template links in this template.
 |Interface {#IFNAME}({#IFALIAS}): Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p><p>3. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CCR1009-7G-1C-1SPC SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CCR1009-7G-1C-1SPC SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CCR1009-7G-1C-1SPC SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))`<p>Recovery expression:</p>`last(/MikroTik CCR1009-7G-1C-1SPC SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0` |AVERAGE |<p>Manual close: YES</p> |
 |Interface {#IFNAME}({#IFALIAS}): High bandwidth usage (>{$IF.UTIL.MAX:"{#IFNAME}"}%) |<p>The network interface utilization is close to its estimated maximum bandwidth.</p> |`(avg(/MikroTik CCR1009-7G-1C-1SPC SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik CCR1009-7G-1C-1SPC SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) or avg(/MikroTik CCR1009-7G-1C-1SPC SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik CCR1009-7G-1C-1SPC SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])) and last(/MikroTik CCR1009-7G-1C-1SPC SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0`<p>Recovery expression:</p>`avg(/MikroTik CCR1009-7G-1C-1SPC SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik CCR1009-7G-1C-1SPC SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) and avg(/MikroTik CCR1009-7G-1C-1SPC SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik CCR1009-7G-1C-1SPC SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |Interface {#IFNAME}({#IFALIAS}): High error rate (>{$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) |<p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p> |`min(/MikroTik CCR1009-7G-1C-1SPC SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"} or min(/MikroTik CCR1009-7G-1C-1SPC SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`max(/MikroTik CCR1009-7G-1C-1SPC SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8 and max(/MikroTik CCR1009-7G-1C-1SPC SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
-|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik CCR1009-7G-1C-1SPC SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik CCR1009-7G-1C-1SPC SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik CCR1009-7G-1C-1SPC SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik CCR1009-7G-1C-1SPC SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik CCR1009-7G-1C-1SPC SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik CCR1009-7G-1C-1SPC SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik CCR1009-7G-1C-1SPC SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik CCR1009-7G-1C-1SPC SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik CCR1009-7G-1C-1SPC SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2) `<p>Recovery expression:</p>`(change(/MikroTik CCR1009-7G-1C-1SPC SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik CCR1009-7G-1C-1SPC SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik CCR1009-7G-1C-1SPC SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2) ` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik CCR1009-7G-1C-1SPC SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik CCR1009-7G-1C-1SPC SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik CCR1009-7G-1C-1SPC SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik CCR1009-7G-1C-1SPC SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik CCR1009-7G-1C-1SPC SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik CCR1009-7G-1C-1SPC SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik CCR1009-7G-1C-1SPC SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik CCR1009-7G-1C-1SPC SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik CCR1009-7G-1C-1SPC SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2)`<p>Recovery expression:</p>`(change(/MikroTik CCR1009-7G-1C-1SPC SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik CCR1009-7G-1C-1SPC SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik CCR1009-7G-1C-1SPC SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2)` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |{HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/MikroTik CCR1009-7G-1C-1SPC SNMP/system.uptime[sysUpTime.0])<10m` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- No SNMP data collection</p> |
 |No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/MikroTik CCR1009-7G-1C-1SPC SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |Unavailable by ICMP ping |<p>Last three attempts returned timeout.  Please check device connectivity.</p> |`max(/MikroTik CCR1009-7G-1C-1SPC SNMP/icmpping,#3)=0` |HIGH | |
 |High ICMP ping loss |<p>-</p> |`min(/MikroTik CCR1009-7G-1C-1SPC SNMP/icmppingloss,5m)>{$ICMP_LOSS_WARN} and min(/MikroTik CCR1009-7G-1C-1SPC SNMP/icmppingloss,5m)<100` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |High ICMP ping response time |<p>-</p> |`avg(/MikroTik CCR1009-7G-1C-1SPC SNMP/icmppingsec,5m)>{$ICMP_RESPONSE_TIME_WARN}` |WARNING |<p>**Depends on**:</p><p>- High ICMP ping loss</p><p>- Unavailable by ICMP ping</p> |
-|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CCR1009-7G-1C-1SPC SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CCR1009-7G-1C-1SPC SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1009-7G-1C-1SPC SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CCR1009-7G-1C-1SPC SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
-|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CCR1009-7G-1C-1SPC SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CCR1009-7G-1C-1SPC SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1009-7G-1C-1SPC SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CCR1009-7G-1C-1SPC SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CCR1009-7G-1C-1SPC SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CCR1009-7G-1C-1SPC SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1009-7G-1C-1SPC SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CCR1009-7G-1C-1SPC SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CCR1009-7G-1C-1SPC SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CCR1009-7G-1C-1SPC SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1009-7G-1C-1SPC SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CCR1009-7G-1C-1SPC SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
 |CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CCR1009-7G-1C-1SPC SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CCR1009-7G-1C-1SPC SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
 |CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CCR1009-7G-1C-1SPC SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CCR1009-7G-1C-1SPC SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
 |CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik CCR1009-7G-1C-1SPC SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik CCR1009-7G-1C-1SPC SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
diff --git a/templates/net/mikrotik/mikrotik_CCR1009-7G-1C-1S+PC_snmp/template_net_mikrotik_CCR1009-7G-1C-1S+PC_snmp.yaml b/templates/net/mikrotik/mikrotik_CCR1009-7G-1C-1S+PC_snmp/template_net_mikrotik_CCR1009-7G-1C-1S+PC_snmp.yaml
index 610a27d6f5d..8b7c929f955 100644
--- a/templates/net/mikrotik/mikrotik_CCR1009-7G-1C-1S+PC_snmp/template_net_mikrotik_CCR1009-7G-1C-1S+PC_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_CCR1009-7G-1C-1S+PC_snmp/template_net_mikrotik_CCR1009-7G-1C-1S+PC_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:43:16Z'
+  date: '2022-01-26T09:44:32Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -35,8 +35,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: feca40f53ed54c84afbb83d2650bbab6
@@ -44,6 +47,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 7d018eef194b4734a67537b410d083d1
           name: 'ICMP loss'
@@ -54,8 +61,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: bca3c4bf4f89480e9c6ccfaaed0039bf
@@ -67,6 +77,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CCR1009-7G-1C-1SPC SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 55b40d51d6694cf5b2da626587afe20e
           name: 'ICMP response time'
@@ -77,8 +94,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: b78ca1d148624deb95177f56eb738338
@@ -93,6 +113,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CCR1009-7G-1C-1SPC SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: f5aa15bcdd8a41449014241122f42ed5
           name: 'SNMP traps (fallback)'
@@ -105,8 +132,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: 45de6d3b762042f1beba38b42a5ce271
           name: 'System contact details'
@@ -128,8 +155,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 42f88903cca745a8a54fed6355d72a86
           name: 'System description'
@@ -152,8 +179,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 4367659d4f49400aa0a4674c74ad00b8
           name: 'Firmware version'
@@ -174,8 +201,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 79b791b5ce1a4e5e8f68b561aeaac838
@@ -185,6 +212,10 @@ zabbix_export:
               priority: INFO
               description: 'Firmware version has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 3d375341d2a140679973c46fe7281dd5
           name: 'Hardware model name'
@@ -203,8 +234,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
         -
           uuid: b1233463a69346b68d538f1c43aa467d
           name: 'Hardware serial number'
@@ -226,8 +257,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: a981ac3d5e7843049eb581ab284edd04
@@ -236,6 +267,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 8d35083324f245fda442d6c2183a2007
           name: 'System location'
@@ -257,8 +292,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: a72a6424b8a24277a952d0d2e3974ad3
           name: 'System name'
@@ -280,8 +315,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 203415c1da0d4e36b1e52904c8f77ad7
@@ -290,6 +325,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: 79d95aec65934350b59a52e4af4b0fd7
           name: 'System object ID'
@@ -310,8 +352,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: f9d30c789f16452d89ee417a2aee11f1
           name: 'Operating system'
@@ -333,8 +375,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: os
           triggers:
             -
               uuid: f7e4983c483944869d44fe5ea4289786
@@ -347,6 +389,10 @@ zabbix_export:
                 -
                   name: 'System name has changed (new name: {ITEM.VALUE})'
                   expression: 'last(/MikroTik CCR1009-7G-1C-1SPC SNMP/system.name,#1)<>last(/MikroTik CCR1009-7G-1C-1SPC SNMP/system.name,#2) and length(last(/MikroTik CCR1009-7G-1C-1SPC SNMP/system.name))>0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 04b76355c37041569f60b8d36d279f31
           name: Uptime
@@ -367,8 +413,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 7cb3423e736d435b87a21687c09debf0
@@ -381,6 +427,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/MikroTik CCR1009-7G-1C-1SPC SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 5546cedfd50648d2a893b6ea59fd7453
           name: 'Total memory'
@@ -407,8 +457,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 5a78d97bd5f14a6b97873a3abe41db20
           name: 'Used memory'
@@ -427,8 +477,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: dc5f8ec0557c4e9980f2224e150e89e7
           name: 'Memory utilization'
@@ -441,8 +491,8 @@ zabbix_export:
           description: 'Memory utilization in %'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: 6a571f6691ec459bbc63e1a8dece1c04
@@ -450,6 +500,13 @@ zabbix_export:
               name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
               priority: AVERAGE
               description: 'The system is running out of free memory.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 7bbae2f760b2437a92e27abc5f0c4c7a
           name: 'SNMP agent availability'
@@ -466,8 +523,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: c48e5ab4112d46898f219f4e9d2e4bae
@@ -480,6 +540,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CCR1009-7G-1C-1SPC SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: b5d7f793a40449af9342a0751d606c04
@@ -504,8 +568,8 @@ zabbix_export:
                 The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
               trigger_prototypes:
                 -
                   uuid: 1586816e4cfe4060b9c2d4c305439e4d
@@ -514,6 +578,10 @@ zabbix_export:
                   opdata: 'Current utilization: {ITEM.LASTVALUE1}'
                   priority: WARNING
                   description: 'CPU utilization is too high. The system might be slow to respond.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 473d7e39becc4c56bef6687d3e197dd8
@@ -558,8 +626,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 7662e3eded674ca996c98d5af253d767
@@ -570,6 +638,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: ad69a0bc0507456787ef21628985e22f
                   expression: 'avg(/MikroTik CCR1009-7G-1C-1SPC SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
@@ -584,6 +659,13 @@ zabbix_export:
                       name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
                       expression: 'avg(/MikroTik CCR1009-7G-1C-1SPC SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
                       recovery_expression: 'max(/MikroTik CCR1009-7G-1C-1SPC SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: d66e0fa34fbf4fc49ac5ebfed3f6dbb0
                   expression: 'avg(/MikroTik CCR1009-7G-1C-1SPC SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
@@ -592,6 +674,13 @@ zabbix_export:
                   name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: bea5c8de3a354405a60f417e7c3f9852
           name: 'Temperature sensor discovery'
@@ -601,8 +690,7 @@ zabbix_export:
           delay: 1h
           description: |
             MIKROTIK-MIB::mtxrHlTemperature
-            Since temperature sensor is not available on all Mikrotik hardware,
-            this is done to avoid unsupported items.
+            Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.
           item_prototypes:
             -
               uuid: b2ac80947a314b8590500aed1ba15b34
@@ -626,8 +714,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: d9e2f17aa26d47239ba7ee40d5b39759
@@ -638,6 +726,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: f6bcaf561a23406e84a22549aed2485d
                   expression: 'avg(/MikroTik CCR1009-7G-1C-1SPC SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
@@ -652,6 +747,13 @@ zabbix_export:
                       name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
                       expression: 'avg(/MikroTik CCR1009-7G-1C-1SPC SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
                       recovery_expression: 'max(/MikroTik CCR1009-7G-1C-1SPC SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: fcf0566a31b9400c9790638caad03e34
                   expression: 'avg(/MikroTik CCR1009-7G-1C-1SPC SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
@@ -660,6 +762,13 @@ zabbix_export:
                   name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: d7d28fbb900742f58ba741a7b2810656
           name: 'LTE modem discovery'
@@ -694,14 +803,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRP Reference Signal Received Power.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 88449b36f96740349cd1e08127b7b39c
                   expression: 'max(/MikroTik CCR1009-7G-1C-1SPC SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 5f60c2de483e4aae8fbedc50798f3bb9
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
@@ -716,14 +838,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: cdab150de72d4e8bb2af4e412be6de27
                   expression: 'max(/MikroTik CCR1009-7G-1C-1SPC SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: df09bd33847c4cf9931b68c49fa0cc2e
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
@@ -738,14 +873,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 5eb2071556a749b382e8d6668fc7c699
                   expression: 'max(/MikroTik CCR1009-7G-1C-1SPC SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 10459f3a756e48f991bbddf9e466f5bb
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
@@ -760,14 +908,27 @@ zabbix_export:
                 mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 9e119f5f5ae74caeb58e9736f5e7e8b1
                   expression: 'max(/MikroTik CCR1009-7G-1C-1SPC SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 38deeca2121f4698834d9f8c984be4bf
@@ -828,8 +989,14 @@ zabbix_export:
                 mtxrWlApAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: e9b16dbe554948ffac6a124c2545e8ed
               name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
@@ -849,8 +1016,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: ec6db43c1009423db17a9db20c193801
               name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
@@ -870,8 +1043,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: f6b5c40031a9451d93e0c1a53c60d90e
               name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
@@ -890,8 +1069,14 @@ zabbix_export:
                     - 15m
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 4fe579127b3249b08c210c8b3f767f7a
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -904,8 +1089,14 @@ zabbix_export:
                 mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
         -
           uuid: 8bb2e43eaeae433381360f436151ca96
           name: 'CAPsMAN AP channel discovery'
@@ -938,8 +1129,14 @@ zabbix_export:
                 mtxrWlCMAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 9e85e8cd51f0489d8aaefdc31ccbffd4
               name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
@@ -959,8 +1156,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 2844bdd0d5094a38a88f756e1fed71ad
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -973,8 +1176,14 @@ zabbix_export:
                 mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 16791055befb41f3b12dabf4aa0c6540
               name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
@@ -994,8 +1203,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: f282823a66354c1aa88b2338efb376f0
@@ -1003,6 +1218,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
                   priority: WARNING
                   description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: afd7c5604cbc4142903dcc6dce8d5653
           name: 'Network interfaces discovery'
@@ -1091,8 +1313,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: ff3b483497b84ff081d5ab28104e4579
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -1111,8 +1339,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 33618d8ffb5c4d07a2b290e4c75073c9
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -1136,8 +1370,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 17633027e7b84b1bbbeae76d53167713
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -1160,8 +1400,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 5c532fd7877a413eaa528137b67d6857
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -1180,8 +1426,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 524fc8bdd17e4eb99184829300e5c056
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -1205,8 +1457,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 534bf0300941479d9e468d418014d098
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -1231,8 +1489,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: f1d0b7bbd5824ab7959be1230a4c0beb
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -1254,8 +1518,14 @@ zabbix_export:
                 name: 'IF-MIB::ifOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 7310ec80c5ce4bd9a8d193ca10ffc636
@@ -1273,6 +1543,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 71d2a42612124a3eaa61a3baee1d4691
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -1296,8 +1570,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           trigger_prototypes:
             -
               uuid: 0ec14ed9e07441bc94331081b1eefea7
@@ -1327,6 +1607,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CCR1009-7G-1C-1SPC SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CCR1009-7G-1C-1SPC SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CCR1009-7G-1C-1SPC SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CCR1009-7G-1C-1SPC SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 6446f31cc81540c4967afe496edcc01b
               expression: |
@@ -1347,6 +1631,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CCR1009-7G-1C-1SPC SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CCR1009-7G-1C-1SPC SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CCR1009-7G-1C-1SPC SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CCR1009-7G-1C-1SPC SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 9a38ec2a71ac47e3afe4c7b65ee22b9f
               expression: |
@@ -1366,6 +1654,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CCR1009-7G-1C-1SPC SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CCR1009-7G-1C-1SPC SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CCR1009-7G-1C-1SPC SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CCR1009-7G-1C-1SPC SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: f8bbfd7785b54c6c8d48bb23340748c9
@@ -1444,8 +1739,11 @@ zabbix_export:
               description: 'Space utilization in % for Disk-{#SNMPINDEX}'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 565b745c23864f1797a2cb3a11eedf7f
               name: 'Disk-{#SNMPINDEX}: Total space'
@@ -1472,8 +1770,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 8cfa6b214639494fa8db1cb673f45e1d
               name: 'Disk-{#SNMPINDEX}: Used space'
@@ -1492,8 +1793,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
           trigger_prototypes:
             -
               uuid: 93eaacd1543d440c93faa4b7c4fcd02d
@@ -1509,6 +1813,13 @@ zabbix_export:
                  - The disk free space is less than 5G.
                  - The disk will be full in less than 24 hours.
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
             -
               uuid: 70397fb0b0754a42a9c97c77c2037d2a
               expression: |
@@ -1529,6 +1840,13 @@ zabbix_export:
                   expression: |
                     last(/MikroTik CCR1009-7G-1C-1SPC SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
                     ((last(/MikroTik CCR1009-7G-1C-1SPC SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1009-7G-1C-1SPC SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CCR1009-7G-1C-1SPC SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
           graph_prototypes:
             -
               uuid: bff3cf781de1430d81a20a71a055e35d
@@ -1552,6 +1870,16 @@ zabbix_export:
                   item:
                     host: 'MikroTik CCR1009-7G-1C-1SPC SNMP'
                     key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: ccr1009-7g-1c-1spluspc
+        -
+          tag: target
+          value: mikrotik
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/net/mikrotik/mikrotik_CCR1009-7G-1C-1S+_snmp/README.md b/templates/net/mikrotik/mikrotik_CCR1009-7G-1C-1S+_snmp/README.md
index 02c3af39af9..34e13ca3c2d 100644
--- a/templates/net/mikrotik/mikrotik_CCR1009-7G-1C-1S+_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_CCR1009-7G-1C-1S+_snmp/README.md
@@ -71,7 +71,7 @@ There are no template links in this template.
 |Network interfaces discovery |<p>Discovering interfaces from IF-MIB.</p> |SNMP |net.if.discovery<p>**Filter**:</p>AND <p>- {#IFADMINSTATUS} MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.MATCHES}`</p><p>- {#IFADMINSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.NOT_MATCHES}`</p><p>- {#IFOPERSTATUS} MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.MATCHES}`</p><p>- {#IFOPERSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.NOT_MATCHES}`</p><p>- {#IFNAME} MATCHES_REGEX `{$NET.IF.IFNAME.MATCHES}`</p><p>- {#IFNAME} NOT_MATCHES_REGEX `{$NET.IF.IFNAME.NOT_MATCHES}`</p><p>- {#IFDESCR} MATCHES_REGEX `{$NET.IF.IFDESCR.MATCHES}`</p><p>- {#IFDESCR} NOT_MATCHES_REGEX `{$NET.IF.IFDESCR.NOT_MATCHES}`</p><p>- {#IFALIAS} MATCHES_REGEX `{$NET.IF.IFALIAS.MATCHES}`</p><p>- {#IFALIAS} NOT_MATCHES_REGEX `{$NET.IF.IFALIAS.NOT_MATCHES}`</p><p>- {#IFTYPE} MATCHES_REGEX `{$NET.IF.IFTYPE.MATCHES}`</p><p>- {#IFTYPE} NOT_MATCHES_REGEX `{$NET.IF.IFTYPE.NOT_MATCHES}`</p> |
 |Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 |Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
-|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
 
 ## Items collected
 
@@ -137,14 +137,14 @@ There are no template links in this template.
 |Interface {#IFNAME}({#IFALIAS}): Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p><p>3. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CCR1009-7G-1C-1S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CCR1009-7G-1C-1S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CCR1009-7G-1C-1S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))`<p>Recovery expression:</p>`last(/MikroTik CCR1009-7G-1C-1S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0` |AVERAGE |<p>Manual close: YES</p> |
 |Interface {#IFNAME}({#IFALIAS}): High bandwidth usage (>{$IF.UTIL.MAX:"{#IFNAME}"}%) |<p>The network interface utilization is close to its estimated maximum bandwidth.</p> |`(avg(/MikroTik CCR1009-7G-1C-1S SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik CCR1009-7G-1C-1S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) or avg(/MikroTik CCR1009-7G-1C-1S SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik CCR1009-7G-1C-1S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])) and last(/MikroTik CCR1009-7G-1C-1S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0`<p>Recovery expression:</p>`avg(/MikroTik CCR1009-7G-1C-1S SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik CCR1009-7G-1C-1S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) and avg(/MikroTik CCR1009-7G-1C-1S SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik CCR1009-7G-1C-1S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |Interface {#IFNAME}({#IFALIAS}): High error rate (>{$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) |<p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p> |`min(/MikroTik CCR1009-7G-1C-1S SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"} or min(/MikroTik CCR1009-7G-1C-1S SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`max(/MikroTik CCR1009-7G-1C-1S SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8 and max(/MikroTik CCR1009-7G-1C-1S SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
-|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik CCR1009-7G-1C-1S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik CCR1009-7G-1C-1S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik CCR1009-7G-1C-1S SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik CCR1009-7G-1C-1S SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik CCR1009-7G-1C-1S SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik CCR1009-7G-1C-1S SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik CCR1009-7G-1C-1S SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik CCR1009-7G-1C-1S SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik CCR1009-7G-1C-1S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2) `<p>Recovery expression:</p>`(change(/MikroTik CCR1009-7G-1C-1S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik CCR1009-7G-1C-1S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik CCR1009-7G-1C-1S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2) ` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik CCR1009-7G-1C-1S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik CCR1009-7G-1C-1S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik CCR1009-7G-1C-1S SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik CCR1009-7G-1C-1S SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik CCR1009-7G-1C-1S SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik CCR1009-7G-1C-1S SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik CCR1009-7G-1C-1S SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik CCR1009-7G-1C-1S SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik CCR1009-7G-1C-1S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2)`<p>Recovery expression:</p>`(change(/MikroTik CCR1009-7G-1C-1S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik CCR1009-7G-1C-1S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik CCR1009-7G-1C-1S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2)` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |{HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/MikroTik CCR1009-7G-1C-1S SNMP/system.uptime[sysUpTime.0])<10m` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- No SNMP data collection</p> |
 |No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/MikroTik CCR1009-7G-1C-1S SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |Unavailable by ICMP ping |<p>Last three attempts returned timeout.  Please check device connectivity.</p> |`max(/MikroTik CCR1009-7G-1C-1S SNMP/icmpping,#3)=0` |HIGH | |
 |High ICMP ping loss |<p>-</p> |`min(/MikroTik CCR1009-7G-1C-1S SNMP/icmppingloss,5m)>{$ICMP_LOSS_WARN} and min(/MikroTik CCR1009-7G-1C-1S SNMP/icmppingloss,5m)<100` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |High ICMP ping response time |<p>-</p> |`avg(/MikroTik CCR1009-7G-1C-1S SNMP/icmppingsec,5m)>{$ICMP_RESPONSE_TIME_WARN}` |WARNING |<p>**Depends on**:</p><p>- High ICMP ping loss</p><p>- Unavailable by ICMP ping</p> |
-|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CCR1009-7G-1C-1S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CCR1009-7G-1C-1S SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1009-7G-1C-1S SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CCR1009-7G-1C-1S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
-|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CCR1009-7G-1C-1S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CCR1009-7G-1C-1S SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1009-7G-1C-1S SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CCR1009-7G-1C-1S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CCR1009-7G-1C-1S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CCR1009-7G-1C-1S SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1009-7G-1C-1S SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CCR1009-7G-1C-1S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CCR1009-7G-1C-1S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CCR1009-7G-1C-1S SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1009-7G-1C-1S SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CCR1009-7G-1C-1S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
 |CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CCR1009-7G-1C-1S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CCR1009-7G-1C-1S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
 |CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CCR1009-7G-1C-1S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CCR1009-7G-1C-1S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
 |CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik CCR1009-7G-1C-1S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik CCR1009-7G-1C-1S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
diff --git a/templates/net/mikrotik/mikrotik_CCR1009-7G-1C-1S+_snmp/template_net_mikrotik_CCR1009-7G-1C-1S+_snmp.yaml b/templates/net/mikrotik/mikrotik_CCR1009-7G-1C-1S+_snmp/template_net_mikrotik_CCR1009-7G-1C-1S+_snmp.yaml
index b0cbc64a663..75e6be7e8ee 100644
--- a/templates/net/mikrotik/mikrotik_CCR1009-7G-1C-1S+_snmp/template_net_mikrotik_CCR1009-7G-1C-1S+_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_CCR1009-7G-1C-1S+_snmp/template_net_mikrotik_CCR1009-7G-1C-1S+_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:43:21Z'
+  date: '2022-01-26T09:45:38Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -35,8 +35,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 5021ba3d848e4c0d80c9644ab70b313b
@@ -44,6 +47,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 17ef5c841e254cf399f05b4a1ebfbddd
           name: 'ICMP loss'
@@ -54,8 +61,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: b4c65c535f9841d98da1d32a9aaed7b8
@@ -67,6 +77,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CCR1009-7G-1C-1S SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: b85868ac7f9646f9b8a672ca0a047dd9
           name: 'ICMP response time'
@@ -77,8 +94,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 493e740c3b3a48c3a308492d67ea11f8
@@ -93,6 +113,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CCR1009-7G-1C-1S SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: ad29673a93724660bbf7f34cc8b9b103
           name: 'SNMP traps (fallback)'
@@ -105,8 +132,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: 2c510a601eb34626bdcc105dc6e88083
           name: 'System contact details'
@@ -128,8 +155,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 0bba1b52c87d47119974e30e373423c6
           name: 'System description'
@@ -152,8 +179,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: cdf7d11d3d47482ca5dad14596256025
           name: 'Firmware version'
@@ -174,8 +201,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 7469aef39ea84a729b87d06d3dd0e9af
@@ -185,6 +212,10 @@ zabbix_export:
               priority: INFO
               description: 'Firmware version has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: ad2df2ad5b4d4bac8da4a24e2c082ad1
           name: 'Hardware model name'
@@ -203,8 +234,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
         -
           uuid: d55015e95d2e4eebb72168b5311f7512
           name: 'Hardware serial number'
@@ -226,8 +257,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: a30f1485711d4a649503638fd3a7d702
@@ -236,6 +267,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 0fc01029ea6c491690c76be5b4a1a10f
           name: 'System location'
@@ -257,8 +292,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 8a59a79c33ce484888308a171b5dd507
           name: 'System name'
@@ -280,8 +315,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: cada2ef5e9b14392885a05f9d50186d8
@@ -290,6 +325,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: 66afc3c4f48e4e008c323c46afd38b21
           name: 'System object ID'
@@ -310,8 +352,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 6004aeb9600c42b5a74155f06cdf8af0
           name: 'Operating system'
@@ -333,8 +375,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: os
           triggers:
             -
               uuid: 8574af8f375a4443bbf030ebf8d904b5
@@ -347,6 +389,10 @@ zabbix_export:
                 -
                   name: 'System name has changed (new name: {ITEM.VALUE})'
                   expression: 'last(/MikroTik CCR1009-7G-1C-1S SNMP/system.name,#1)<>last(/MikroTik CCR1009-7G-1C-1S SNMP/system.name,#2) and length(last(/MikroTik CCR1009-7G-1C-1S SNMP/system.name))>0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: bd0d3629dc4445968d42642640cee4ef
           name: Uptime
@@ -367,8 +413,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 354a68e77ee043a684ab8be18628ffca
@@ -381,6 +427,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/MikroTik CCR1009-7G-1C-1S SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: cef294e9c4874526a093935ac3f093b6
           name: 'Total memory'
@@ -407,8 +457,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 3b3a0def1cf740f496bbd345de5ed605
           name: 'Used memory'
@@ -427,8 +477,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: d7dadc80881a4d3c9be8f1b660232c03
           name: 'Memory utilization'
@@ -441,8 +491,8 @@ zabbix_export:
           description: 'Memory utilization in %'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: 18ae9503588a4d398f387ab0d9015e26
@@ -450,6 +500,13 @@ zabbix_export:
               name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
               priority: AVERAGE
               description: 'The system is running out of free memory.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: d2a7924b19e14fb5a0adea4664cddb52
           name: 'SNMP agent availability'
@@ -466,8 +523,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: b19e8ce655fb48e389a384a78826d5d6
@@ -480,6 +540,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CCR1009-7G-1C-1S SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: 3d3038d06ddb4fc282940f4a76e4ec85
@@ -504,8 +568,8 @@ zabbix_export:
                 The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
               trigger_prototypes:
                 -
                   uuid: 2f1676c21f7044a289a8fd3077f9c95f
@@ -514,6 +578,10 @@ zabbix_export:
                   opdata: 'Current utilization: {ITEM.LASTVALUE1}'
                   priority: WARNING
                   description: 'CPU utilization is too high. The system might be slow to respond.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 5154454506aa483b8683638345709c0f
@@ -558,8 +626,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 306d44e9256041089e0499678d0a9b6b
@@ -570,6 +638,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 3ef08416c6e649469b036b730f756a35
                   expression: 'avg(/MikroTik CCR1009-7G-1C-1S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
@@ -584,6 +659,13 @@ zabbix_export:
                       name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
                       expression: 'avg(/MikroTik CCR1009-7G-1C-1S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
                       recovery_expression: 'max(/MikroTik CCR1009-7G-1C-1S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: db4a2f3baf9c44058e81df8924c51714
                   expression: 'avg(/MikroTik CCR1009-7G-1C-1S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
@@ -592,6 +674,13 @@ zabbix_export:
                   name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 28fc52f85b454d24bf7e99f971f0bac4
           name: 'Temperature sensor discovery'
@@ -601,8 +690,7 @@ zabbix_export:
           delay: 1h
           description: |
             MIKROTIK-MIB::mtxrHlTemperature
-            Since temperature sensor is not available on all Mikrotik hardware,
-            this is done to avoid unsupported items.
+            Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.
           item_prototypes:
             -
               uuid: 6d1b24e94e8840c884c1cac3e8842eea
@@ -626,8 +714,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 3de221d9357541e68cb0e949f58b0f3c
@@ -638,6 +726,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 21158d7b18b64861b373be6718006753
                   expression: 'avg(/MikroTik CCR1009-7G-1C-1S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
@@ -652,6 +747,13 @@ zabbix_export:
                       name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
                       expression: 'avg(/MikroTik CCR1009-7G-1C-1S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
                       recovery_expression: 'max(/MikroTik CCR1009-7G-1C-1S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: c1c9783678e846ec88d1b68486abd5a0
                   expression: 'avg(/MikroTik CCR1009-7G-1C-1S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
@@ -660,6 +762,13 @@ zabbix_export:
                   name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 873a002d903f440b8861dfae848d9bc9
           name: 'LTE modem discovery'
@@ -694,14 +803,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRP Reference Signal Received Power.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 86e76d6d249a4f339ca2841d9b433204
                   expression: 'max(/MikroTik CCR1009-7G-1C-1S SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: bb6f2eb38a2c4aee968332eefcca5f7a
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
@@ -716,14 +838,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 4b5ad89e3ecf4d38a8bdb75b10028ba2
                   expression: 'max(/MikroTik CCR1009-7G-1C-1S SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 59124b030d4f498094eb01952c42b1da
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
@@ -738,14 +873,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 404195780f234277874f9c1d88ce286a
                   expression: 'max(/MikroTik CCR1009-7G-1C-1S SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 79f14b61c0044e7a92745288c7cf0159
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
@@ -760,14 +908,27 @@ zabbix_export:
                 mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 1e58c3aaa1a9469bb170fc50b75e1686
                   expression: 'max(/MikroTik CCR1009-7G-1C-1S SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 7cbf0b34c2154834b34f25ef18c70748
@@ -828,8 +989,14 @@ zabbix_export:
                 mtxrWlApAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 06452635ff154445b04377dd42ea3f0d
               name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
@@ -849,8 +1016,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: ee7e17722ffa4a71ba337b9cb2b8d05e
               name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
@@ -870,8 +1043,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 06295e345bb948d196a22baa485ecedd
               name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
@@ -890,8 +1069,14 @@ zabbix_export:
                     - 15m
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 7d9df48a9bd74cbc8be35a78dded0701
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -904,8 +1089,14 @@ zabbix_export:
                 mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
         -
           uuid: 43f128e426044f5b82419ad75ca6e17c
           name: 'CAPsMAN AP channel discovery'
@@ -938,8 +1129,14 @@ zabbix_export:
                 mtxrWlCMAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: a3d138d7663b43ddbf11b71377f33e19
               name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
@@ -959,8 +1156,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 0939fc0eddef42698e6bb505159c5a4e
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -973,8 +1176,14 @@ zabbix_export:
                 mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 6aa454cc8cac42b79045c71393b88130
               name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
@@ -994,8 +1203,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: cb698e80cd15409bad16d476fc637a61
@@ -1003,6 +1218,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
                   priority: WARNING
                   description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: f4df6cb6afce4d0298e1f97f8d0a7ad5
           name: 'Network interfaces discovery'
@@ -1091,8 +1313,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 0e6b356f0adf473bbaf9dd06c5841a4f
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -1111,8 +1339,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 2c09bbd51b8e4831918ae3af18d3afff
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -1136,8 +1370,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 9f02418a4efd4b8984b5a8077f66a90a
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -1160,8 +1400,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 2dbfd918f1e84062a20551658c7c334a
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -1180,8 +1426,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 18048b87397d48c5bd49bed17255cff4
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -1205,8 +1457,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 844a0876ea2f435dbf9f0642659102b2
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -1231,8 +1489,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 6665aecef4f844b68f71ef27fd5011dc
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -1254,8 +1518,14 @@ zabbix_export:
                 name: 'IF-MIB::ifOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 013ab2e8443a4380b29960f1eb748ff1
@@ -1273,6 +1543,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: ff6673977cc44e7f9aa883baaf9186cc
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -1296,8 +1570,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           trigger_prototypes:
             -
               uuid: 597cab58269142b2bcf893e72baa9a0f
@@ -1327,6 +1607,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CCR1009-7G-1C-1S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CCR1009-7G-1C-1S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CCR1009-7G-1C-1S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CCR1009-7G-1C-1S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: ce9c951bfca14de29b0d0379c3da3b38
               expression: |
@@ -1347,6 +1631,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CCR1009-7G-1C-1S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CCR1009-7G-1C-1S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CCR1009-7G-1C-1S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CCR1009-7G-1C-1S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 25d69f21627e49aab9fde89e3c1f8078
               expression: |
@@ -1366,6 +1654,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CCR1009-7G-1C-1S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CCR1009-7G-1C-1S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CCR1009-7G-1C-1S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CCR1009-7G-1C-1S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: e717bd84cf5f4d02b80537b10483af81
@@ -1444,8 +1739,11 @@ zabbix_export:
               description: 'Space utilization in % for Disk-{#SNMPINDEX}'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 9fc01e7f1027439cbf1d0e35e0c7d353
               name: 'Disk-{#SNMPINDEX}: Total space'
@@ -1472,8 +1770,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 58593e0ecf5c42f79340a7da5f1c1e86
               name: 'Disk-{#SNMPINDEX}: Used space'
@@ -1492,8 +1793,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
           trigger_prototypes:
             -
               uuid: e6500e2d99fa46dea445d9cc469df81e
@@ -1509,6 +1813,13 @@ zabbix_export:
                  - The disk free space is less than 5G.
                  - The disk will be full in less than 24 hours.
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
             -
               uuid: 33a9e94bff174f31978be450df1f3c40
               expression: |
@@ -1529,6 +1840,13 @@ zabbix_export:
                   expression: |
                     last(/MikroTik CCR1009-7G-1C-1S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
                     ((last(/MikroTik CCR1009-7G-1C-1S SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1009-7G-1C-1S SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CCR1009-7G-1C-1S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
           graph_prototypes:
             -
               uuid: ec4206d099ad41b79c2c65f1c684a8ae
@@ -1552,6 +1870,16 @@ zabbix_export:
                   item:
                     host: 'MikroTik CCR1009-7G-1C-1S SNMP'
                     key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: ccr1009-7g-1c-1splus
+        -
+          tag: target
+          value: mikrotik
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/net/mikrotik/mikrotik_CCR1009-7G-1C-PC_snmp/README.md b/templates/net/mikrotik/mikrotik_CCR1009-7G-1C-PC_snmp/README.md
index a6c2f81eda0..ffcd120e4d1 100644
--- a/templates/net/mikrotik/mikrotik_CCR1009-7G-1C-PC_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_CCR1009-7G-1C-PC_snmp/README.md
@@ -71,7 +71,7 @@ There are no template links in this template.
 |Network interfaces discovery |<p>Discovering interfaces from IF-MIB.</p> |SNMP |net.if.discovery<p>**Filter**:</p>AND <p>- {#IFADMINSTATUS} MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.MATCHES}`</p><p>- {#IFADMINSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.NOT_MATCHES}`</p><p>- {#IFOPERSTATUS} MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.MATCHES}`</p><p>- {#IFOPERSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.NOT_MATCHES}`</p><p>- {#IFNAME} MATCHES_REGEX `{$NET.IF.IFNAME.MATCHES}`</p><p>- {#IFNAME} NOT_MATCHES_REGEX `{$NET.IF.IFNAME.NOT_MATCHES}`</p><p>- {#IFDESCR} MATCHES_REGEX `{$NET.IF.IFDESCR.MATCHES}`</p><p>- {#IFDESCR} NOT_MATCHES_REGEX `{$NET.IF.IFDESCR.NOT_MATCHES}`</p><p>- {#IFALIAS} MATCHES_REGEX `{$NET.IF.IFALIAS.MATCHES}`</p><p>- {#IFALIAS} NOT_MATCHES_REGEX `{$NET.IF.IFALIAS.NOT_MATCHES}`</p><p>- {#IFTYPE} MATCHES_REGEX `{$NET.IF.IFTYPE.MATCHES}`</p><p>- {#IFTYPE} NOT_MATCHES_REGEX `{$NET.IF.IFTYPE.NOT_MATCHES}`</p> |
 |Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 |Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
-|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
 
 ## Items collected
 
@@ -137,14 +137,14 @@ There are no template links in this template.
 |Interface {#IFNAME}({#IFALIAS}): Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p><p>3. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CCR1009-7G-1C-PC SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CCR1009-7G-1C-PC SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CCR1009-7G-1C-PC SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))`<p>Recovery expression:</p>`last(/MikroTik CCR1009-7G-1C-PC SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0` |AVERAGE |<p>Manual close: YES</p> |
 |Interface {#IFNAME}({#IFALIAS}): High bandwidth usage (>{$IF.UTIL.MAX:"{#IFNAME}"}%) |<p>The network interface utilization is close to its estimated maximum bandwidth.</p> |`(avg(/MikroTik CCR1009-7G-1C-PC SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik CCR1009-7G-1C-PC SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) or avg(/MikroTik CCR1009-7G-1C-PC SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik CCR1009-7G-1C-PC SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])) and last(/MikroTik CCR1009-7G-1C-PC SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0`<p>Recovery expression:</p>`avg(/MikroTik CCR1009-7G-1C-PC SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik CCR1009-7G-1C-PC SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) and avg(/MikroTik CCR1009-7G-1C-PC SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik CCR1009-7G-1C-PC SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |Interface {#IFNAME}({#IFALIAS}): High error rate (>{$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) |<p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p> |`min(/MikroTik CCR1009-7G-1C-PC SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"} or min(/MikroTik CCR1009-7G-1C-PC SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`max(/MikroTik CCR1009-7G-1C-PC SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8 and max(/MikroTik CCR1009-7G-1C-PC SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
-|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik CCR1009-7G-1C-PC SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik CCR1009-7G-1C-PC SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik CCR1009-7G-1C-PC SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik CCR1009-7G-1C-PC SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik CCR1009-7G-1C-PC SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik CCR1009-7G-1C-PC SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik CCR1009-7G-1C-PC SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik CCR1009-7G-1C-PC SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik CCR1009-7G-1C-PC SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2) `<p>Recovery expression:</p>`(change(/MikroTik CCR1009-7G-1C-PC SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik CCR1009-7G-1C-PC SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik CCR1009-7G-1C-PC SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2) ` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik CCR1009-7G-1C-PC SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik CCR1009-7G-1C-PC SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik CCR1009-7G-1C-PC SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik CCR1009-7G-1C-PC SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik CCR1009-7G-1C-PC SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik CCR1009-7G-1C-PC SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik CCR1009-7G-1C-PC SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik CCR1009-7G-1C-PC SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik CCR1009-7G-1C-PC SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2)`<p>Recovery expression:</p>`(change(/MikroTik CCR1009-7G-1C-PC SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik CCR1009-7G-1C-PC SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik CCR1009-7G-1C-PC SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2)` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |{HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/MikroTik CCR1009-7G-1C-PC SNMP/system.uptime[sysUpTime.0])<10m` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- No SNMP data collection</p> |
 |No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/MikroTik CCR1009-7G-1C-PC SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |Unavailable by ICMP ping |<p>Last three attempts returned timeout.  Please check device connectivity.</p> |`max(/MikroTik CCR1009-7G-1C-PC SNMP/icmpping,#3)=0` |HIGH | |
 |High ICMP ping loss |<p>-</p> |`min(/MikroTik CCR1009-7G-1C-PC SNMP/icmppingloss,5m)>{$ICMP_LOSS_WARN} and min(/MikroTik CCR1009-7G-1C-PC SNMP/icmppingloss,5m)<100` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |High ICMP ping response time |<p>-</p> |`avg(/MikroTik CCR1009-7G-1C-PC SNMP/icmppingsec,5m)>{$ICMP_RESPONSE_TIME_WARN}` |WARNING |<p>**Depends on**:</p><p>- High ICMP ping loss</p><p>- Unavailable by ICMP ping</p> |
-|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CCR1009-7G-1C-PC SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CCR1009-7G-1C-PC SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1009-7G-1C-PC SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CCR1009-7G-1C-PC SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
-|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CCR1009-7G-1C-PC SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CCR1009-7G-1C-PC SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1009-7G-1C-PC SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CCR1009-7G-1C-PC SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CCR1009-7G-1C-PC SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CCR1009-7G-1C-PC SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1009-7G-1C-PC SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CCR1009-7G-1C-PC SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CCR1009-7G-1C-PC SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CCR1009-7G-1C-PC SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1009-7G-1C-PC SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CCR1009-7G-1C-PC SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
 |CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CCR1009-7G-1C-PC SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CCR1009-7G-1C-PC SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
 |CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CCR1009-7G-1C-PC SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CCR1009-7G-1C-PC SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
 |CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik CCR1009-7G-1C-PC SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik CCR1009-7G-1C-PC SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
diff --git a/templates/net/mikrotik/mikrotik_CCR1009-7G-1C-PC_snmp/template_net_mikrotik_CCR1009-7G-1C-PC_snmp.yaml b/templates/net/mikrotik/mikrotik_CCR1009-7G-1C-PC_snmp/template_net_mikrotik_CCR1009-7G-1C-PC_snmp.yaml
index f39b9ef5cf3..7b94cce0067 100644
--- a/templates/net/mikrotik/mikrotik_CCR1009-7G-1C-PC_snmp/template_net_mikrotik_CCR1009-7G-1C-PC_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_CCR1009-7G-1C-PC_snmp/template_net_mikrotik_CCR1009-7G-1C-PC_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:43:25Z'
+  date: '2022-01-26T10:45:47Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -35,8 +35,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: fe75c4f4867942638e3d39face2aea7f
@@ -44,6 +47,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: f22e586a94424cb18483170ffa9f8b33
           name: 'ICMP loss'
@@ -54,8 +61,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: ebb9113e215a4ab999b5faf043c3cdd3
@@ -67,6 +77,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CCR1009-7G-1C-PC SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: cf38efbab9c84551bb15f0544fb57838
           name: 'ICMP response time'
@@ -77,8 +94,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: ac9ee5f5347945eaa12f8551ca54ec9b
@@ -93,6 +113,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CCR1009-7G-1C-PC SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 7b02fde229c24c99a5ce8f9073717855
           name: 'SNMP traps (fallback)'
@@ -105,8 +132,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: 4f5b003c74924567972b75b3c240c16c
           name: 'System contact details'
@@ -128,8 +155,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 4d011e0751664b31b216329a1963afc2
           name: 'System description'
@@ -152,8 +179,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 701b0e5e1b0d4f6199836c12bbeb23fb
           name: 'Firmware version'
@@ -174,8 +201,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: de61b57b4fd54166a207bc040aa482a4
@@ -185,6 +212,10 @@ zabbix_export:
               priority: INFO
               description: 'Firmware version has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 3172eba914574fd894cd4ab3c1295ed7
           name: 'Hardware model name'
@@ -203,8 +234,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
         -
           uuid: c5ade5b11ba84948ba84c0f975c6cbbe
           name: 'Hardware serial number'
@@ -226,8 +257,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 1776f8b97fba4feb962b0a47e4780076
@@ -236,6 +267,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: bb4e80a9dfaf4165abac4fa360e77bf3
           name: 'System location'
@@ -257,8 +292,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 651753ff590d41a7b7478ca98ec9b0d9
           name: 'System name'
@@ -280,8 +315,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 796b3caf5996404c93c8266fe7c5aa89
@@ -290,6 +325,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: 744a4d413ff74ffea13e0d6a0813eeee
           name: 'System object ID'
@@ -310,8 +352,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 6f1cabbfe9b84535b77ba2d7b32706fc
           name: 'Operating system'
@@ -333,8 +375,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: os
           triggers:
             -
               uuid: 0b8bd128fed047c591b839f3f46412dd
@@ -347,6 +389,10 @@ zabbix_export:
                 -
                   name: 'System name has changed (new name: {ITEM.VALUE})'
                   expression: 'last(/MikroTik CCR1009-7G-1C-PC SNMP/system.name,#1)<>last(/MikroTik CCR1009-7G-1C-PC SNMP/system.name,#2) and length(last(/MikroTik CCR1009-7G-1C-PC SNMP/system.name))>0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 8fd10918d51640619279d5874e06e20b
           name: Uptime
@@ -367,8 +413,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 99da791be26943ec806a2c690f74a66d
@@ -381,6 +427,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/MikroTik CCR1009-7G-1C-PC SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: aef1126fc6354f5083ce2b35d03aaa3c
           name: 'Total memory'
@@ -407,8 +457,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: f3f71753cbe14516929027f5f7c39380
           name: 'Used memory'
@@ -427,8 +477,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: bde1da2443a3415296281c5259bc0b10
           name: 'Memory utilization'
@@ -441,8 +491,8 @@ zabbix_export:
           description: 'Memory utilization in %'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: 2dec63fe94b943549c8351fe1e737975
@@ -450,6 +500,13 @@ zabbix_export:
               name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
               priority: AVERAGE
               description: 'The system is running out of free memory.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 22fd5ba91f1d4297b07e4be7f420735a
           name: 'SNMP agent availability'
@@ -466,8 +523,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: a6a88593c32342deb0b72e998872a3c9
@@ -480,6 +540,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CCR1009-7G-1C-PC SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: e6521ab9c51647ccaac14af8d146eb7f
@@ -504,8 +568,8 @@ zabbix_export:
                 The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
               trigger_prototypes:
                 -
                   uuid: e25580100dde402eaf640b6653223a82
@@ -514,6 +578,10 @@ zabbix_export:
                   opdata: 'Current utilization: {ITEM.LASTVALUE1}'
                   priority: WARNING
                   description: 'CPU utilization is too high. The system might be slow to respond.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: d8eb7cb6b67348c0911756a89bfffe99
@@ -558,8 +626,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 5b950c6be6494ba7b743a572a208fd42
@@ -570,6 +638,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: f091c3d0b2754d1a883ad9e5f96f7037
                   expression: 'avg(/MikroTik CCR1009-7G-1C-PC SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
@@ -584,6 +659,13 @@ zabbix_export:
                       name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
                       expression: 'avg(/MikroTik CCR1009-7G-1C-PC SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
                       recovery_expression: 'max(/MikroTik CCR1009-7G-1C-PC SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: e9c78b7e0b0d4d64b420b5802c91f02a
                   expression: 'avg(/MikroTik CCR1009-7G-1C-PC SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
@@ -592,6 +674,13 @@ zabbix_export:
                   name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: b6389e2689eb439183ad1a25590f421d
           name: 'Temperature sensor discovery'
@@ -601,8 +690,7 @@ zabbix_export:
           delay: 1h
           description: |
             MIKROTIK-MIB::mtxrHlTemperature
-            Since temperature sensor is not available on all Mikrotik hardware,
-            this is done to avoid unsupported items.
+            Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.
           item_prototypes:
             -
               uuid: 311bd2dea3ea4db896d92ba8a82429bf
@@ -626,8 +714,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 67f8c41b8c4748a6b5ab836821e79610
@@ -638,6 +726,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: d18498b9f4df42fca625f01ec465d819
                   expression: 'avg(/MikroTik CCR1009-7G-1C-PC SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
@@ -652,6 +747,13 @@ zabbix_export:
                       name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
                       expression: 'avg(/MikroTik CCR1009-7G-1C-PC SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
                       recovery_expression: 'max(/MikroTik CCR1009-7G-1C-PC SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: b457b4345c694e3a9963b74c9c2992c6
                   expression: 'avg(/MikroTik CCR1009-7G-1C-PC SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
@@ -660,6 +762,13 @@ zabbix_export:
                   name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 182d09c6f9764ffc9481f0930039dd95
           name: 'LTE modem discovery'
@@ -694,14 +803,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRP Reference Signal Received Power.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 0f5a0e7593b447e2a9a5071f2ec4a30b
                   expression: 'max(/MikroTik CCR1009-7G-1C-PC SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: f99cdf9843ab4b67a2160e29ed5ab333
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
@@ -716,14 +838,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 932fe21bdb6c460581093fb523b3c4b2
                   expression: 'max(/MikroTik CCR1009-7G-1C-PC SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 055aeb31cf1e4964b5e55e5caf090acd
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
@@ -738,14 +873,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: d6dcbaaaa89c4cfe80060830c595e4bb
                   expression: 'max(/MikroTik CCR1009-7G-1C-PC SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: ac8523f8566a43a5afd01dd074f24a6d
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
@@ -760,14 +908,27 @@ zabbix_export:
                 mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: d6e15977be5242edb4dd4bb8dcd0fbd0
                   expression: 'max(/MikroTik CCR1009-7G-1C-PC SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 15c4b3a688e4485ca2ab76a990e43ce1
@@ -828,8 +989,14 @@ zabbix_export:
                 mtxrWlApAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 9b04a4945910475c945ac92a1558ee41
               name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
@@ -849,8 +1016,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 1c06ee28e2b242f1b6449340b9250c4c
               name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
@@ -870,8 +1043,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 67d9b1ca3e80411691981c86dc571373
               name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
@@ -890,8 +1069,14 @@ zabbix_export:
                     - 15m
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: ce995698b4ec4af18a3687eb9212c6ee
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -904,8 +1089,14 @@ zabbix_export:
                 mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
         -
           uuid: ed8c46d319f742cb90cf948822cff340
           name: 'CAPsMAN AP channel discovery'
@@ -938,8 +1129,14 @@ zabbix_export:
                 mtxrWlCMAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 8980ce3faa3f4c45963255029ced713d
               name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
@@ -959,8 +1156,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 49f612f570814c809330e4d940a85ddf
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -973,8 +1176,14 @@ zabbix_export:
                 mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 64617cafa0e74284ba3662e6ee4cee0b
               name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
@@ -994,8 +1203,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 36dc48462d28464787978c8e6f74cafe
@@ -1003,6 +1218,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
                   priority: WARNING
                   description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 4a6d05e315d3402989b53df2ce59ab8c
           name: 'Network interfaces discovery'
@@ -1091,8 +1313,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: e00497ab2965474e9c5d3ab7ea6589f9
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -1111,8 +1339,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 8624f7dd1e2742b1a721d0c62d005afe
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -1136,8 +1370,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 530649dcb53f4069b1ab1d0cca8e26a1
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -1160,8 +1400,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 2dfd48d9417c4bf8b9ec6b272a245b9e
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -1180,8 +1426,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: cef1258beb714f1c9d81e48de7c5deed
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -1205,8 +1457,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 567ebfed5b574f7a93949373e03ecfa9
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -1231,8 +1489,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 8086dade1d974203ad8e4dcfccc48014
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -1254,8 +1518,14 @@ zabbix_export:
                 name: 'IF-MIB::ifOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 13d005d75c364bfd89008c30df81afc8
@@ -1273,6 +1543,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 24ae5851f6d84bc0aeeac124e8a3b35f
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -1296,8 +1570,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           trigger_prototypes:
             -
               uuid: 6cf5856a75df4190a0ba25ec62347194
@@ -1327,6 +1607,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CCR1009-7G-1C-PC SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CCR1009-7G-1C-PC SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CCR1009-7G-1C-PC SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CCR1009-7G-1C-PC SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 7538c8f6c90f441cae42f030a34365f9
               expression: |
@@ -1347,6 +1631,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CCR1009-7G-1C-PC SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CCR1009-7G-1C-PC SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CCR1009-7G-1C-PC SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CCR1009-7G-1C-PC SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 6ac02e1d7b024c1ca4e3e19215d09c6b
               expression: |
@@ -1366,6 +1654,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CCR1009-7G-1C-PC SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CCR1009-7G-1C-PC SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CCR1009-7G-1C-PC SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CCR1009-7G-1C-PC SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: 625ca63a5c744a3896af126018dccfd1
@@ -1444,8 +1739,11 @@ zabbix_export:
               description: 'Space utilization in % for Disk-{#SNMPINDEX}'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 4d9c4d471c7e4919b9a8d801e514a7db
               name: 'Disk-{#SNMPINDEX}: Total space'
@@ -1472,8 +1770,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 1471eee2cfc8486da6b20358954a512e
               name: 'Disk-{#SNMPINDEX}: Used space'
@@ -1492,8 +1793,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
           trigger_prototypes:
             -
               uuid: fc93929bd60542d3896fbcdd590479be
@@ -1509,6 +1813,13 @@ zabbix_export:
                  - The disk free space is less than 5G.
                  - The disk will be full in less than 24 hours.
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
             -
               uuid: 6aa796b2784848a7ab26a7e6da8993a9
               expression: |
@@ -1529,6 +1840,13 @@ zabbix_export:
                   expression: |
                     last(/MikroTik CCR1009-7G-1C-PC SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
                     ((last(/MikroTik CCR1009-7G-1C-PC SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1009-7G-1C-PC SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CCR1009-7G-1C-PC SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
           graph_prototypes:
             -
               uuid: ee6f2f6f632a4e04849e64251bcd7eeb
@@ -1552,6 +1870,16 @@ zabbix_export:
                   item:
                     host: 'MikroTik CCR1009-7G-1C-PC SNMP'
                     key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: ccr1009-7g-1c-pc
+        -
+          tag: target
+          value: mikrotik
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/net/mikrotik/mikrotik_CCR1016-12G_snmp/README.md b/templates/net/mikrotik/mikrotik_CCR1016-12G_snmp/README.md
index 2c39777db38..2df5ef785de 100644
--- a/templates/net/mikrotik/mikrotik_CCR1016-12G_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_CCR1016-12G_snmp/README.md
@@ -71,7 +71,7 @@ There are no template links in this template.
 |Network interfaces discovery |<p>Discovering interfaces from IF-MIB.</p> |SNMP |net.if.discovery<p>**Filter**:</p>AND <p>- {#IFADMINSTATUS} MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.MATCHES}`</p><p>- {#IFADMINSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.NOT_MATCHES}`</p><p>- {#IFOPERSTATUS} MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.MATCHES}`</p><p>- {#IFOPERSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.NOT_MATCHES}`</p><p>- {#IFNAME} MATCHES_REGEX `{$NET.IF.IFNAME.MATCHES}`</p><p>- {#IFNAME} NOT_MATCHES_REGEX `{$NET.IF.IFNAME.NOT_MATCHES}`</p><p>- {#IFDESCR} MATCHES_REGEX `{$NET.IF.IFDESCR.MATCHES}`</p><p>- {#IFDESCR} NOT_MATCHES_REGEX `{$NET.IF.IFDESCR.NOT_MATCHES}`</p><p>- {#IFALIAS} MATCHES_REGEX `{$NET.IF.IFALIAS.MATCHES}`</p><p>- {#IFALIAS} NOT_MATCHES_REGEX `{$NET.IF.IFALIAS.NOT_MATCHES}`</p><p>- {#IFTYPE} MATCHES_REGEX `{$NET.IF.IFTYPE.MATCHES}`</p><p>- {#IFTYPE} NOT_MATCHES_REGEX `{$NET.IF.IFTYPE.NOT_MATCHES}`</p> |
 |Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 |Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
-|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
 
 ## Items collected
 
@@ -137,14 +137,14 @@ There are no template links in this template.
 |Interface {#IFNAME}({#IFALIAS}): Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p><p>3. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CCR1016-12G SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CCR1016-12G SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CCR1016-12G SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))`<p>Recovery expression:</p>`last(/MikroTik CCR1016-12G SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0` |AVERAGE |<p>Manual close: YES</p> |
 |Interface {#IFNAME}({#IFALIAS}): High bandwidth usage (>{$IF.UTIL.MAX:"{#IFNAME}"}%) |<p>The network interface utilization is close to its estimated maximum bandwidth.</p> |`(avg(/MikroTik CCR1016-12G SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik CCR1016-12G SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) or avg(/MikroTik CCR1016-12G SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik CCR1016-12G SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])) and last(/MikroTik CCR1016-12G SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0`<p>Recovery expression:</p>`avg(/MikroTik CCR1016-12G SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik CCR1016-12G SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) and avg(/MikroTik CCR1016-12G SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik CCR1016-12G SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |Interface {#IFNAME}({#IFALIAS}): High error rate (>{$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) |<p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p> |`min(/MikroTik CCR1016-12G SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"} or min(/MikroTik CCR1016-12G SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`max(/MikroTik CCR1016-12G SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8 and max(/MikroTik CCR1016-12G SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
-|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik CCR1016-12G SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik CCR1016-12G SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik CCR1016-12G SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik CCR1016-12G SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik CCR1016-12G SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik CCR1016-12G SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik CCR1016-12G SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik CCR1016-12G SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik CCR1016-12G SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2) `<p>Recovery expression:</p>`(change(/MikroTik CCR1016-12G SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik CCR1016-12G SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik CCR1016-12G SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2) ` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik CCR1016-12G SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik CCR1016-12G SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik CCR1016-12G SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik CCR1016-12G SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik CCR1016-12G SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik CCR1016-12G SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik CCR1016-12G SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik CCR1016-12G SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik CCR1016-12G SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2)`<p>Recovery expression:</p>`(change(/MikroTik CCR1016-12G SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik CCR1016-12G SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik CCR1016-12G SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2)` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |{HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/MikroTik CCR1016-12G SNMP/system.uptime[sysUpTime.0])<10m` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- No SNMP data collection</p> |
 |No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/MikroTik CCR1016-12G SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |Unavailable by ICMP ping |<p>Last three attempts returned timeout.  Please check device connectivity.</p> |`max(/MikroTik CCR1016-12G SNMP/icmpping,#3)=0` |HIGH | |
 |High ICMP ping loss |<p>-</p> |`min(/MikroTik CCR1016-12G SNMP/icmppingloss,5m)>{$ICMP_LOSS_WARN} and min(/MikroTik CCR1016-12G SNMP/icmppingloss,5m)<100` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |High ICMP ping response time |<p>-</p> |`avg(/MikroTik CCR1016-12G SNMP/icmppingsec,5m)>{$ICMP_RESPONSE_TIME_WARN}` |WARNING |<p>**Depends on**:</p><p>- High ICMP ping loss</p><p>- Unavailable by ICMP ping</p> |
-|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CCR1016-12G SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CCR1016-12G SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1016-12G SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CCR1016-12G SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
-|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CCR1016-12G SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CCR1016-12G SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1016-12G SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CCR1016-12G SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CCR1016-12G SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CCR1016-12G SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1016-12G SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CCR1016-12G SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CCR1016-12G SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CCR1016-12G SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1016-12G SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CCR1016-12G SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
 |CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CCR1016-12G SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CCR1016-12G SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
 |CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CCR1016-12G SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CCR1016-12G SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
 |CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik CCR1016-12G SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik CCR1016-12G SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
diff --git a/templates/net/mikrotik/mikrotik_CCR1016-12G_snmp/template_net_mikrotik_CCR1016-12G_snmp.yaml b/templates/net/mikrotik/mikrotik_CCR1016-12G_snmp/template_net_mikrotik_CCR1016-12G_snmp.yaml
index 62b72a09ecb..5226610d471 100644
--- a/templates/net/mikrotik/mikrotik_CCR1016-12G_snmp/template_net_mikrotik_CCR1016-12G_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_CCR1016-12G_snmp/template_net_mikrotik_CCR1016-12G_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:43:30Z'
+  date: '2022-01-26T09:46:27Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -35,8 +35,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 81ff4b462e134758bf758ea598a89ac5
@@ -44,6 +47,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 7d502a4b55224f3b8b4323c568d34535
           name: 'ICMP loss'
@@ -54,8 +61,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 5cf5ce1e93f54801a94370f4db68422a
@@ -67,6 +77,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CCR1016-12G SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 5631c72ae88f4755822b993d42dd2c02
           name: 'ICMP response time'
@@ -77,8 +94,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: f9e60c1f73a24df5a9d84ebb81b28861
@@ -93,6 +113,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CCR1016-12G SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 3b3bc4be23664c91b61f835f5eb601ac
           name: 'SNMP traps (fallback)'
@@ -105,8 +132,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: 4f4699712b2547c68ce6f5cc0523c0d5
           name: 'System contact details'
@@ -128,8 +155,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: dfc51b19b72544d998a5c5ef6ca1c21e
           name: 'System description'
@@ -152,8 +179,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 929df02b3b7a462f949c948d655d2f77
           name: 'Firmware version'
@@ -174,8 +201,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 4ff0ad1fe7a043f28e46403ab4ce500b
@@ -185,6 +212,10 @@ zabbix_export:
               priority: INFO
               description: 'Firmware version has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 9e85d395c80b4db8868d5bccf64edfaa
           name: 'Hardware model name'
@@ -203,8 +234,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
         -
           uuid: 14b7fb61e1e64fbd900fd376ee087a40
           name: 'Hardware serial number'
@@ -226,8 +257,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 0abb489d471e414b84d9bfe5d6d0e453
@@ -236,6 +267,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 252fc6ffddbf403a91e0bf1f558526d6
           name: 'System location'
@@ -257,8 +292,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 8891f56528a34481838f9a8303412b0d
           name: 'System name'
@@ -280,8 +315,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 5a2e293b0f664c93ac675f925f0ee3e0
@@ -290,6 +325,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: f91f4184edee42bbbd45dc23668946f2
           name: 'System object ID'
@@ -310,8 +352,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 6cd07fdee09249c092abbee25f526c9a
           name: 'Operating system'
@@ -333,8 +375,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: os
           triggers:
             -
               uuid: 3146fc39809741a09a46852ef392b694
@@ -347,6 +389,10 @@ zabbix_export:
                 -
                   name: 'System name has changed (new name: {ITEM.VALUE})'
                   expression: 'last(/MikroTik CCR1016-12G SNMP/system.name,#1)<>last(/MikroTik CCR1016-12G SNMP/system.name,#2) and length(last(/MikroTik CCR1016-12G SNMP/system.name))>0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 4d42c5c9972445889de6e09abfdbc847
           name: Uptime
@@ -367,8 +413,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 4748e443639d47b2a969070386524eee
@@ -381,6 +427,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/MikroTik CCR1016-12G SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: e6db19f9ea46407dac1744adc4caa945
           name: 'Total memory'
@@ -407,8 +457,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: d05360006eb148a6a66f157513bfe26f
           name: 'Used memory'
@@ -427,8 +477,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 1ccd49102df74a0da7bc068ef3e6c81c
           name: 'Memory utilization'
@@ -441,8 +491,8 @@ zabbix_export:
           description: 'Memory utilization in %'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: 4093f81ecb9f4320b5c5ca719a6b8574
@@ -450,6 +500,13 @@ zabbix_export:
               name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
               priority: AVERAGE
               description: 'The system is running out of free memory.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 7ddd377d90e34afe92e33df8be63b759
           name: 'SNMP agent availability'
@@ -466,8 +523,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: f8bfaedd5b0f45ae9e91831865b2c1fa
@@ -480,6 +540,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CCR1016-12G SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: 9edfde07815b4a03895c24f7703fbe9e
@@ -504,8 +568,8 @@ zabbix_export:
                 The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
               trigger_prototypes:
                 -
                   uuid: 20cfcbcae14b4b7fb9c86486f4e6b972
@@ -514,6 +578,10 @@ zabbix_export:
                   opdata: 'Current utilization: {ITEM.LASTVALUE1}'
                   priority: WARNING
                   description: 'CPU utilization is too high. The system might be slow to respond.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 4bd6447ec4e54e45b12893adf4a92bc3
@@ -558,8 +626,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: c84e4932a71849549be90027810335ea
@@ -570,6 +638,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 67d43cb946d94556bb921b0b120d58ee
                   expression: 'avg(/MikroTik CCR1016-12G SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
@@ -584,6 +659,13 @@ zabbix_export:
                       name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
                       expression: 'avg(/MikroTik CCR1016-12G SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
                       recovery_expression: 'max(/MikroTik CCR1016-12G SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: cd3aaf374f81487f98f0056920870782
                   expression: 'avg(/MikroTik CCR1016-12G SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
@@ -592,6 +674,13 @@ zabbix_export:
                   name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: aeb7b829ab72424f96c53ac8d5788dfe
           name: 'Temperature sensor discovery'
@@ -601,8 +690,7 @@ zabbix_export:
           delay: 1h
           description: |
             MIKROTIK-MIB::mtxrHlTemperature
-            Since temperature sensor is not available on all Mikrotik hardware,
-            this is done to avoid unsupported items.
+            Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.
           item_prototypes:
             -
               uuid: c6d9685ed59d4d719205cea9e750cae3
@@ -626,8 +714,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 1e6346dade484f4aad2a63c03ebf32d4
@@ -638,6 +726,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 9eafc6dc38614e26a301d943f4f8dd5d
                   expression: 'avg(/MikroTik CCR1016-12G SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
@@ -652,6 +747,13 @@ zabbix_export:
                       name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
                       expression: 'avg(/MikroTik CCR1016-12G SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
                       recovery_expression: 'max(/MikroTik CCR1016-12G SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: d6cc20f91d5748fd85ab8743b5152be6
                   expression: 'avg(/MikroTik CCR1016-12G SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
@@ -660,6 +762,13 @@ zabbix_export:
                   name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: e4dddf65df514c03993ef70372bbdb78
           name: 'LTE modem discovery'
@@ -694,14 +803,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRP Reference Signal Received Power.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 6c73b57b26b1484c83d7a8185829bd85
                   expression: 'max(/MikroTik CCR1016-12G SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 8d84ea1e90a0441ca84c4d0922a6489b
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
@@ -716,14 +838,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 5eafa20544ed463fad00fb233b34f92c
                   expression: 'max(/MikroTik CCR1016-12G SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: a5e73872ef424a6082f408e3217502eb
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
@@ -738,14 +873,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 0d079b01ba334fcd8f3e527ec7102c3b
                   expression: 'max(/MikroTik CCR1016-12G SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: eaaceff4c42949ff86c7557ba5f994dc
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
@@ -760,14 +908,27 @@ zabbix_export:
                 mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: fddf1697f5c04bae95c4752d2627856f
                   expression: 'max(/MikroTik CCR1016-12G SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 3048504b46b7470ca54ef976cf973411
@@ -828,8 +989,14 @@ zabbix_export:
                 mtxrWlApAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: b3ae9d00db964983a878382f52b3a171
               name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
@@ -849,8 +1016,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 85e91fc9812543228e069b97f1fcce30
               name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
@@ -870,8 +1043,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 78d7ad1a885e46a3a94a7d9014addf60
               name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
@@ -890,8 +1069,14 @@ zabbix_export:
                     - 15m
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 7cc3ec557e144b4e83038c29a9d3bddd
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -904,8 +1089,14 @@ zabbix_export:
                 mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
         -
           uuid: 7a5ef1da8c6d4d569a6d01bb76d4700e
           name: 'CAPsMAN AP channel discovery'
@@ -938,8 +1129,14 @@ zabbix_export:
                 mtxrWlCMAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 5803d60c0a96463f9768627847b306aa
               name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
@@ -959,8 +1156,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 4697cee2b20944d49e31c3727c67db66
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -973,8 +1176,14 @@ zabbix_export:
                 mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: a504100b84894c01890a70c6fbbecb97
               name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
@@ -994,8 +1203,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 815c19538e7b48edb63bd46ad4d641d3
@@ -1003,6 +1218,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
                   priority: WARNING
                   description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: d93cca84ed0f4fbb9209d4d9880e9945
           name: 'Network interfaces discovery'
@@ -1091,8 +1313,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 94ce6be8cec6430490a50a19fdabb154
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -1111,8 +1339,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: d16cbebb823e4ed9a55f0c3a9be66f84
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -1136,8 +1370,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 984ed6174e284d87a4fad9a73c6c9b7c
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -1160,8 +1400,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: c5d4c6d3b6ce41a4911315e774ba8395
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -1180,8 +1426,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: ab7fe09d3aa6427ebaae6b6c0de1d47f
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -1205,8 +1457,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 573c2c167a554e6c9be9616e3a041732
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -1231,8 +1489,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 872a74bdeab845d8829d7adfeab9ceb5
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -1254,8 +1518,14 @@ zabbix_export:
                 name: 'IF-MIB::ifOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 80c35372193e4616969d2e681a412606
@@ -1273,6 +1543,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: c5adf6b317794b3da1227d20410ecdd3
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -1296,8 +1570,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           trigger_prototypes:
             -
               uuid: 4246c08015084a69a8025aaa928efb3f
@@ -1327,6 +1607,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CCR1016-12G SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CCR1016-12G SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CCR1016-12G SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CCR1016-12G SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: b96a1bd98a964bc4b3aa10f1b723c256
               expression: |
@@ -1347,6 +1631,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CCR1016-12G SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CCR1016-12G SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CCR1016-12G SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CCR1016-12G SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: b2999652071a4eecb8f7112b03168412
               expression: |
@@ -1366,6 +1654,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CCR1016-12G SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CCR1016-12G SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CCR1016-12G SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CCR1016-12G SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: 0594fca19f084adaaab11ab876ab303a
@@ -1444,8 +1739,11 @@ zabbix_export:
               description: 'Space utilization in % for Disk-{#SNMPINDEX}'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 99dbbdae777d4910939c2993a70f6892
               name: 'Disk-{#SNMPINDEX}: Total space'
@@ -1472,8 +1770,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 7ce857423f0b4eb188bf07434449e600
               name: 'Disk-{#SNMPINDEX}: Used space'
@@ -1492,8 +1793,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
           trigger_prototypes:
             -
               uuid: 79b2a705172743a88de436aa62be33ad
@@ -1509,6 +1813,13 @@ zabbix_export:
                  - The disk free space is less than 5G.
                  - The disk will be full in less than 24 hours.
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
             -
               uuid: 8c8e59c2079d4bfcbd775b0c38bbf253
               expression: |
@@ -1529,6 +1840,13 @@ zabbix_export:
                   expression: |
                     last(/MikroTik CCR1016-12G SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
                     ((last(/MikroTik CCR1016-12G SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1016-12G SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CCR1016-12G SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
           graph_prototypes:
             -
               uuid: 7fb9b943f8ce49a88f48095d24f9efda
@@ -1552,6 +1870,16 @@ zabbix_export:
                   item:
                     host: 'MikroTik CCR1016-12G SNMP'
                     key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: ccr1016-12g
+        -
+          tag: target
+          value: mikrotik
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/net/mikrotik/mikrotik_CCR1016-12S-1S+_snmp/README.md b/templates/net/mikrotik/mikrotik_CCR1016-12S-1S+_snmp/README.md
index a76a9997e61..267970e93e5 100644
--- a/templates/net/mikrotik/mikrotik_CCR1016-12S-1S+_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_CCR1016-12S-1S+_snmp/README.md
@@ -71,7 +71,7 @@ There are no template links in this template.
 |Network interfaces discovery |<p>Discovering interfaces from IF-MIB.</p> |SNMP |net.if.discovery<p>**Filter**:</p>AND <p>- {#IFADMINSTATUS} MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.MATCHES}`</p><p>- {#IFADMINSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.NOT_MATCHES}`</p><p>- {#IFOPERSTATUS} MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.MATCHES}`</p><p>- {#IFOPERSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.NOT_MATCHES}`</p><p>- {#IFNAME} MATCHES_REGEX `{$NET.IF.IFNAME.MATCHES}`</p><p>- {#IFNAME} NOT_MATCHES_REGEX `{$NET.IF.IFNAME.NOT_MATCHES}`</p><p>- {#IFDESCR} MATCHES_REGEX `{$NET.IF.IFDESCR.MATCHES}`</p><p>- {#IFDESCR} NOT_MATCHES_REGEX `{$NET.IF.IFDESCR.NOT_MATCHES}`</p><p>- {#IFALIAS} MATCHES_REGEX `{$NET.IF.IFALIAS.MATCHES}`</p><p>- {#IFALIAS} NOT_MATCHES_REGEX `{$NET.IF.IFALIAS.NOT_MATCHES}`</p><p>- {#IFTYPE} MATCHES_REGEX `{$NET.IF.IFTYPE.MATCHES}`</p><p>- {#IFTYPE} NOT_MATCHES_REGEX `{$NET.IF.IFTYPE.NOT_MATCHES}`</p> |
 |Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 |Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
-|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
 
 ## Items collected
 
@@ -137,14 +137,14 @@ There are no template links in this template.
 |Interface {#IFNAME}({#IFALIAS}): Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p><p>3. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CCR1016-12S-1S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CCR1016-12S-1S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CCR1016-12S-1S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))`<p>Recovery expression:</p>`last(/MikroTik CCR1016-12S-1S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0` |AVERAGE |<p>Manual close: YES</p> |
 |Interface {#IFNAME}({#IFALIAS}): High bandwidth usage (>{$IF.UTIL.MAX:"{#IFNAME}"}%) |<p>The network interface utilization is close to its estimated maximum bandwidth.</p> |`(avg(/MikroTik CCR1016-12S-1S SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik CCR1016-12S-1S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) or avg(/MikroTik CCR1016-12S-1S SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik CCR1016-12S-1S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])) and last(/MikroTik CCR1016-12S-1S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0`<p>Recovery expression:</p>`avg(/MikroTik CCR1016-12S-1S SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik CCR1016-12S-1S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) and avg(/MikroTik CCR1016-12S-1S SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik CCR1016-12S-1S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |Interface {#IFNAME}({#IFALIAS}): High error rate (>{$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) |<p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p> |`min(/MikroTik CCR1016-12S-1S SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"} or min(/MikroTik CCR1016-12S-1S SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`max(/MikroTik CCR1016-12S-1S SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8 and max(/MikroTik CCR1016-12S-1S SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
-|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik CCR1016-12S-1S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik CCR1016-12S-1S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik CCR1016-12S-1S SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik CCR1016-12S-1S SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik CCR1016-12S-1S SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik CCR1016-12S-1S SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik CCR1016-12S-1S SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik CCR1016-12S-1S SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik CCR1016-12S-1S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2) `<p>Recovery expression:</p>`(change(/MikroTik CCR1016-12S-1S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik CCR1016-12S-1S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik CCR1016-12S-1S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2) ` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik CCR1016-12S-1S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik CCR1016-12S-1S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik CCR1016-12S-1S SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik CCR1016-12S-1S SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik CCR1016-12S-1S SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik CCR1016-12S-1S SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik CCR1016-12S-1S SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik CCR1016-12S-1S SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik CCR1016-12S-1S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2)`<p>Recovery expression:</p>`(change(/MikroTik CCR1016-12S-1S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik CCR1016-12S-1S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik CCR1016-12S-1S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2)` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |{HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/MikroTik CCR1016-12S-1S SNMP/system.uptime[sysUpTime.0])<10m` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- No SNMP data collection</p> |
 |No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/MikroTik CCR1016-12S-1S SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |Unavailable by ICMP ping |<p>Last three attempts returned timeout.  Please check device connectivity.</p> |`max(/MikroTik CCR1016-12S-1S SNMP/icmpping,#3)=0` |HIGH | |
 |High ICMP ping loss |<p>-</p> |`min(/MikroTik CCR1016-12S-1S SNMP/icmppingloss,5m)>{$ICMP_LOSS_WARN} and min(/MikroTik CCR1016-12S-1S SNMP/icmppingloss,5m)<100` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |High ICMP ping response time |<p>-</p> |`avg(/MikroTik CCR1016-12S-1S SNMP/icmppingsec,5m)>{$ICMP_RESPONSE_TIME_WARN}` |WARNING |<p>**Depends on**:</p><p>- High ICMP ping loss</p><p>- Unavailable by ICMP ping</p> |
-|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CCR1016-12S-1S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CCR1016-12S-1S SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1016-12S-1S SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CCR1016-12S-1S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
-|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CCR1016-12S-1S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CCR1016-12S-1S SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1016-12S-1S SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CCR1016-12S-1S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CCR1016-12S-1S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CCR1016-12S-1S SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1016-12S-1S SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CCR1016-12S-1S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CCR1016-12S-1S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CCR1016-12S-1S SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1016-12S-1S SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CCR1016-12S-1S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
 |CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CCR1016-12S-1S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CCR1016-12S-1S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
 |CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CCR1016-12S-1S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CCR1016-12S-1S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
 |CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik CCR1016-12S-1S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik CCR1016-12S-1S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
diff --git a/templates/net/mikrotik/mikrotik_CCR1016-12S-1S+_snmp/template_net_mikrotik_CCR1016-12S-1S+_snmp.yaml b/templates/net/mikrotik/mikrotik_CCR1016-12S-1S+_snmp/template_net_mikrotik_CCR1016-12S-1S+_snmp.yaml
index c5c4c174d86..90657e588cd 100644
--- a/templates/net/mikrotik/mikrotik_CCR1016-12S-1S+_snmp/template_net_mikrotik_CCR1016-12S-1S+_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_CCR1016-12S-1S+_snmp/template_net_mikrotik_CCR1016-12S-1S+_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:43:34Z'
+  date: '2022-01-26T09:51:23Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -35,8 +35,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: ace4ead8482a47fea59f346d0cc41c62
@@ -44,6 +47,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 84123d3f0fac4b178b3bb1cb878553e8
           name: 'ICMP loss'
@@ -54,8 +61,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: e474571997454a96a7e86294c876c0a7
@@ -67,6 +77,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CCR1016-12S-1S SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: be0dd1d97e0b4f14b0283899821795a3
           name: 'ICMP response time'
@@ -77,8 +94,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: d4e0d30eadce4dd5a37afd48a10ed379
@@ -93,6 +113,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CCR1016-12S-1S SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: dcace506d88d437893b1b9fce0eaee89
           name: 'SNMP traps (fallback)'
@@ -105,8 +132,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: 601f9df762134a84aa5e2509a58f0309
           name: 'System contact details'
@@ -128,8 +155,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 03977b99f6fd4723bc29ce6790deca0b
           name: 'System description'
@@ -152,8 +179,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 9bb0cd6e869b4e00800c2893b4cf43bf
           name: 'Firmware version'
@@ -174,8 +201,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 8012e0275fc24d9e9688cfccb3134aae
@@ -185,6 +212,10 @@ zabbix_export:
               priority: INFO
               description: 'Firmware version has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 6d2bed107e30443ea44f3c3cd61f7cf5
           name: 'Hardware model name'
@@ -203,8 +234,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
         -
           uuid: 460078d3884e4927818a3015dc36ec17
           name: 'Hardware serial number'
@@ -226,8 +257,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: c6e011ff0a1f41c5b90bb8fba507fe7d
@@ -236,6 +267,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 87a5ef8c320c46f2a8936e64e53b2c2e
           name: 'System location'
@@ -257,8 +292,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 05d02e7166c74b87ab67e2c76e9fa6dc
           name: 'System name'
@@ -280,8 +315,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 1060d8c4dda547d9902dc94ac68f1b33
@@ -290,6 +325,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: 7fb0ffa57e5446e5912350700638e7a5
           name: 'System object ID'
@@ -310,8 +352,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: c71d909522214671afd2b636aa54a06d
           name: 'Operating system'
@@ -333,8 +375,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: os
           triggers:
             -
               uuid: f8ac6aaa8c06474d9a9b86e5e43b5ed5
@@ -347,6 +389,10 @@ zabbix_export:
                 -
                   name: 'System name has changed (new name: {ITEM.VALUE})'
                   expression: 'last(/MikroTik CCR1016-12S-1S SNMP/system.name,#1)<>last(/MikroTik CCR1016-12S-1S SNMP/system.name,#2) and length(last(/MikroTik CCR1016-12S-1S SNMP/system.name))>0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: ab98bfc1746743feb6ab0d4a21c1a3bf
           name: Uptime
@@ -367,8 +413,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 916fbb00982f4fb38b1942cf44daf5f2
@@ -381,6 +427,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/MikroTik CCR1016-12S-1S SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 1077bedb2f1b48509ec5a4f299aac7cf
           name: 'Total memory'
@@ -407,8 +457,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: b24d15e975cd4423a4ef27008ee5fda1
           name: 'Used memory'
@@ -427,8 +477,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 3ea0ffecf896435284e268758203272d
           name: 'Memory utilization'
@@ -441,8 +491,8 @@ zabbix_export:
           description: 'Memory utilization in %'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: 63e95c315b6f422e9d4f6e532e847e9c
@@ -450,6 +500,13 @@ zabbix_export:
               name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
               priority: AVERAGE
               description: 'The system is running out of free memory.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 3fe54510eaa1418aba59a833bf93b5dd
           name: 'SNMP agent availability'
@@ -466,8 +523,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: c98fffdacb89455aa6f4f62060d360de
@@ -480,6 +540,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CCR1016-12S-1S SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: 574e87197ce64d3ba47b7f99ee1bf45d
@@ -504,8 +568,8 @@ zabbix_export:
                 The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
               trigger_prototypes:
                 -
                   uuid: a8920b239ceb42e6b3e26ffd310a409a
@@ -514,6 +578,10 @@ zabbix_export:
                   opdata: 'Current utilization: {ITEM.LASTVALUE1}'
                   priority: WARNING
                   description: 'CPU utilization is too high. The system might be slow to respond.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 0c73159da76a4b61bbc7c8116af9d7fc
@@ -558,8 +626,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: c3b13c3d1f8c4d53b1fa67f9abc168bd
@@ -570,6 +638,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 80fd1bd8bf564aecbe37b77294c84ae6
                   expression: 'avg(/MikroTik CCR1016-12S-1S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
@@ -584,6 +659,13 @@ zabbix_export:
                       name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
                       expression: 'avg(/MikroTik CCR1016-12S-1S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
                       recovery_expression: 'max(/MikroTik CCR1016-12S-1S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 335090c080c04b909f1b46b404dd025c
                   expression: 'avg(/MikroTik CCR1016-12S-1S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
@@ -592,6 +674,13 @@ zabbix_export:
                   name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 7d321af0e12c4149a2c61e22326d4074
           name: 'Temperature sensor discovery'
@@ -601,8 +690,7 @@ zabbix_export:
           delay: 1h
           description: |
             MIKROTIK-MIB::mtxrHlTemperature
-            Since temperature sensor is not available on all Mikrotik hardware,
-            this is done to avoid unsupported items.
+            Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.
           item_prototypes:
             -
               uuid: 48385fb97a77406bbf7f6da6f76c02fc
@@ -626,8 +714,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 5b86f67e1e184ef79b7023760d951747
@@ -638,6 +726,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: c62972c2c47d403bb92d43ff7b9b5a20
                   expression: 'avg(/MikroTik CCR1016-12S-1S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
@@ -652,6 +747,13 @@ zabbix_export:
                       name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
                       expression: 'avg(/MikroTik CCR1016-12S-1S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
                       recovery_expression: 'max(/MikroTik CCR1016-12S-1S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: fc2ffec9e7054c82880a560da071781a
                   expression: 'avg(/MikroTik CCR1016-12S-1S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
@@ -660,6 +762,13 @@ zabbix_export:
                   name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 6c3a1517e3ab441db0bb102f9efe3aed
           name: 'LTE modem discovery'
@@ -694,14 +803,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRP Reference Signal Received Power.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 42329cfbff37430f87adfefa852b39fe
                   expression: 'max(/MikroTik CCR1016-12S-1S SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: f752e73907bb485391661bde8301c894
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
@@ -716,14 +838,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 0259421d33e745d992e5eb03091b787a
                   expression: 'max(/MikroTik CCR1016-12S-1S SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 7a0c2eafe0e0464788dea620cdb16cb0
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
@@ -738,14 +873,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: ac07e47a3ce447febb5049da33931109
                   expression: 'max(/MikroTik CCR1016-12S-1S SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 9b02e4b2f89349ec9b364f023d0f999a
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
@@ -760,14 +908,27 @@ zabbix_export:
                 mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: ef75c9ab974c46a99579c544e43a2c2c
                   expression: 'max(/MikroTik CCR1016-12S-1S SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 43b1fee8802d46ed838db745daff8be1
@@ -828,8 +989,14 @@ zabbix_export:
                 mtxrWlApAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 045edf92e0084089961529eb7d5b1baf
               name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
@@ -849,8 +1016,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: a351cfdfce4a474fa08282338accc213
               name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
@@ -870,8 +1043,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: d0447954c1214428841537404b2ca7fd
               name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
@@ -890,8 +1069,14 @@ zabbix_export:
                     - 15m
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 0fe201eb562b4080bdef34e6fe43ae30
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -904,8 +1089,14 @@ zabbix_export:
                 mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
         -
           uuid: 3d3ffa19c93e4d6aaaf63178cf2c3728
           name: 'CAPsMAN AP channel discovery'
@@ -938,8 +1129,14 @@ zabbix_export:
                 mtxrWlCMAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 9ed7d527871e428282ac08c5c4b94ad4
               name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
@@ -959,8 +1156,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 7cdfe024544f494f9cc241ace013be76
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -973,8 +1176,14 @@ zabbix_export:
                 mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: f7655d3d40d742f5abec39dfc753dbc2
               name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
@@ -994,8 +1203,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: ff2543e8251945f29036cb43fda69c72
@@ -1003,6 +1218,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
                   priority: WARNING
                   description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 3833c90d67194b87b5c914a3a6164be2
           name: 'Network interfaces discovery'
@@ -1091,8 +1313,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: bd4691f3e0774477b33708bfdb35a4c3
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -1111,8 +1339,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 3f2f73c8d6824027802fead0f090fdbb
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -1136,8 +1370,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 0164020946ce4198aed52d97fa39cf80
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -1160,8 +1400,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 0482022b45794bc590837d3b4f8ed757
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -1180,8 +1426,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 2be5cdf9d1674b8c871ae93c6315b29b
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -1205,8 +1457,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 6aca8bc6ff7c45cea816f076aa70f9ba
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -1231,8 +1489,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: f86b184949024d6d89b8425fe706259b
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -1254,8 +1518,14 @@ zabbix_export:
                 name: 'IF-MIB::ifOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: b0bc658fd9654ca4802593051c5a368f
@@ -1273,6 +1543,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: a0e4472622824516a9c176f99015d55f
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -1296,8 +1570,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           trigger_prototypes:
             -
               uuid: 837272175f904763bd4c0462946e9a0e
@@ -1327,6 +1607,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CCR1016-12S-1S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CCR1016-12S-1S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CCR1016-12S-1S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CCR1016-12S-1S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: d57a8a917c2a4ad89618acef7c5f1fcb
               expression: |
@@ -1347,6 +1631,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CCR1016-12S-1S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CCR1016-12S-1S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CCR1016-12S-1S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CCR1016-12S-1S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: d7b2ed63b7f941878d34b64ca7ffe21b
               expression: |
@@ -1366,6 +1654,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CCR1016-12S-1S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CCR1016-12S-1S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CCR1016-12S-1S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CCR1016-12S-1S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: a6b64d432afc465d9816a55de2cb4a79
@@ -1444,8 +1739,11 @@ zabbix_export:
               description: 'Space utilization in % for Disk-{#SNMPINDEX}'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 31b78c198bf54971b7d523341538ac55
               name: 'Disk-{#SNMPINDEX}: Total space'
@@ -1472,8 +1770,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 0774ba4162ca42e68b7ad37e76e9ef7b
               name: 'Disk-{#SNMPINDEX}: Used space'
@@ -1492,8 +1793,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
           trigger_prototypes:
             -
               uuid: 7e201487d2ed496492eb2dbb1a169021
@@ -1509,6 +1813,13 @@ zabbix_export:
                  - The disk free space is less than 5G.
                  - The disk will be full in less than 24 hours.
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
             -
               uuid: fcc24d6aa85a4ae4b104d9523afe073d
               expression: |
@@ -1529,6 +1840,13 @@ zabbix_export:
                   expression: |
                     last(/MikroTik CCR1016-12S-1S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
                     ((last(/MikroTik CCR1016-12S-1S SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1016-12S-1S SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CCR1016-12S-1S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
           graph_prototypes:
             -
               uuid: 8a71589751e94467973c7f52af45f440
@@ -1552,6 +1870,16 @@ zabbix_export:
                   item:
                     host: 'MikroTik CCR1016-12S-1S SNMP'
                     key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: ccr1016-12s-1splus
+        -
+          tag: target
+          value: mikrotik
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/net/mikrotik/mikrotik_CCR1036-12G-4S-EM_snmp/README.md b/templates/net/mikrotik/mikrotik_CCR1036-12G-4S-EM_snmp/README.md
index 024fd3a3f80..cdb4a8e5f3e 100644
--- a/templates/net/mikrotik/mikrotik_CCR1036-12G-4S-EM_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_CCR1036-12G-4S-EM_snmp/README.md
@@ -71,7 +71,7 @@ There are no template links in this template.
 |Network interfaces discovery |<p>Discovering interfaces from IF-MIB.</p> |SNMP |net.if.discovery<p>**Filter**:</p>AND <p>- {#IFADMINSTATUS} MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.MATCHES}`</p><p>- {#IFADMINSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.NOT_MATCHES}`</p><p>- {#IFOPERSTATUS} MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.MATCHES}`</p><p>- {#IFOPERSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.NOT_MATCHES}`</p><p>- {#IFNAME} MATCHES_REGEX `{$NET.IF.IFNAME.MATCHES}`</p><p>- {#IFNAME} NOT_MATCHES_REGEX `{$NET.IF.IFNAME.NOT_MATCHES}`</p><p>- {#IFDESCR} MATCHES_REGEX `{$NET.IF.IFDESCR.MATCHES}`</p><p>- {#IFDESCR} NOT_MATCHES_REGEX `{$NET.IF.IFDESCR.NOT_MATCHES}`</p><p>- {#IFALIAS} MATCHES_REGEX `{$NET.IF.IFALIAS.MATCHES}`</p><p>- {#IFALIAS} NOT_MATCHES_REGEX `{$NET.IF.IFALIAS.NOT_MATCHES}`</p><p>- {#IFTYPE} MATCHES_REGEX `{$NET.IF.IFTYPE.MATCHES}`</p><p>- {#IFTYPE} NOT_MATCHES_REGEX `{$NET.IF.IFTYPE.NOT_MATCHES}`</p> |
 |Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 |Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
-|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
 
 ## Items collected
 
@@ -137,14 +137,14 @@ There are no template links in this template.
 |Interface {#IFNAME}({#IFALIAS}): Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p><p>3. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CCR1036-12G-4S-EM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CCR1036-12G-4S-EM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CCR1036-12G-4S-EM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))`<p>Recovery expression:</p>`last(/MikroTik CCR1036-12G-4S-EM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0` |AVERAGE |<p>Manual close: YES</p> |
 |Interface {#IFNAME}({#IFALIAS}): High bandwidth usage (>{$IF.UTIL.MAX:"{#IFNAME}"}%) |<p>The network interface utilization is close to its estimated maximum bandwidth.</p> |`(avg(/MikroTik CCR1036-12G-4S-EM SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik CCR1036-12G-4S-EM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) or avg(/MikroTik CCR1036-12G-4S-EM SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik CCR1036-12G-4S-EM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])) and last(/MikroTik CCR1036-12G-4S-EM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0`<p>Recovery expression:</p>`avg(/MikroTik CCR1036-12G-4S-EM SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik CCR1036-12G-4S-EM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) and avg(/MikroTik CCR1036-12G-4S-EM SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik CCR1036-12G-4S-EM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |Interface {#IFNAME}({#IFALIAS}): High error rate (>{$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) |<p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p> |`min(/MikroTik CCR1036-12G-4S-EM SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"} or min(/MikroTik CCR1036-12G-4S-EM SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`max(/MikroTik CCR1036-12G-4S-EM SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8 and max(/MikroTik CCR1036-12G-4S-EM SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
-|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik CCR1036-12G-4S-EM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik CCR1036-12G-4S-EM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik CCR1036-12G-4S-EM SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik CCR1036-12G-4S-EM SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik CCR1036-12G-4S-EM SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik CCR1036-12G-4S-EM SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik CCR1036-12G-4S-EM SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik CCR1036-12G-4S-EM SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik CCR1036-12G-4S-EM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2) `<p>Recovery expression:</p>`(change(/MikroTik CCR1036-12G-4S-EM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik CCR1036-12G-4S-EM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik CCR1036-12G-4S-EM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2) ` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik CCR1036-12G-4S-EM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik CCR1036-12G-4S-EM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik CCR1036-12G-4S-EM SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik CCR1036-12G-4S-EM SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik CCR1036-12G-4S-EM SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik CCR1036-12G-4S-EM SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik CCR1036-12G-4S-EM SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik CCR1036-12G-4S-EM SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik CCR1036-12G-4S-EM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2)`<p>Recovery expression:</p>`(change(/MikroTik CCR1036-12G-4S-EM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik CCR1036-12G-4S-EM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik CCR1036-12G-4S-EM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2)` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |{HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/MikroTik CCR1036-12G-4S-EM SNMP/system.uptime[sysUpTime.0])<10m` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- No SNMP data collection</p> |
 |No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/MikroTik CCR1036-12G-4S-EM SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |Unavailable by ICMP ping |<p>Last three attempts returned timeout.  Please check device connectivity.</p> |`max(/MikroTik CCR1036-12G-4S-EM SNMP/icmpping,#3)=0` |HIGH | |
 |High ICMP ping loss |<p>-</p> |`min(/MikroTik CCR1036-12G-4S-EM SNMP/icmppingloss,5m)>{$ICMP_LOSS_WARN} and min(/MikroTik CCR1036-12G-4S-EM SNMP/icmppingloss,5m)<100` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |High ICMP ping response time |<p>-</p> |`avg(/MikroTik CCR1036-12G-4S-EM SNMP/icmppingsec,5m)>{$ICMP_RESPONSE_TIME_WARN}` |WARNING |<p>**Depends on**:</p><p>- High ICMP ping loss</p><p>- Unavailable by ICMP ping</p> |
-|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CCR1036-12G-4S-EM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CCR1036-12G-4S-EM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1036-12G-4S-EM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CCR1036-12G-4S-EM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
-|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CCR1036-12G-4S-EM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CCR1036-12G-4S-EM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1036-12G-4S-EM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CCR1036-12G-4S-EM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CCR1036-12G-4S-EM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CCR1036-12G-4S-EM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1036-12G-4S-EM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CCR1036-12G-4S-EM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CCR1036-12G-4S-EM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CCR1036-12G-4S-EM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1036-12G-4S-EM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CCR1036-12G-4S-EM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
 |CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CCR1036-12G-4S-EM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CCR1036-12G-4S-EM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
 |CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CCR1036-12G-4S-EM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CCR1036-12G-4S-EM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
 |CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik CCR1036-12G-4S-EM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik CCR1036-12G-4S-EM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
diff --git a/templates/net/mikrotik/mikrotik_CCR1036-12G-4S-EM_snmp/template_net_mikrotik_CCR1036-12G-4S-EM_snmp.yaml b/templates/net/mikrotik/mikrotik_CCR1036-12G-4S-EM_snmp/template_net_mikrotik_CCR1036-12G-4S-EM_snmp.yaml
index 6243d748ad7..c01cf0e0933 100644
--- a/templates/net/mikrotik/mikrotik_CCR1036-12G-4S-EM_snmp/template_net_mikrotik_CCR1036-12G-4S-EM_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_CCR1036-12G-4S-EM_snmp/template_net_mikrotik_CCR1036-12G-4S-EM_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:43:39Z'
+  date: '2022-01-26T09:50:35Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -35,8 +35,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: f9fd5f6cd1a24a22ae48b0628193e0c4
@@ -44,6 +47,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 29036393918345269f36aa4daba59823
           name: 'ICMP loss'
@@ -54,8 +61,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: c72587594cfb49a6a8b39575e39ea8eb
@@ -67,6 +77,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CCR1036-12G-4S-EM SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: ac362f04138e40b0b2611a66101cb6d7
           name: 'ICMP response time'
@@ -77,8 +94,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 7d3593f5ee8f4350867de676743c4f60
@@ -93,6 +113,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CCR1036-12G-4S-EM SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 7e58aff2b1704d99a73ecc607fbf286d
           name: 'SNMP traps (fallback)'
@@ -105,8 +132,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: b6a9d9049fef46c69ae2508892060a43
           name: 'System contact details'
@@ -128,8 +155,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 267ee9321d50436f8c5a3ab6c1bbbfec
           name: 'System description'
@@ -152,8 +179,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 3b45bf2cd74b496e8882ef8421f3075f
           name: 'Firmware version'
@@ -174,8 +201,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: e0decdba5c7a44ef9983da4d0912ba37
@@ -185,6 +212,10 @@ zabbix_export:
               priority: INFO
               description: 'Firmware version has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 11cf922dd6534e9faad83972f43021f0
           name: 'Hardware model name'
@@ -203,8 +234,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
         -
           uuid: 87694d7f0a6742c5922fc3f1d3c4c950
           name: 'Hardware serial number'
@@ -226,8 +257,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: ee34d0bdac3f4b0489fc96a3feecb72b
@@ -236,6 +267,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 34303c8ce03c4b59bca308055c7d3506
           name: 'System location'
@@ -257,8 +292,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 0f635b37975e45a88116436b46f76486
           name: 'System name'
@@ -280,8 +315,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 10caf9fc68e14308a0dbe730e7e4199e
@@ -290,6 +325,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: a55661d0520a4a3686938402b9a39ecf
           name: 'System object ID'
@@ -310,8 +352,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 4118b55b18df44798e3593e7c4ab1dd7
           name: 'Operating system'
@@ -333,8 +375,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: os
           triggers:
             -
               uuid: 65ac535fb0114cc098bd89d1e2a5cfed
@@ -347,6 +389,10 @@ zabbix_export:
                 -
                   name: 'System name has changed (new name: {ITEM.VALUE})'
                   expression: 'last(/MikroTik CCR1036-12G-4S-EM SNMP/system.name,#1)<>last(/MikroTik CCR1036-12G-4S-EM SNMP/system.name,#2) and length(last(/MikroTik CCR1036-12G-4S-EM SNMP/system.name))>0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: c9d27f7a8a2a40699e0b013c5badcbc0
           name: Uptime
@@ -367,8 +413,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 8138034748544325bad6bdc90484ad21
@@ -381,6 +427,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/MikroTik CCR1036-12G-4S-EM SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 9c918b9f51a14b5aabe9bf662d459a45
           name: 'Total memory'
@@ -407,8 +457,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 4664580c7f80415a8813dfac83c3f616
           name: 'Used memory'
@@ -427,8 +477,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 635ee2092ff64314910c0612fc33ee6c
           name: 'Memory utilization'
@@ -441,8 +491,8 @@ zabbix_export:
           description: 'Memory utilization in %'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: 1ed5e95e003d4119bd578ac4f572ba16
@@ -450,6 +500,13 @@ zabbix_export:
               name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
               priority: AVERAGE
               description: 'The system is running out of free memory.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 048e394bc01149b4976b0bde0e5cfa62
           name: 'SNMP agent availability'
@@ -466,8 +523,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: d4932539ba7245ff8975cc8c224f8d36
@@ -480,6 +540,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CCR1036-12G-4S-EM SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: d00d9cce234d4d75ac0035da246aad00
@@ -504,8 +568,8 @@ zabbix_export:
                 The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
               trigger_prototypes:
                 -
                   uuid: 519211164f324540a624c3f1046dbd44
@@ -514,6 +578,10 @@ zabbix_export:
                   opdata: 'Current utilization: {ITEM.LASTVALUE1}'
                   priority: WARNING
                   description: 'CPU utilization is too high. The system might be slow to respond.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 7ad0424405ea4a1d9e9269d3f4c70fdd
@@ -558,8 +626,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 09b73cf701ab4f4aac2fdbb4ff26e893
@@ -570,6 +638,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 3e86bb9cfaa5410d8b932f80c413e340
                   expression: 'avg(/MikroTik CCR1036-12G-4S-EM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
@@ -584,6 +659,13 @@ zabbix_export:
                       name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
                       expression: 'avg(/MikroTik CCR1036-12G-4S-EM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
                       recovery_expression: 'max(/MikroTik CCR1036-12G-4S-EM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 5f52e2e9403544b987568c00046deaea
                   expression: 'avg(/MikroTik CCR1036-12G-4S-EM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
@@ -592,6 +674,13 @@ zabbix_export:
                   name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: fa20d2b065454093b058086c5936dff3
           name: 'Temperature sensor discovery'
@@ -601,8 +690,7 @@ zabbix_export:
           delay: 1h
           description: |
             MIKROTIK-MIB::mtxrHlTemperature
-            Since temperature sensor is not available on all Mikrotik hardware,
-            this is done to avoid unsupported items.
+            Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.
           item_prototypes:
             -
               uuid: 3c392ed2b8194b9ebdc88a3865f3c03f
@@ -626,8 +714,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 6c46256f6d124cf9b3d602f7536a4788
@@ -638,6 +726,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 8b61d889f30e43f28102163a6284c8d4
                   expression: 'avg(/MikroTik CCR1036-12G-4S-EM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
@@ -652,6 +747,13 @@ zabbix_export:
                       name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
                       expression: 'avg(/MikroTik CCR1036-12G-4S-EM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
                       recovery_expression: 'max(/MikroTik CCR1036-12G-4S-EM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: edbf42873c99405cb77d0eb3fd6986a8
                   expression: 'avg(/MikroTik CCR1036-12G-4S-EM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
@@ -660,6 +762,13 @@ zabbix_export:
                   name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 1022bfe65683409f92d390a005250d35
           name: 'LTE modem discovery'
@@ -694,14 +803,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRP Reference Signal Received Power.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: bbe7c7f1238649119b44e657c5f0d292
                   expression: 'max(/MikroTik CCR1036-12G-4S-EM SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 060e1a17f8244cf48f55605e9977bf36
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
@@ -716,14 +838,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 8f858819c89542bc88afa76981b4639a
                   expression: 'max(/MikroTik CCR1036-12G-4S-EM SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 66389bb0e1a846f8a26567d0d9e182fe
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
@@ -738,14 +873,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: ad82b43ac27c44258f4a4f3ca212cdbf
                   expression: 'max(/MikroTik CCR1036-12G-4S-EM SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: b6f955df3ab04d85baf81d60ad41eb4c
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
@@ -760,14 +908,27 @@ zabbix_export:
                 mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 6a3ce63f84ef4df9b8e9cc231ddf3fe0
                   expression: 'max(/MikroTik CCR1036-12G-4S-EM SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 687618f8d1c74502b6cf0fa90bd634a1
@@ -828,8 +989,14 @@ zabbix_export:
                 mtxrWlApAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: a026d85a54c04205833a36b39d5f0b73
               name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
@@ -849,8 +1016,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: b5e956501870483fb045df1655751b69
               name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
@@ -870,8 +1043,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: e2a923c0d22e4872acc473e3783ccdb6
               name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
@@ -890,8 +1069,14 @@ zabbix_export:
                     - 15m
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 8017849385a648df8f45e35a8a1a080a
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -904,8 +1089,14 @@ zabbix_export:
                 mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
         -
           uuid: 04c6bcdd1e634c129707b0b39c86cc8c
           name: 'CAPsMAN AP channel discovery'
@@ -938,8 +1129,14 @@ zabbix_export:
                 mtxrWlCMAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 5edccab248474bf6beb3132626be1675
               name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
@@ -959,8 +1156,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 13f3f91149694ed8bd33067fa82979d8
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -973,8 +1176,14 @@ zabbix_export:
                 mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: b244af1db2374fbb865c735e81a56ae8
               name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
@@ -994,8 +1203,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 4a5a914ac69f42eb8fa9ca5ef30e63cc
@@ -1003,6 +1218,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
                   priority: WARNING
                   description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: b788130afb324d5c9f034d67b40c68f9
           name: 'Network interfaces discovery'
@@ -1091,8 +1313,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 8bf7bea2c4504ac688a8b340a015bfa9
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -1111,8 +1339,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 96c5ae0259c8477699a793e2bfa4989c
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -1136,8 +1370,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 7abf14afbffe4398ad0c61509cac0524
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -1160,8 +1400,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: ed5d74e331f14e44b96ec39a25f9c975
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -1180,8 +1426,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: cf89dbbd5501476d98a5aae1bab4f2d7
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -1205,8 +1457,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: a0d069ef6c7449d79c1d1629ba507ddf
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -1231,8 +1489,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 111f84c9c695410eb1a5296ff2309cb7
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -1254,8 +1518,14 @@ zabbix_export:
                 name: 'IF-MIB::ifOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 6aa1807ef8c94f09a7bd527f5c34fd1f
@@ -1273,6 +1543,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 069253500b244569b6c20bcd9b436873
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -1296,8 +1570,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           trigger_prototypes:
             -
               uuid: f3c8a1a967524ca2bba4c646987e3fc8
@@ -1327,6 +1607,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CCR1036-12G-4S-EM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CCR1036-12G-4S-EM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CCR1036-12G-4S-EM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CCR1036-12G-4S-EM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: b810391bc8204730b88b3059e2eefa16
               expression: |
@@ -1347,6 +1631,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CCR1036-12G-4S-EM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CCR1036-12G-4S-EM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CCR1036-12G-4S-EM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CCR1036-12G-4S-EM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 6f66143ac9064cdfa02884fde84a4c96
               expression: |
@@ -1366,6 +1654,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CCR1036-12G-4S-EM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CCR1036-12G-4S-EM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CCR1036-12G-4S-EM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CCR1036-12G-4S-EM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: acb45b1477594e53a0fbc1af74c0ef2d
@@ -1444,8 +1739,11 @@ zabbix_export:
               description: 'Space utilization in % for Disk-{#SNMPINDEX}'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 24a12296bd844160b4d34988be84f368
               name: 'Disk-{#SNMPINDEX}: Total space'
@@ -1472,8 +1770,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 159cecb702d2450e9e868c108903e360
               name: 'Disk-{#SNMPINDEX}: Used space'
@@ -1492,8 +1793,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
           trigger_prototypes:
             -
               uuid: 07a38ca5caf7408fa0e61ec5bb2d2c9a
@@ -1509,6 +1813,13 @@ zabbix_export:
                  - The disk free space is less than 5G.
                  - The disk will be full in less than 24 hours.
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
             -
               uuid: 313ea923495e4a0289519b8c228f018a
               expression: |
@@ -1529,6 +1840,13 @@ zabbix_export:
                   expression: |
                     last(/MikroTik CCR1036-12G-4S-EM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
                     ((last(/MikroTik CCR1036-12G-4S-EM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1036-12G-4S-EM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CCR1036-12G-4S-EM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
           graph_prototypes:
             -
               uuid: 07380c601c834361b6ccec958d64a643
@@ -1552,6 +1870,16 @@ zabbix_export:
                   item:
                     host: 'MikroTik CCR1036-12G-4S-EM SNMP'
                     key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: ccr1036-12g-4s-em
+        -
+          tag: target
+          value: mikrotik
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/net/mikrotik/mikrotik_CCR1036-12G-4S_snmp/README.md b/templates/net/mikrotik/mikrotik_CCR1036-12G-4S_snmp/README.md
index 748d7fcfd5f..7eefceec664 100644
--- a/templates/net/mikrotik/mikrotik_CCR1036-12G-4S_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_CCR1036-12G-4S_snmp/README.md
@@ -71,7 +71,7 @@ There are no template links in this template.
 |Network interfaces discovery |<p>Discovering interfaces from IF-MIB.</p> |SNMP |net.if.discovery<p>**Filter**:</p>AND <p>- {#IFADMINSTATUS} MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.MATCHES}`</p><p>- {#IFADMINSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.NOT_MATCHES}`</p><p>- {#IFOPERSTATUS} MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.MATCHES}`</p><p>- {#IFOPERSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.NOT_MATCHES}`</p><p>- {#IFNAME} MATCHES_REGEX `{$NET.IF.IFNAME.MATCHES}`</p><p>- {#IFNAME} NOT_MATCHES_REGEX `{$NET.IF.IFNAME.NOT_MATCHES}`</p><p>- {#IFDESCR} MATCHES_REGEX `{$NET.IF.IFDESCR.MATCHES}`</p><p>- {#IFDESCR} NOT_MATCHES_REGEX `{$NET.IF.IFDESCR.NOT_MATCHES}`</p><p>- {#IFALIAS} MATCHES_REGEX `{$NET.IF.IFALIAS.MATCHES}`</p><p>- {#IFALIAS} NOT_MATCHES_REGEX `{$NET.IF.IFALIAS.NOT_MATCHES}`</p><p>- {#IFTYPE} MATCHES_REGEX `{$NET.IF.IFTYPE.MATCHES}`</p><p>- {#IFTYPE} NOT_MATCHES_REGEX `{$NET.IF.IFTYPE.NOT_MATCHES}`</p> |
 |Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 |Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
-|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
 
 ## Items collected
 
@@ -137,14 +137,14 @@ There are no template links in this template.
 |Interface {#IFNAME}({#IFALIAS}): Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p><p>3. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CCR1036-12G-4S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CCR1036-12G-4S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CCR1036-12G-4S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))`<p>Recovery expression:</p>`last(/MikroTik CCR1036-12G-4S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0` |AVERAGE |<p>Manual close: YES</p> |
 |Interface {#IFNAME}({#IFALIAS}): High bandwidth usage (>{$IF.UTIL.MAX:"{#IFNAME}"}%) |<p>The network interface utilization is close to its estimated maximum bandwidth.</p> |`(avg(/MikroTik CCR1036-12G-4S SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik CCR1036-12G-4S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) or avg(/MikroTik CCR1036-12G-4S SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik CCR1036-12G-4S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])) and last(/MikroTik CCR1036-12G-4S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0`<p>Recovery expression:</p>`avg(/MikroTik CCR1036-12G-4S SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik CCR1036-12G-4S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) and avg(/MikroTik CCR1036-12G-4S SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik CCR1036-12G-4S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |Interface {#IFNAME}({#IFALIAS}): High error rate (>{$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) |<p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p> |`min(/MikroTik CCR1036-12G-4S SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"} or min(/MikroTik CCR1036-12G-4S SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`max(/MikroTik CCR1036-12G-4S SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8 and max(/MikroTik CCR1036-12G-4S SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
-|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik CCR1036-12G-4S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik CCR1036-12G-4S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik CCR1036-12G-4S SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik CCR1036-12G-4S SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik CCR1036-12G-4S SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik CCR1036-12G-4S SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik CCR1036-12G-4S SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik CCR1036-12G-4S SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik CCR1036-12G-4S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2) `<p>Recovery expression:</p>`(change(/MikroTik CCR1036-12G-4S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik CCR1036-12G-4S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik CCR1036-12G-4S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2) ` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik CCR1036-12G-4S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik CCR1036-12G-4S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik CCR1036-12G-4S SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik CCR1036-12G-4S SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik CCR1036-12G-4S SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik CCR1036-12G-4S SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik CCR1036-12G-4S SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik CCR1036-12G-4S SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik CCR1036-12G-4S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2)`<p>Recovery expression:</p>`(change(/MikroTik CCR1036-12G-4S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik CCR1036-12G-4S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik CCR1036-12G-4S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2)` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |{HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/MikroTik CCR1036-12G-4S SNMP/system.uptime[sysUpTime.0])<10m` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- No SNMP data collection</p> |
 |No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/MikroTik CCR1036-12G-4S SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |Unavailable by ICMP ping |<p>Last three attempts returned timeout.  Please check device connectivity.</p> |`max(/MikroTik CCR1036-12G-4S SNMP/icmpping,#3)=0` |HIGH | |
 |High ICMP ping loss |<p>-</p> |`min(/MikroTik CCR1036-12G-4S SNMP/icmppingloss,5m)>{$ICMP_LOSS_WARN} and min(/MikroTik CCR1036-12G-4S SNMP/icmppingloss,5m)<100` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |High ICMP ping response time |<p>-</p> |`avg(/MikroTik CCR1036-12G-4S SNMP/icmppingsec,5m)>{$ICMP_RESPONSE_TIME_WARN}` |WARNING |<p>**Depends on**:</p><p>- High ICMP ping loss</p><p>- Unavailable by ICMP ping</p> |
-|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CCR1036-12G-4S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CCR1036-12G-4S SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1036-12G-4S SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CCR1036-12G-4S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
-|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CCR1036-12G-4S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CCR1036-12G-4S SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1036-12G-4S SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CCR1036-12G-4S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CCR1036-12G-4S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CCR1036-12G-4S SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1036-12G-4S SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CCR1036-12G-4S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CCR1036-12G-4S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CCR1036-12G-4S SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1036-12G-4S SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CCR1036-12G-4S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
 |CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CCR1036-12G-4S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CCR1036-12G-4S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
 |CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CCR1036-12G-4S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CCR1036-12G-4S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
 |CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik CCR1036-12G-4S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik CCR1036-12G-4S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
diff --git a/templates/net/mikrotik/mikrotik_CCR1036-12G-4S_snmp/template_net_mikrotik_CCR1036-12G-4S_snmp.yaml b/templates/net/mikrotik/mikrotik_CCR1036-12G-4S_snmp/template_net_mikrotik_CCR1036-12G-4S_snmp.yaml
index 1e92a88773e..684746cd883 100644
--- a/templates/net/mikrotik/mikrotik_CCR1036-12G-4S_snmp/template_net_mikrotik_CCR1036-12G-4S_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_CCR1036-12G-4S_snmp/template_net_mikrotik_CCR1036-12G-4S_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:43:45Z'
+  date: '2022-01-26T09:53:02Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -35,8 +35,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 65c639dc46a345da90e22ca0dc491d8c
@@ -44,6 +47,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: c0abc057afc84b459e0b5cfe43abbd03
           name: 'ICMP loss'
@@ -54,8 +61,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 65eb4b94fead4b57acda0b7ac001c41c
@@ -67,6 +77,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CCR1036-12G-4S SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 5302099600ae4973810fe71d21ab4533
           name: 'ICMP response time'
@@ -77,8 +94,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 410faf17c1ca41408cb773270dc614b3
@@ -93,6 +113,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CCR1036-12G-4S SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 9a30d3659344407ab31a3997e75e2c8a
           name: 'SNMP traps (fallback)'
@@ -105,8 +132,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: ffb768eca167467b910da993f38f3ca7
           name: 'System contact details'
@@ -128,8 +155,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: b9348f8739fc4296a19a92de49f261fc
           name: 'System description'
@@ -152,8 +179,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 9316b737e8174862b0ce60ad10dca68b
           name: 'Firmware version'
@@ -174,8 +201,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 565c94a00dde43c1af72f8c2d00edcb5
@@ -185,6 +212,10 @@ zabbix_export:
               priority: INFO
               description: 'Firmware version has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: c758cdb68e854cedbb9fc53d361c878b
           name: 'Hardware model name'
@@ -203,8 +234,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
         -
           uuid: b04e3b3b91294e3b9a5968e475166473
           name: 'Hardware serial number'
@@ -226,8 +257,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 6d02cc3ff4144efda53554446feb0058
@@ -236,6 +267,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: b5fbca72e7724e689c5563877e3beef1
           name: 'System location'
@@ -257,8 +292,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 9e21e99f85ec464cba6473f4c0d15e96
           name: 'System name'
@@ -280,8 +315,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: ed7279478045454b809f46211c5c71b9
@@ -290,6 +325,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: f48f704473374e1991267a007809ec00
           name: 'System object ID'
@@ -310,8 +352,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: d0d399bd9e7e4aca86de1b4aa23cfa0c
           name: 'Operating system'
@@ -333,8 +375,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: os
           triggers:
             -
               uuid: 18900918495f4dd99cbde564a071bf34
@@ -347,6 +389,10 @@ zabbix_export:
                 -
                   name: 'System name has changed (new name: {ITEM.VALUE})'
                   expression: 'last(/MikroTik CCR1036-12G-4S SNMP/system.name,#1)<>last(/MikroTik CCR1036-12G-4S SNMP/system.name,#2) and length(last(/MikroTik CCR1036-12G-4S SNMP/system.name))>0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: cbb288d0de7c4732b74ff812698cccbc
           name: Uptime
@@ -367,8 +413,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: ecf84d7e28504c23a40b013683d1cfee
@@ -381,6 +427,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/MikroTik CCR1036-12G-4S SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 8be77fd4f4704108aedd5ab35a212172
           name: 'Total memory'
@@ -407,8 +457,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: b8102bbf381c4a6e9d759e3ae3902616
           name: 'Used memory'
@@ -427,8 +477,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 383e2e5544ef439199784bcf81cced10
           name: 'Memory utilization'
@@ -441,8 +491,8 @@ zabbix_export:
           description: 'Memory utilization in %'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: d89ab73e0c534f84ae9481a1a48d5064
@@ -450,6 +500,13 @@ zabbix_export:
               name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
               priority: AVERAGE
               description: 'The system is running out of free memory.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 4c0d4bc7872847248c4659bf7f29dee1
           name: 'SNMP agent availability'
@@ -466,8 +523,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 56f238340c7e40b39eb8cc04a67cf465
@@ -480,6 +540,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CCR1036-12G-4S SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: e3e28fe259aa4a43b30e5b919d44afcd
@@ -504,8 +568,8 @@ zabbix_export:
                 The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
               trigger_prototypes:
                 -
                   uuid: 24667b99976c417985bbb1a307184d88
@@ -514,6 +578,10 @@ zabbix_export:
                   opdata: 'Current utilization: {ITEM.LASTVALUE1}'
                   priority: WARNING
                   description: 'CPU utilization is too high. The system might be slow to respond.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 29baf5d5e81846de97fd1dd470d55583
@@ -558,8 +626,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: aa6398ab43ec491ab5aa96c8d8422112
@@ -570,6 +638,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 186b82ffb7934fe8a62a150970dc2468
                   expression: 'avg(/MikroTik CCR1036-12G-4S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
@@ -584,6 +659,13 @@ zabbix_export:
                       name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
                       expression: 'avg(/MikroTik CCR1036-12G-4S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
                       recovery_expression: 'max(/MikroTik CCR1036-12G-4S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 58357816e19b4c9986e8d26165c4f29a
                   expression: 'avg(/MikroTik CCR1036-12G-4S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
@@ -592,6 +674,13 @@ zabbix_export:
                   name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 99d9e2e9d49241158e7e6a4b582be953
           name: 'Temperature sensor discovery'
@@ -601,8 +690,7 @@ zabbix_export:
           delay: 1h
           description: |
             MIKROTIK-MIB::mtxrHlTemperature
-            Since temperature sensor is not available on all Mikrotik hardware,
-            this is done to avoid unsupported items.
+            Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.
           item_prototypes:
             -
               uuid: 651743f22cbb4fb58233a5af65bb66f3
@@ -626,8 +714,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 522ee0ddfd7e40a4b81612d4ba4266cf
@@ -638,6 +726,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 6a5b1f729c054ec7acc3665ffb831bcc
                   expression: 'avg(/MikroTik CCR1036-12G-4S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
@@ -652,6 +747,13 @@ zabbix_export:
                       name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
                       expression: 'avg(/MikroTik CCR1036-12G-4S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
                       recovery_expression: 'max(/MikroTik CCR1036-12G-4S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: f4198424045742619f84410ee7a2939c
                   expression: 'avg(/MikroTik CCR1036-12G-4S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
@@ -660,6 +762,13 @@ zabbix_export:
                   name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: be0f695c529c4eb299ec52cf35894748
           name: 'LTE modem discovery'
@@ -694,14 +803,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRP Reference Signal Received Power.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: b7d3eebe1d6944b88ed8afa923caf884
                   expression: 'max(/MikroTik CCR1036-12G-4S SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 34bf54ed6a5f4e53986f359d544c30cb
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
@@ -716,14 +838,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 94c9e778f2a7471c8002dfa6918dde8f
                   expression: 'max(/MikroTik CCR1036-12G-4S SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 3823c35804ca433c8bcb5911f72bcea1
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
@@ -738,14 +873,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 77e69f355f7348a4bc823a8428980356
                   expression: 'max(/MikroTik CCR1036-12G-4S SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: b978cd0e8ea54e76ac2306550880c3bb
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
@@ -760,14 +908,27 @@ zabbix_export:
                 mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: c1926140ee5d4532adeecf590f740e96
                   expression: 'max(/MikroTik CCR1036-12G-4S SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 610a541bb14d4913bf2da6621c34e374
@@ -828,8 +989,14 @@ zabbix_export:
                 mtxrWlApAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 50e5ff8d2fcd40969e84bfeb4337a3f3
               name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
@@ -849,8 +1016,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: e618a4a331f744a4b3803197d49560af
               name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
@@ -870,8 +1043,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 16cdd7e0531a4e589f6a80516afa05f4
               name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
@@ -890,8 +1069,14 @@ zabbix_export:
                     - 15m
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: b8c258ea4d8d43e2a76563cd67e310ae
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -904,8 +1089,14 @@ zabbix_export:
                 mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
         -
           uuid: 12c3d78774c74147a6117369b96b4256
           name: 'CAPsMAN AP channel discovery'
@@ -938,8 +1129,14 @@ zabbix_export:
                 mtxrWlCMAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: f9436b34ccd54749adcf2ce4250306fa
               name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
@@ -959,8 +1156,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: e230eabed9c346ea953cfd1d74e7539d
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -973,8 +1176,14 @@ zabbix_export:
                 mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 2c38689dacdb426b93a933693e6aa400
               name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
@@ -994,8 +1203,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: d32004c5c1804105aee11b22722556e1
@@ -1003,6 +1218,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
                   priority: WARNING
                   description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 60bd54d856ff48cebdcc36cae159f05e
           name: 'Network interfaces discovery'
@@ -1091,8 +1313,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 8193ad4c190f465da3cca3f5bc0ca2d9
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -1111,8 +1339,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 2957eff649ec42d98e9426242a7ea875
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -1136,8 +1370,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 123f16658e504451add404e15acefc47
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -1160,8 +1400,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 8306c1a20a964b90b145160a246ff8a6
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -1180,8 +1426,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: ce76a9441b314208b097c132894cebd7
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -1205,8 +1457,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 13b5a00bc3a747df9c21bf123b78362f
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -1231,8 +1489,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 87f30fec9a0c43bd9f96712448c585b3
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -1254,8 +1518,14 @@ zabbix_export:
                 name: 'IF-MIB::ifOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 7b8a57cb6eeb4eb5b2a6e270065f6032
@@ -1273,6 +1543,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 9c36325c00124757a18cb91d5860e7b6
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -1296,8 +1570,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           trigger_prototypes:
             -
               uuid: bc744a57d4e44fd187453b4b8f72538e
@@ -1327,6 +1607,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CCR1036-12G-4S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CCR1036-12G-4S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CCR1036-12G-4S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CCR1036-12G-4S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 4a4f855dd0744cd29c3d24eb7e00de35
               expression: |
@@ -1347,6 +1631,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CCR1036-12G-4S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CCR1036-12G-4S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CCR1036-12G-4S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CCR1036-12G-4S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: f8e4afe44bc041e9b1853644d1b662f8
               expression: |
@@ -1366,6 +1654,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CCR1036-12G-4S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CCR1036-12G-4S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CCR1036-12G-4S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CCR1036-12G-4S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: 877800605f9f473e93ca08ea1e0fa25d
@@ -1444,8 +1739,11 @@ zabbix_export:
               description: 'Space utilization in % for Disk-{#SNMPINDEX}'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 9186466c7a374a9d9a243bec3e00efdc
               name: 'Disk-{#SNMPINDEX}: Total space'
@@ -1472,8 +1770,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 9bdbfc448dcb4d3fbfff2fc1a78b938d
               name: 'Disk-{#SNMPINDEX}: Used space'
@@ -1492,8 +1793,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
           trigger_prototypes:
             -
               uuid: 73127568919e45ca9df89ab08285a3b5
@@ -1509,6 +1813,13 @@ zabbix_export:
                  - The disk free space is less than 5G.
                  - The disk will be full in less than 24 hours.
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
             -
               uuid: 954903eaecf54c26874d9e5ce47e044b
               expression: |
@@ -1529,6 +1840,13 @@ zabbix_export:
                   expression: |
                     last(/MikroTik CCR1036-12G-4S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
                     ((last(/MikroTik CCR1036-12G-4S SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1036-12G-4S SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CCR1036-12G-4S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
           graph_prototypes:
             -
               uuid: d9d444f2cfd5498d857d74aed0678406
@@ -1552,6 +1870,16 @@ zabbix_export:
                   item:
                     host: 'MikroTik CCR1036-12G-4S SNMP'
                     key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: ccr1036-12g-4s
+        -
+          tag: target
+          value: mikrotik
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/net/mikrotik/mikrotik_CCR1036-8G-2S+EM_snmp/README.md b/templates/net/mikrotik/mikrotik_CCR1036-8G-2S+EM_snmp/README.md
index f94e173f7e1..f38458d5ac8 100644
--- a/templates/net/mikrotik/mikrotik_CCR1036-8G-2S+EM_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_CCR1036-8G-2S+EM_snmp/README.md
@@ -71,7 +71,7 @@ There are no template links in this template.
 |Network interfaces discovery |<p>Discovering interfaces from IF-MIB.</p> |SNMP |net.if.discovery<p>**Filter**:</p>AND <p>- {#IFADMINSTATUS} MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.MATCHES}`</p><p>- {#IFADMINSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.NOT_MATCHES}`</p><p>- {#IFOPERSTATUS} MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.MATCHES}`</p><p>- {#IFOPERSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.NOT_MATCHES}`</p><p>- {#IFNAME} MATCHES_REGEX `{$NET.IF.IFNAME.MATCHES}`</p><p>- {#IFNAME} NOT_MATCHES_REGEX `{$NET.IF.IFNAME.NOT_MATCHES}`</p><p>- {#IFDESCR} MATCHES_REGEX `{$NET.IF.IFDESCR.MATCHES}`</p><p>- {#IFDESCR} NOT_MATCHES_REGEX `{$NET.IF.IFDESCR.NOT_MATCHES}`</p><p>- {#IFALIAS} MATCHES_REGEX `{$NET.IF.IFALIAS.MATCHES}`</p><p>- {#IFALIAS} NOT_MATCHES_REGEX `{$NET.IF.IFALIAS.NOT_MATCHES}`</p><p>- {#IFTYPE} MATCHES_REGEX `{$NET.IF.IFTYPE.MATCHES}`</p><p>- {#IFTYPE} NOT_MATCHES_REGEX `{$NET.IF.IFTYPE.NOT_MATCHES}`</p> |
 |Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 |Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
-|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
 
 ## Items collected
 
@@ -137,14 +137,14 @@ There are no template links in this template.
 |Interface {#IFNAME}({#IFALIAS}): Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p><p>3. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CCR1036-8G-2SEM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CCR1036-8G-2SEM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CCR1036-8G-2SEM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))`<p>Recovery expression:</p>`last(/MikroTik CCR1036-8G-2SEM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0` |AVERAGE |<p>Manual close: YES</p> |
 |Interface {#IFNAME}({#IFALIAS}): High bandwidth usage (>{$IF.UTIL.MAX:"{#IFNAME}"}%) |<p>The network interface utilization is close to its estimated maximum bandwidth.</p> |`(avg(/MikroTik CCR1036-8G-2SEM SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik CCR1036-8G-2SEM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) or avg(/MikroTik CCR1036-8G-2SEM SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik CCR1036-8G-2SEM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])) and last(/MikroTik CCR1036-8G-2SEM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0`<p>Recovery expression:</p>`avg(/MikroTik CCR1036-8G-2SEM SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik CCR1036-8G-2SEM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) and avg(/MikroTik CCR1036-8G-2SEM SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik CCR1036-8G-2SEM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |Interface {#IFNAME}({#IFALIAS}): High error rate (>{$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) |<p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p> |`min(/MikroTik CCR1036-8G-2SEM SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"} or min(/MikroTik CCR1036-8G-2SEM SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`max(/MikroTik CCR1036-8G-2SEM SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8 and max(/MikroTik CCR1036-8G-2SEM SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
-|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik CCR1036-8G-2SEM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik CCR1036-8G-2SEM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik CCR1036-8G-2SEM SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik CCR1036-8G-2SEM SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik CCR1036-8G-2SEM SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik CCR1036-8G-2SEM SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik CCR1036-8G-2SEM SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik CCR1036-8G-2SEM SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik CCR1036-8G-2SEM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2) `<p>Recovery expression:</p>`(change(/MikroTik CCR1036-8G-2SEM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik CCR1036-8G-2SEM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik CCR1036-8G-2SEM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2) ` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik CCR1036-8G-2SEM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik CCR1036-8G-2SEM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik CCR1036-8G-2SEM SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik CCR1036-8G-2SEM SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik CCR1036-8G-2SEM SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik CCR1036-8G-2SEM SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik CCR1036-8G-2SEM SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik CCR1036-8G-2SEM SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik CCR1036-8G-2SEM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2)`<p>Recovery expression:</p>`(change(/MikroTik CCR1036-8G-2SEM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik CCR1036-8G-2SEM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik CCR1036-8G-2SEM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2)` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |{HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/MikroTik CCR1036-8G-2SEM SNMP/system.uptime[sysUpTime.0])<10m` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- No SNMP data collection</p> |
 |No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/MikroTik CCR1036-8G-2SEM SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |Unavailable by ICMP ping |<p>Last three attempts returned timeout.  Please check device connectivity.</p> |`max(/MikroTik CCR1036-8G-2SEM SNMP/icmpping,#3)=0` |HIGH | |
 |High ICMP ping loss |<p>-</p> |`min(/MikroTik CCR1036-8G-2SEM SNMP/icmppingloss,5m)>{$ICMP_LOSS_WARN} and min(/MikroTik CCR1036-8G-2SEM SNMP/icmppingloss,5m)<100` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |High ICMP ping response time |<p>-</p> |`avg(/MikroTik CCR1036-8G-2SEM SNMP/icmppingsec,5m)>{$ICMP_RESPONSE_TIME_WARN}` |WARNING |<p>**Depends on**:</p><p>- High ICMP ping loss</p><p>- Unavailable by ICMP ping</p> |
-|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CCR1036-8G-2SEM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CCR1036-8G-2SEM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1036-8G-2SEM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CCR1036-8G-2SEM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
-|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CCR1036-8G-2SEM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CCR1036-8G-2SEM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1036-8G-2SEM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CCR1036-8G-2SEM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CCR1036-8G-2SEM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CCR1036-8G-2SEM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1036-8G-2SEM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CCR1036-8G-2SEM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CCR1036-8G-2SEM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CCR1036-8G-2SEM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1036-8G-2SEM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CCR1036-8G-2SEM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
 |CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CCR1036-8G-2SEM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CCR1036-8G-2SEM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
 |CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CCR1036-8G-2SEM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CCR1036-8G-2SEM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
 |CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik CCR1036-8G-2SEM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik CCR1036-8G-2SEM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
diff --git a/templates/net/mikrotik/mikrotik_CCR1036-8G-2S+EM_snmp/template_net_mikrotik_CCR1036-8G-2S+EM_snmp.yaml b/templates/net/mikrotik/mikrotik_CCR1036-8G-2S+EM_snmp/template_net_mikrotik_CCR1036-8G-2S+EM_snmp.yaml
index 3da93ef5c9c..733c8c92acb 100644
--- a/templates/net/mikrotik/mikrotik_CCR1036-8G-2S+EM_snmp/template_net_mikrotik_CCR1036-8G-2S+EM_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_CCR1036-8G-2S+EM_snmp/template_net_mikrotik_CCR1036-8G-2S+EM_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:43:50Z'
+  date: '2022-01-26T09:46:53Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -35,8 +35,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 151029088e374c23bb89abe498da70ef
@@ -44,6 +47,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 20177d9560fd41518274117a8573fcbf
           name: 'ICMP loss'
@@ -54,8 +61,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: f719d0a102d84edb8c2672502ee28b25
@@ -67,6 +77,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CCR1036-8G-2SEM SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 47ded308c77c4cbba98051665f09a378
           name: 'ICMP response time'
@@ -77,8 +94,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: acba03a0cc9a40fb89258e1ece7dce30
@@ -93,6 +113,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CCR1036-8G-2SEM SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 5fc1581406334366ba038c350335c7af
           name: 'SNMP traps (fallback)'
@@ -105,8 +132,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: 1e20df1ba4f740768c5d167928b52a91
           name: 'System contact details'
@@ -128,8 +155,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 1e0feae3c04e4736bf7a4485e36be60e
           name: 'System description'
@@ -152,8 +179,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: a808f02d217e4b338fbd5d8f52474d7d
           name: 'Firmware version'
@@ -174,8 +201,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: a42442ce9d7d4a378964296eed6a6b33
@@ -185,6 +212,10 @@ zabbix_export:
               priority: INFO
               description: 'Firmware version has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 721918724f3f47189db3d73a51eed73e
           name: 'Hardware model name'
@@ -203,8 +234,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
         -
           uuid: 028dcc2c59f34754b646c0a07e6e4709
           name: 'Hardware serial number'
@@ -226,8 +257,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 2da3a78731324233be1563691f353d04
@@ -236,6 +267,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 966c104811674f4cbae586a8b5356247
           name: 'System location'
@@ -257,8 +292,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 18bbaa17cf224712944aa4ccfd3c56f8
           name: 'System name'
@@ -280,8 +315,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: f2d7211cd2ca476facec96075e06298c
@@ -290,6 +325,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: a21804a0cb5549ea8f8b447802600aaa
           name: 'System object ID'
@@ -310,8 +352,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 5f186d66075841689596629ffecd1d45
           name: 'Operating system'
@@ -333,8 +375,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: os
           triggers:
             -
               uuid: 855a1e17110e49eaaaf4dd263f16a591
@@ -347,6 +389,10 @@ zabbix_export:
                 -
                   name: 'System name has changed (new name: {ITEM.VALUE})'
                   expression: 'last(/MikroTik CCR1036-8G-2SEM SNMP/system.name,#1)<>last(/MikroTik CCR1036-8G-2SEM SNMP/system.name,#2) and length(last(/MikroTik CCR1036-8G-2SEM SNMP/system.name))>0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 34d40f56c17541ddb276e773d0e39737
           name: Uptime
@@ -367,8 +413,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 75e9434ddcb34c5489190d8b6de07e87
@@ -381,6 +427,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/MikroTik CCR1036-8G-2SEM SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 19a2d0e30b0c4123899147a6230863cf
           name: 'Total memory'
@@ -407,8 +457,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 8b64d82e4b7b46a28cc88b1fc6c772d8
           name: 'Used memory'
@@ -427,8 +477,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: a1a1e9109bb24cefb67b397dc94d3ed9
           name: 'Memory utilization'
@@ -441,8 +491,8 @@ zabbix_export:
           description: 'Memory utilization in %'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: 9a83e6b6a0874a49a983cb610a7e0e50
@@ -450,6 +500,13 @@ zabbix_export:
               name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
               priority: AVERAGE
               description: 'The system is running out of free memory.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: f77c57fb2dca4391ba2d741ef636b0cd
           name: 'SNMP agent availability'
@@ -466,8 +523,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: b14b41ca31c342be803852075ff5c9f9
@@ -480,6 +540,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CCR1036-8G-2SEM SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: c10d4bba94a54260853ce18bb4a1dbac
@@ -504,8 +568,8 @@ zabbix_export:
                 The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
               trigger_prototypes:
                 -
                   uuid: bc07372dff2f4f72a6b1b7c0e02f79c7
@@ -514,6 +578,10 @@ zabbix_export:
                   opdata: 'Current utilization: {ITEM.LASTVALUE1}'
                   priority: WARNING
                   description: 'CPU utilization is too high. The system might be slow to respond.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 01ef650a4abb4a1f9ff59f507ba15528
@@ -558,8 +626,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: b3ce44c470a64dc49bc169c06bf9761d
@@ -570,6 +638,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 876a62a4aa6a449d888f1233c24c0dbc
                   expression: 'avg(/MikroTik CCR1036-8G-2SEM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
@@ -584,6 +659,13 @@ zabbix_export:
                       name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
                       expression: 'avg(/MikroTik CCR1036-8G-2SEM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
                       recovery_expression: 'max(/MikroTik CCR1036-8G-2SEM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 79304fcbafe349d4adeebe277858d23a
                   expression: 'avg(/MikroTik CCR1036-8G-2SEM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
@@ -592,6 +674,13 @@ zabbix_export:
                   name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: a5a949d4fee442ffa2feb45f703396dd
           name: 'Temperature sensor discovery'
@@ -601,8 +690,7 @@ zabbix_export:
           delay: 1h
           description: |
             MIKROTIK-MIB::mtxrHlTemperature
-            Since temperature sensor is not available on all Mikrotik hardware,
-            this is done to avoid unsupported items.
+            Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.
           item_prototypes:
             -
               uuid: efe26a08e5244aba9529e2a19512b022
@@ -626,8 +714,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 80af013716d944e8be4cef996aabfef2
@@ -638,6 +726,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: ab46cd19e709417ebeb5c3b9964e2eee
                   expression: 'avg(/MikroTik CCR1036-8G-2SEM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
@@ -652,6 +747,13 @@ zabbix_export:
                       name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
                       expression: 'avg(/MikroTik CCR1036-8G-2SEM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
                       recovery_expression: 'max(/MikroTik CCR1036-8G-2SEM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 06e95d596af74a288b3787cb665255bb
                   expression: 'avg(/MikroTik CCR1036-8G-2SEM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
@@ -660,6 +762,13 @@ zabbix_export:
                   name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: abc09b388f484f10aa5d7e7203bdbbcf
           name: 'LTE modem discovery'
@@ -694,14 +803,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRP Reference Signal Received Power.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 4f9b8def6c3e4d72b7afeb50808cae21
                   expression: 'max(/MikroTik CCR1036-8G-2SEM SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 0d85d562ee204270becddfe118253dcd
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
@@ -716,14 +838,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: aa5d408235834a5e8492a55e178f5dc7
                   expression: 'max(/MikroTik CCR1036-8G-2SEM SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 67ef3c61b30048fda4139fbc29cb7abc
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
@@ -738,14 +873,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 5c4489b0d28649a9a487d65833043589
                   expression: 'max(/MikroTik CCR1036-8G-2SEM SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: afc1517dbedf49c089eacf2467392963
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
@@ -760,14 +908,27 @@ zabbix_export:
                 mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 1d77ead6601b40d5b22afc9098a8a211
                   expression: 'max(/MikroTik CCR1036-8G-2SEM SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 594db09a7c024245a5eead39296b3c2c
@@ -828,8 +989,14 @@ zabbix_export:
                 mtxrWlApAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 105399b0d5d84b9094b7eb75603d75b3
               name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
@@ -849,8 +1016,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 8d0b0fca17b343dab54abe2b3f4b49f9
               name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
@@ -870,8 +1043,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: e17ac687194544698dee18404081a7d9
               name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
@@ -890,8 +1069,14 @@ zabbix_export:
                     - 15m
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 7d942107cdaf4ff58c9ad7a1a21f260d
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -904,8 +1089,14 @@ zabbix_export:
                 mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
         -
           uuid: 543247e3c8a74ebcb21aec300625eceb
           name: 'CAPsMAN AP channel discovery'
@@ -938,8 +1129,14 @@ zabbix_export:
                 mtxrWlCMAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 7ffae69ac5c644efa17ba9db8e3d16bd
               name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
@@ -959,8 +1156,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 03fdd1fb023d4e109e1a69bd01e1b588
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -973,8 +1176,14 @@ zabbix_export:
                 mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 139d2b1d8a0946f5b3febab4e9fd0587
               name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
@@ -994,8 +1203,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 1b02cd1523474c949dcabd004a01089f
@@ -1003,6 +1218,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
                   priority: WARNING
                   description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: f684ba95e12942a28e9c152670ea1a4c
           name: 'Network interfaces discovery'
@@ -1091,8 +1313,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 08d326dcf526411c948211b415f67992
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -1111,8 +1339,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: f5ec52a22acb4156aae1d804bbae2668
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -1136,8 +1370,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: af396e21711f419ba854d78ea6dc5244
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -1160,8 +1400,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 1a961ca305f748a99e807efeacbef3be
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -1180,8 +1426,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 9a9671c5bc574aff993c898453496781
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -1205,8 +1457,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: d313a2ecd18d4230bd5b0e77c230be85
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -1231,8 +1489,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: f24cb71bbf454cd492149aae3ce492b9
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -1254,8 +1518,14 @@ zabbix_export:
                 name: 'IF-MIB::ifOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 80d625abfee747ffa6513c604aff983f
@@ -1273,6 +1543,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: b41c85b4504a4a5e9ef546096ac45c11
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -1296,8 +1570,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           trigger_prototypes:
             -
               uuid: 1d4bee528df346c6b9ac8e73352b0871
@@ -1327,6 +1607,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CCR1036-8G-2SEM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CCR1036-8G-2SEM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CCR1036-8G-2SEM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CCR1036-8G-2SEM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 17ab3a7deafe4ffdbc33a1d3ebef3039
               expression: |
@@ -1347,6 +1631,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CCR1036-8G-2SEM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CCR1036-8G-2SEM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CCR1036-8G-2SEM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CCR1036-8G-2SEM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 94fa2681675b4295ad1ee4d86e6f85f0
               expression: |
@@ -1366,6 +1654,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CCR1036-8G-2SEM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CCR1036-8G-2SEM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CCR1036-8G-2SEM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CCR1036-8G-2SEM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: 244bb4d31f8240959e1496d3ed88ca95
@@ -1444,8 +1739,11 @@ zabbix_export:
               description: 'Space utilization in % for Disk-{#SNMPINDEX}'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 79e5b2ee35d648d3b3a5f4988f3e7592
               name: 'Disk-{#SNMPINDEX}: Total space'
@@ -1472,8 +1770,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 6bce04e7abea4d16bb901d81e618f186
               name: 'Disk-{#SNMPINDEX}: Used space'
@@ -1492,8 +1793,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
           trigger_prototypes:
             -
               uuid: 768953b43aab47d0bfcf9eeef75625ad
@@ -1509,6 +1813,13 @@ zabbix_export:
                  - The disk free space is less than 5G.
                  - The disk will be full in less than 24 hours.
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
             -
               uuid: 74b9590a3e2448bc926fdd29bc6ec153
               expression: |
@@ -1529,6 +1840,13 @@ zabbix_export:
                   expression: |
                     last(/MikroTik CCR1036-8G-2SEM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
                     ((last(/MikroTik CCR1036-8G-2SEM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1036-8G-2SEM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CCR1036-8G-2SEM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
           graph_prototypes:
             -
               uuid: 2cd5ec756edb4c189a003a1cfa4f5cb4
@@ -1552,6 +1870,16 @@ zabbix_export:
                   item:
                     host: 'MikroTik CCR1036-8G-2SEM SNMP'
                     key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: ccr1036-8g-2splusem
+        -
+          tag: target
+          value: mikrotik
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/net/mikrotik/mikrotik_CCR1036-8G-2S+_snmp/README.md b/templates/net/mikrotik/mikrotik_CCR1036-8G-2S+_snmp/README.md
index ed2d1e06518..66612b60311 100644
--- a/templates/net/mikrotik/mikrotik_CCR1036-8G-2S+_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_CCR1036-8G-2S+_snmp/README.md
@@ -71,7 +71,7 @@ There are no template links in this template.
 |Network interfaces discovery |<p>Discovering interfaces from IF-MIB.</p> |SNMP |net.if.discovery<p>**Filter**:</p>AND <p>- {#IFADMINSTATUS} MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.MATCHES}`</p><p>- {#IFADMINSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.NOT_MATCHES}`</p><p>- {#IFOPERSTATUS} MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.MATCHES}`</p><p>- {#IFOPERSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.NOT_MATCHES}`</p><p>- {#IFNAME} MATCHES_REGEX `{$NET.IF.IFNAME.MATCHES}`</p><p>- {#IFNAME} NOT_MATCHES_REGEX `{$NET.IF.IFNAME.NOT_MATCHES}`</p><p>- {#IFDESCR} MATCHES_REGEX `{$NET.IF.IFDESCR.MATCHES}`</p><p>- {#IFDESCR} NOT_MATCHES_REGEX `{$NET.IF.IFDESCR.NOT_MATCHES}`</p><p>- {#IFALIAS} MATCHES_REGEX `{$NET.IF.IFALIAS.MATCHES}`</p><p>- {#IFALIAS} NOT_MATCHES_REGEX `{$NET.IF.IFALIAS.NOT_MATCHES}`</p><p>- {#IFTYPE} MATCHES_REGEX `{$NET.IF.IFTYPE.MATCHES}`</p><p>- {#IFTYPE} NOT_MATCHES_REGEX `{$NET.IF.IFTYPE.NOT_MATCHES}`</p> |
 |Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 |Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
-|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
 
 ## Items collected
 
@@ -137,14 +137,14 @@ There are no template links in this template.
 |Interface {#IFNAME}({#IFALIAS}): Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p><p>3. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CCR1036-8G-2S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CCR1036-8G-2S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CCR1036-8G-2S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))`<p>Recovery expression:</p>`last(/MikroTik CCR1036-8G-2S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0` |AVERAGE |<p>Manual close: YES</p> |
 |Interface {#IFNAME}({#IFALIAS}): High bandwidth usage (>{$IF.UTIL.MAX:"{#IFNAME}"}%) |<p>The network interface utilization is close to its estimated maximum bandwidth.</p> |`(avg(/MikroTik CCR1036-8G-2S SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik CCR1036-8G-2S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) or avg(/MikroTik CCR1036-8G-2S SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik CCR1036-8G-2S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])) and last(/MikroTik CCR1036-8G-2S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0`<p>Recovery expression:</p>`avg(/MikroTik CCR1036-8G-2S SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik CCR1036-8G-2S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) and avg(/MikroTik CCR1036-8G-2S SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik CCR1036-8G-2S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |Interface {#IFNAME}({#IFALIAS}): High error rate (>{$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) |<p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p> |`min(/MikroTik CCR1036-8G-2S SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"} or min(/MikroTik CCR1036-8G-2S SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`max(/MikroTik CCR1036-8G-2S SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8 and max(/MikroTik CCR1036-8G-2S SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
-|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik CCR1036-8G-2S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik CCR1036-8G-2S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik CCR1036-8G-2S SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik CCR1036-8G-2S SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik CCR1036-8G-2S SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik CCR1036-8G-2S SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik CCR1036-8G-2S SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik CCR1036-8G-2S SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik CCR1036-8G-2S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2) `<p>Recovery expression:</p>`(change(/MikroTik CCR1036-8G-2S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik CCR1036-8G-2S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik CCR1036-8G-2S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2) ` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik CCR1036-8G-2S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik CCR1036-8G-2S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik CCR1036-8G-2S SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik CCR1036-8G-2S SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik CCR1036-8G-2S SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik CCR1036-8G-2S SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik CCR1036-8G-2S SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik CCR1036-8G-2S SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik CCR1036-8G-2S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2)`<p>Recovery expression:</p>`(change(/MikroTik CCR1036-8G-2S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik CCR1036-8G-2S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik CCR1036-8G-2S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2)` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |{HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/MikroTik CCR1036-8G-2S SNMP/system.uptime[sysUpTime.0])<10m` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- No SNMP data collection</p> |
 |No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/MikroTik CCR1036-8G-2S SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |Unavailable by ICMP ping |<p>Last three attempts returned timeout.  Please check device connectivity.</p> |`max(/MikroTik CCR1036-8G-2S SNMP/icmpping,#3)=0` |HIGH | |
 |High ICMP ping loss |<p>-</p> |`min(/MikroTik CCR1036-8G-2S SNMP/icmppingloss,5m)>{$ICMP_LOSS_WARN} and min(/MikroTik CCR1036-8G-2S SNMP/icmppingloss,5m)<100` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |High ICMP ping response time |<p>-</p> |`avg(/MikroTik CCR1036-8G-2S SNMP/icmppingsec,5m)>{$ICMP_RESPONSE_TIME_WARN}` |WARNING |<p>**Depends on**:</p><p>- High ICMP ping loss</p><p>- Unavailable by ICMP ping</p> |
-|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CCR1036-8G-2S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CCR1036-8G-2S SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1036-8G-2S SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CCR1036-8G-2S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
-|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CCR1036-8G-2S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CCR1036-8G-2S SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1036-8G-2S SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CCR1036-8G-2S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CCR1036-8G-2S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CCR1036-8G-2S SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1036-8G-2S SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CCR1036-8G-2S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CCR1036-8G-2S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CCR1036-8G-2S SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1036-8G-2S SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CCR1036-8G-2S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
 |CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CCR1036-8G-2S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CCR1036-8G-2S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
 |CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CCR1036-8G-2S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CCR1036-8G-2S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
 |CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik CCR1036-8G-2S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik CCR1036-8G-2S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
diff --git a/templates/net/mikrotik/mikrotik_CCR1036-8G-2S+_snmp/template_net_mikrotik_CCR1036-8G-2S+_snmp.yaml b/templates/net/mikrotik/mikrotik_CCR1036-8G-2S+_snmp/template_net_mikrotik_CCR1036-8G-2S+_snmp.yaml
index 7d418922909..1052c9462ae 100644
--- a/templates/net/mikrotik/mikrotik_CCR1036-8G-2S+_snmp/template_net_mikrotik_CCR1036-8G-2S+_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_CCR1036-8G-2S+_snmp/template_net_mikrotik_CCR1036-8G-2S+_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:43:56Z'
+  date: '2022-01-26T09:54:28Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -35,8 +35,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 00453dcba3e74c4cb1bfce45c0d29590
@@ -44,6 +47,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: d6a55e92ef1f49669df5641093aefbdd
           name: 'ICMP loss'
@@ -54,8 +61,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: ef9c639da1fb4c7d9e9082b76468353e
@@ -67,6 +77,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CCR1036-8G-2S SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: b784087e681644f68b96f4d7a041e57e
           name: 'ICMP response time'
@@ -77,8 +94,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 8a7a50a814854217bae736f9766a9f42
@@ -93,6 +113,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CCR1036-8G-2S SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 972afbe794124caa8fd35b44856c4b73
           name: 'SNMP traps (fallback)'
@@ -105,8 +132,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: 451ed0953b82410797051f377fda6e5b
           name: 'System contact details'
@@ -128,8 +155,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 9264b3ce82d648fbb209fd11a0d7069c
           name: 'System description'
@@ -152,8 +179,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: e565515e2bfe469db344bd78bdfcba74
           name: 'Firmware version'
@@ -174,8 +201,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 26d7b5b5fc4149d4869a4e3a94173172
@@ -185,6 +212,10 @@ zabbix_export:
               priority: INFO
               description: 'Firmware version has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 2ef71aac4f8b462cb4103327331c359c
           name: 'Hardware model name'
@@ -203,8 +234,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
         -
           uuid: 5d766873d7ee41ddad6d90199c1e8a38
           name: 'Hardware serial number'
@@ -226,8 +257,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 79405589edba4a878d7d2ab5d0399076
@@ -236,6 +267,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: b4c93df60aca48ffa7b7f67b58918b5f
           name: 'System location'
@@ -257,8 +292,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 74e4c3fb1719453faa539e5c4c03e725
           name: 'System name'
@@ -280,8 +315,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 3d3902234c994181819a311b9f1947dd
@@ -290,6 +325,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: 9a33a5e56bcf422fa357fdb664a93d03
           name: 'System object ID'
@@ -310,8 +352,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 56f7e706b7f84fdf827f5a14fb3bdc7c
           name: 'Operating system'
@@ -333,8 +375,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: os
           triggers:
             -
               uuid: 1ed2e0368bb94a4fbfa8a82764b3b40d
@@ -347,6 +389,10 @@ zabbix_export:
                 -
                   name: 'System name has changed (new name: {ITEM.VALUE})'
                   expression: 'last(/MikroTik CCR1036-8G-2S SNMP/system.name,#1)<>last(/MikroTik CCR1036-8G-2S SNMP/system.name,#2) and length(last(/MikroTik CCR1036-8G-2S SNMP/system.name))>0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 95869b7593644ccebab3fc2bb81f493c
           name: Uptime
@@ -367,8 +413,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 7b5ce136e1524c2c85febecb055e50f8
@@ -381,6 +427,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/MikroTik CCR1036-8G-2S SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 818712f7986b40e8a3ce3994f43199ea
           name: 'Total memory'
@@ -407,8 +457,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 0b3849a88cf9436284dea73e86f70405
           name: 'Used memory'
@@ -427,8 +477,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: deb60e7c19b74431aed7b6c26fb7616b
           name: 'Memory utilization'
@@ -441,8 +491,8 @@ zabbix_export:
           description: 'Memory utilization in %'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: 03cdc40813dd4d5093512db3c5e574ff
@@ -450,6 +500,13 @@ zabbix_export:
               name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
               priority: AVERAGE
               description: 'The system is running out of free memory.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 6fe6e7afa7bd42269e6b7e49661d1c3f
           name: 'SNMP agent availability'
@@ -466,8 +523,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 2fdfcfe056e848f2b0a628d87ad4aa6c
@@ -480,6 +540,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CCR1036-8G-2S SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: c58edbe489db4e26a93a75c58c88a1f3
@@ -504,8 +568,8 @@ zabbix_export:
                 The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
               trigger_prototypes:
                 -
                   uuid: a9f3354cf2044306ba8ca1aae227ee60
@@ -514,6 +578,10 @@ zabbix_export:
                   opdata: 'Current utilization: {ITEM.LASTVALUE1}'
                   priority: WARNING
                   description: 'CPU utilization is too high. The system might be slow to respond.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 58020e927fcb4113a0339a9f2458f711
@@ -558,8 +626,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: f399cf1f48d24ec3b3f33159cb7b4fe0
@@ -570,6 +638,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 0c240046f1434ffb8c2cba26e4b0e61d
                   expression: 'avg(/MikroTik CCR1036-8G-2S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
@@ -584,6 +659,13 @@ zabbix_export:
                       name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
                       expression: 'avg(/MikroTik CCR1036-8G-2S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
                       recovery_expression: 'max(/MikroTik CCR1036-8G-2S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: f810f58531c54e3bbcf6d0e677100237
                   expression: 'avg(/MikroTik CCR1036-8G-2S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
@@ -592,6 +674,13 @@ zabbix_export:
                   name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: db9785c59e4b4b1e922fd5a6ded18ae6
           name: 'Temperature sensor discovery'
@@ -601,8 +690,7 @@ zabbix_export:
           delay: 1h
           description: |
             MIKROTIK-MIB::mtxrHlTemperature
-            Since temperature sensor is not available on all Mikrotik hardware,
-            this is done to avoid unsupported items.
+            Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.
           item_prototypes:
             -
               uuid: 1798378de4a34ef39db1c9b22a1131e8
@@ -626,8 +714,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 773c5f9316c44d8297b4fd3cdd236da1
@@ -638,6 +726,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 3d688fda4da843e192c26d955d8d8dd9
                   expression: 'avg(/MikroTik CCR1036-8G-2S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
@@ -652,6 +747,13 @@ zabbix_export:
                       name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
                       expression: 'avg(/MikroTik CCR1036-8G-2S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
                       recovery_expression: 'max(/MikroTik CCR1036-8G-2S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 2a21380034244b29878bbb198cca6712
                   expression: 'avg(/MikroTik CCR1036-8G-2S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
@@ -660,6 +762,13 @@ zabbix_export:
                   name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: ccebe51b33a6459b99847e6a379f6037
           name: 'LTE modem discovery'
@@ -694,14 +803,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRP Reference Signal Received Power.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 67152820f4884d51a16966f339947955
                   expression: 'max(/MikroTik CCR1036-8G-2S SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 1ee273ffb87749a897d5de628694eef2
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
@@ -716,14 +838,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: ca8b841c9830497dabd0138fafade175
                   expression: 'max(/MikroTik CCR1036-8G-2S SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: c35c822a0f3f4dd3bd80beb1d9bbdd05
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
@@ -738,14 +873,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: e8f613b6301b43efa4a2e84d62ec520f
                   expression: 'max(/MikroTik CCR1036-8G-2S SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 676b0104a7d94496a139ddd470bf7b2a
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
@@ -760,14 +908,27 @@ zabbix_export:
                 mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: c215c39df396474e865ae9b36c40545f
                   expression: 'max(/MikroTik CCR1036-8G-2S SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: e95ab4bef8354ea2bd66e421a2c63460
@@ -828,8 +989,14 @@ zabbix_export:
                 mtxrWlApAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: acf03c7db037477c99bfa298ff11c976
               name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
@@ -849,8 +1016,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 37c8c5e1dfaf4b7c841a21c2519bc699
               name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
@@ -870,8 +1043,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: ca04a3369ba347ffaf2c67825bd2d200
               name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
@@ -890,8 +1069,14 @@ zabbix_export:
                     - 15m
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 5e7de2ae51d5463e835eb73b9f07186e
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -904,8 +1089,14 @@ zabbix_export:
                 mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
         -
           uuid: 6130a63b523a4d5780cc7c6187e25092
           name: 'CAPsMAN AP channel discovery'
@@ -938,8 +1129,14 @@ zabbix_export:
                 mtxrWlCMAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 4d2b9aaebdb1460dba179e2139802b66
               name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
@@ -959,8 +1156,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 0447138203d9420287fe3317148ffdd7
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -973,8 +1176,14 @@ zabbix_export:
                 mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: c00fb1e73f1b495c8994bbaf3d6d4d50
               name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
@@ -994,8 +1203,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 587ccbe7d604489783b66411a3b21cb1
@@ -1003,6 +1218,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
                   priority: WARNING
                   description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 943ddeb0de9f457cac2a0f4eccc7a3d3
           name: 'Network interfaces discovery'
@@ -1091,8 +1313,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 1468bc68752741b2b58f1d26ec4957d5
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -1111,8 +1339,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 4fdb243ad3714135bb1a04ca12ec42ef
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -1136,8 +1370,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: d5e1c2875beb42d9a1b5b876ee4e1d7b
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -1160,8 +1400,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 23e1145639f54a509fc4b629af9bfe9a
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -1180,8 +1426,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: c41739be871e4044b8218ff1cc289ea4
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -1205,8 +1457,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: f9db52be572643c3ac04ef113aa84262
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -1231,8 +1489,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 0f8614d6d02840e1868ffd4540048daf
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -1254,8 +1518,14 @@ zabbix_export:
                 name: 'IF-MIB::ifOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 1f7c8669552d4890ac963f53aefcf100
@@ -1273,6 +1543,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 934e91a1cbee404fb99411147351230b
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -1296,8 +1570,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           trigger_prototypes:
             -
               uuid: e9c85085a0d546ba910b139c99adee10
@@ -1327,6 +1607,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CCR1036-8G-2S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CCR1036-8G-2S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CCR1036-8G-2S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CCR1036-8G-2S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 91c48f7aac824bfbb58d78bd791a60e2
               expression: |
@@ -1347,6 +1631,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CCR1036-8G-2S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CCR1036-8G-2S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CCR1036-8G-2S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CCR1036-8G-2S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: d7a049070a434aa5b3a9c320f25eb040
               expression: |
@@ -1366,6 +1654,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CCR1036-8G-2S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CCR1036-8G-2S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CCR1036-8G-2S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CCR1036-8G-2S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: 93da4c226ca84d9ca20e4496b2e2201f
@@ -1444,8 +1739,11 @@ zabbix_export:
               description: 'Space utilization in % for Disk-{#SNMPINDEX}'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 175c5f77af65445fb21d0d876fcb3983
               name: 'Disk-{#SNMPINDEX}: Total space'
@@ -1472,8 +1770,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 827812e4bfef4bc5aa61630a8965d56f
               name: 'Disk-{#SNMPINDEX}: Used space'
@@ -1492,8 +1793,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
           trigger_prototypes:
             -
               uuid: 72a2fc862c354ab0a3d8fb491aaed9e1
@@ -1509,6 +1813,13 @@ zabbix_export:
                  - The disk free space is less than 5G.
                  - The disk will be full in less than 24 hours.
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
             -
               uuid: d66a941be43a440fb13386d9a319a5b3
               expression: |
@@ -1529,6 +1840,13 @@ zabbix_export:
                   expression: |
                     last(/MikroTik CCR1036-8G-2S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
                     ((last(/MikroTik CCR1036-8G-2S SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1036-8G-2S SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CCR1036-8G-2S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
           graph_prototypes:
             -
               uuid: f724179d92fa44b4adc25a2808522fc6
@@ -1552,6 +1870,16 @@ zabbix_export:
                   item:
                     host: 'MikroTik CCR1036-8G-2S SNMP'
                     key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: ccr1036-8g-2splus
+        -
+          tag: target
+          value: mikrotik
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/net/mikrotik/mikrotik_CCR1072-1G-8S+_snmp/README.md b/templates/net/mikrotik/mikrotik_CCR1072-1G-8S+_snmp/README.md
index 636bb2c71be..57cfa721eea 100644
--- a/templates/net/mikrotik/mikrotik_CCR1072-1G-8S+_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_CCR1072-1G-8S+_snmp/README.md
@@ -71,7 +71,7 @@ There are no template links in this template.
 |Network interfaces discovery |<p>Discovering interfaces from IF-MIB.</p> |SNMP |net.if.discovery<p>**Filter**:</p>AND <p>- {#IFADMINSTATUS} MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.MATCHES}`</p><p>- {#IFADMINSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.NOT_MATCHES}`</p><p>- {#IFOPERSTATUS} MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.MATCHES}`</p><p>- {#IFOPERSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.NOT_MATCHES}`</p><p>- {#IFNAME} MATCHES_REGEX `{$NET.IF.IFNAME.MATCHES}`</p><p>- {#IFNAME} NOT_MATCHES_REGEX `{$NET.IF.IFNAME.NOT_MATCHES}`</p><p>- {#IFDESCR} MATCHES_REGEX `{$NET.IF.IFDESCR.MATCHES}`</p><p>- {#IFDESCR} NOT_MATCHES_REGEX `{$NET.IF.IFDESCR.NOT_MATCHES}`</p><p>- {#IFALIAS} MATCHES_REGEX `{$NET.IF.IFALIAS.MATCHES}`</p><p>- {#IFALIAS} NOT_MATCHES_REGEX `{$NET.IF.IFALIAS.NOT_MATCHES}`</p><p>- {#IFTYPE} MATCHES_REGEX `{$NET.IF.IFTYPE.MATCHES}`</p><p>- {#IFTYPE} NOT_MATCHES_REGEX `{$NET.IF.IFTYPE.NOT_MATCHES}`</p> |
 |Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 |Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
-|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
 
 ## Items collected
 
@@ -137,14 +137,14 @@ There are no template links in this template.
 |Interface {#IFNAME}({#IFALIAS}): Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p><p>3. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CCR1072-1G-8S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CCR1072-1G-8S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CCR1072-1G-8S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))`<p>Recovery expression:</p>`last(/MikroTik CCR1072-1G-8S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0` |AVERAGE |<p>Manual close: YES</p> |
 |Interface {#IFNAME}({#IFALIAS}): High bandwidth usage (>{$IF.UTIL.MAX:"{#IFNAME}"}%) |<p>The network interface utilization is close to its estimated maximum bandwidth.</p> |`(avg(/MikroTik CCR1072-1G-8S SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik CCR1072-1G-8S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) or avg(/MikroTik CCR1072-1G-8S SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik CCR1072-1G-8S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])) and last(/MikroTik CCR1072-1G-8S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0`<p>Recovery expression:</p>`avg(/MikroTik CCR1072-1G-8S SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik CCR1072-1G-8S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) and avg(/MikroTik CCR1072-1G-8S SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik CCR1072-1G-8S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |Interface {#IFNAME}({#IFALIAS}): High error rate (>{$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) |<p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p> |`min(/MikroTik CCR1072-1G-8S SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"} or min(/MikroTik CCR1072-1G-8S SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`max(/MikroTik CCR1072-1G-8S SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8 and max(/MikroTik CCR1072-1G-8S SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
-|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik CCR1072-1G-8S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik CCR1072-1G-8S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik CCR1072-1G-8S SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik CCR1072-1G-8S SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik CCR1072-1G-8S SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik CCR1072-1G-8S SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik CCR1072-1G-8S SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik CCR1072-1G-8S SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik CCR1072-1G-8S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2) `<p>Recovery expression:</p>`(change(/MikroTik CCR1072-1G-8S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik CCR1072-1G-8S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik CCR1072-1G-8S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2) ` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik CCR1072-1G-8S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik CCR1072-1G-8S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik CCR1072-1G-8S SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik CCR1072-1G-8S SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik CCR1072-1G-8S SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik CCR1072-1G-8S SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik CCR1072-1G-8S SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik CCR1072-1G-8S SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik CCR1072-1G-8S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2)`<p>Recovery expression:</p>`(change(/MikroTik CCR1072-1G-8S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik CCR1072-1G-8S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik CCR1072-1G-8S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2)` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |{HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/MikroTik CCR1072-1G-8S SNMP/system.uptime[sysUpTime.0])<10m` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- No SNMP data collection</p> |
 |No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/MikroTik CCR1072-1G-8S SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |Unavailable by ICMP ping |<p>Last three attempts returned timeout.  Please check device connectivity.</p> |`max(/MikroTik CCR1072-1G-8S SNMP/icmpping,#3)=0` |HIGH | |
 |High ICMP ping loss |<p>-</p> |`min(/MikroTik CCR1072-1G-8S SNMP/icmppingloss,5m)>{$ICMP_LOSS_WARN} and min(/MikroTik CCR1072-1G-8S SNMP/icmppingloss,5m)<100` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |High ICMP ping response time |<p>-</p> |`avg(/MikroTik CCR1072-1G-8S SNMP/icmppingsec,5m)>{$ICMP_RESPONSE_TIME_WARN}` |WARNING |<p>**Depends on**:</p><p>- High ICMP ping loss</p><p>- Unavailable by ICMP ping</p> |
-|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CCR1072-1G-8S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CCR1072-1G-8S SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1072-1G-8S SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CCR1072-1G-8S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
-|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CCR1072-1G-8S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CCR1072-1G-8S SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1072-1G-8S SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CCR1072-1G-8S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CCR1072-1G-8S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CCR1072-1G-8S SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1072-1G-8S SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CCR1072-1G-8S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CCR1072-1G-8S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CCR1072-1G-8S SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1072-1G-8S SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CCR1072-1G-8S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
 |CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CCR1072-1G-8S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CCR1072-1G-8S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
 |CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CCR1072-1G-8S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CCR1072-1G-8S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
 |CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik CCR1072-1G-8S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik CCR1072-1G-8S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
diff --git a/templates/net/mikrotik/mikrotik_CCR1072-1G-8S+_snmp/template_net_mikrotik_CCR1072-1G-8S+_snmp.yaml b/templates/net/mikrotik/mikrotik_CCR1072-1G-8S+_snmp/template_net_mikrotik_CCR1072-1G-8S+_snmp.yaml
index 2f6ae9e36cc..e9bd540c3b5 100644
--- a/templates/net/mikrotik/mikrotik_CCR1072-1G-8S+_snmp/template_net_mikrotik_CCR1072-1G-8S+_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_CCR1072-1G-8S+_snmp/template_net_mikrotik_CCR1072-1G-8S+_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:44:01Z'
+  date: '2022-01-26T09:48:15Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -35,8 +35,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 2510c2fd36cf4379b15e3e18abffea95
@@ -44,6 +47,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 30907fe670ce46ad957b199bc58534bf
           name: 'ICMP loss'
@@ -54,8 +61,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 48a93170038b41af9fd8b6f25500ee37
@@ -67,6 +77,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CCR1072-1G-8S SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 20d51d89f4604f6f8f56f1de7dcbb5cf
           name: 'ICMP response time'
@@ -77,8 +94,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 1e70b999e9854c4093a75a960f8282a2
@@ -93,6 +113,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CCR1072-1G-8S SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 7215e2ee187f45439e367c0ee9b78fd8
           name: 'SNMP traps (fallback)'
@@ -105,8 +132,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: 8bd0bba343264b6fa43c1c99d39f4bdc
           name: 'System contact details'
@@ -128,8 +155,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: b022eea34d6d4e46b403e3e6eb1df42e
           name: 'System description'
@@ -152,8 +179,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: e06462712e7c45f296fa8dc0c53871d0
           name: 'Firmware version'
@@ -174,8 +201,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 385231b6c7eb4ce6a275969b437c8d44
@@ -185,6 +212,10 @@ zabbix_export:
               priority: INFO
               description: 'Firmware version has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: b1a6e11a8ba64f9e9270db35847b3421
           name: 'Hardware model name'
@@ -203,8 +234,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
         -
           uuid: 0fa99ad0d0744f24ab49ad9be423b3d4
           name: 'Hardware serial number'
@@ -226,8 +257,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: bb2cc5758a154bc0ad07138e87f353a4
@@ -236,6 +267,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 4d85307924e84fe8ab5cecb8ee8afead
           name: 'System location'
@@ -257,8 +292,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 09fdf7b507614abe811670bb36c20aec
           name: 'System name'
@@ -280,8 +315,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 9e3ce4eb299547199e67c131556d5bc5
@@ -290,6 +325,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: 241278e60289451ba100834fcb41b04b
           name: 'System object ID'
@@ -310,8 +352,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 00ed6d0e4cd84395a74a5015e3440877
           name: 'Operating system'
@@ -333,8 +375,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: os
           triggers:
             -
               uuid: ff7510d9e2d44057a089b9486af74971
@@ -347,6 +389,10 @@ zabbix_export:
                 -
                   name: 'System name has changed (new name: {ITEM.VALUE})'
                   expression: 'last(/MikroTik CCR1072-1G-8S SNMP/system.name,#1)<>last(/MikroTik CCR1072-1G-8S SNMP/system.name,#2) and length(last(/MikroTik CCR1072-1G-8S SNMP/system.name))>0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: f57e6a6b360b4844be4c125c44f4b799
           name: Uptime
@@ -367,8 +413,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: be74bf6810694df98cd43a669e247aab
@@ -381,6 +427,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/MikroTik CCR1072-1G-8S SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: f7c0ee962f1c4fab9262181dd9dee211
           name: 'Total memory'
@@ -407,8 +457,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: d3c3ff16e7dd4d2e811e72cb0279a827
           name: 'Used memory'
@@ -427,8 +477,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: ee81aaa76f1d40a898ba48e0dde79d13
           name: 'Memory utilization'
@@ -441,8 +491,8 @@ zabbix_export:
           description: 'Memory utilization in %'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: a7fa3a261f0c4362938700ff8954cdc9
@@ -450,6 +500,13 @@ zabbix_export:
               name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
               priority: AVERAGE
               description: 'The system is running out of free memory.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 7a54976f73f14c0cacff759a406806a9
           name: 'SNMP agent availability'
@@ -466,8 +523,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: a2d66f40be294b8b81a96e11afcfe7ec
@@ -480,6 +540,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CCR1072-1G-8S SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: 1abbf37ece7c40ca93bb925c7bd27d89
@@ -504,8 +568,8 @@ zabbix_export:
                 The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
               trigger_prototypes:
                 -
                   uuid: a47faa0771b348ed8fd040027deebd95
@@ -514,6 +578,10 @@ zabbix_export:
                   opdata: 'Current utilization: {ITEM.LASTVALUE1}'
                   priority: WARNING
                   description: 'CPU utilization is too high. The system might be slow to respond.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 3370f88daa5947b3b23514c98202cd48
@@ -558,8 +626,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: b32ecc16390c42bfbc0ad23305f59392
@@ -570,6 +638,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: fb39a804a60e4154ad6602fad05c399d
                   expression: 'avg(/MikroTik CCR1072-1G-8S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
@@ -584,6 +659,13 @@ zabbix_export:
                       name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
                       expression: 'avg(/MikroTik CCR1072-1G-8S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
                       recovery_expression: 'max(/MikroTik CCR1072-1G-8S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: e35e3256fd58439d923ca54b7e33e64c
                   expression: 'avg(/MikroTik CCR1072-1G-8S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
@@ -592,6 +674,13 @@ zabbix_export:
                   name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 4cc4ce99e8c2450aa6a74075306f1b13
           name: 'Temperature sensor discovery'
@@ -601,8 +690,7 @@ zabbix_export:
           delay: 1h
           description: |
             MIKROTIK-MIB::mtxrHlTemperature
-            Since temperature sensor is not available on all Mikrotik hardware,
-            this is done to avoid unsupported items.
+            Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.
           item_prototypes:
             -
               uuid: 7765ee205fe64485a341109b2173e85f
@@ -626,8 +714,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: ea9da810d00445f3b4649f8aec0d9ef7
@@ -638,6 +726,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 28a883547a4449ea96c1168aef939a65
                   expression: 'avg(/MikroTik CCR1072-1G-8S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
@@ -652,6 +747,13 @@ zabbix_export:
                       name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
                       expression: 'avg(/MikroTik CCR1072-1G-8S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
                       recovery_expression: 'max(/MikroTik CCR1072-1G-8S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 760505068a3946edbd38294f867e08e5
                   expression: 'avg(/MikroTik CCR1072-1G-8S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
@@ -660,6 +762,13 @@ zabbix_export:
                   name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 750de67c2b6043a3a317ece3f2d182a5
           name: 'LTE modem discovery'
@@ -694,14 +803,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRP Reference Signal Received Power.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: eacd5dec75404c9e80bd18d5ea0f3bff
                   expression: 'max(/MikroTik CCR1072-1G-8S SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 676d18905c9b43c4ad36b45c90bc6248
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
@@ -716,14 +838,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 0e79530582ee4e3aa270d8a43a96f7f0
                   expression: 'max(/MikroTik CCR1072-1G-8S SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: af72ce8fb6344e6ebb946ea81453b276
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
@@ -738,14 +873,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: ddbe2cfcdd6f4d5895780fa6510acb73
                   expression: 'max(/MikroTik CCR1072-1G-8S SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: a78be7de743d49d8b9fa9070d32e4db9
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
@@ -760,14 +908,27 @@ zabbix_export:
                 mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 5f8087b4f9ae4d3693d55d189c1f99f4
                   expression: 'max(/MikroTik CCR1072-1G-8S SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: cfccdd73e3b246c9b2b4f9b242964699
@@ -828,8 +989,14 @@ zabbix_export:
                 mtxrWlApAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 7e24b5bc03d74b1aa2ee0c9e4c56ac89
               name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
@@ -849,8 +1016,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 80fa9dbbb386432d9c534cbc86de36f7
               name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
@@ -870,8 +1043,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: d258ab237f1f4e79a31778d42ef14447
               name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
@@ -890,8 +1069,14 @@ zabbix_export:
                     - 15m
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 0b7cd68c901d46fea18594cb7b1df015
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -904,8 +1089,14 @@ zabbix_export:
                 mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
         -
           uuid: ded0e3b9a1c84f84aa7fb6e05f0afded
           name: 'CAPsMAN AP channel discovery'
@@ -938,8 +1129,14 @@ zabbix_export:
                 mtxrWlCMAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 29efa5a1a2fe4076a2a178374a52ada1
               name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
@@ -959,8 +1156,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: c5a823ac8d684b8fb386090e3f48eaeb
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -973,8 +1176,14 @@ zabbix_export:
                 mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: f8d680f85dae470296e8c25e692a3a0f
               name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
@@ -994,8 +1203,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: e25c484ec45a4a01b51f961318813e30
@@ -1003,6 +1218,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
                   priority: WARNING
                   description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: f8ba0c9d18ef405bbf1619f98028ee80
           name: 'Network interfaces discovery'
@@ -1091,8 +1313,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: fd1cebcc629b4b559603b9520a97f30a
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -1111,8 +1339,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 8d07a2c675194a8c84c854a5717f2ab0
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -1136,8 +1370,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 209f0a2d63174582bc660dc4d9c4410d
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -1160,8 +1400,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: d1cd8ebe0db54c26af2f4d1695b74144
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -1180,8 +1426,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: c56972bb674c448496cdd99039a75480
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -1205,8 +1457,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: a1526abe61a3440cbdda84ae6bbf0dc5
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -1231,8 +1489,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 335473458efe48e1b5a93e2f365d489b
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -1254,8 +1518,14 @@ zabbix_export:
                 name: 'IF-MIB::ifOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 24634d43d28146ca802ae4aee7af276a
@@ -1273,6 +1543,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 192cfe0188a045f8ac9e903bc605f80f
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -1296,8 +1570,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           trigger_prototypes:
             -
               uuid: 7a475a2472c64ee2b15b5f36c93e17db
@@ -1327,6 +1607,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CCR1072-1G-8S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CCR1072-1G-8S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CCR1072-1G-8S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CCR1072-1G-8S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 2154cc56a5304ec5b6327852cf4eea8b
               expression: |
@@ -1347,6 +1631,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CCR1072-1G-8S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CCR1072-1G-8S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CCR1072-1G-8S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CCR1072-1G-8S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 450f5f3106cf4755b48cbfd9d0c2a287
               expression: |
@@ -1366,6 +1654,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CCR1072-1G-8S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CCR1072-1G-8S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CCR1072-1G-8S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CCR1072-1G-8S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: 18284f037cd04993b3eb236ab3616781
@@ -1444,8 +1739,11 @@ zabbix_export:
               description: 'Space utilization in % for Disk-{#SNMPINDEX}'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 47623ca42a2c4b80b9140d4672329d26
               name: 'Disk-{#SNMPINDEX}: Total space'
@@ -1472,8 +1770,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: cf424ebd271a4cda9ce1f69a3c735dfb
               name: 'Disk-{#SNMPINDEX}: Used space'
@@ -1492,8 +1793,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
           trigger_prototypes:
             -
               uuid: 044aabf4d95c4c9ba7ccec76446f50af
@@ -1509,6 +1813,13 @@ zabbix_export:
                  - The disk free space is less than 5G.
                  - The disk will be full in less than 24 hours.
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
             -
               uuid: 3a5a7043d1b64fe5a7fdefc341fcc22a
               expression: |
@@ -1529,6 +1840,13 @@ zabbix_export:
                   expression: |
                     last(/MikroTik CCR1072-1G-8S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
                     ((last(/MikroTik CCR1072-1G-8S SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1072-1G-8S SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CCR1072-1G-8S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
           graph_prototypes:
             -
               uuid: 719dcbc5a85e4d3e99a7906e8b9ee28d
@@ -1552,6 +1870,16 @@ zabbix_export:
                   item:
                     host: 'MikroTik CCR1072-1G-8S SNMP'
                     key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: ccr1072-1g-8splus
+        -
+          tag: target
+          value: mikrotik
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/net/mikrotik/mikrotik_CCR2004-16G-2S+_snmp/README.md b/templates/net/mikrotik/mikrotik_CCR2004-16G-2S+_snmp/README.md
index 4ffbb79c7bc..a608853a0a2 100644
--- a/templates/net/mikrotik/mikrotik_CCR2004-16G-2S+_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_CCR2004-16G-2S+_snmp/README.md
@@ -71,7 +71,7 @@ There are no template links in this template.
 |Network interfaces discovery |<p>Discovering interfaces from IF-MIB.</p> |SNMP |net.if.discovery<p>**Filter**:</p>AND <p>- {#IFADMINSTATUS} MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.MATCHES}`</p><p>- {#IFADMINSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.NOT_MATCHES}`</p><p>- {#IFOPERSTATUS} MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.MATCHES}`</p><p>- {#IFOPERSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.NOT_MATCHES}`</p><p>- {#IFNAME} MATCHES_REGEX `{$NET.IF.IFNAME.MATCHES}`</p><p>- {#IFNAME} NOT_MATCHES_REGEX `{$NET.IF.IFNAME.NOT_MATCHES}`</p><p>- {#IFDESCR} MATCHES_REGEX `{$NET.IF.IFDESCR.MATCHES}`</p><p>- {#IFDESCR} NOT_MATCHES_REGEX `{$NET.IF.IFDESCR.NOT_MATCHES}`</p><p>- {#IFALIAS} MATCHES_REGEX `{$NET.IF.IFALIAS.MATCHES}`</p><p>- {#IFALIAS} NOT_MATCHES_REGEX `{$NET.IF.IFALIAS.NOT_MATCHES}`</p><p>- {#IFTYPE} MATCHES_REGEX `{$NET.IF.IFTYPE.MATCHES}`</p><p>- {#IFTYPE} NOT_MATCHES_REGEX `{$NET.IF.IFTYPE.NOT_MATCHES}`</p> |
 |Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 |Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
-|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
 
 ## Items collected
 
@@ -137,14 +137,14 @@ There are no template links in this template.
 |Interface {#IFNAME}({#IFALIAS}): Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p><p>3. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CCR2004-16G-2S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CCR2004-16G-2S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CCR2004-16G-2S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))`<p>Recovery expression:</p>`last(/MikroTik CCR2004-16G-2S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0` |AVERAGE |<p>Manual close: YES</p> |
 |Interface {#IFNAME}({#IFALIAS}): High bandwidth usage (>{$IF.UTIL.MAX:"{#IFNAME}"}%) |<p>The network interface utilization is close to its estimated maximum bandwidth.</p> |`(avg(/MikroTik CCR2004-16G-2S SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik CCR2004-16G-2S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) or avg(/MikroTik CCR2004-16G-2S SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik CCR2004-16G-2S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])) and last(/MikroTik CCR2004-16G-2S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0`<p>Recovery expression:</p>`avg(/MikroTik CCR2004-16G-2S SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik CCR2004-16G-2S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) and avg(/MikroTik CCR2004-16G-2S SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik CCR2004-16G-2S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |Interface {#IFNAME}({#IFALIAS}): High error rate (>{$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) |<p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p> |`min(/MikroTik CCR2004-16G-2S SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"} or min(/MikroTik CCR2004-16G-2S SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`max(/MikroTik CCR2004-16G-2S SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8 and max(/MikroTik CCR2004-16G-2S SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
-|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik CCR2004-16G-2S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik CCR2004-16G-2S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik CCR2004-16G-2S SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik CCR2004-16G-2S SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik CCR2004-16G-2S SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik CCR2004-16G-2S SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik CCR2004-16G-2S SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik CCR2004-16G-2S SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik CCR2004-16G-2S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2) `<p>Recovery expression:</p>`(change(/MikroTik CCR2004-16G-2S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik CCR2004-16G-2S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik CCR2004-16G-2S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2) ` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik CCR2004-16G-2S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik CCR2004-16G-2S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik CCR2004-16G-2S SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik CCR2004-16G-2S SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik CCR2004-16G-2S SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik CCR2004-16G-2S SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik CCR2004-16G-2S SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik CCR2004-16G-2S SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik CCR2004-16G-2S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2)`<p>Recovery expression:</p>`(change(/MikroTik CCR2004-16G-2S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik CCR2004-16G-2S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik CCR2004-16G-2S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2)` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |{HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/MikroTik CCR2004-16G-2S SNMP/system.uptime[sysUpTime.0])<10m` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- No SNMP data collection</p> |
 |No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/MikroTik CCR2004-16G-2S SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |Unavailable by ICMP ping |<p>Last three attempts returned timeout.  Please check device connectivity.</p> |`max(/MikroTik CCR2004-16G-2S SNMP/icmpping,#3)=0` |HIGH | |
 |High ICMP ping loss |<p>-</p> |`min(/MikroTik CCR2004-16G-2S SNMP/icmppingloss,5m)>{$ICMP_LOSS_WARN} and min(/MikroTik CCR2004-16G-2S SNMP/icmppingloss,5m)<100` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |High ICMP ping response time |<p>-</p> |`avg(/MikroTik CCR2004-16G-2S SNMP/icmppingsec,5m)>{$ICMP_RESPONSE_TIME_WARN}` |WARNING |<p>**Depends on**:</p><p>- High ICMP ping loss</p><p>- Unavailable by ICMP ping</p> |
-|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CCR2004-16G-2S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CCR2004-16G-2S SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR2004-16G-2S SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CCR2004-16G-2S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
-|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CCR2004-16G-2S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CCR2004-16G-2S SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR2004-16G-2S SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CCR2004-16G-2S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CCR2004-16G-2S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CCR2004-16G-2S SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR2004-16G-2S SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CCR2004-16G-2S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CCR2004-16G-2S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CCR2004-16G-2S SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR2004-16G-2S SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CCR2004-16G-2S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
 |CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CCR2004-16G-2S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CCR2004-16G-2S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
 |CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CCR2004-16G-2S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CCR2004-16G-2S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
 |CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik CCR2004-16G-2S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik CCR2004-16G-2S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
diff --git a/templates/net/mikrotik/mikrotik_CCR2004-16G-2S+_snmp/template_net_mikrotik_CCR2004-16G-2S+_snmp.yaml b/templates/net/mikrotik/mikrotik_CCR2004-16G-2S+_snmp/template_net_mikrotik_CCR2004-16G-2S+_snmp.yaml
index 829680fc0ce..e2c0e456cb1 100644
--- a/templates/net/mikrotik/mikrotik_CCR2004-16G-2S+_snmp/template_net_mikrotik_CCR2004-16G-2S+_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_CCR2004-16G-2S+_snmp/template_net_mikrotik_CCR2004-16G-2S+_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:44:06Z'
+  date: '2022-01-26T09:44:49Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -35,8 +35,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: f37a32635c674102aaf1b7ceafa8532a
@@ -44,6 +47,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: dcda1847f1324215ace997f21e2c9136
           name: 'ICMP loss'
@@ -54,8 +61,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 1889f2943a044c49830914fd18846172
@@ -67,6 +77,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CCR2004-16G-2S SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 5505dcdce64f4d4bafc65250fdc44d55
           name: 'ICMP response time'
@@ -77,8 +94,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 805b3e4698dc4c55a4cc40712e14e494
@@ -93,6 +113,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CCR2004-16G-2S SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: bd102e739e6d4ec183d94d8965f9c0da
           name: 'SNMP traps (fallback)'
@@ -105,8 +132,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: 77a875ad0d3348618ad166e13df8859c
           name: 'System contact details'
@@ -128,8 +155,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: e2610c67fd0546d0a4f6d44515c38bfa
           name: 'System description'
@@ -152,8 +179,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: b74cbfd6dbc84c0c916402c81fb11fe9
           name: 'Firmware version'
@@ -174,8 +201,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 6172f360bcca4bc6a105a5093be8665c
@@ -185,6 +212,10 @@ zabbix_export:
               priority: INFO
               description: 'Firmware version has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 3c8159ac8de24685be689387f69e0e20
           name: 'Hardware model name'
@@ -203,8 +234,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
         -
           uuid: cc917e510e004211be5fc624b071fc95
           name: 'Hardware serial number'
@@ -226,8 +257,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 80072866ba994094a279eb45020311d1
@@ -236,6 +267,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: cfbb37cb51c94191a8812b4fc18846c9
           name: 'System location'
@@ -257,8 +292,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 234bbf0b94ae4efe9e0708ef7748a592
           name: 'System name'
@@ -280,8 +315,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 9ffbe2020d8b46f1ac730c038e9d1f51
@@ -290,6 +325,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: a947ad3c3e634a4185ed7e4d80ac2b11
           name: 'System object ID'
@@ -310,8 +352,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 4776598588384d30ac472ec39df3ef25
           name: 'Operating system'
@@ -333,8 +375,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: os
           triggers:
             -
               uuid: d66d2b488b784574943c90f20d0153ce
@@ -347,6 +389,10 @@ zabbix_export:
                 -
                   name: 'System name has changed (new name: {ITEM.VALUE})'
                   expression: 'last(/MikroTik CCR2004-16G-2S SNMP/system.name,#1)<>last(/MikroTik CCR2004-16G-2S SNMP/system.name,#2) and length(last(/MikroTik CCR2004-16G-2S SNMP/system.name))>0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 15665fae5ef043d2b39863ae3148f5da
           name: Uptime
@@ -367,8 +413,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: a885ccc0d0e546fe8a970ff4876f9471
@@ -381,6 +427,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/MikroTik CCR2004-16G-2S SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 0260f825e71e419da953e2f6285318bc
           name: 'Total memory'
@@ -407,8 +457,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 49b860cd17af4bed904651fbe620d533
           name: 'Used memory'
@@ -427,8 +477,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 4a339ee32bc047a790562e1d17c4f733
           name: 'Memory utilization'
@@ -441,8 +491,8 @@ zabbix_export:
           description: 'Memory utilization in %'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: 02a8b7e7ebbb4d1baf5ee155167e36ba
@@ -450,6 +500,13 @@ zabbix_export:
               name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
               priority: AVERAGE
               description: 'The system is running out of free memory.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: b7d3a7a170bc417190109ee6316f14e2
           name: 'SNMP agent availability'
@@ -466,8 +523,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 6c2ff9e7f39a46918bf5d1843c7bf615
@@ -480,6 +540,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CCR2004-16G-2S SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: fac0b2a001034a888731ce9ff4d0a0b1
@@ -504,8 +568,8 @@ zabbix_export:
                 The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
               trigger_prototypes:
                 -
                   uuid: a81f9bcd4d4d4c4593654293b55f864d
@@ -514,6 +578,10 @@ zabbix_export:
                   opdata: 'Current utilization: {ITEM.LASTVALUE1}'
                   priority: WARNING
                   description: 'CPU utilization is too high. The system might be slow to respond.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 1695386899b54ad5b5b3e9268f323801
@@ -558,8 +626,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: ac0cfe319121487fb2009436d27f4f2b
@@ -570,6 +638,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: c1c53cec6a204411b9739eac84447c2a
                   expression: 'avg(/MikroTik CCR2004-16G-2S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
@@ -584,6 +659,13 @@ zabbix_export:
                       name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
                       expression: 'avg(/MikroTik CCR2004-16G-2S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
                       recovery_expression: 'max(/MikroTik CCR2004-16G-2S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: f0d3f01db5d44b74826326048bca05a8
                   expression: 'avg(/MikroTik CCR2004-16G-2S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
@@ -592,6 +674,13 @@ zabbix_export:
                   name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: f65e9753464a4521bb8a537daab08a5b
           name: 'Temperature sensor discovery'
@@ -601,8 +690,7 @@ zabbix_export:
           delay: 1h
           description: |
             MIKROTIK-MIB::mtxrHlTemperature
-            Since temperature sensor is not available on all Mikrotik hardware,
-            this is done to avoid unsupported items.
+            Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.
           item_prototypes:
             -
               uuid: 44c8106b4f174854962a97a5fe3fc3c8
@@ -626,8 +714,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: dbfb3ba672c944149aea12b3f4a1cdbe
@@ -638,6 +726,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 8c4ffcc25b254dc29928ac1ac0272b7a
                   expression: 'avg(/MikroTik CCR2004-16G-2S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
@@ -652,6 +747,13 @@ zabbix_export:
                       name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
                       expression: 'avg(/MikroTik CCR2004-16G-2S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
                       recovery_expression: 'max(/MikroTik CCR2004-16G-2S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: df1aa24cf39947528099405c6cd311f4
                   expression: 'avg(/MikroTik CCR2004-16G-2S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
@@ -660,6 +762,13 @@ zabbix_export:
                   name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 33669092f8b542fea3911e23337feb2f
           name: 'LTE modem discovery'
@@ -694,14 +803,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRP Reference Signal Received Power.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: f929a190e2624171a7a4b80919ae025e
                   expression: 'max(/MikroTik CCR2004-16G-2S SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 2fd85f6131924caeb2e73a630c7970e5
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
@@ -716,14 +838,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: dff7058dd39f4cb294533048160b3b75
                   expression: 'max(/MikroTik CCR2004-16G-2S SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: e2133a97d7c4406e9b708c31b1ad691f
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
@@ -738,14 +873,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: e57c17fcddd04bdf921a9f1b6151ccb2
                   expression: 'max(/MikroTik CCR2004-16G-2S SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: f52a4a4442894479bfd0f9acf9b92945
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
@@ -760,14 +908,27 @@ zabbix_export:
                 mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 95e376a33c1642c9a7d33b40bcda3389
                   expression: 'max(/MikroTik CCR2004-16G-2S SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 6c9bc962ee1040c8b1c0a3b3d2353b61
@@ -828,8 +989,14 @@ zabbix_export:
                 mtxrWlApAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 85cdb71f2f184c73baef88358c86fc27
               name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
@@ -849,8 +1016,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: e77874f460dc4a8580c63076388af10c
               name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
@@ -870,8 +1043,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 7d033a3bf8644f3aa7f66dddd6d45f44
               name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
@@ -890,8 +1069,14 @@ zabbix_export:
                     - 15m
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 1f70e9c256b64e698affb2216d124d24
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -904,8 +1089,14 @@ zabbix_export:
                 mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
         -
           uuid: f072c431d2e24b84bfd3eba28cebd3fc
           name: 'CAPsMAN AP channel discovery'
@@ -938,8 +1129,14 @@ zabbix_export:
                 mtxrWlCMAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: ef0f673527f4462e9728ef06b73d9e99
               name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
@@ -959,8 +1156,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 455d7ff186ae4990a1d60a8c3c165344
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -973,8 +1176,14 @@ zabbix_export:
                 mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 2e9d6f80bfa445beb64b4d5b17125800
               name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
@@ -994,8 +1203,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 569c6b51c3714d84bce3522093e442a6
@@ -1003,6 +1218,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
                   priority: WARNING
                   description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 69a5667ce42d4c33a358f85ef695fae4
           name: 'Network interfaces discovery'
@@ -1091,8 +1313,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 6ceda965a17f40f48cab26b697b66f13
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -1111,8 +1339,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 24b6d9edd4f14d75954581c5f9396c4f
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -1136,8 +1370,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 36a4bc21b0ed46bcb025388dad56ac51
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -1160,8 +1400,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 655955f36c4849a796bb01f7a9a305f1
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -1180,8 +1426,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: d85d1c9656fc4f54ad77d127b0d544d3
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -1205,8 +1457,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 85e2e5686cd24b7a9d32a2718609493b
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -1231,8 +1489,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: d0c19009d4c748a68122136f942b33b2
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -1254,8 +1518,14 @@ zabbix_export:
                 name: 'IF-MIB::ifOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 7596859088f04a0785c6e5b07d446ba8
@@ -1273,6 +1543,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 31d0a94b3f284ea699ce740276c5174c
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -1296,8 +1570,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           trigger_prototypes:
             -
               uuid: ef8a1963f5e743bb921edaa2115c9076
@@ -1327,6 +1607,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CCR2004-16G-2S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CCR2004-16G-2S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CCR2004-16G-2S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CCR2004-16G-2S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 5fe8afc5b0554c0f99b8fc4fe914deca
               expression: |
@@ -1347,6 +1631,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CCR2004-16G-2S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CCR2004-16G-2S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CCR2004-16G-2S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CCR2004-16G-2S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: f4eec00173b3447080d0528805b31aef
               expression: |
@@ -1366,6 +1654,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CCR2004-16G-2S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CCR2004-16G-2S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CCR2004-16G-2S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CCR2004-16G-2S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: 84a67bfc0ec444dfaba6eef5e651c244
@@ -1444,8 +1739,11 @@ zabbix_export:
               description: 'Space utilization in % for Disk-{#SNMPINDEX}'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 8b2f31738f90436b984801b4cef65b66
               name: 'Disk-{#SNMPINDEX}: Total space'
@@ -1472,8 +1770,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: dbc682e6a824455db742449efb76b4cf
               name: 'Disk-{#SNMPINDEX}: Used space'
@@ -1492,8 +1793,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
           trigger_prototypes:
             -
               uuid: 8ddf161b19eb4716b1ec7cb270970703
@@ -1509,6 +1813,13 @@ zabbix_export:
                  - The disk free space is less than 5G.
                  - The disk will be full in less than 24 hours.
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
             -
               uuid: 0a19983ae1d443bbb4224a61d46b62de
               expression: |
@@ -1529,6 +1840,13 @@ zabbix_export:
                   expression: |
                     last(/MikroTik CCR2004-16G-2S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
                     ((last(/MikroTik CCR2004-16G-2S SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR2004-16G-2S SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CCR2004-16G-2S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
           graph_prototypes:
             -
               uuid: 90c58f1e92914a32a4189f0029a5a5fc
@@ -1552,6 +1870,16 @@ zabbix_export:
                   item:
                     host: 'MikroTik CCR2004-16G-2S SNMP'
                     key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: ccr2004-16g-2splus
+        -
+          tag: target
+          value: mikrotik
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/net/mikrotik/mikrotik_CCR2004-1G-12S+2XS_snmp/README.md b/templates/net/mikrotik/mikrotik_CCR2004-1G-12S+2XS_snmp/README.md
index acd27489d02..68c68b75ea3 100644
--- a/templates/net/mikrotik/mikrotik_CCR2004-1G-12S+2XS_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_CCR2004-1G-12S+2XS_snmp/README.md
@@ -71,7 +71,7 @@ There are no template links in this template.
 |Network interfaces discovery |<p>Discovering interfaces from IF-MIB.</p> |SNMP |net.if.discovery<p>**Filter**:</p>AND <p>- {#IFADMINSTATUS} MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.MATCHES}`</p><p>- {#IFADMINSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.NOT_MATCHES}`</p><p>- {#IFOPERSTATUS} MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.MATCHES}`</p><p>- {#IFOPERSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.NOT_MATCHES}`</p><p>- {#IFNAME} MATCHES_REGEX `{$NET.IF.IFNAME.MATCHES}`</p><p>- {#IFNAME} NOT_MATCHES_REGEX `{$NET.IF.IFNAME.NOT_MATCHES}`</p><p>- {#IFDESCR} MATCHES_REGEX `{$NET.IF.IFDESCR.MATCHES}`</p><p>- {#IFDESCR} NOT_MATCHES_REGEX `{$NET.IF.IFDESCR.NOT_MATCHES}`</p><p>- {#IFALIAS} MATCHES_REGEX `{$NET.IF.IFALIAS.MATCHES}`</p><p>- {#IFALIAS} NOT_MATCHES_REGEX `{$NET.IF.IFALIAS.NOT_MATCHES}`</p><p>- {#IFTYPE} MATCHES_REGEX `{$NET.IF.IFTYPE.MATCHES}`</p><p>- {#IFTYPE} NOT_MATCHES_REGEX `{$NET.IF.IFTYPE.NOT_MATCHES}`</p> |
 |Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 |Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
-|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
 
 ## Items collected
 
@@ -137,14 +137,14 @@ There are no template links in this template.
 |Interface {#IFNAME}({#IFALIAS}): Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p><p>3. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CCR2004-1G-12S2XS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CCR2004-1G-12S2XS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CCR2004-1G-12S2XS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))`<p>Recovery expression:</p>`last(/MikroTik CCR2004-1G-12S2XS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0` |AVERAGE |<p>Manual close: YES</p> |
 |Interface {#IFNAME}({#IFALIAS}): High bandwidth usage (>{$IF.UTIL.MAX:"{#IFNAME}"}%) |<p>The network interface utilization is close to its estimated maximum bandwidth.</p> |`(avg(/MikroTik CCR2004-1G-12S2XS SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik CCR2004-1G-12S2XS SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) or avg(/MikroTik CCR2004-1G-12S2XS SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik CCR2004-1G-12S2XS SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])) and last(/MikroTik CCR2004-1G-12S2XS SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0`<p>Recovery expression:</p>`avg(/MikroTik CCR2004-1G-12S2XS SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik CCR2004-1G-12S2XS SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) and avg(/MikroTik CCR2004-1G-12S2XS SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik CCR2004-1G-12S2XS SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |Interface {#IFNAME}({#IFALIAS}): High error rate (>{$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) |<p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p> |`min(/MikroTik CCR2004-1G-12S2XS SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"} or min(/MikroTik CCR2004-1G-12S2XS SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`max(/MikroTik CCR2004-1G-12S2XS SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8 and max(/MikroTik CCR2004-1G-12S2XS SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
-|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik CCR2004-1G-12S2XS SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik CCR2004-1G-12S2XS SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik CCR2004-1G-12S2XS SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik CCR2004-1G-12S2XS SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik CCR2004-1G-12S2XS SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik CCR2004-1G-12S2XS SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik CCR2004-1G-12S2XS SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik CCR2004-1G-12S2XS SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik CCR2004-1G-12S2XS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2) `<p>Recovery expression:</p>`(change(/MikroTik CCR2004-1G-12S2XS SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik CCR2004-1G-12S2XS SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik CCR2004-1G-12S2XS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2) ` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik CCR2004-1G-12S2XS SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik CCR2004-1G-12S2XS SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik CCR2004-1G-12S2XS SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik CCR2004-1G-12S2XS SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik CCR2004-1G-12S2XS SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik CCR2004-1G-12S2XS SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik CCR2004-1G-12S2XS SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik CCR2004-1G-12S2XS SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik CCR2004-1G-12S2XS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2)`<p>Recovery expression:</p>`(change(/MikroTik CCR2004-1G-12S2XS SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik CCR2004-1G-12S2XS SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik CCR2004-1G-12S2XS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2)` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |{HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/MikroTik CCR2004-1G-12S2XS SNMP/system.uptime[sysUpTime.0])<10m` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- No SNMP data collection</p> |
 |No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/MikroTik CCR2004-1G-12S2XS SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |Unavailable by ICMP ping |<p>Last three attempts returned timeout.  Please check device connectivity.</p> |`max(/MikroTik CCR2004-1G-12S2XS SNMP/icmpping,#3)=0` |HIGH | |
 |High ICMP ping loss |<p>-</p> |`min(/MikroTik CCR2004-1G-12S2XS SNMP/icmppingloss,5m)>{$ICMP_LOSS_WARN} and min(/MikroTik CCR2004-1G-12S2XS SNMP/icmppingloss,5m)<100` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |High ICMP ping response time |<p>-</p> |`avg(/MikroTik CCR2004-1G-12S2XS SNMP/icmppingsec,5m)>{$ICMP_RESPONSE_TIME_WARN}` |WARNING |<p>**Depends on**:</p><p>- High ICMP ping loss</p><p>- Unavailable by ICMP ping</p> |
-|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CCR2004-1G-12S2XS SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CCR2004-1G-12S2XS SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR2004-1G-12S2XS SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CCR2004-1G-12S2XS SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
-|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CCR2004-1G-12S2XS SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CCR2004-1G-12S2XS SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR2004-1G-12S2XS SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CCR2004-1G-12S2XS SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CCR2004-1G-12S2XS SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CCR2004-1G-12S2XS SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR2004-1G-12S2XS SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CCR2004-1G-12S2XS SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CCR2004-1G-12S2XS SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CCR2004-1G-12S2XS SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR2004-1G-12S2XS SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CCR2004-1G-12S2XS SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
 |CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CCR2004-1G-12S2XS SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CCR2004-1G-12S2XS SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
 |CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CCR2004-1G-12S2XS SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CCR2004-1G-12S2XS SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
 |CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik CCR2004-1G-12S2XS SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik CCR2004-1G-12S2XS SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
diff --git a/templates/net/mikrotik/mikrotik_CCR2004-1G-12S+2XS_snmp/template_net_mikrotik_CCR2004-1G-12S+2XS_snmp.yaml b/templates/net/mikrotik/mikrotik_CCR2004-1G-12S+2XS_snmp/template_net_mikrotik_CCR2004-1G-12S+2XS_snmp.yaml
index 83c134affe0..a2786fa0a44 100644
--- a/templates/net/mikrotik/mikrotik_CCR2004-1G-12S+2XS_snmp/template_net_mikrotik_CCR2004-1G-12S+2XS_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_CCR2004-1G-12S+2XS_snmp/template_net_mikrotik_CCR2004-1G-12S+2XS_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:44:11Z'
+  date: '2022-01-26T09:44:24Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -35,8 +35,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: d17f5a29c6104de78dd9b66ae8144e9b
@@ -44,6 +47,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 747a11088cdb4336acde1a3db6b6fb0a
           name: 'ICMP loss'
@@ -54,8 +61,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: f3ad9f5ef4734e6da08c699d937a1521
@@ -67,6 +77,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CCR2004-1G-12S2XS SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 5511b24404044a999a4e63b5742fba69
           name: 'ICMP response time'
@@ -77,8 +94,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 831afefc75dc472ab3d010757abab4e2
@@ -93,6 +113,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CCR2004-1G-12S2XS SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 03477df2c6a54edbb33043e0ad372aca
           name: 'SNMP traps (fallback)'
@@ -105,8 +132,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: 07ed423ecd90404da796326fdf88d59f
           name: 'System contact details'
@@ -128,8 +155,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 14a7067e6be141af97af075439c741a0
           name: 'System description'
@@ -152,8 +179,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 9f94a0e5d26b401d84ca8a58b8121f2e
           name: 'Firmware version'
@@ -174,8 +201,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 324d699f4767400e88e16f37ffcd2abd
@@ -185,6 +212,10 @@ zabbix_export:
               priority: INFO
               description: 'Firmware version has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: be05eb6603df4b2b974319c0b90dd543
           name: 'Hardware model name'
@@ -203,8 +234,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
         -
           uuid: c147284d49cb43b3950a28de281cf4a0
           name: 'Hardware serial number'
@@ -226,8 +257,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 53e8fc3eac46426fbce375cc2ce983c8
@@ -236,6 +267,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: fc1ac08bab0c482f85f7666c9f932863
           name: 'System location'
@@ -257,8 +292,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: a1cfc4a89a29405790c8004648397c16
           name: 'System name'
@@ -280,8 +315,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: ed353db14a0742a7a865e9805025e9a9
@@ -290,6 +325,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: 68aaafe3efc449c1b718af4da8675d76
           name: 'System object ID'
@@ -310,8 +352,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 1da1f71f2dfd4c9ca450217a07068872
           name: 'Operating system'
@@ -333,8 +375,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: os
           triggers:
             -
               uuid: 2a0736cbd3324122b51c4ac4629c1323
@@ -347,6 +389,10 @@ zabbix_export:
                 -
                   name: 'System name has changed (new name: {ITEM.VALUE})'
                   expression: 'last(/MikroTik CCR2004-1G-12S2XS SNMP/system.name,#1)<>last(/MikroTik CCR2004-1G-12S2XS SNMP/system.name,#2) and length(last(/MikroTik CCR2004-1G-12S2XS SNMP/system.name))>0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: acec0fba9acb475298c23815478e1232
           name: Uptime
@@ -367,8 +413,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 285c2be6116d4e5fae7d0cbad5ccecb2
@@ -381,6 +427,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/MikroTik CCR2004-1G-12S2XS SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 4b1df0f8bebc443398bdb240a7a30db5
           name: 'Total memory'
@@ -407,8 +457,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 370e2a4ed66f4cc8ba31abdcff08598f
           name: 'Used memory'
@@ -427,8 +477,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 8fef22e8a7e0484b8e4ca48b66b322a1
           name: 'Memory utilization'
@@ -441,8 +491,8 @@ zabbix_export:
           description: 'Memory utilization in %'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: 8246aab86f954be8968169f55889a842
@@ -450,6 +500,13 @@ zabbix_export:
               name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
               priority: AVERAGE
               description: 'The system is running out of free memory.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 37dad400826443b9a70df99c46cadb7b
           name: 'SNMP agent availability'
@@ -466,8 +523,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 7a821734dc78455fa363bf7a8c2f2dc2
@@ -480,6 +540,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CCR2004-1G-12S2XS SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: d006aef2136542aab3e97092fff6ba09
@@ -504,8 +568,8 @@ zabbix_export:
                 The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
               trigger_prototypes:
                 -
                   uuid: bc2854ed0ff645ae9a932ab5baa62a91
@@ -514,6 +578,10 @@ zabbix_export:
                   opdata: 'Current utilization: {ITEM.LASTVALUE1}'
                   priority: WARNING
                   description: 'CPU utilization is too high. The system might be slow to respond.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 13064af8424048bca2e925c4bc050700
@@ -558,8 +626,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: b3d35f977375429a8a0f4b76dabf294c
@@ -570,6 +638,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 3be96603ac0a474694bf53d2b8aa8487
                   expression: 'avg(/MikroTik CCR2004-1G-12S2XS SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
@@ -584,6 +659,13 @@ zabbix_export:
                       name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
                       expression: 'avg(/MikroTik CCR2004-1G-12S2XS SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
                       recovery_expression: 'max(/MikroTik CCR2004-1G-12S2XS SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 809c702cedf749b6b53f591ee37c56ba
                   expression: 'avg(/MikroTik CCR2004-1G-12S2XS SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
@@ -592,6 +674,13 @@ zabbix_export:
                   name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: db3d7ea3f60f4e4fa53156f9ae87b651
           name: 'Temperature sensor discovery'
@@ -601,8 +690,7 @@ zabbix_export:
           delay: 1h
           description: |
             MIKROTIK-MIB::mtxrHlTemperature
-            Since temperature sensor is not available on all Mikrotik hardware,
-            this is done to avoid unsupported items.
+            Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.
           item_prototypes:
             -
               uuid: 6e122ae0407044ad9359fd2ce74b5897
@@ -626,8 +714,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 973e5d05599c4ee79d8cc210b004f38d
@@ -638,6 +726,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 58c9f09a52ed48f7b65a4ab6a7b19c35
                   expression: 'avg(/MikroTik CCR2004-1G-12S2XS SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
@@ -652,6 +747,13 @@ zabbix_export:
                       name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
                       expression: 'avg(/MikroTik CCR2004-1G-12S2XS SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
                       recovery_expression: 'max(/MikroTik CCR2004-1G-12S2XS SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: cfb884d37884407fbba3f93515020352
                   expression: 'avg(/MikroTik CCR2004-1G-12S2XS SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
@@ -660,6 +762,13 @@ zabbix_export:
                   name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: d7d673db00e445b98ed9109f51f4a16e
           name: 'LTE modem discovery'
@@ -694,14 +803,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRP Reference Signal Received Power.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: f5bf9d28bfb344728e481a3a478c6986
                   expression: 'max(/MikroTik CCR2004-1G-12S2XS SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 32087595f17c44d9b94d7762ef427ba5
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
@@ -716,14 +838,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 0b427fe9c54d486792c9388b8c2968cc
                   expression: 'max(/MikroTik CCR2004-1G-12S2XS SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 5a65177ee82a417f924cffbc6a92b593
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
@@ -738,14 +873,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 130cdbfb721646ef92c6c1664dffce72
                   expression: 'max(/MikroTik CCR2004-1G-12S2XS SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: c42347e1e0e046b68f557ce011be1886
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
@@ -760,14 +908,27 @@ zabbix_export:
                 mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 2df17dc1ca8f4d9fb135c23f86fb50d3
                   expression: 'max(/MikroTik CCR2004-1G-12S2XS SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 2d92488ff5874fbb9b13065df937a315
@@ -828,8 +989,14 @@ zabbix_export:
                 mtxrWlApAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 7ed23e95f7144fddb4f7c5797ea462b9
               name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
@@ -849,8 +1016,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 7d94a281ff544e5bbabd0d41f3672174
               name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
@@ -870,8 +1043,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: e184a832057f43b6bdacd2b6f3cb0c0a
               name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
@@ -890,8 +1069,14 @@ zabbix_export:
                     - 15m
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 8c7307d75f5345dfb389cfad66cb88aa
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -904,8 +1089,14 @@ zabbix_export:
                 mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
         -
           uuid: f69f464b8b59471f808b43772e1f5f4e
           name: 'CAPsMAN AP channel discovery'
@@ -938,8 +1129,14 @@ zabbix_export:
                 mtxrWlCMAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: e6e8db7c216d41fcbfd28845c541255d
               name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
@@ -959,8 +1156,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: e272eecff3f343eab7b6641e6429c47a
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -973,8 +1176,14 @@ zabbix_export:
                 mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 024d36a1f48f4976848bdfff2ee18fba
               name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
@@ -994,8 +1203,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: d1a52557a4f746da96893c3d1436b3f2
@@ -1003,6 +1218,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
                   priority: WARNING
                   description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 975657e824c94bf3a8360291daa1ee16
           name: 'Network interfaces discovery'
@@ -1091,8 +1313,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 410f18fab2a34f30b9bde48c53b0758c
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -1111,8 +1339,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: d813c68f3b974dae80d2bb8060b4916a
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -1136,8 +1370,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: f0b88262b4ea40cc86b98dab09a0c8e5
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -1160,8 +1400,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 4bf81a1abe324c48b907e9f3f67152f2
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -1180,8 +1426,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: cd35bca00aaf4e4bbb577c4945dfb4cf
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -1205,8 +1457,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: b5642292e0064832b40a09cbec0027c5
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -1231,8 +1489,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 274f221a50894d67ae7c8fa8f969811a
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -1254,8 +1518,14 @@ zabbix_export:
                 name: 'IF-MIB::ifOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: cb6f6e2bddc0454eb142cc35344e7082
@@ -1273,6 +1543,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 50a691ac0639468ca1fadf2223da3319
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -1296,8 +1570,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           trigger_prototypes:
             -
               uuid: 127e4dfad7884ac782f9d31d0b84dfee
@@ -1327,6 +1607,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CCR2004-1G-12S2XS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CCR2004-1G-12S2XS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CCR2004-1G-12S2XS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CCR2004-1G-12S2XS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 839abcd582c340c8986edba7e8df360b
               expression: |
@@ -1347,6 +1631,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CCR2004-1G-12S2XS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CCR2004-1G-12S2XS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CCR2004-1G-12S2XS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CCR2004-1G-12S2XS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 32debbc2bfb546a0bcc3091494ee5b60
               expression: |
@@ -1366,6 +1654,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CCR2004-1G-12S2XS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CCR2004-1G-12S2XS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CCR2004-1G-12S2XS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CCR2004-1G-12S2XS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: c78f1a22b8a540e2a0d2b2f5672d4810
@@ -1444,8 +1739,11 @@ zabbix_export:
               description: 'Space utilization in % for Disk-{#SNMPINDEX}'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 2b54aec93faf4db280732db48075ff49
               name: 'Disk-{#SNMPINDEX}: Total space'
@@ -1472,8 +1770,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: d02b3ec6c2d3489da7c29e85996d1a7c
               name: 'Disk-{#SNMPINDEX}: Used space'
@@ -1492,8 +1793,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
           trigger_prototypes:
             -
               uuid: dfcf03d83fb147b18be991b65d2298d6
@@ -1509,6 +1813,13 @@ zabbix_export:
                  - The disk free space is less than 5G.
                  - The disk will be full in less than 24 hours.
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
             -
               uuid: 95f44fd2b533449593e2095edda00fc9
               expression: |
@@ -1529,6 +1840,13 @@ zabbix_export:
                   expression: |
                     last(/MikroTik CCR2004-1G-12S2XS SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
                     ((last(/MikroTik CCR2004-1G-12S2XS SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR2004-1G-12S2XS SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CCR2004-1G-12S2XS SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
           graph_prototypes:
             -
               uuid: 379200cf5dd64fcf8986b18d9ecc4cd5
@@ -1552,6 +1870,16 @@ zabbix_export:
                   item:
                     host: 'MikroTik CCR2004-1G-12S2XS SNMP'
                     key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: ccr2004-1g-12splus2xs
+        -
+          tag: target
+          value: mikrotik
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/net/mikrotik/mikrotik_CRS106-1C-5S_snmp/README.md b/templates/net/mikrotik/mikrotik_CRS106-1C-5S_snmp/README.md
index 5189eb7ccb4..e38bb764622 100644
--- a/templates/net/mikrotik/mikrotik_CRS106-1C-5S_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_CRS106-1C-5S_snmp/README.md
@@ -71,7 +71,7 @@ There are no template links in this template.
 |Network interfaces discovery |<p>Discovering interfaces from IF-MIB.</p> |SNMP |net.if.discovery<p>**Filter**:</p>AND <p>- {#IFADMINSTATUS} MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.MATCHES}`</p><p>- {#IFADMINSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.NOT_MATCHES}`</p><p>- {#IFOPERSTATUS} MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.MATCHES}`</p><p>- {#IFOPERSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.NOT_MATCHES}`</p><p>- {#IFNAME} MATCHES_REGEX `{$NET.IF.IFNAME.MATCHES}`</p><p>- {#IFNAME} NOT_MATCHES_REGEX `{$NET.IF.IFNAME.NOT_MATCHES}`</p><p>- {#IFDESCR} MATCHES_REGEX `{$NET.IF.IFDESCR.MATCHES}`</p><p>- {#IFDESCR} NOT_MATCHES_REGEX `{$NET.IF.IFDESCR.NOT_MATCHES}`</p><p>- {#IFALIAS} MATCHES_REGEX `{$NET.IF.IFALIAS.MATCHES}`</p><p>- {#IFALIAS} NOT_MATCHES_REGEX `{$NET.IF.IFALIAS.NOT_MATCHES}`</p><p>- {#IFTYPE} MATCHES_REGEX `{$NET.IF.IFTYPE.MATCHES}`</p><p>- {#IFTYPE} NOT_MATCHES_REGEX `{$NET.IF.IFTYPE.NOT_MATCHES}`</p> |
 |Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 |Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
-|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
 
 ## Items collected
 
@@ -137,14 +137,14 @@ There are no template links in this template.
 |Interface {#IFNAME}({#IFALIAS}): Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p><p>3. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CRS106-1C-5S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CRS106-1C-5S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CRS106-1C-5S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))`<p>Recovery expression:</p>`last(/MikroTik CRS106-1C-5S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0` |AVERAGE |<p>Manual close: YES</p> |
 |Interface {#IFNAME}({#IFALIAS}): High bandwidth usage (>{$IF.UTIL.MAX:"{#IFNAME}"}%) |<p>The network interface utilization is close to its estimated maximum bandwidth.</p> |`(avg(/MikroTik CRS106-1C-5S SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik CRS106-1C-5S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) or avg(/MikroTik CRS106-1C-5S SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik CRS106-1C-5S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])) and last(/MikroTik CRS106-1C-5S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0`<p>Recovery expression:</p>`avg(/MikroTik CRS106-1C-5S SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik CRS106-1C-5S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) and avg(/MikroTik CRS106-1C-5S SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik CRS106-1C-5S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |Interface {#IFNAME}({#IFALIAS}): High error rate (>{$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) |<p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p> |`min(/MikroTik CRS106-1C-5S SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"} or min(/MikroTik CRS106-1C-5S SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`max(/MikroTik CRS106-1C-5S SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8 and max(/MikroTik CRS106-1C-5S SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
-|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik CRS106-1C-5S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik CRS106-1C-5S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik CRS106-1C-5S SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik CRS106-1C-5S SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik CRS106-1C-5S SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik CRS106-1C-5S SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik CRS106-1C-5S SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik CRS106-1C-5S SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik CRS106-1C-5S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2) `<p>Recovery expression:</p>`(change(/MikroTik CRS106-1C-5S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik CRS106-1C-5S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik CRS106-1C-5S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2) ` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik CRS106-1C-5S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik CRS106-1C-5S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik CRS106-1C-5S SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik CRS106-1C-5S SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik CRS106-1C-5S SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik CRS106-1C-5S SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik CRS106-1C-5S SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik CRS106-1C-5S SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik CRS106-1C-5S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2)`<p>Recovery expression:</p>`(change(/MikroTik CRS106-1C-5S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik CRS106-1C-5S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik CRS106-1C-5S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2)` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |{HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/MikroTik CRS106-1C-5S SNMP/system.uptime[sysUpTime.0])<10m` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- No SNMP data collection</p> |
 |No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/MikroTik CRS106-1C-5S SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |Unavailable by ICMP ping |<p>Last three attempts returned timeout.  Please check device connectivity.</p> |`max(/MikroTik CRS106-1C-5S SNMP/icmpping,#3)=0` |HIGH | |
 |High ICMP ping loss |<p>-</p> |`min(/MikroTik CRS106-1C-5S SNMP/icmppingloss,5m)>{$ICMP_LOSS_WARN} and min(/MikroTik CRS106-1C-5S SNMP/icmppingloss,5m)<100` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |High ICMP ping response time |<p>-</p> |`avg(/MikroTik CRS106-1C-5S SNMP/icmppingsec,5m)>{$ICMP_RESPONSE_TIME_WARN}` |WARNING |<p>**Depends on**:</p><p>- High ICMP ping loss</p><p>- Unavailable by ICMP ping</p> |
-|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS106-1C-5S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS106-1C-5S SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS106-1C-5S SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS106-1C-5S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
-|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS106-1C-5S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS106-1C-5S SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS106-1C-5S SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CRS106-1C-5S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS106-1C-5S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS106-1C-5S SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS106-1C-5S SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS106-1C-5S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS106-1C-5S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS106-1C-5S SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS106-1C-5S SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CRS106-1C-5S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
 |CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS106-1C-5S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CRS106-1C-5S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
 |CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS106-1C-5S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CRS106-1C-5S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
 |CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik CRS106-1C-5S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik CRS106-1C-5S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
diff --git a/templates/net/mikrotik/mikrotik_CRS106-1C-5S_snmp/template_net_mikrotik_CRS106-1C-5S_snmp.yaml b/templates/net/mikrotik/mikrotik_CRS106-1C-5S_snmp/template_net_mikrotik_CRS106-1C-5S_snmp.yaml
index 2f52870f3c4..4f2abd706f6 100644
--- a/templates/net/mikrotik/mikrotik_CRS106-1C-5S_snmp/template_net_mikrotik_CRS106-1C-5S_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_CRS106-1C-5S_snmp/template_net_mikrotik_CRS106-1C-5S_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:44:16Z'
+  date: '2022-01-26T09:51:33Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -35,8 +35,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 93236f96ce364b1ab95c603503c6984f
@@ -44,6 +47,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 0855d5a498274c078e8d2725b613f491
           name: 'ICMP loss'
@@ -54,8 +61,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: e7c3d84b4e3f4faabd28f36984116925
@@ -67,6 +77,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CRS106-1C-5S SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 58c2d3109593425ca65b1da7b93de738
           name: 'ICMP response time'
@@ -77,8 +94,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 4219929d04dd4367bf82c0c97f85eae7
@@ -93,6 +113,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CRS106-1C-5S SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: ceb8ab85069b4c7ca7c6517cf0c5b9d5
           name: 'SNMP traps (fallback)'
@@ -105,8 +132,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: 47b25b5beacc4890b8e3218ec26482a9
           name: 'System contact details'
@@ -128,8 +155,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: a4366a2506b64e07984fe3a3e1f1ecb6
           name: 'System description'
@@ -152,8 +179,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 1a2326a0d3884a679d05e4430f24f9cd
           name: 'Firmware version'
@@ -174,8 +201,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 6739b5af597443449dcfb946d2b89393
@@ -185,6 +212,10 @@ zabbix_export:
               priority: INFO
               description: 'Firmware version has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 2c11a09561a447949a86bbb75b9b7b08
           name: 'Hardware model name'
@@ -203,8 +234,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
         -
           uuid: 8d750b95502a462dbca47ff6aacd24da
           name: 'Hardware serial number'
@@ -226,8 +257,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: dfc2b8c7f27049a6bd51c283cc6a29ce
@@ -236,6 +267,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 4578904cc2cd43af9f537ceef6307403
           name: 'System location'
@@ -257,8 +292,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: b8600abc5e0a47ab821b656b2b781654
           name: 'System name'
@@ -280,8 +315,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 3bbc3dcf8127414abb426c830e8fddee
@@ -290,6 +325,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: eb2be7f070704027a3bc190da2937f5a
           name: 'System object ID'
@@ -310,8 +352,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 4f4d1445451a41758afc06ba2a287805
           name: 'Operating system'
@@ -333,8 +375,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: os
           triggers:
             -
               uuid: dc48fc089a314b7ebae646f2dfb925c5
@@ -347,6 +389,10 @@ zabbix_export:
                 -
                   name: 'System name has changed (new name: {ITEM.VALUE})'
                   expression: 'last(/MikroTik CRS106-1C-5S SNMP/system.name,#1)<>last(/MikroTik CRS106-1C-5S SNMP/system.name,#2) and length(last(/MikroTik CRS106-1C-5S SNMP/system.name))>0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 6d23ba015bfa40a180851bd0a8e4ead7
           name: Uptime
@@ -367,8 +413,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: f445d5e35c2b4296a670165e332be78c
@@ -381,6 +427,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/MikroTik CRS106-1C-5S SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: af7785e1221c4c458a333189d70208a2
           name: 'Total memory'
@@ -407,8 +457,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: ecb4ad0744b04ad9a9e650012e394e6b
           name: 'Used memory'
@@ -427,8 +477,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 2a8f4c7d1c52496093779c4a70e01668
           name: 'Memory utilization'
@@ -441,8 +491,8 @@ zabbix_export:
           description: 'Memory utilization in %'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: fdcc98f2475247f29fdf48c3a4a69058
@@ -450,6 +500,13 @@ zabbix_export:
               name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
               priority: AVERAGE
               description: 'The system is running out of free memory.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 506984ef2c14483cbfa7ab7e126cd258
           name: 'SNMP agent availability'
@@ -466,8 +523,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: e38ee3ff9c5a438fa7785db98162b84a
@@ -480,6 +540,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CRS106-1C-5S SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: 6ac6410ae08249bf9c726821804aa003
@@ -504,8 +568,8 @@ zabbix_export:
                 The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
               trigger_prototypes:
                 -
                   uuid: 08ca4ad1230144488299a8f4eaacef7f
@@ -514,6 +578,10 @@ zabbix_export:
                   opdata: 'Current utilization: {ITEM.LASTVALUE1}'
                   priority: WARNING
                   description: 'CPU utilization is too high. The system might be slow to respond.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 9be53d92e0294bd095ee45b175187503
@@ -558,8 +626,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 3f1ce913660a493387485d5dab3ebfc4
@@ -570,6 +638,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: e7a78d2798b44c438a81c308d1a1c0ed
                   expression: 'avg(/MikroTik CRS106-1C-5S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
@@ -584,6 +659,13 @@ zabbix_export:
                       name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
                       expression: 'avg(/MikroTik CRS106-1C-5S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
                       recovery_expression: 'max(/MikroTik CRS106-1C-5S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 890865ebc7ea41ef8e9d3c794395092b
                   expression: 'avg(/MikroTik CRS106-1C-5S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
@@ -592,6 +674,13 @@ zabbix_export:
                   name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 255e1f84524643ea8d827ad0492d5a73
           name: 'Temperature sensor discovery'
@@ -601,8 +690,7 @@ zabbix_export:
           delay: 1h
           description: |
             MIKROTIK-MIB::mtxrHlTemperature
-            Since temperature sensor is not available on all Mikrotik hardware,
-            this is done to avoid unsupported items.
+            Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.
           item_prototypes:
             -
               uuid: 461a7262a99f43cf99856fec3482dab7
@@ -626,8 +714,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 0c035a51301746588e0bc01bb0bf425a
@@ -638,6 +726,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: efc19507ca614ef487d0a9a637a8f7a6
                   expression: 'avg(/MikroTik CRS106-1C-5S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
@@ -652,6 +747,13 @@ zabbix_export:
                       name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
                       expression: 'avg(/MikroTik CRS106-1C-5S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
                       recovery_expression: 'max(/MikroTik CRS106-1C-5S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 54b7d721900742acbb1548714c34c7c2
                   expression: 'avg(/MikroTik CRS106-1C-5S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
@@ -660,6 +762,13 @@ zabbix_export:
                   name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: bd83bc1bdaf54b2595e8199219a6fa48
           name: 'LTE modem discovery'
@@ -694,14 +803,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRP Reference Signal Received Power.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 9c9bab7ccb354d478ae1d5f7ab66f5ea
                   expression: 'max(/MikroTik CRS106-1C-5S SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 9bb9bc5e259d40c0aca83914d08385d9
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
@@ -716,14 +838,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: f44e31574a68494cbcefbc961662063b
                   expression: 'max(/MikroTik CRS106-1C-5S SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 9ef5ed92e2e84b309dd05b862646970e
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
@@ -738,14 +873,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 9ebee838e00c46bba067094ea9732f6d
                   expression: 'max(/MikroTik CRS106-1C-5S SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 44f45954c01d4aa4bec812cb70bdedc4
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
@@ -760,14 +908,27 @@ zabbix_export:
                 mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 90fc1e486dd9409aacf0f68f86caf80c
                   expression: 'max(/MikroTik CRS106-1C-5S SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 512de641fee14826b8c0f7c3d16e176f
@@ -828,8 +989,14 @@ zabbix_export:
                 mtxrWlApAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 71fbf20e2ec8495c920df331edd59f11
               name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
@@ -849,8 +1016,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 59b84a7a0419432fb0651a86e437c88a
               name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
@@ -870,8 +1043,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 62208faa28fa42bb8444408f054b1a90
               name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
@@ -890,8 +1069,14 @@ zabbix_export:
                     - 15m
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: f1966c50faf640539d3c3bbad1202b4a
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -904,8 +1089,14 @@ zabbix_export:
                 mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
         -
           uuid: 032c67a20a064ca180eb0f23a43a67ea
           name: 'CAPsMAN AP channel discovery'
@@ -938,8 +1129,14 @@ zabbix_export:
                 mtxrWlCMAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 7c86d11f26724fbc820aefb5c8a5f036
               name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
@@ -959,8 +1156,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: e8bc0e639cc342eda083157fe6a0e187
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -973,8 +1176,14 @@ zabbix_export:
                 mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: ae5b708b4a044e81ac6f5be93762fed9
               name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
@@ -994,8 +1203,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 2e15eff553614e51a59590c6e3df4a42
@@ -1003,6 +1218,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
                   priority: WARNING
                   description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 845b1efc219e45f0a5b5cc9da4cd4473
           name: 'Network interfaces discovery'
@@ -1091,8 +1313,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: a6dea41689604e7f9b3c0415b255da53
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -1111,8 +1339,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: f7da909ba9a24f4fbfead2636b0a15c5
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -1136,8 +1370,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 9b5bf23911b747e39229d905dd6e6fe8
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -1160,8 +1400,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: d2257baa2950456daf6c75cfaf7529c2
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -1180,8 +1426,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 81e957d3ac6f40d78d17541ae25664e0
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -1205,8 +1457,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: bbb3fc3e3b7f401db406767070b02ee6
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -1231,8 +1489,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 6b4baafc654841238c65f6d08742a441
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -1254,8 +1518,14 @@ zabbix_export:
                 name: 'IF-MIB::ifOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: b9f20adf207c43d192921831fd5c882c
@@ -1273,6 +1543,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 9d878d01c9b94756b778524b1792bfb6
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -1296,8 +1570,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           trigger_prototypes:
             -
               uuid: b88f9f6974434f6ab26fbb747feb66e6
@@ -1327,6 +1607,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CRS106-1C-5S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CRS106-1C-5S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CRS106-1C-5S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CRS106-1C-5S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 7dd2c3c0a76649f097999376f6bd4bfc
               expression: |
@@ -1347,6 +1631,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CRS106-1C-5S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CRS106-1C-5S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CRS106-1C-5S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CRS106-1C-5S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 53652249393a485dab8db23696953e31
               expression: |
@@ -1366,6 +1654,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CRS106-1C-5S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CRS106-1C-5S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CRS106-1C-5S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CRS106-1C-5S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: 3e3ce3b1ea2f40eb9d32244326247a16
@@ -1444,8 +1739,11 @@ zabbix_export:
               description: 'Space utilization in % for Disk-{#SNMPINDEX}'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 341aa7a1559c4af48c2a8b5446930f2f
               name: 'Disk-{#SNMPINDEX}: Total space'
@@ -1472,8 +1770,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: d0e6479c9b004f8b95fe47f197779b82
               name: 'Disk-{#SNMPINDEX}: Used space'
@@ -1492,8 +1793,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
           trigger_prototypes:
             -
               uuid: 6a2a5c6ce51b4f6b912a01e45d1a5409
@@ -1509,6 +1813,13 @@ zabbix_export:
                  - The disk free space is less than 5G.
                  - The disk will be full in less than 24 hours.
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
             -
               uuid: 0df7d927286d47998fcf15c41bce944f
               expression: |
@@ -1529,6 +1840,13 @@ zabbix_export:
                   expression: |
                     last(/MikroTik CRS106-1C-5S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
                     ((last(/MikroTik CRS106-1C-5S SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS106-1C-5S SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS106-1C-5S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
           graph_prototypes:
             -
               uuid: a58c6530ebe04f54ad52abca0629ca3d
@@ -1552,6 +1870,16 @@ zabbix_export:
                   item:
                     host: 'MikroTik CRS106-1C-5S SNMP'
                     key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: crs106-1c-5s
+        -
+          tag: target
+          value: mikrotik
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/net/mikrotik/mikrotik_CRS109-8G-1S-2HnD-IN_snmp/README.md b/templates/net/mikrotik/mikrotik_CRS109-8G-1S-2HnD-IN_snmp/README.md
index 0987da20a65..e57b9f6ac38 100644
--- a/templates/net/mikrotik/mikrotik_CRS109-8G-1S-2HnD-IN_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_CRS109-8G-1S-2HnD-IN_snmp/README.md
@@ -71,7 +71,7 @@ There are no template links in this template.
 |Network interfaces discovery |<p>Discovering interfaces from IF-MIB.</p> |SNMP |net.if.discovery<p>**Filter**:</p>AND <p>- {#IFADMINSTATUS} MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.MATCHES}`</p><p>- {#IFADMINSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.NOT_MATCHES}`</p><p>- {#IFOPERSTATUS} MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.MATCHES}`</p><p>- {#IFOPERSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.NOT_MATCHES}`</p><p>- {#IFNAME} MATCHES_REGEX `{$NET.IF.IFNAME.MATCHES}`</p><p>- {#IFNAME} NOT_MATCHES_REGEX `{$NET.IF.IFNAME.NOT_MATCHES}`</p><p>- {#IFDESCR} MATCHES_REGEX `{$NET.IF.IFDESCR.MATCHES}`</p><p>- {#IFDESCR} NOT_MATCHES_REGEX `{$NET.IF.IFDESCR.NOT_MATCHES}`</p><p>- {#IFALIAS} MATCHES_REGEX `{$NET.IF.IFALIAS.MATCHES}`</p><p>- {#IFALIAS} NOT_MATCHES_REGEX `{$NET.IF.IFALIAS.NOT_MATCHES}`</p><p>- {#IFTYPE} MATCHES_REGEX `{$NET.IF.IFTYPE.MATCHES}`</p><p>- {#IFTYPE} NOT_MATCHES_REGEX `{$NET.IF.IFTYPE.NOT_MATCHES}`</p> |
 |Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 |Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
-|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
 
 ## Items collected
 
@@ -137,14 +137,14 @@ There are no template links in this template.
 |Interface {#IFNAME}({#IFALIAS}): Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p><p>3. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))`<p>Recovery expression:</p>`last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0` |AVERAGE |<p>Manual close: YES</p> |
 |Interface {#IFNAME}({#IFALIAS}): High bandwidth usage (>{$IF.UTIL.MAX:"{#IFNAME}"}%) |<p>The network interface utilization is close to its estimated maximum bandwidth.</p> |`(avg(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) or avg(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])) and last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0`<p>Recovery expression:</p>`avg(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) and avg(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |Interface {#IFNAME}({#IFALIAS}): High error rate (>{$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) |<p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p> |`min(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"} or min(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`max(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8 and max(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
-|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2) `<p>Recovery expression:</p>`(change(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2) ` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2)`<p>Recovery expression:</p>`(change(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2)` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |{HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/system.uptime[sysUpTime.0])<10m` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- No SNMP data collection</p> |
 |No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |Unavailable by ICMP ping |<p>Last three attempts returned timeout.  Please check device connectivity.</p> |`max(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/icmpping,#3)=0` |HIGH | |
 |High ICMP ping loss |<p>-</p> |`min(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/icmppingloss,5m)>{$ICMP_LOSS_WARN} and min(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/icmppingloss,5m)<100` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |High ICMP ping response time |<p>-</p> |`avg(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/icmppingsec,5m)>{$ICMP_RESPONSE_TIME_WARN}` |WARNING |<p>**Depends on**:</p><p>- High ICMP ping loss</p><p>- Unavailable by ICMP ping</p> |
-|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
-|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
 |CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
 |CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
 |CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
diff --git a/templates/net/mikrotik/mikrotik_CRS109-8G-1S-2HnD-IN_snmp/template_net_mikrotik_CRS109-8G-1S-2HnD-IN_snmp.yaml b/templates/net/mikrotik/mikrotik_CRS109-8G-1S-2HnD-IN_snmp/template_net_mikrotik_CRS109-8G-1S-2HnD-IN_snmp.yaml
index a0e90cd3631..069a5f76eb2 100644
--- a/templates/net/mikrotik/mikrotik_CRS109-8G-1S-2HnD-IN_snmp/template_net_mikrotik_CRS109-8G-1S-2HnD-IN_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_CRS109-8G-1S-2HnD-IN_snmp/template_net_mikrotik_CRS109-8G-1S-2HnD-IN_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:44:21Z'
+  date: '2022-01-26T10:22:45Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -35,8 +35,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 04d896fcaf2c4573bb077432604ca2ad
@@ -44,6 +47,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 7871185930284f9eb03c359baf2cd703
           name: 'ICMP loss'
@@ -54,8 +61,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: c6468c0bef2c4ad2958d69df8364722a
@@ -67,6 +77,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 701c51a923e940b288bc486df8bcb896
           name: 'ICMP response time'
@@ -77,8 +94,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 2b339fa462ce498fbf5d7557e8548930
@@ -93,6 +113,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 3d716d3580c24e49834f8b7927a62f18
           name: 'SNMP traps (fallback)'
@@ -105,8 +132,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: 787629e255a043ec89a9235792af48e8
           name: 'System contact details'
@@ -128,8 +155,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: d2c1cba3782e48e8a416e6bf5126de26
           name: 'System description'
@@ -152,8 +179,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: af43dfeeeb7c4f2ea7636e3409e70f1f
           name: 'Firmware version'
@@ -174,8 +201,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 07248a02609a4964be773df77f86f30a
@@ -185,6 +212,10 @@ zabbix_export:
               priority: INFO
               description: 'Firmware version has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 74bfb7d4834a499a8946c8275012ee76
           name: 'Hardware model name'
@@ -203,8 +234,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
         -
           uuid: 13fa6f235afa4f968f9de61b0727dced
           name: 'Hardware serial number'
@@ -226,8 +257,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: a79318151008414cb9a0c3d788b76f76
@@ -236,6 +267,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 8d7d12e82d0141e7919135d93e955d02
           name: 'System location'
@@ -257,8 +292,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: c549da27ab6741619d96c0473b6e5e81
           name: 'System name'
@@ -280,8 +315,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 3517d04dc5c34d07aad7ec73381deaaf
@@ -290,6 +325,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: 8204bf9e17794dc1994d657baaafa62d
           name: 'System object ID'
@@ -310,8 +352,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: b6e1b6013d3b41c68b4a0cc85bb539d6
           name: 'Operating system'
@@ -333,8 +375,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: os
           triggers:
             -
               uuid: 829598b7b1b4404bbd959ae186734251
@@ -347,6 +389,10 @@ zabbix_export:
                 -
                   name: 'System name has changed (new name: {ITEM.VALUE})'
                   expression: 'last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/system.name,#1)<>last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/system.name,#2) and length(last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/system.name))>0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: dd1816fc79704e6687bb841d729695c7
           name: Uptime
@@ -367,8 +413,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 40fac3f864c442f9bcbcbd5757070c38
@@ -381,6 +427,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 53c2b19776d14395832025f398d613eb
           name: 'Total memory'
@@ -407,8 +457,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 644de67163d14fe384128d7a89780d09
           name: 'Used memory'
@@ -427,8 +477,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 9b69a0a71c2a410783d8275a732b800a
           name: 'Memory utilization'
@@ -441,8 +491,8 @@ zabbix_export:
           description: 'Memory utilization in %'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: 7f44b9ee964f4ae798f3af4c12799e12
@@ -450,6 +500,13 @@ zabbix_export:
               name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
               priority: AVERAGE
               description: 'The system is running out of free memory.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 62a7b8240f65452db1b62ebd3e608328
           name: 'SNMP agent availability'
@@ -466,8 +523,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: bb5432b89f7248758d05d4c44cdf0d0a
@@ -480,6 +540,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: b65b318fff444191b92f52c023bdee21
@@ -504,8 +568,8 @@ zabbix_export:
                 The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
               trigger_prototypes:
                 -
                   uuid: 37579561f5e74042827d0d3fc5dc85e7
@@ -514,6 +578,10 @@ zabbix_export:
                   opdata: 'Current utilization: {ITEM.LASTVALUE1}'
                   priority: WARNING
                   description: 'CPU utilization is too high. The system might be slow to respond.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: f5d0c8258423411d86e9daf1a14418b1
@@ -558,8 +626,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 50a28d8380d64feca6fb2691e2477fed
@@ -570,6 +638,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 6bd9170284ef49b4825cf347e1f43548
                   expression: 'avg(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
@@ -584,6 +659,13 @@ zabbix_export:
                       name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
                       expression: 'avg(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
                       recovery_expression: 'max(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: ccda9a03941b42b0ac184e22aa23666c
                   expression: 'avg(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
@@ -592,6 +674,13 @@ zabbix_export:
                   name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 5afeb3e22aa4479ba0f2cfde3e39155a
           name: 'Temperature sensor discovery'
@@ -601,8 +690,7 @@ zabbix_export:
           delay: 1h
           description: |
             MIKROTIK-MIB::mtxrHlTemperature
-            Since temperature sensor is not available on all Mikrotik hardware,
-            this is done to avoid unsupported items.
+            Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.
           item_prototypes:
             -
               uuid: ca23bb18b5df4e9f9f447b27ff453c1a
@@ -626,8 +714,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 2c4b897afc03484fb7e435af025ac9a3
@@ -638,6 +726,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 8de55e3f0a2d46f69d430362b208654b
                   expression: 'avg(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
@@ -652,6 +747,13 @@ zabbix_export:
                       name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
                       expression: 'avg(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
                       recovery_expression: 'max(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 5d4582baab9b4b98ba6d6e3e78678280
                   expression: 'avg(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
@@ -660,6 +762,13 @@ zabbix_export:
                   name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 1040b8ec32f947d4bfce2fba18d7caae
           name: 'LTE modem discovery'
@@ -694,14 +803,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRP Reference Signal Received Power.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: b3abf2a74b1444d7af3cdfc8ac550ec4
                   expression: 'max(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: b6cf57437c7043a584ebb8376d658ef4
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
@@ -716,14 +838,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: e3300b34a9f34bbd91af48f5b8e89d9e
                   expression: 'max(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: a68c39fc6e4248d9b6b073a67f58f4ac
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
@@ -738,14 +873,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 7a06e44d440b4b85ad3b102fccf24309
                   expression: 'max(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 46d0b195b09e4def9ecce5f0d306add9
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
@@ -760,14 +908,27 @@ zabbix_export:
                 mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 6950612291f84d1d805b2f250c133096
                   expression: 'max(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 8099417bb7b44a5da8e0d7d05fc3c6e4
@@ -828,8 +989,14 @@ zabbix_export:
                 mtxrWlApAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 5d4556364513438399429334cc12f3d6
               name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
@@ -849,8 +1016,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 689e40655841450b9b8c91595a26774a
               name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
@@ -870,8 +1043,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: bac9f6f2692348348abdc29cc4ead952
               name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
@@ -890,8 +1069,14 @@ zabbix_export:
                     - 15m
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: eb067e2b305642599ad39cacac524902
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -904,8 +1089,14 @@ zabbix_export:
                 mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
         -
           uuid: f02ad98b3cb94232b322c4b66683e4b7
           name: 'CAPsMAN AP channel discovery'
@@ -938,8 +1129,14 @@ zabbix_export:
                 mtxrWlCMAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 7666985eaeca4e78b03e8097acb39ca5
               name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
@@ -959,8 +1156,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 6717ff0736644482be60d2dc2a6b6f1a
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -973,8 +1176,14 @@ zabbix_export:
                 mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 175056db73b443acbc16e9943cb83660
               name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
@@ -994,8 +1203,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 68fac07f6dd045ba8040c7fe813bdf2e
@@ -1003,6 +1218,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
                   priority: WARNING
                   description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: cc608b1f528d4098b8393eba8dd997d7
           name: 'Network interfaces discovery'
@@ -1091,8 +1313,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 2af6f068b36a4a4dbaef7a545ea9ef87
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -1111,8 +1339,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 82e97f30fe794772873c93e45fa93e3c
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -1136,8 +1370,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 49e742f27d8c43eba3bdaf661a2af64a
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -1160,8 +1400,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 2aeed3cfe655422289358c5baede343a
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -1180,8 +1426,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 9447ff7e4baa430f8447ebaf910e5714
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -1205,8 +1457,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: f85bd6cedc754e45ba653247a94dae89
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -1231,8 +1489,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 71eaf25c58ed46b8bbe72b7b6e41510d
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -1254,8 +1518,14 @@ zabbix_export:
                 name: 'IF-MIB::ifOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 518c5d16112b4b76a043d74e98748901
@@ -1273,6 +1543,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 0f12f613a5a648ef8309af58cb69805e
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -1296,8 +1570,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           trigger_prototypes:
             -
               uuid: fac8789a47e44e1e98a047f9a8af8a16
@@ -1327,6 +1607,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 6f683ec4b17642b6add94e73ea306f2f
               expression: |
@@ -1347,6 +1631,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 71e00ff03c6c46f6a4b5b986c67e3c2c
               expression: |
@@ -1366,6 +1654,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: 939d3dd20774413386677ddee8eab5eb
@@ -1444,8 +1739,11 @@ zabbix_export:
               description: 'Space utilization in % for Disk-{#SNMPINDEX}'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: e1fe51aa353d4808bce466924ccfc280
               name: 'Disk-{#SNMPINDEX}: Total space'
@@ -1472,8 +1770,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 6169a9872cde47b7888e6e2c3b8f90cd
               name: 'Disk-{#SNMPINDEX}: Used space'
@@ -1492,8 +1793,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
           trigger_prototypes:
             -
               uuid: 463c460bdff441ce9af1ea170ea4dbc2
@@ -1509,6 +1813,13 @@ zabbix_export:
                  - The disk free space is less than 5G.
                  - The disk will be full in less than 24 hours.
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
             -
               uuid: a758c3e0841e4fff93ff4bcaa41505eb
               expression: |
@@ -1529,6 +1840,13 @@ zabbix_export:
                   expression: |
                     last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
                     ((last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
           graph_prototypes:
             -
               uuid: 1ef7e8e42a954db4b7293a080a00bc9d
@@ -1552,6 +1870,16 @@ zabbix_export:
                   item:
                     host: 'MikroTik CRS109-8G-1S-2HnD-IN SNMP'
                     key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: crs109-8g-1s-2hnd-in
+        -
+          tag: target
+          value: mikrotik
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/net/mikrotik/mikrotik_CRS112-8G-4S-IN_snmp/README.md b/templates/net/mikrotik/mikrotik_CRS112-8G-4S-IN_snmp/README.md
index 4ba09317c9c..141a9325dbf 100644
--- a/templates/net/mikrotik/mikrotik_CRS112-8G-4S-IN_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_CRS112-8G-4S-IN_snmp/README.md
@@ -71,7 +71,7 @@ There are no template links in this template.
 |Network interfaces discovery |<p>Discovering interfaces from IF-MIB.</p> |SNMP |net.if.discovery<p>**Filter**:</p>AND <p>- {#IFADMINSTATUS} MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.MATCHES}`</p><p>- {#IFADMINSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.NOT_MATCHES}`</p><p>- {#IFOPERSTATUS} MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.MATCHES}`</p><p>- {#IFOPERSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.NOT_MATCHES}`</p><p>- {#IFNAME} MATCHES_REGEX `{$NET.IF.IFNAME.MATCHES}`</p><p>- {#IFNAME} NOT_MATCHES_REGEX `{$NET.IF.IFNAME.NOT_MATCHES}`</p><p>- {#IFDESCR} MATCHES_REGEX `{$NET.IF.IFDESCR.MATCHES}`</p><p>- {#IFDESCR} NOT_MATCHES_REGEX `{$NET.IF.IFDESCR.NOT_MATCHES}`</p><p>- {#IFALIAS} MATCHES_REGEX `{$NET.IF.IFALIAS.MATCHES}`</p><p>- {#IFALIAS} NOT_MATCHES_REGEX `{$NET.IF.IFALIAS.NOT_MATCHES}`</p><p>- {#IFTYPE} MATCHES_REGEX `{$NET.IF.IFTYPE.MATCHES}`</p><p>- {#IFTYPE} NOT_MATCHES_REGEX `{$NET.IF.IFTYPE.NOT_MATCHES}`</p> |
 |Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 |Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
-|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
 
 ## Items collected
 
@@ -137,14 +137,14 @@ There are no template links in this template.
 |Interface {#IFNAME}({#IFALIAS}): Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p><p>3. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CRS112-8G-4S-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CRS112-8G-4S-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CRS112-8G-4S-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))`<p>Recovery expression:</p>`last(/MikroTik CRS112-8G-4S-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0` |AVERAGE |<p>Manual close: YES</p> |
 |Interface {#IFNAME}({#IFALIAS}): High bandwidth usage (>{$IF.UTIL.MAX:"{#IFNAME}"}%) |<p>The network interface utilization is close to its estimated maximum bandwidth.</p> |`(avg(/MikroTik CRS112-8G-4S-IN SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik CRS112-8G-4S-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) or avg(/MikroTik CRS112-8G-4S-IN SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik CRS112-8G-4S-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])) and last(/MikroTik CRS112-8G-4S-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0`<p>Recovery expression:</p>`avg(/MikroTik CRS112-8G-4S-IN SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik CRS112-8G-4S-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) and avg(/MikroTik CRS112-8G-4S-IN SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik CRS112-8G-4S-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |Interface {#IFNAME}({#IFALIAS}): High error rate (>{$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) |<p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p> |`min(/MikroTik CRS112-8G-4S-IN SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"} or min(/MikroTik CRS112-8G-4S-IN SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`max(/MikroTik CRS112-8G-4S-IN SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8 and max(/MikroTik CRS112-8G-4S-IN SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
-|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik CRS112-8G-4S-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik CRS112-8G-4S-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik CRS112-8G-4S-IN SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik CRS112-8G-4S-IN SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik CRS112-8G-4S-IN SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik CRS112-8G-4S-IN SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik CRS112-8G-4S-IN SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik CRS112-8G-4S-IN SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik CRS112-8G-4S-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2) `<p>Recovery expression:</p>`(change(/MikroTik CRS112-8G-4S-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik CRS112-8G-4S-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik CRS112-8G-4S-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2) ` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik CRS112-8G-4S-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik CRS112-8G-4S-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik CRS112-8G-4S-IN SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik CRS112-8G-4S-IN SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik CRS112-8G-4S-IN SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik CRS112-8G-4S-IN SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik CRS112-8G-4S-IN SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik CRS112-8G-4S-IN SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik CRS112-8G-4S-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2)`<p>Recovery expression:</p>`(change(/MikroTik CRS112-8G-4S-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik CRS112-8G-4S-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik CRS112-8G-4S-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2)` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |{HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/MikroTik CRS112-8G-4S-IN SNMP/system.uptime[sysUpTime.0])<10m` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- No SNMP data collection</p> |
 |No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/MikroTik CRS112-8G-4S-IN SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |Unavailable by ICMP ping |<p>Last three attempts returned timeout.  Please check device connectivity.</p> |`max(/MikroTik CRS112-8G-4S-IN SNMP/icmpping,#3)=0` |HIGH | |
 |High ICMP ping loss |<p>-</p> |`min(/MikroTik CRS112-8G-4S-IN SNMP/icmppingloss,5m)>{$ICMP_LOSS_WARN} and min(/MikroTik CRS112-8G-4S-IN SNMP/icmppingloss,5m)<100` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |High ICMP ping response time |<p>-</p> |`avg(/MikroTik CRS112-8G-4S-IN SNMP/icmppingsec,5m)>{$ICMP_RESPONSE_TIME_WARN}` |WARNING |<p>**Depends on**:</p><p>- High ICMP ping loss</p><p>- Unavailable by ICMP ping</p> |
-|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS112-8G-4S-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS112-8G-4S-IN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS112-8G-4S-IN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS112-8G-4S-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
-|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS112-8G-4S-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS112-8G-4S-IN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS112-8G-4S-IN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CRS112-8G-4S-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS112-8G-4S-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS112-8G-4S-IN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS112-8G-4S-IN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS112-8G-4S-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS112-8G-4S-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS112-8G-4S-IN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS112-8G-4S-IN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CRS112-8G-4S-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
 |CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS112-8G-4S-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CRS112-8G-4S-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
 |CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS112-8G-4S-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CRS112-8G-4S-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
 |CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik CRS112-8G-4S-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik CRS112-8G-4S-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
diff --git a/templates/net/mikrotik/mikrotik_CRS112-8G-4S-IN_snmp/template_net_mikrotik_CRS112-8G-4S-IN_snmp.yaml b/templates/net/mikrotik/mikrotik_CRS112-8G-4S-IN_snmp/template_net_mikrotik_CRS112-8G-4S-IN_snmp.yaml
index 6c454074a4b..0e07b9a39b6 100644
--- a/templates/net/mikrotik/mikrotik_CRS112-8G-4S-IN_snmp/template_net_mikrotik_CRS112-8G-4S-IN_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_CRS112-8G-4S-IN_snmp/template_net_mikrotik_CRS112-8G-4S-IN_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:44:26Z'
+  date: '2022-01-26T09:46:19Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -35,8 +35,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: c63272b308134676a35c7b8311d71589
@@ -44,6 +47,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 6ab02f2204e94d9fa90e905c70312544
           name: 'ICMP loss'
@@ -54,8 +61,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 09d55f6987784bffb6024266e0895878
@@ -67,6 +77,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CRS112-8G-4S-IN SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: fb7fad1847eb4df9a2c26f60f61afa5c
           name: 'ICMP response time'
@@ -77,8 +94,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 235acd3457814902b4bf316065d05e00
@@ -93,6 +113,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CRS112-8G-4S-IN SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 9bad59edc7f9432988cf286b5497a7e4
           name: 'SNMP traps (fallback)'
@@ -105,8 +132,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: a0396c448a24457583dcb11a7847731c
           name: 'System contact details'
@@ -128,8 +155,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 7f69a36c9c86495bb84eb1e4768520bb
           name: 'System description'
@@ -152,8 +179,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 5c3719bbbd424403b78d73824fdb45aa
           name: 'Firmware version'
@@ -174,8 +201,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 6729f53f42ff445c8ab26b91cdb811e2
@@ -185,6 +212,10 @@ zabbix_export:
               priority: INFO
               description: 'Firmware version has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 35142b0597a348838f0f77cf7c11266f
           name: 'Hardware model name'
@@ -203,8 +234,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
         -
           uuid: 0a2b5f7921d74498bb1761e5bb773dec
           name: 'Hardware serial number'
@@ -226,8 +257,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 24e52c80e5544295b778c677d0de35b2
@@ -236,6 +267,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: dee2119103e640eab76243f6ff769c77
           name: 'System location'
@@ -257,8 +292,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: bd417ca6edeb4e7bbf446b8a3d003e7a
           name: 'System name'
@@ -280,8 +315,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 5431acc090c34d879e911cd90a52eb48
@@ -290,6 +325,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: 3fadb391f77d44d099b0f1f7b51f8062
           name: 'System object ID'
@@ -310,8 +352,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: c98293d0ebe844d390474d48a937d0fc
           name: 'Operating system'
@@ -333,8 +375,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: os
           triggers:
             -
               uuid: 8846801d462142938e7e0683dd481087
@@ -347,6 +389,10 @@ zabbix_export:
                 -
                   name: 'System name has changed (new name: {ITEM.VALUE})'
                   expression: 'last(/MikroTik CRS112-8G-4S-IN SNMP/system.name,#1)<>last(/MikroTik CRS112-8G-4S-IN SNMP/system.name,#2) and length(last(/MikroTik CRS112-8G-4S-IN SNMP/system.name))>0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 479d3825a16b4060a06b3bba21515a9c
           name: Uptime
@@ -367,8 +413,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 7bcd342f9c4f467a98ab38a5ea3e174b
@@ -381,6 +427,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/MikroTik CRS112-8G-4S-IN SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 545eb326fcd94bbcafd561824f1759db
           name: 'Total memory'
@@ -407,8 +457,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 8a6c7605ff3d45c092dff46fdc9fa1f8
           name: 'Used memory'
@@ -427,8 +477,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 8b8c952075db4ac6884cb0b352a75496
           name: 'Memory utilization'
@@ -441,8 +491,8 @@ zabbix_export:
           description: 'Memory utilization in %'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: d9f9ee61646a4881bcb34a5e564738f3
@@ -450,6 +500,13 @@ zabbix_export:
               name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
               priority: AVERAGE
               description: 'The system is running out of free memory.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 769ce4d237c043a2a86af0a66ff06a1a
           name: 'SNMP agent availability'
@@ -466,8 +523,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 2f271102d58b4068b87eab5ff70b7798
@@ -480,6 +540,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CRS112-8G-4S-IN SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: 58462afd23c44a788d49469d4ba5f5b4
@@ -504,8 +568,8 @@ zabbix_export:
                 The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
               trigger_prototypes:
                 -
                   uuid: 9fc63b1881da411baea0e78cd671606a
@@ -514,6 +578,10 @@ zabbix_export:
                   opdata: 'Current utilization: {ITEM.LASTVALUE1}'
                   priority: WARNING
                   description: 'CPU utilization is too high. The system might be slow to respond.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: f3bb0b7df1904d698e1ec9e5c6b1254d
@@ -558,8 +626,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 9ab9bb63b838495f863feee9d62fcb72
@@ -570,6 +638,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 1f68799afde34df49dd0d693872aa19a
                   expression: 'avg(/MikroTik CRS112-8G-4S-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
@@ -584,6 +659,13 @@ zabbix_export:
                       name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
                       expression: 'avg(/MikroTik CRS112-8G-4S-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
                       recovery_expression: 'max(/MikroTik CRS112-8G-4S-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 21a3e86813114562a8e382bd3120030f
                   expression: 'avg(/MikroTik CRS112-8G-4S-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
@@ -592,6 +674,13 @@ zabbix_export:
                   name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: fc23fc78ca3145798b76216070acb4d5
           name: 'Temperature sensor discovery'
@@ -601,8 +690,7 @@ zabbix_export:
           delay: 1h
           description: |
             MIKROTIK-MIB::mtxrHlTemperature
-            Since temperature sensor is not available on all Mikrotik hardware,
-            this is done to avoid unsupported items.
+            Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.
           item_prototypes:
             -
               uuid: e78b76cc8a864070b275f1e82d5a0cd0
@@ -626,8 +714,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 52e3b8b493eb4ab09bacb707ed7454ab
@@ -638,6 +726,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 00ed3d5d280f47a1b20073e87f6ec6f0
                   expression: 'avg(/MikroTik CRS112-8G-4S-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
@@ -652,6 +747,13 @@ zabbix_export:
                       name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
                       expression: 'avg(/MikroTik CRS112-8G-4S-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
                       recovery_expression: 'max(/MikroTik CRS112-8G-4S-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 0e8120688a774b63823848119deaf4a5
                   expression: 'avg(/MikroTik CRS112-8G-4S-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
@@ -660,6 +762,13 @@ zabbix_export:
                   name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 2b33d07e9e4049feb9344a226d019e5c
           name: 'LTE modem discovery'
@@ -694,14 +803,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRP Reference Signal Received Power.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 4d8a166e4cc8442c87c2989fa87b8e1d
                   expression: 'max(/MikroTik CRS112-8G-4S-IN SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: aae34986ae5f4641891454a28570a71c
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
@@ -716,14 +838,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 1affa10b3e2d477c92951193292f57d0
                   expression: 'max(/MikroTik CRS112-8G-4S-IN SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 6b3e94493e3d4e2fa5a02850646131f2
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
@@ -738,14 +873,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: bb085163f97341259cd0d42e38c1685e
                   expression: 'max(/MikroTik CRS112-8G-4S-IN SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 7e0266ca1918400abb2acfb74cb1208f
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
@@ -760,14 +908,27 @@ zabbix_export:
                 mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 4b214d3637994c89816ef4f951ce8828
                   expression: 'max(/MikroTik CRS112-8G-4S-IN SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 68b35ab5b6314e7c919cbcb7a6a5983c
@@ -828,8 +989,14 @@ zabbix_export:
                 mtxrWlApAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 57f9dfd940c84045a71a0d3032ec408b
               name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
@@ -849,8 +1016,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 7219178010374790b7d121431223a50c
               name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
@@ -870,8 +1043,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 423a6fa257f14693b5669a663fbaa184
               name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
@@ -890,8 +1069,14 @@ zabbix_export:
                     - 15m
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 5deabb9273f74a60bc5d869c8a744060
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -904,8 +1089,14 @@ zabbix_export:
                 mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
         -
           uuid: 3e5cfaec61a145a3b6dd2236da486408
           name: 'CAPsMAN AP channel discovery'
@@ -938,8 +1129,14 @@ zabbix_export:
                 mtxrWlCMAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 54a475089c49498ea96d0e063b37f678
               name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
@@ -959,8 +1156,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: e69f18d991704f349e551e0f4024e685
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -973,8 +1176,14 @@ zabbix_export:
                 mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 787f088f58794997b39d55864ffcf25a
               name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
@@ -994,8 +1203,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 9b32c491ea3d41bca60ab53c664ee369
@@ -1003,6 +1218,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
                   priority: WARNING
                   description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: a667d9273ccf46a5a9fafb58c10adf6c
           name: 'Network interfaces discovery'
@@ -1091,8 +1313,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 8845d896a14f4db68cee5c8d4b9e612a
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -1111,8 +1339,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 421c2c5345114a2686e880fb995c159d
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -1136,8 +1370,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 7b0e671970444dca8e1386ec7f0ca0eb
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -1160,8 +1400,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 65118ff16f3649c1bab06b5620b278ea
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -1180,8 +1426,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 92a754f7ae904787ae8f2fcd4bd0112b
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -1205,8 +1457,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 3426adc2f7224e9ea037be081146df32
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -1231,8 +1489,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 37a01e7bb0e24177961220d810df16a2
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -1254,8 +1518,14 @@ zabbix_export:
                 name: 'IF-MIB::ifOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: d9beebab41fd436fad7f54cfab6e5eb0
@@ -1273,6 +1543,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 90e74ae087de40efb7fe19e06b70a5d0
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -1296,8 +1570,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           trigger_prototypes:
             -
               uuid: f2b1a41fe508425cadd992422f9f2e1a
@@ -1327,6 +1607,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CRS112-8G-4S-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CRS112-8G-4S-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CRS112-8G-4S-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CRS112-8G-4S-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 89c85677363b4416a8718b6455c5e2ec
               expression: |
@@ -1347,6 +1631,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CRS112-8G-4S-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CRS112-8G-4S-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CRS112-8G-4S-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CRS112-8G-4S-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: b1ae075b11a2481da6a64b65c5d0d4a8
               expression: |
@@ -1366,6 +1654,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CRS112-8G-4S-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CRS112-8G-4S-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CRS112-8G-4S-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CRS112-8G-4S-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: a4e49eeebc8e4129b586f92ee8a0c51e
@@ -1444,8 +1739,11 @@ zabbix_export:
               description: 'Space utilization in % for Disk-{#SNMPINDEX}'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: a659baef4d94473caa9cfe962d04ffd9
               name: 'Disk-{#SNMPINDEX}: Total space'
@@ -1472,8 +1770,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: f0584dd985664955b7513c97cce54f83
               name: 'Disk-{#SNMPINDEX}: Used space'
@@ -1492,8 +1793,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
           trigger_prototypes:
             -
               uuid: 572cb48de9bd4010b907cff6efa9f3a8
@@ -1509,6 +1813,13 @@ zabbix_export:
                  - The disk free space is less than 5G.
                  - The disk will be full in less than 24 hours.
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
             -
               uuid: 10639cc4b8de4879a99c70061d5d48ea
               expression: |
@@ -1529,6 +1840,13 @@ zabbix_export:
                   expression: |
                     last(/MikroTik CRS112-8G-4S-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
                     ((last(/MikroTik CRS112-8G-4S-IN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS112-8G-4S-IN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS112-8G-4S-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
           graph_prototypes:
             -
               uuid: a3cb6c6211b745469b2e42d7f10d2fda
@@ -1552,6 +1870,16 @@ zabbix_export:
                   item:
                     host: 'MikroTik CRS112-8G-4S-IN SNMP'
                     key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: crs112-8g-4s-in
+        -
+          tag: target
+          value: mikrotik
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/net/mikrotik/mikrotik_CRS112-8P-4S-IN_snmp/README.md b/templates/net/mikrotik/mikrotik_CRS112-8P-4S-IN_snmp/README.md
index 7cfc9904fb3..c543dc5bcf3 100644
--- a/templates/net/mikrotik/mikrotik_CRS112-8P-4S-IN_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_CRS112-8P-4S-IN_snmp/README.md
@@ -71,7 +71,7 @@ There are no template links in this template.
 |Network interfaces discovery |<p>Discovering interfaces from IF-MIB.</p> |SNMP |net.if.discovery<p>**Filter**:</p>AND <p>- {#IFADMINSTATUS} MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.MATCHES}`</p><p>- {#IFADMINSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.NOT_MATCHES}`</p><p>- {#IFOPERSTATUS} MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.MATCHES}`</p><p>- {#IFOPERSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.NOT_MATCHES}`</p><p>- {#IFNAME} MATCHES_REGEX `{$NET.IF.IFNAME.MATCHES}`</p><p>- {#IFNAME} NOT_MATCHES_REGEX `{$NET.IF.IFNAME.NOT_MATCHES}`</p><p>- {#IFDESCR} MATCHES_REGEX `{$NET.IF.IFDESCR.MATCHES}`</p><p>- {#IFDESCR} NOT_MATCHES_REGEX `{$NET.IF.IFDESCR.NOT_MATCHES}`</p><p>- {#IFALIAS} MATCHES_REGEX `{$NET.IF.IFALIAS.MATCHES}`</p><p>- {#IFALIAS} NOT_MATCHES_REGEX `{$NET.IF.IFALIAS.NOT_MATCHES}`</p><p>- {#IFTYPE} MATCHES_REGEX `{$NET.IF.IFTYPE.MATCHES}`</p><p>- {#IFTYPE} NOT_MATCHES_REGEX `{$NET.IF.IFTYPE.NOT_MATCHES}`</p> |
 |Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 |Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
-|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
 
 ## Items collected
 
@@ -137,14 +137,14 @@ There are no template links in this template.
 |Interface {#IFNAME}({#IFALIAS}): Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p><p>3. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CRS112-8P-4S-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CRS112-8P-4S-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CRS112-8P-4S-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))`<p>Recovery expression:</p>`last(/MikroTik CRS112-8P-4S-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0` |AVERAGE |<p>Manual close: YES</p> |
 |Interface {#IFNAME}({#IFALIAS}): High bandwidth usage (>{$IF.UTIL.MAX:"{#IFNAME}"}%) |<p>The network interface utilization is close to its estimated maximum bandwidth.</p> |`(avg(/MikroTik CRS112-8P-4S-IN SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik CRS112-8P-4S-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) or avg(/MikroTik CRS112-8P-4S-IN SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik CRS112-8P-4S-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])) and last(/MikroTik CRS112-8P-4S-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0`<p>Recovery expression:</p>`avg(/MikroTik CRS112-8P-4S-IN SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik CRS112-8P-4S-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) and avg(/MikroTik CRS112-8P-4S-IN SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik CRS112-8P-4S-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |Interface {#IFNAME}({#IFALIAS}): High error rate (>{$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) |<p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p> |`min(/MikroTik CRS112-8P-4S-IN SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"} or min(/MikroTik CRS112-8P-4S-IN SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`max(/MikroTik CRS112-8P-4S-IN SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8 and max(/MikroTik CRS112-8P-4S-IN SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
-|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik CRS112-8P-4S-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik CRS112-8P-4S-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik CRS112-8P-4S-IN SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik CRS112-8P-4S-IN SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik CRS112-8P-4S-IN SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik CRS112-8P-4S-IN SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik CRS112-8P-4S-IN SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik CRS112-8P-4S-IN SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik CRS112-8P-4S-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2) `<p>Recovery expression:</p>`(change(/MikroTik CRS112-8P-4S-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik CRS112-8P-4S-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik CRS112-8P-4S-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2) ` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik CRS112-8P-4S-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik CRS112-8P-4S-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik CRS112-8P-4S-IN SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik CRS112-8P-4S-IN SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik CRS112-8P-4S-IN SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik CRS112-8P-4S-IN SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik CRS112-8P-4S-IN SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik CRS112-8P-4S-IN SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik CRS112-8P-4S-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2)`<p>Recovery expression:</p>`(change(/MikroTik CRS112-8P-4S-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik CRS112-8P-4S-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik CRS112-8P-4S-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2)` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |{HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/MikroTik CRS112-8P-4S-IN SNMP/system.uptime[sysUpTime.0])<10m` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- No SNMP data collection</p> |
 |No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/MikroTik CRS112-8P-4S-IN SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |Unavailable by ICMP ping |<p>Last three attempts returned timeout.  Please check device connectivity.</p> |`max(/MikroTik CRS112-8P-4S-IN SNMP/icmpping,#3)=0` |HIGH | |
 |High ICMP ping loss |<p>-</p> |`min(/MikroTik CRS112-8P-4S-IN SNMP/icmppingloss,5m)>{$ICMP_LOSS_WARN} and min(/MikroTik CRS112-8P-4S-IN SNMP/icmppingloss,5m)<100` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |High ICMP ping response time |<p>-</p> |`avg(/MikroTik CRS112-8P-4S-IN SNMP/icmppingsec,5m)>{$ICMP_RESPONSE_TIME_WARN}` |WARNING |<p>**Depends on**:</p><p>- High ICMP ping loss</p><p>- Unavailable by ICMP ping</p> |
-|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS112-8P-4S-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS112-8P-4S-IN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS112-8P-4S-IN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS112-8P-4S-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
-|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS112-8P-4S-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS112-8P-4S-IN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS112-8P-4S-IN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CRS112-8P-4S-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS112-8P-4S-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS112-8P-4S-IN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS112-8P-4S-IN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS112-8P-4S-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS112-8P-4S-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS112-8P-4S-IN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS112-8P-4S-IN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CRS112-8P-4S-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
 |CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS112-8P-4S-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CRS112-8P-4S-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
 |CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS112-8P-4S-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CRS112-8P-4S-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
 |CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik CRS112-8P-4S-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik CRS112-8P-4S-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
diff --git a/templates/net/mikrotik/mikrotik_CRS112-8P-4S-IN_snmp/template_net_mikrotik_CRS112-8P-4S-IN_snmp.yaml b/templates/net/mikrotik/mikrotik_CRS112-8P-4S-IN_snmp/template_net_mikrotik_CRS112-8P-4S-IN_snmp.yaml
index 2d355f3b16c..784d662e617 100644
--- a/templates/net/mikrotik/mikrotik_CRS112-8P-4S-IN_snmp/template_net_mikrotik_CRS112-8P-4S-IN_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_CRS112-8P-4S-IN_snmp/template_net_mikrotik_CRS112-8P-4S-IN_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:44:30Z'
+  date: '2022-01-26T09:53:13Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -35,8 +35,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 16ef2e7fa1a949298407a0a0b4d77746
@@ -44,6 +47,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 710be8da30564d90816b724c4aa409f4
           name: 'ICMP loss'
@@ -54,8 +61,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 1dbb087e217944aebb6cd2ed14685a46
@@ -67,6 +77,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CRS112-8P-4S-IN SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 9a37178d9a534fbca0c71e7f6387b718
           name: 'ICMP response time'
@@ -77,8 +94,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 2dd9b73423b946f89dc7a421e12fd58e
@@ -93,6 +113,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CRS112-8P-4S-IN SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: fd5785cc745a4c23b36e7b88920cb677
           name: 'SNMP traps (fallback)'
@@ -105,8 +132,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: 52453d3272f04c1b90334407a44ed110
           name: 'System contact details'
@@ -128,8 +155,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 419bf63514994b58abba6586d4241c72
           name: 'System description'
@@ -152,8 +179,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 23de7a030b324ae2bee4fa96d6a724da
           name: 'Firmware version'
@@ -174,8 +201,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 0f66010aec32455eb56414c1ba576982
@@ -185,6 +212,10 @@ zabbix_export:
               priority: INFO
               description: 'Firmware version has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: c41bb4d7171b44aca3656092aa2b12b8
           name: 'Hardware model name'
@@ -203,8 +234,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
         -
           uuid: de134343b324455c9e17396c75aac869
           name: 'Hardware serial number'
@@ -226,8 +257,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 59c929b470d342b691b01b5d12f87456
@@ -236,6 +267,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: c911a3f7ceb740719933b255aa78a86e
           name: 'System location'
@@ -257,8 +292,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: c1bebf0a8a444b84a94f2edf0a631a4f
           name: 'System name'
@@ -280,8 +315,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 40ae2f08e95b4affab12454007f4bdc6
@@ -290,6 +325,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: 4ccdb09d16244ab990eb187ed7c06248
           name: 'System object ID'
@@ -310,8 +352,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 709a68530d314d448fbf9f9339af594f
           name: 'Operating system'
@@ -333,8 +375,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: os
           triggers:
             -
               uuid: c9fb96d72f6942d1b4320014b2e40b0c
@@ -347,6 +389,10 @@ zabbix_export:
                 -
                   name: 'System name has changed (new name: {ITEM.VALUE})'
                   expression: 'last(/MikroTik CRS112-8P-4S-IN SNMP/system.name,#1)<>last(/MikroTik CRS112-8P-4S-IN SNMP/system.name,#2) and length(last(/MikroTik CRS112-8P-4S-IN SNMP/system.name))>0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 66bffe7a0b8041b1aca4609cfebaa924
           name: Uptime
@@ -367,8 +413,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: d81cc3699a454ae3bd9bf813fff8e286
@@ -381,6 +427,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/MikroTik CRS112-8P-4S-IN SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: d80810c2936846d9b037f5e9d00eb6f6
           name: 'Total memory'
@@ -407,8 +457,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 82807a05026644379df67c28026b9696
           name: 'Used memory'
@@ -427,8 +477,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 7bfd8141f2d34548a16f73ff7bb665eb
           name: 'Memory utilization'
@@ -441,8 +491,8 @@ zabbix_export:
           description: 'Memory utilization in %'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: 72863d07fe654e78b740e2f48e0cebe5
@@ -450,6 +500,13 @@ zabbix_export:
               name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
               priority: AVERAGE
               description: 'The system is running out of free memory.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 3d39d94dbe8b42f9a2dd6d726f04e6fb
           name: 'SNMP agent availability'
@@ -466,8 +523,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: d720c3c0a669406cad47bf135de9be8c
@@ -480,6 +540,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CRS112-8P-4S-IN SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: 1a85ac0568c2458f90a90cb7a0642370
@@ -504,8 +568,8 @@ zabbix_export:
                 The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
               trigger_prototypes:
                 -
                   uuid: a2148ac68e78401c81ea5ef66cddc04c
@@ -514,6 +578,10 @@ zabbix_export:
                   opdata: 'Current utilization: {ITEM.LASTVALUE1}'
                   priority: WARNING
                   description: 'CPU utilization is too high. The system might be slow to respond.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: f4d14cb6ccdd44ccb5e43d449baa8d65
@@ -558,8 +626,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 0e9494a8018f4943a84c1e6b6304439f
@@ -570,6 +638,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 6877c6d086354b5eac351ddbe1dc5656
                   expression: 'avg(/MikroTik CRS112-8P-4S-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
@@ -584,6 +659,13 @@ zabbix_export:
                       name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
                       expression: 'avg(/MikroTik CRS112-8P-4S-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
                       recovery_expression: 'max(/MikroTik CRS112-8P-4S-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 608d5359e01148a2b8dcc507a11f5ea3
                   expression: 'avg(/MikroTik CRS112-8P-4S-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
@@ -592,6 +674,13 @@ zabbix_export:
                   name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 715783a411ee47bb9cca13c7ef7b5938
           name: 'Temperature sensor discovery'
@@ -601,8 +690,7 @@ zabbix_export:
           delay: 1h
           description: |
             MIKROTIK-MIB::mtxrHlTemperature
-            Since temperature sensor is not available on all Mikrotik hardware,
-            this is done to avoid unsupported items.
+            Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.
           item_prototypes:
             -
               uuid: 078f3735ac0d4403b539c27a77284658
@@ -626,8 +714,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 5eff445458ec4f2f9b9b9085f9487f7d
@@ -638,6 +726,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 3d9498b115df444981717267ccbe926b
                   expression: 'avg(/MikroTik CRS112-8P-4S-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
@@ -652,6 +747,13 @@ zabbix_export:
                       name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
                       expression: 'avg(/MikroTik CRS112-8P-4S-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
                       recovery_expression: 'max(/MikroTik CRS112-8P-4S-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: c3b94c3a222746cc9f88c5f44c3e882b
                   expression: 'avg(/MikroTik CRS112-8P-4S-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
@@ -660,6 +762,13 @@ zabbix_export:
                   name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 4ec79e9f9a65495eae664a3b8a503978
           name: 'LTE modem discovery'
@@ -694,14 +803,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRP Reference Signal Received Power.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: d3b264a57365416ba32dd5ee7f3b2c72
                   expression: 'max(/MikroTik CRS112-8P-4S-IN SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: ccfcd108155b4d359388311b7d74c988
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
@@ -716,14 +838,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: c69186a3c737437696414d1d1c434a3c
                   expression: 'max(/MikroTik CRS112-8P-4S-IN SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 9e9296bb427c42828eede79f5ec62c1a
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
@@ -738,14 +873,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 8179d0962048402c9843878c34f3a45c
                   expression: 'max(/MikroTik CRS112-8P-4S-IN SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 53fd3660ee2b45eeadb7300962bb1ac4
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
@@ -760,14 +908,27 @@ zabbix_export:
                 mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: fdb14600d90a448a83bdc51dd170296b
                   expression: 'max(/MikroTik CRS112-8P-4S-IN SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 5cdf7db912de4880950b91606659976a
@@ -828,8 +989,14 @@ zabbix_export:
                 mtxrWlApAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 73bcd9521b2e4a13898d1dab0632e76e
               name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
@@ -849,8 +1016,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 332f17f8800145088ea65fbd56bcc355
               name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
@@ -870,8 +1043,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 5d3d6f97506b4fc3a5cef2c6a03cdbaf
               name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
@@ -890,8 +1069,14 @@ zabbix_export:
                     - 15m
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: f74d9c3ed71c45bb910f08bcb0fb3eda
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -904,8 +1089,14 @@ zabbix_export:
                 mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
         -
           uuid: 5ace2ebfb2734287abf9d361fedfb4f3
           name: 'CAPsMAN AP channel discovery'
@@ -938,8 +1129,14 @@ zabbix_export:
                 mtxrWlCMAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: d171d2cc8f774581ac7bb39ec8749bcd
               name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
@@ -959,8 +1156,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 2527a7e7306640dc83a0c810a9ff248c
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -973,8 +1176,14 @@ zabbix_export:
                 mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: a1f9dec23d75439b9d47670c93881360
               name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
@@ -994,8 +1203,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: f60557875559490a891eb81c11e0cf37
@@ -1003,6 +1218,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
                   priority: WARNING
                   description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: c2479dd8eab044e3b5f141a0f993a24c
           name: 'Network interfaces discovery'
@@ -1091,8 +1313,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 3b0097d2131f4081a6f80d5d91c5db71
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -1111,8 +1339,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: ec9f44208eae4baf84b8efeac18d4218
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -1136,8 +1370,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: b1c8a69233b94c898b8f5af80a29b182
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -1160,8 +1400,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: da9968a76a9c43d3bbf6ecbe786797e2
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -1180,8 +1426,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: e356fde53c964f17a4b0794102bf76e6
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -1205,8 +1457,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: d32f4d57b4f34b1696480ba583812e69
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -1231,8 +1489,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 68e8bd9d8a56444a95cb7215518e4c2c
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -1254,8 +1518,14 @@ zabbix_export:
                 name: 'IF-MIB::ifOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: bdab20ca351f4d39a27c636b33df9de1
@@ -1273,6 +1543,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 835bd6ca78b143af833d267e408f9862
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -1296,8 +1570,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           trigger_prototypes:
             -
               uuid: ba58df29a51d4ad6b415654f10968e27
@@ -1327,6 +1607,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CRS112-8P-4S-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CRS112-8P-4S-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CRS112-8P-4S-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CRS112-8P-4S-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 29ca187c6d6941caab396f6b57e86746
               expression: |
@@ -1347,6 +1631,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CRS112-8P-4S-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CRS112-8P-4S-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CRS112-8P-4S-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CRS112-8P-4S-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 72076d70d7b644b19e64bd55fab5e594
               expression: |
@@ -1366,6 +1654,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CRS112-8P-4S-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CRS112-8P-4S-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CRS112-8P-4S-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CRS112-8P-4S-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: 490128f059d24904ab5e6ef0454ea3d4
@@ -1444,8 +1739,11 @@ zabbix_export:
               description: 'Space utilization in % for Disk-{#SNMPINDEX}'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 1fe1c3ed7e1d413e9c5717f7bc511845
               name: 'Disk-{#SNMPINDEX}: Total space'
@@ -1472,8 +1770,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: bffab5765d194dd6a8f74b5b40f2ec8f
               name: 'Disk-{#SNMPINDEX}: Used space'
@@ -1492,8 +1793,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
           trigger_prototypes:
             -
               uuid: 2e7f4f0eaf384c68acaf1bafadc6296a
@@ -1509,6 +1813,13 @@ zabbix_export:
                  - The disk free space is less than 5G.
                  - The disk will be full in less than 24 hours.
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
             -
               uuid: 380f830e3e714a99b9c7b30c1fbce14b
               expression: |
@@ -1529,6 +1840,13 @@ zabbix_export:
                   expression: |
                     last(/MikroTik CRS112-8P-4S-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
                     ((last(/MikroTik CRS112-8P-4S-IN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS112-8P-4S-IN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS112-8P-4S-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
           graph_prototypes:
             -
               uuid: 3923f122da254a36b7c89cf96d85dc02
@@ -1552,6 +1870,16 @@ zabbix_export:
                   item:
                     host: 'MikroTik CRS112-8P-4S-IN SNMP'
                     key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: crs112-8p-4s-in
+        -
+          tag: target
+          value: mikrotik
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/net/mikrotik/mikrotik_CRS125-24G-1S-2HnD-IN_snmp/README.md b/templates/net/mikrotik/mikrotik_CRS125-24G-1S-2HnD-IN_snmp/README.md
index 359c69f6180..0c902a0a26d 100644
--- a/templates/net/mikrotik/mikrotik_CRS125-24G-1S-2HnD-IN_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_CRS125-24G-1S-2HnD-IN_snmp/README.md
@@ -71,7 +71,7 @@ There are no template links in this template.
 |Network interfaces discovery |<p>Discovering interfaces from IF-MIB.</p> |SNMP |net.if.discovery<p>**Filter**:</p>AND <p>- {#IFADMINSTATUS} MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.MATCHES}`</p><p>- {#IFADMINSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.NOT_MATCHES}`</p><p>- {#IFOPERSTATUS} MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.MATCHES}`</p><p>- {#IFOPERSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.NOT_MATCHES}`</p><p>- {#IFNAME} MATCHES_REGEX `{$NET.IF.IFNAME.MATCHES}`</p><p>- {#IFNAME} NOT_MATCHES_REGEX `{$NET.IF.IFNAME.NOT_MATCHES}`</p><p>- {#IFDESCR} MATCHES_REGEX `{$NET.IF.IFDESCR.MATCHES}`</p><p>- {#IFDESCR} NOT_MATCHES_REGEX `{$NET.IF.IFDESCR.NOT_MATCHES}`</p><p>- {#IFALIAS} MATCHES_REGEX `{$NET.IF.IFALIAS.MATCHES}`</p><p>- {#IFALIAS} NOT_MATCHES_REGEX `{$NET.IF.IFALIAS.NOT_MATCHES}`</p><p>- {#IFTYPE} MATCHES_REGEX `{$NET.IF.IFTYPE.MATCHES}`</p><p>- {#IFTYPE} NOT_MATCHES_REGEX `{$NET.IF.IFTYPE.NOT_MATCHES}`</p> |
 |Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 |Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
-|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
 
 ## Items collected
 
@@ -137,14 +137,14 @@ There are no template links in this template.
 |Interface {#IFNAME}({#IFALIAS}): Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p><p>3. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))`<p>Recovery expression:</p>`last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0` |AVERAGE |<p>Manual close: YES</p> |
 |Interface {#IFNAME}({#IFALIAS}): High bandwidth usage (>{$IF.UTIL.MAX:"{#IFNAME}"}%) |<p>The network interface utilization is close to its estimated maximum bandwidth.</p> |`(avg(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) or avg(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])) and last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0`<p>Recovery expression:</p>`avg(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) and avg(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |Interface {#IFNAME}({#IFALIAS}): High error rate (>{$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) |<p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p> |`min(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"} or min(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`max(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8 and max(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
-|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2) `<p>Recovery expression:</p>`(change(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2) ` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2)`<p>Recovery expression:</p>`(change(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2)` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |{HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/system.uptime[sysUpTime.0])<10m` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- No SNMP data collection</p> |
 |No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |Unavailable by ICMP ping |<p>Last three attempts returned timeout.  Please check device connectivity.</p> |`max(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/icmpping,#3)=0` |HIGH | |
 |High ICMP ping loss |<p>-</p> |`min(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/icmppingloss,5m)>{$ICMP_LOSS_WARN} and min(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/icmppingloss,5m)<100` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |High ICMP ping response time |<p>-</p> |`avg(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/icmppingsec,5m)>{$ICMP_RESPONSE_TIME_WARN}` |WARNING |<p>**Depends on**:</p><p>- High ICMP ping loss</p><p>- Unavailable by ICMP ping</p> |
-|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
-|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
 |CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
 |CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
 |CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
diff --git a/templates/net/mikrotik/mikrotik_CRS125-24G-1S-2HnD-IN_snmp/template_net_mikrotik_CRS125-24G-1S-2HnD-IN_snmp.yaml b/templates/net/mikrotik/mikrotik_CRS125-24G-1S-2HnD-IN_snmp/template_net_mikrotik_CRS125-24G-1S-2HnD-IN_snmp.yaml
index 8de82de0bd7..faa56c07143 100644
--- a/templates/net/mikrotik/mikrotik_CRS125-24G-1S-2HnD-IN_snmp/template_net_mikrotik_CRS125-24G-1S-2HnD-IN_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_CRS125-24G-1S-2HnD-IN_snmp/template_net_mikrotik_CRS125-24G-1S-2HnD-IN_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:44:35Z'
+  date: '2022-01-26T09:44:09Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -35,8 +35,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: eccaf3e02f9944638588b82322322c32
@@ -44,6 +47,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 21ee91bb65fc4b6bbb83c1e35558b7d1
           name: 'ICMP loss'
@@ -54,8 +61,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 71286dd187734ee18b53fdf73602ef7d
@@ -67,6 +77,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: f13323a6a0e84d2c865f4bf2d5e59f79
           name: 'ICMP response time'
@@ -77,8 +94,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 18e8caa0b7a44c64aaec1d5eecf76297
@@ -93,6 +113,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 2dff60db5ff640839ebfddbc68c72243
           name: 'SNMP traps (fallback)'
@@ -105,8 +132,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: adabeec14fdb405495907ef6771a11a1
           name: 'System contact details'
@@ -128,8 +155,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: c6403a32598e400db8084d77083d1621
           name: 'System description'
@@ -152,8 +179,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 2fc0c608418046d0bbfc371f5f8d8c22
           name: 'Firmware version'
@@ -174,8 +201,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: f0c59541e6df4c649e7c2ef76d7bda4b
@@ -185,6 +212,10 @@ zabbix_export:
               priority: INFO
               description: 'Firmware version has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 6a3ca4bce4da4e8eb6a15a2dcf51bce1
           name: 'Hardware model name'
@@ -203,8 +234,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
         -
           uuid: 589cacbe509547bf944f7c8e3a518c7d
           name: 'Hardware serial number'
@@ -226,8 +257,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: a1cf2d27ddc447988aa808318aef167f
@@ -236,6 +267,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: e0e2d52ad8cd41dd92a97669e89c5fc6
           name: 'System location'
@@ -257,8 +292,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 6edc651f2acd4a718b1802aec08cad0f
           name: 'System name'
@@ -280,8 +315,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 681af1da9ba7432aa407019b1ff5192f
@@ -290,6 +325,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: 590c0449f2fe40999ac2d758bfa60058
           name: 'System object ID'
@@ -310,8 +352,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 31fb56c30de1477bbe69306c2b9e3d69
           name: 'Operating system'
@@ -333,8 +375,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: os
           triggers:
             -
               uuid: 9bfebd1764bb4acc82fa8c7f175c0b87
@@ -347,6 +389,10 @@ zabbix_export:
                 -
                   name: 'System name has changed (new name: {ITEM.VALUE})'
                   expression: 'last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/system.name,#1)<>last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/system.name,#2) and length(last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/system.name))>0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 3afb18b2452e45778ce5cdaa20bf58b8
           name: Uptime
@@ -367,8 +413,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 6cbc680faf50402a8aa5eb6b2b848f7b
@@ -381,6 +427,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: cb66968d87fe41a2ad4c5cb769849be4
           name: 'Total memory'
@@ -407,8 +457,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 62b4597135824686b5de3cd51fcd46f4
           name: 'Used memory'
@@ -427,8 +477,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 414bec3767eb49c39bd67a135f60ba02
           name: 'Memory utilization'
@@ -441,8 +491,8 @@ zabbix_export:
           description: 'Memory utilization in %'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: 9af92a1dddd0405587bb090b8fd5757d
@@ -450,6 +500,13 @@ zabbix_export:
               name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
               priority: AVERAGE
               description: 'The system is running out of free memory.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 752fd8bdeaed449484add53bf1cfbcd7
           name: 'SNMP agent availability'
@@ -466,8 +523,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 147de2ef3a3447cf9401f4197e911b17
@@ -480,6 +540,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: 6d574937fd7e47c8ba7da4fc7df2b812
@@ -504,8 +568,8 @@ zabbix_export:
                 The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
               trigger_prototypes:
                 -
                   uuid: c06050c48eac4f8f90df94c6d125f369
@@ -514,6 +578,10 @@ zabbix_export:
                   opdata: 'Current utilization: {ITEM.LASTVALUE1}'
                   priority: WARNING
                   description: 'CPU utilization is too high. The system might be slow to respond.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 7af56504cad442c68f801cbfff17952b
@@ -558,8 +626,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 9f6533c6505948abb10869f4d0a11070
@@ -570,6 +638,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: e683521cc3de43eaa7c8ecbbb360fb7d
                   expression: 'avg(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
@@ -584,6 +659,13 @@ zabbix_export:
                       name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
                       expression: 'avg(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
                       recovery_expression: 'max(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 2d1bba8f19694737a6cb59e12289327c
                   expression: 'avg(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
@@ -592,6 +674,13 @@ zabbix_export:
                   name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: fd1e16940eef4715906c2f8241df141e
           name: 'Temperature sensor discovery'
@@ -601,8 +690,7 @@ zabbix_export:
           delay: 1h
           description: |
             MIKROTIK-MIB::mtxrHlTemperature
-            Since temperature sensor is not available on all Mikrotik hardware,
-            this is done to avoid unsupported items.
+            Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.
           item_prototypes:
             -
               uuid: b9b599a6f7d746959af746bf348c3c45
@@ -626,8 +714,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 8db96c9e7d164b0fa6d2af61899ea427
@@ -638,6 +726,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 33c12e280a464d20960ae73341ea3dbe
                   expression: 'avg(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
@@ -652,6 +747,13 @@ zabbix_export:
                       name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
                       expression: 'avg(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
                       recovery_expression: 'max(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 4fa5ef5d55fd4fc8a21516dbfb0ff7eb
                   expression: 'avg(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
@@ -660,6 +762,13 @@ zabbix_export:
                   name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 6da207d2ffa84756a676fa7e7bd19e40
           name: 'LTE modem discovery'
@@ -694,14 +803,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRP Reference Signal Received Power.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: fd43c6f8ed834db3a69e6c30c29878ed
                   expression: 'max(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: bf05683ec6bd4882af965c5671bca4c8
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
@@ -716,14 +838,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 685f5eba5ddd4b2ba3173fc82367b476
                   expression: 'max(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 39b0a1c4d5134fb7a2a6bd114278a773
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
@@ -738,14 +873,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 4a4f14e171504413ae16d92597fe1024
                   expression: 'max(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 250f123915b94618b4af6aa4166f6e9a
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
@@ -760,14 +908,27 @@ zabbix_export:
                 mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: ed070d7bccb649a49b29eda9b8a02192
                   expression: 'max(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: efcb23bafcdc48f1b64090c437c18799
@@ -828,8 +989,14 @@ zabbix_export:
                 mtxrWlApAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: ede61f7e21cc41e2abe7e8931aef6b95
               name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
@@ -849,8 +1016,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 3ce1884489f4482a887756abf92248e5
               name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
@@ -870,8 +1043,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 56bdd3739b874e8db259ac6e4736affb
               name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
@@ -890,8 +1069,14 @@ zabbix_export:
                     - 15m
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: f952b47d2a4e4f2991db17dd89e79f24
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -904,8 +1089,14 @@ zabbix_export:
                 mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
         -
           uuid: a2e92faea0da45b59a9dd254440c875b
           name: 'CAPsMAN AP channel discovery'
@@ -938,8 +1129,14 @@ zabbix_export:
                 mtxrWlCMAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 6509bb0c5e044c0580398ca99b768b75
               name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
@@ -959,8 +1156,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 8661f6e91dbf4d9a93785f07157eec93
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -973,8 +1176,14 @@ zabbix_export:
                 mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: ec83a91a8b284f3a9137c8c4cf36a9c3
               name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
@@ -994,8 +1203,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 89940e123e8c4c04b402a436c977d999
@@ -1003,6 +1218,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
                   priority: WARNING
                   description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 0f943d18ef9148798fe783d3aadb9047
           name: 'Network interfaces discovery'
@@ -1091,8 +1313,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: d14d2c8908d64ce0b3adb45fc8c4a210
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -1111,8 +1339,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 0621b5bff79843ea9579eac665a352bc
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -1136,8 +1370,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: d4d79ba39825445b8cb59e76bb67250e
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -1160,8 +1400,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 0558424847e9412889bf0d009e0002c7
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -1180,8 +1426,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 56ba20c1f5ba4ea58dca9dafd83c8352
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -1205,8 +1457,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 906c4b98ecff4caf874d44d362a62a07
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -1231,8 +1489,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: e2d06c66e8574b5ca0083ecdb8e5b050
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -1254,8 +1518,14 @@ zabbix_export:
                 name: 'IF-MIB::ifOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 1f51aae95ee44368be4327fa0bb02c8a
@@ -1273,6 +1543,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: ff460a89977d4935a59a193d08d31f4a
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -1296,8 +1570,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           trigger_prototypes:
             -
               uuid: 7ff7bef321134c08bc70b8988abb91c4
@@ -1327,6 +1607,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 43f1d416170f493d825b087a88fd8b0e
               expression: |
@@ -1347,6 +1631,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 6e91f3d30c5a492dbb56b284594aa6ba
               expression: |
@@ -1366,6 +1654,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: 748a89b01346486f8241d73272e2c669
@@ -1444,8 +1739,11 @@ zabbix_export:
               description: 'Space utilization in % for Disk-{#SNMPINDEX}'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 1c12733c14eb45a8bb36b3fcb8ef7ce7
               name: 'Disk-{#SNMPINDEX}: Total space'
@@ -1472,8 +1770,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 6202b55760514c64832b9df48828c344
               name: 'Disk-{#SNMPINDEX}: Used space'
@@ -1492,8 +1793,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
           trigger_prototypes:
             -
               uuid: e5df295edd2848329708aaf765a8e8be
@@ -1509,6 +1813,13 @@ zabbix_export:
                  - The disk free space is less than 5G.
                  - The disk will be full in less than 24 hours.
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
             -
               uuid: 31ff4cd8ae95435193ecc37238327c4c
               expression: |
@@ -1529,6 +1840,13 @@ zabbix_export:
                   expression: |
                     last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
                     ((last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
           graph_prototypes:
             -
               uuid: e4d5a4fb28804aacb284c58ce3b8cc09
@@ -1552,6 +1870,16 @@ zabbix_export:
                   item:
                     host: 'MikroTik CRS125-24G-1S-2HnD-IN SNMP'
                     key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: crs125-24g-1s-2hnd-in
+        -
+          tag: target
+          value: mikrotik
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/net/mikrotik/mikrotik_CRS212-1G-10S-1S+IN_snmp/README.md b/templates/net/mikrotik/mikrotik_CRS212-1G-10S-1S+IN_snmp/README.md
index c1e096f9f64..7e61caac2d2 100644
--- a/templates/net/mikrotik/mikrotik_CRS212-1G-10S-1S+IN_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_CRS212-1G-10S-1S+IN_snmp/README.md
@@ -71,7 +71,7 @@ There are no template links in this template.
 |Network interfaces discovery |<p>Discovering interfaces from IF-MIB.</p> |SNMP |net.if.discovery<p>**Filter**:</p>AND <p>- {#IFADMINSTATUS} MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.MATCHES}`</p><p>- {#IFADMINSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.NOT_MATCHES}`</p><p>- {#IFOPERSTATUS} MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.MATCHES}`</p><p>- {#IFOPERSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.NOT_MATCHES}`</p><p>- {#IFNAME} MATCHES_REGEX `{$NET.IF.IFNAME.MATCHES}`</p><p>- {#IFNAME} NOT_MATCHES_REGEX `{$NET.IF.IFNAME.NOT_MATCHES}`</p><p>- {#IFDESCR} MATCHES_REGEX `{$NET.IF.IFDESCR.MATCHES}`</p><p>- {#IFDESCR} NOT_MATCHES_REGEX `{$NET.IF.IFDESCR.NOT_MATCHES}`</p><p>- {#IFALIAS} MATCHES_REGEX `{$NET.IF.IFALIAS.MATCHES}`</p><p>- {#IFALIAS} NOT_MATCHES_REGEX `{$NET.IF.IFALIAS.NOT_MATCHES}`</p><p>- {#IFTYPE} MATCHES_REGEX `{$NET.IF.IFTYPE.MATCHES}`</p><p>- {#IFTYPE} NOT_MATCHES_REGEX `{$NET.IF.IFTYPE.NOT_MATCHES}`</p> |
 |Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 |Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
-|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
 
 ## Items collected
 
@@ -137,14 +137,14 @@ There are no template links in this template.
 |Interface {#IFNAME}({#IFALIAS}): Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p><p>3. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CRS212-1G-10S-1SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CRS212-1G-10S-1SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CRS212-1G-10S-1SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))`<p>Recovery expression:</p>`last(/MikroTik CRS212-1G-10S-1SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0` |AVERAGE |<p>Manual close: YES</p> |
 |Interface {#IFNAME}({#IFALIAS}): High bandwidth usage (>{$IF.UTIL.MAX:"{#IFNAME}"}%) |<p>The network interface utilization is close to its estimated maximum bandwidth.</p> |`(avg(/MikroTik CRS212-1G-10S-1SIN SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik CRS212-1G-10S-1SIN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) or avg(/MikroTik CRS212-1G-10S-1SIN SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik CRS212-1G-10S-1SIN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])) and last(/MikroTik CRS212-1G-10S-1SIN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0`<p>Recovery expression:</p>`avg(/MikroTik CRS212-1G-10S-1SIN SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik CRS212-1G-10S-1SIN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) and avg(/MikroTik CRS212-1G-10S-1SIN SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik CRS212-1G-10S-1SIN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |Interface {#IFNAME}({#IFALIAS}): High error rate (>{$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) |<p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p> |`min(/MikroTik CRS212-1G-10S-1SIN SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"} or min(/MikroTik CRS212-1G-10S-1SIN SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`max(/MikroTik CRS212-1G-10S-1SIN SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8 and max(/MikroTik CRS212-1G-10S-1SIN SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
-|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik CRS212-1G-10S-1SIN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik CRS212-1G-10S-1SIN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik CRS212-1G-10S-1SIN SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik CRS212-1G-10S-1SIN SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik CRS212-1G-10S-1SIN SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik CRS212-1G-10S-1SIN SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik CRS212-1G-10S-1SIN SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik CRS212-1G-10S-1SIN SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik CRS212-1G-10S-1SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2) `<p>Recovery expression:</p>`(change(/MikroTik CRS212-1G-10S-1SIN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik CRS212-1G-10S-1SIN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik CRS212-1G-10S-1SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2) ` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik CRS212-1G-10S-1SIN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik CRS212-1G-10S-1SIN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik CRS212-1G-10S-1SIN SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik CRS212-1G-10S-1SIN SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik CRS212-1G-10S-1SIN SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik CRS212-1G-10S-1SIN SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik CRS212-1G-10S-1SIN SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik CRS212-1G-10S-1SIN SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik CRS212-1G-10S-1SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2)`<p>Recovery expression:</p>`(change(/MikroTik CRS212-1G-10S-1SIN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik CRS212-1G-10S-1SIN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik CRS212-1G-10S-1SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2)` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |{HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/MikroTik CRS212-1G-10S-1SIN SNMP/system.uptime[sysUpTime.0])<10m` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- No SNMP data collection</p> |
 |No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/MikroTik CRS212-1G-10S-1SIN SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |Unavailable by ICMP ping |<p>Last three attempts returned timeout.  Please check device connectivity.</p> |`max(/MikroTik CRS212-1G-10S-1SIN SNMP/icmpping,#3)=0` |HIGH | |
 |High ICMP ping loss |<p>-</p> |`min(/MikroTik CRS212-1G-10S-1SIN SNMP/icmppingloss,5m)>{$ICMP_LOSS_WARN} and min(/MikroTik CRS212-1G-10S-1SIN SNMP/icmppingloss,5m)<100` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |High ICMP ping response time |<p>-</p> |`avg(/MikroTik CRS212-1G-10S-1SIN SNMP/icmppingsec,5m)>{$ICMP_RESPONSE_TIME_WARN}` |WARNING |<p>**Depends on**:</p><p>- High ICMP ping loss</p><p>- Unavailable by ICMP ping</p> |
-|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS212-1G-10S-1SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS212-1G-10S-1SIN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS212-1G-10S-1SIN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS212-1G-10S-1SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
-|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS212-1G-10S-1SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS212-1G-10S-1SIN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS212-1G-10S-1SIN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CRS212-1G-10S-1SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS212-1G-10S-1SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS212-1G-10S-1SIN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS212-1G-10S-1SIN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS212-1G-10S-1SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS212-1G-10S-1SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS212-1G-10S-1SIN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS212-1G-10S-1SIN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CRS212-1G-10S-1SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
 |CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS212-1G-10S-1SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CRS212-1G-10S-1SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
 |CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS212-1G-10S-1SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CRS212-1G-10S-1SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
 |CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik CRS212-1G-10S-1SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik CRS212-1G-10S-1SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
diff --git a/templates/net/mikrotik/mikrotik_CRS212-1G-10S-1S+IN_snmp/template_net_mikrotik_CRS212-1G-10S-1S+IN_snmp.yaml b/templates/net/mikrotik/mikrotik_CRS212-1G-10S-1S+IN_snmp/template_net_mikrotik_CRS212-1G-10S-1S+IN_snmp.yaml
index 1a0f0255442..be8024048d8 100644
--- a/templates/net/mikrotik/mikrotik_CRS212-1G-10S-1S+IN_snmp/template_net_mikrotik_CRS212-1G-10S-1S+IN_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_CRS212-1G-10S-1S+IN_snmp/template_net_mikrotik_CRS212-1G-10S-1S+IN_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:44:41Z'
+  date: '2022-01-26T09:50:25Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -35,8 +35,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 6883be571ae343a791670f2f0c36cd02
@@ -44,6 +47,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: e23f070baecf4e85bfd4b919a313363f
           name: 'ICMP loss'
@@ -54,8 +61,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: ea3e5695d49f4868bd6a83e67689e5d6
@@ -67,6 +77,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CRS212-1G-10S-1SIN SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 19cb2bfb6b5a4aa48f38a6346ad1832f
           name: 'ICMP response time'
@@ -77,8 +94,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 4439b1b6d31d4824ba1ed448d9bda1b4
@@ -93,6 +113,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CRS212-1G-10S-1SIN SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: ddc1215a46464ed6b5e379d243816bc4
           name: 'SNMP traps (fallback)'
@@ -105,8 +132,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: 2fed3da1b4d646cfab6e0249e2cb9c6c
           name: 'System contact details'
@@ -128,8 +155,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 87adae25334a4965a6d03f5c611d8359
           name: 'System description'
@@ -152,8 +179,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 86226852333f4573b461e7283ae93c8a
           name: 'Firmware version'
@@ -174,8 +201,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 70a98e004bd34fb48e9c410ca52f4bc0
@@ -185,6 +212,10 @@ zabbix_export:
               priority: INFO
               description: 'Firmware version has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: cf0cd44044154f0097685ac4da1e0f6b
           name: 'Hardware model name'
@@ -203,8 +234,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
         -
           uuid: 3ec9f238ffa643c28011036ece349c2e
           name: 'Hardware serial number'
@@ -226,8 +257,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: e4da63844b774f4eb9e0188f659f256d
@@ -236,6 +267,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: c8656758df544bccae950414c2adb969
           name: 'System location'
@@ -257,8 +292,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 1a852e5ecb4745e4aaf6d819c8614c0c
           name: 'System name'
@@ -280,8 +315,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: ab81c691a90a409fa0d24ddac4ee455f
@@ -290,6 +325,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: 1f4839491fae42fd96d63f960486dc02
           name: 'System object ID'
@@ -310,8 +352,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 8ebce52c1fe045ef9e774aefb3359667
           name: 'Operating system'
@@ -333,8 +375,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: os
           triggers:
             -
               uuid: 9f738a1caee34259a3d38e52ddb6c791
@@ -347,6 +389,10 @@ zabbix_export:
                 -
                   name: 'System name has changed (new name: {ITEM.VALUE})'
                   expression: 'last(/MikroTik CRS212-1G-10S-1SIN SNMP/system.name,#1)<>last(/MikroTik CRS212-1G-10S-1SIN SNMP/system.name,#2) and length(last(/MikroTik CRS212-1G-10S-1SIN SNMP/system.name))>0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: a8f78c05de534873a8cb2250c528387b
           name: Uptime
@@ -367,8 +413,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 1d5170eb0ba14c4e8799d712ee84d004
@@ -381,6 +427,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/MikroTik CRS212-1G-10S-1SIN SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 1ca1d02815cb46dba0b2b27de86cd1d4
           name: 'Total memory'
@@ -407,8 +457,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 891105963e744b8283682a5e4520347b
           name: 'Used memory'
@@ -427,8 +477,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: b78b6b52884148f6b925e99b418f1838
           name: 'Memory utilization'
@@ -441,8 +491,8 @@ zabbix_export:
           description: 'Memory utilization in %'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: 640203769816409d883d5ba38a6ff4e5
@@ -450,6 +500,13 @@ zabbix_export:
               name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
               priority: AVERAGE
               description: 'The system is running out of free memory.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 6ff75377e11348e7be6e65301ba29aaa
           name: 'SNMP agent availability'
@@ -466,8 +523,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 94b83963c4474cd5a8d21a8cdae584f4
@@ -480,6 +540,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CRS212-1G-10S-1SIN SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: 17aca6820fbf4ae3b7c0bbd36ae191a5
@@ -504,8 +568,8 @@ zabbix_export:
                 The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
               trigger_prototypes:
                 -
                   uuid: 087f5705a7ce4a88a8c699541ee704be
@@ -514,6 +578,10 @@ zabbix_export:
                   opdata: 'Current utilization: {ITEM.LASTVALUE1}'
                   priority: WARNING
                   description: 'CPU utilization is too high. The system might be slow to respond.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: acbf5458996a46428574c0a90df0958b
@@ -558,8 +626,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 8aa17694ab184951b24093d8a765eae0
@@ -570,6 +638,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 3c33429067c84714b68c4bbd8f729bc7
                   expression: 'avg(/MikroTik CRS212-1G-10S-1SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
@@ -584,6 +659,13 @@ zabbix_export:
                       name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
                       expression: 'avg(/MikroTik CRS212-1G-10S-1SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
                       recovery_expression: 'max(/MikroTik CRS212-1G-10S-1SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 100002ca08614467b16f313dfeda6e68
                   expression: 'avg(/MikroTik CRS212-1G-10S-1SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
@@ -592,6 +674,13 @@ zabbix_export:
                   name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 1b64317c196f4a31b8c7dfd614b285a7
           name: 'Temperature sensor discovery'
@@ -601,8 +690,7 @@ zabbix_export:
           delay: 1h
           description: |
             MIKROTIK-MIB::mtxrHlTemperature
-            Since temperature sensor is not available on all Mikrotik hardware,
-            this is done to avoid unsupported items.
+            Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.
           item_prototypes:
             -
               uuid: 412e6077aaed46bebb182343f1b97023
@@ -626,8 +714,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 757ac3b43a62450f9e49885dd654167f
@@ -638,6 +726,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 71f8b72b4c7240a8a4e10b503a2aec9f
                   expression: 'avg(/MikroTik CRS212-1G-10S-1SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
@@ -652,6 +747,13 @@ zabbix_export:
                       name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
                       expression: 'avg(/MikroTik CRS212-1G-10S-1SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
                       recovery_expression: 'max(/MikroTik CRS212-1G-10S-1SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 818f218a8ee3455db507dcded146c3ea
                   expression: 'avg(/MikroTik CRS212-1G-10S-1SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
@@ -660,6 +762,13 @@ zabbix_export:
                   name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 708e4d3595004248a8acece9641eb4d6
           name: 'LTE modem discovery'
@@ -694,14 +803,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRP Reference Signal Received Power.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 6a8f6966f59a45e48a68f0343c372973
                   expression: 'max(/MikroTik CRS212-1G-10S-1SIN SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 7486c89623e34e8a84d51df4ea38347a
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
@@ -716,14 +838,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 0b4661e442014e21a98e56b8b332a6ba
                   expression: 'max(/MikroTik CRS212-1G-10S-1SIN SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 8b1a41af48da46e5a0c37e78a68127df
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
@@ -738,14 +873,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: d04782f202c44772b039867d744582de
                   expression: 'max(/MikroTik CRS212-1G-10S-1SIN SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 0c18873c93914367a7aa54156964e0f8
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
@@ -760,14 +908,27 @@ zabbix_export:
                 mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: d8d6a75db4de4ff7b8b2f4ab1f8d7258
                   expression: 'max(/MikroTik CRS212-1G-10S-1SIN SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 52ae7c9217d64fc89821768bb16df21c
@@ -828,8 +989,14 @@ zabbix_export:
                 mtxrWlApAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: fb5bb87dd9ec4ffd8ac9745dd7e5e698
               name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
@@ -849,8 +1016,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: a0576fd0cfbc47d3a48d651dfed2cf7f
               name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
@@ -870,8 +1043,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 29464ad001e944e2a007e9b6aedf07ca
               name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
@@ -890,8 +1069,14 @@ zabbix_export:
                     - 15m
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 9f93a69ba465474b8ff554e9017de788
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -904,8 +1089,14 @@ zabbix_export:
                 mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
         -
           uuid: 9e73e76f915e447191c77ffa452d3a38
           name: 'CAPsMAN AP channel discovery'
@@ -938,8 +1129,14 @@ zabbix_export:
                 mtxrWlCMAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: e5b5cdbce91946e38b4d194c3bc645c1
               name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
@@ -959,8 +1156,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 847ad6413af94fe89bf6d4f78a1fc449
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -973,8 +1176,14 @@ zabbix_export:
                 mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 3cc43df83ca24a50b44e8b6d899d29ff
               name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
@@ -994,8 +1203,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 6dfee746a74b4f96b103202b00ed3720
@@ -1003,6 +1218,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
                   priority: WARNING
                   description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 162858d4c89c44008f4c8c4226cf598d
           name: 'Network interfaces discovery'
@@ -1091,8 +1313,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 01791b11bba547abb88d2d607c88903d
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -1111,8 +1339,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 8e9f42386005498ba508ba72570a6b26
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -1136,8 +1370,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: e3e1bd9a9c3c43fcba1e8177ad653682
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -1160,8 +1400,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 653e8d4bfcb147989e5a5a5d49b3bca8
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -1180,8 +1426,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 6d516f24cbc24bd48656a3a7713c2c0a
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -1205,8 +1457,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: ff25d8ade4ef44b6888a26aac9d54344
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -1231,8 +1489,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 15679b8403054515af9c4ad21081cf2e
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -1254,8 +1518,14 @@ zabbix_export:
                 name: 'IF-MIB::ifOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 61ea7de46c3841c7a4fc04f67ef1448f
@@ -1273,6 +1543,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 08ff8dd9165b43519b633c4d276fc2e8
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -1296,8 +1570,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           trigger_prototypes:
             -
               uuid: b34e8d6b7e81481bb19b3f39236c29e4
@@ -1327,6 +1607,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CRS212-1G-10S-1SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CRS212-1G-10S-1SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CRS212-1G-10S-1SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CRS212-1G-10S-1SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 3c74af72b29e4b8484ccf36539caf234
               expression: |
@@ -1347,6 +1631,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CRS212-1G-10S-1SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CRS212-1G-10S-1SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CRS212-1G-10S-1SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CRS212-1G-10S-1SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 6fae861a027a4965b5b80500a218c0f1
               expression: |
@@ -1366,6 +1654,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CRS212-1G-10S-1SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CRS212-1G-10S-1SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CRS212-1G-10S-1SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CRS212-1G-10S-1SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: b9376c60bb114fc4b6c018d068dd6d7b
@@ -1444,8 +1739,11 @@ zabbix_export:
               description: 'Space utilization in % for Disk-{#SNMPINDEX}'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: ad99f629e6e94c8abad0215c9a914907
               name: 'Disk-{#SNMPINDEX}: Total space'
@@ -1472,8 +1770,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 9c2accea5a7a488ab6ebc3dd31f3e797
               name: 'Disk-{#SNMPINDEX}: Used space'
@@ -1492,8 +1793,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
           trigger_prototypes:
             -
               uuid: 2e330eb1ac0a4427ab150c2f1c3949b0
@@ -1509,6 +1813,13 @@ zabbix_export:
                  - The disk free space is less than 5G.
                  - The disk will be full in less than 24 hours.
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
             -
               uuid: ba3b9fe3bb7041c5a2e7d9fec8bed517
               expression: |
@@ -1529,6 +1840,13 @@ zabbix_export:
                   expression: |
                     last(/MikroTik CRS212-1G-10S-1SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
                     ((last(/MikroTik CRS212-1G-10S-1SIN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS212-1G-10S-1SIN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS212-1G-10S-1SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
           graph_prototypes:
             -
               uuid: 712ea2b949224520bcde3bc03428d21e
@@ -1552,6 +1870,16 @@ zabbix_export:
                   item:
                     host: 'MikroTik CRS212-1G-10S-1SIN SNMP'
                     key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: crs212-1g-10s-1splusin
+        -
+          tag: target
+          value: mikrotik
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/net/mikrotik/mikrotik_CRS305-1G-4S+IN_snmp/README.md b/templates/net/mikrotik/mikrotik_CRS305-1G-4S+IN_snmp/README.md
index fb0f7844801..ac2acba4ed0 100644
--- a/templates/net/mikrotik/mikrotik_CRS305-1G-4S+IN_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_CRS305-1G-4S+IN_snmp/README.md
@@ -71,7 +71,7 @@ There are no template links in this template.
 |Network interfaces discovery |<p>Discovering interfaces from IF-MIB.</p> |SNMP |net.if.discovery<p>**Filter**:</p>AND <p>- {#IFADMINSTATUS} MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.MATCHES}`</p><p>- {#IFADMINSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.NOT_MATCHES}`</p><p>- {#IFOPERSTATUS} MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.MATCHES}`</p><p>- {#IFOPERSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.NOT_MATCHES}`</p><p>- {#IFNAME} MATCHES_REGEX `{$NET.IF.IFNAME.MATCHES}`</p><p>- {#IFNAME} NOT_MATCHES_REGEX `{$NET.IF.IFNAME.NOT_MATCHES}`</p><p>- {#IFDESCR} MATCHES_REGEX `{$NET.IF.IFDESCR.MATCHES}`</p><p>- {#IFDESCR} NOT_MATCHES_REGEX `{$NET.IF.IFDESCR.NOT_MATCHES}`</p><p>- {#IFALIAS} MATCHES_REGEX `{$NET.IF.IFALIAS.MATCHES}`</p><p>- {#IFALIAS} NOT_MATCHES_REGEX `{$NET.IF.IFALIAS.NOT_MATCHES}`</p><p>- {#IFTYPE} MATCHES_REGEX `{$NET.IF.IFTYPE.MATCHES}`</p><p>- {#IFTYPE} NOT_MATCHES_REGEX `{$NET.IF.IFTYPE.NOT_MATCHES}`</p> |
 |Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 |Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
-|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
 
 ## Items collected
 
@@ -137,14 +137,14 @@ There are no template links in this template.
 |Interface {#IFNAME}({#IFALIAS}): Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p><p>3. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CRS305-1G-4SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CRS305-1G-4SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CRS305-1G-4SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))`<p>Recovery expression:</p>`last(/MikroTik CRS305-1G-4SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0` |AVERAGE |<p>Manual close: YES</p> |
 |Interface {#IFNAME}({#IFALIAS}): High bandwidth usage (>{$IF.UTIL.MAX:"{#IFNAME}"}%) |<p>The network interface utilization is close to its estimated maximum bandwidth.</p> |`(avg(/MikroTik CRS305-1G-4SIN SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik CRS305-1G-4SIN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) or avg(/MikroTik CRS305-1G-4SIN SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik CRS305-1G-4SIN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])) and last(/MikroTik CRS305-1G-4SIN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0`<p>Recovery expression:</p>`avg(/MikroTik CRS305-1G-4SIN SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik CRS305-1G-4SIN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) and avg(/MikroTik CRS305-1G-4SIN SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik CRS305-1G-4SIN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |Interface {#IFNAME}({#IFALIAS}): High error rate (>{$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) |<p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p> |`min(/MikroTik CRS305-1G-4SIN SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"} or min(/MikroTik CRS305-1G-4SIN SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`max(/MikroTik CRS305-1G-4SIN SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8 and max(/MikroTik CRS305-1G-4SIN SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
-|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik CRS305-1G-4SIN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik CRS305-1G-4SIN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik CRS305-1G-4SIN SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik CRS305-1G-4SIN SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik CRS305-1G-4SIN SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik CRS305-1G-4SIN SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik CRS305-1G-4SIN SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik CRS305-1G-4SIN SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik CRS305-1G-4SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2) `<p>Recovery expression:</p>`(change(/MikroTik CRS305-1G-4SIN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik CRS305-1G-4SIN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik CRS305-1G-4SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2) ` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik CRS305-1G-4SIN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik CRS305-1G-4SIN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik CRS305-1G-4SIN SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik CRS305-1G-4SIN SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik CRS305-1G-4SIN SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik CRS305-1G-4SIN SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik CRS305-1G-4SIN SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik CRS305-1G-4SIN SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik CRS305-1G-4SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2)`<p>Recovery expression:</p>`(change(/MikroTik CRS305-1G-4SIN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik CRS305-1G-4SIN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik CRS305-1G-4SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2)` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |{HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/MikroTik CRS305-1G-4SIN SNMP/system.uptime[sysUpTime.0])<10m` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- No SNMP data collection</p> |
 |No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/MikroTik CRS305-1G-4SIN SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |Unavailable by ICMP ping |<p>Last three attempts returned timeout.  Please check device connectivity.</p> |`max(/MikroTik CRS305-1G-4SIN SNMP/icmpping,#3)=0` |HIGH | |
 |High ICMP ping loss |<p>-</p> |`min(/MikroTik CRS305-1G-4SIN SNMP/icmppingloss,5m)>{$ICMP_LOSS_WARN} and min(/MikroTik CRS305-1G-4SIN SNMP/icmppingloss,5m)<100` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |High ICMP ping response time |<p>-</p> |`avg(/MikroTik CRS305-1G-4SIN SNMP/icmppingsec,5m)>{$ICMP_RESPONSE_TIME_WARN}` |WARNING |<p>**Depends on**:</p><p>- High ICMP ping loss</p><p>- Unavailable by ICMP ping</p> |
-|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS305-1G-4SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS305-1G-4SIN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS305-1G-4SIN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS305-1G-4SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
-|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS305-1G-4SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS305-1G-4SIN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS305-1G-4SIN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CRS305-1G-4SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS305-1G-4SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS305-1G-4SIN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS305-1G-4SIN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS305-1G-4SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS305-1G-4SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS305-1G-4SIN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS305-1G-4SIN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CRS305-1G-4SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
 |CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS305-1G-4SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CRS305-1G-4SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
 |CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS305-1G-4SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CRS305-1G-4SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
 |CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik CRS305-1G-4SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik CRS305-1G-4SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
diff --git a/templates/net/mikrotik/mikrotik_CRS305-1G-4S+IN_snmp/template_net_mikrotik_CRS305-1G-4S+IN_snmp.yaml b/templates/net/mikrotik/mikrotik_CRS305-1G-4S+IN_snmp/template_net_mikrotik_CRS305-1G-4S+IN_snmp.yaml
index f6214677409..602409abda0 100644
--- a/templates/net/mikrotik/mikrotik_CRS305-1G-4S+IN_snmp/template_net_mikrotik_CRS305-1G-4S+IN_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_CRS305-1G-4S+IN_snmp/template_net_mikrotik_CRS305-1G-4S+IN_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:44:46Z'
+  date: '2022-01-26T09:53:33Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -35,8 +35,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 31542fecf2794dcb8b96293087b71526
@@ -44,6 +47,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 896f08cd051e41a8bbb0f63fd1a23bb8
           name: 'ICMP loss'
@@ -54,8 +61,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: ded01e910a0046fa94a89c7011cc9514
@@ -67,6 +77,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CRS305-1G-4SIN SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 209d4503520a4a61a183f7f1c303a801
           name: 'ICMP response time'
@@ -77,8 +94,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 5c9b3116dc4140bdb7903a094fbf098f
@@ -93,6 +113,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CRS305-1G-4SIN SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 035cd00faa4b48d69b8ba9d93d5adb1a
           name: 'SNMP traps (fallback)'
@@ -105,8 +132,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: 44e64e9c36ce40d7b2a2138dab8030ee
           name: 'System contact details'
@@ -128,8 +155,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 14055a3a922f43c083ec97dcb8899085
           name: 'System description'
@@ -152,8 +179,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: a90c400056634a4b8e1befa2b5868e1c
           name: 'Firmware version'
@@ -174,8 +201,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 66ea5bdabba4438ba8f9959e0c4b24ec
@@ -185,6 +212,10 @@ zabbix_export:
               priority: INFO
               description: 'Firmware version has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: d1a55ccf0dd640439c149672d9f86c11
           name: 'Hardware model name'
@@ -203,8 +234,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
         -
           uuid: 4ab55ba9cf82449a8b683ded8c691a11
           name: 'Hardware serial number'
@@ -226,8 +257,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 425777ce38e54daba1f6501bd4f6bf6b
@@ -236,6 +267,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 1e385c4c4f7145d1a7973fe1f7dcc1ed
           name: 'System location'
@@ -257,8 +292,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 83cb30ef232d46f79f01c47ae7477270
           name: 'System name'
@@ -280,8 +315,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 1e2f2debb1cc4f13b133cbe6600c99cc
@@ -290,6 +325,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: 1c220049b4b94d08b35e03fde9111ded
           name: 'System object ID'
@@ -310,8 +352,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: dcb3f5f1561543959e170e62e61f1457
           name: 'Operating system'
@@ -333,8 +375,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: os
           triggers:
             -
               uuid: 73aec359593a4ce9ae07e66a39ea2275
@@ -347,6 +389,10 @@ zabbix_export:
                 -
                   name: 'System name has changed (new name: {ITEM.VALUE})'
                   expression: 'last(/MikroTik CRS305-1G-4SIN SNMP/system.name,#1)<>last(/MikroTik CRS305-1G-4SIN SNMP/system.name,#2) and length(last(/MikroTik CRS305-1G-4SIN SNMP/system.name))>0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 2b284f4d96704b71920bc8b3beac050c
           name: Uptime
@@ -367,8 +413,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: a888ad0e55f14ba0803bf6923dc7d227
@@ -381,6 +427,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/MikroTik CRS305-1G-4SIN SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 4cf79d752ffe4eeeb80db78bd1f39813
           name: 'Total memory'
@@ -407,8 +457,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 4682ebaf961d4782b7447de52646dfd4
           name: 'Used memory'
@@ -427,8 +477,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 805237bf56894386acfc37c7f38ad907
           name: 'Memory utilization'
@@ -441,8 +491,8 @@ zabbix_export:
           description: 'Memory utilization in %'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: 179753654a4849d48935c10417994eb7
@@ -450,6 +500,13 @@ zabbix_export:
               name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
               priority: AVERAGE
               description: 'The system is running out of free memory.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 3616f93a2ed449e38d95722f4e318497
           name: 'SNMP agent availability'
@@ -466,8 +523,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 3efee76288274e42921647d5a1d82ab1
@@ -480,6 +540,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CRS305-1G-4SIN SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: dcc0b3e7e4304c27b9156deb1fb56781
@@ -504,8 +568,8 @@ zabbix_export:
                 The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
               trigger_prototypes:
                 -
                   uuid: 295ec169c36b482790f9091db3a39357
@@ -514,6 +578,10 @@ zabbix_export:
                   opdata: 'Current utilization: {ITEM.LASTVALUE1}'
                   priority: WARNING
                   description: 'CPU utilization is too high. The system might be slow to respond.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: aec4c254cd944a1f8ac6bc911e6ab77c
@@ -558,8 +626,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: ae05e13963974301850e66f5e4f33a2c
@@ -570,6 +638,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: f5b55111b94e427082a07baa856bb4fb
                   expression: 'avg(/MikroTik CRS305-1G-4SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
@@ -584,6 +659,13 @@ zabbix_export:
                       name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
                       expression: 'avg(/MikroTik CRS305-1G-4SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
                       recovery_expression: 'max(/MikroTik CRS305-1G-4SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 1e19d78e1b394165ab9dc6da8c072ab8
                   expression: 'avg(/MikroTik CRS305-1G-4SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
@@ -592,6 +674,13 @@ zabbix_export:
                   name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 13c315f3af5747deb5590a52d979f2df
           name: 'Temperature sensor discovery'
@@ -601,8 +690,7 @@ zabbix_export:
           delay: 1h
           description: |
             MIKROTIK-MIB::mtxrHlTemperature
-            Since temperature sensor is not available on all Mikrotik hardware,
-            this is done to avoid unsupported items.
+            Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.
           item_prototypes:
             -
               uuid: 6915ae48936a4ce084412df12c92b80f
@@ -626,8 +714,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 588874bb24d64ca6b10179eab36fa7c2
@@ -638,6 +726,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 40cd8afdf46a4d03aa426cedd7ce7d9a
                   expression: 'avg(/MikroTik CRS305-1G-4SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
@@ -652,6 +747,13 @@ zabbix_export:
                       name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
                       expression: 'avg(/MikroTik CRS305-1G-4SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
                       recovery_expression: 'max(/MikroTik CRS305-1G-4SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: ae2260c1ecdd44e48e72d43ce1936222
                   expression: 'avg(/MikroTik CRS305-1G-4SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
@@ -660,6 +762,13 @@ zabbix_export:
                   name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 87ca6cf207f147bc926d521530449c81
           name: 'LTE modem discovery'
@@ -694,14 +803,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRP Reference Signal Received Power.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 1e1893cd271a4b1f9d04afb520cd6925
                   expression: 'max(/MikroTik CRS305-1G-4SIN SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 9e1d91dcc55b43b9a9a33a50e08f7037
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
@@ -716,14 +838,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: c045d57678f4478cb6caf5fb0a80d0e9
                   expression: 'max(/MikroTik CRS305-1G-4SIN SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 45cb37b6dcb64115b7fc021359f5e2e1
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
@@ -738,14 +873,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 8125b0058dfd42e786bcf3cac7ab4c88
                   expression: 'max(/MikroTik CRS305-1G-4SIN SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: da44c19b868a41058a5c91792e4153b0
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
@@ -760,14 +908,27 @@ zabbix_export:
                 mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: bf70869515ec4c35814efa05b8305403
                   expression: 'max(/MikroTik CRS305-1G-4SIN SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 15a4213a18ae489f8f11aa948a075e68
@@ -828,8 +989,14 @@ zabbix_export:
                 mtxrWlApAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: c57390f8e3764add926431b9b6351ea0
               name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
@@ -849,8 +1016,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 4723a555cf1e4c179e9af54cd8c7ca10
               name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
@@ -870,8 +1043,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 0004683dd9e84d3b92bb5f6b5304bb9b
               name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
@@ -890,8 +1069,14 @@ zabbix_export:
                     - 15m
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: b4e81fbbecf2479798c604c3514b25d9
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -904,8 +1089,14 @@ zabbix_export:
                 mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
         -
           uuid: 26e3b6942ca64f0ca17080a7149d695c
           name: 'CAPsMAN AP channel discovery'
@@ -938,8 +1129,14 @@ zabbix_export:
                 mtxrWlCMAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: b06f561f915f43c198d4fd011ea676f0
               name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
@@ -959,8 +1156,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: f14009a9bae64d0ba293f710149ca764
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -973,8 +1176,14 @@ zabbix_export:
                 mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 62ae5c6fc3504346b37b997798bd635e
               name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
@@ -994,8 +1203,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 9b78a081991540cda9aad21e6255b632
@@ -1003,6 +1218,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
                   priority: WARNING
                   description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 341d0f810f7b47e4ac81a7bf25716179
           name: 'Network interfaces discovery'
@@ -1091,8 +1313,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: d758573510064110bdd2b4319476d909
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -1111,8 +1339,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 405b8cbc415a4d63a9ce1d925d89c233
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -1136,8 +1370,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 0afa40c2bcd24f09b4ab9943cf383198
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -1160,8 +1400,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: dac4dcac3a8244448aa9c41a369dac2f
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -1180,8 +1426,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 7063424dec694e81900014d9e0281d13
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -1205,8 +1457,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 7b50701968654f54815b9952a224ae5b
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -1231,8 +1489,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: f7ea1a7b96cd4095b1bb71b023a55a5d
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -1254,8 +1518,14 @@ zabbix_export:
                 name: 'IF-MIB::ifOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 979f432cdb8442faa8105b295b394dda
@@ -1273,6 +1543,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: c45e431a237d44ad9942c388d8399016
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -1296,8 +1570,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           trigger_prototypes:
             -
               uuid: 19b7437f8a91461da91c77abec3ae9f2
@@ -1327,6 +1607,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CRS305-1G-4SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CRS305-1G-4SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CRS305-1G-4SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CRS305-1G-4SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 462f683cfd5d4c5096b23d7051440671
               expression: |
@@ -1347,6 +1631,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CRS305-1G-4SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CRS305-1G-4SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CRS305-1G-4SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CRS305-1G-4SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 25641b52614a4e3b9a11af9212c47b4f
               expression: |
@@ -1366,6 +1654,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CRS305-1G-4SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CRS305-1G-4SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CRS305-1G-4SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CRS305-1G-4SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: 4262ac5550524146acac664b0bd65f3f
@@ -1444,8 +1739,11 @@ zabbix_export:
               description: 'Space utilization in % for Disk-{#SNMPINDEX}'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: afec00d5d90c4386b2d32c03f22a6374
               name: 'Disk-{#SNMPINDEX}: Total space'
@@ -1472,8 +1770,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: b3bb874134804e9f8370a774867715bd
               name: 'Disk-{#SNMPINDEX}: Used space'
@@ -1492,8 +1793,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
           trigger_prototypes:
             -
               uuid: 7589fe3f0e3e4c26ac21cd314b1c07e7
@@ -1509,6 +1813,13 @@ zabbix_export:
                  - The disk free space is less than 5G.
                  - The disk will be full in less than 24 hours.
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
             -
               uuid: 30977d9643d6482c89fe5a08030c559a
               expression: |
@@ -1529,6 +1840,13 @@ zabbix_export:
                   expression: |
                     last(/MikroTik CRS305-1G-4SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
                     ((last(/MikroTik CRS305-1G-4SIN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS305-1G-4SIN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS305-1G-4SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
           graph_prototypes:
             -
               uuid: 7924cfc798e048918fc496133557bea2
@@ -1552,6 +1870,16 @@ zabbix_export:
                   item:
                     host: 'MikroTik CRS305-1G-4SIN SNMP'
                     key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: crs305-1g-4splusin
+        -
+          tag: target
+          value: mikrotik
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/net/mikrotik/mikrotik_CRS309-1G-8S+IN_snmp/README.md b/templates/net/mikrotik/mikrotik_CRS309-1G-8S+IN_snmp/README.md
index 083818826c6..0ec4dd9528b 100644
--- a/templates/net/mikrotik/mikrotik_CRS309-1G-8S+IN_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_CRS309-1G-8S+IN_snmp/README.md
@@ -71,7 +71,7 @@ There are no template links in this template.
 |Network interfaces discovery |<p>Discovering interfaces from IF-MIB.</p> |SNMP |net.if.discovery<p>**Filter**:</p>AND <p>- {#IFADMINSTATUS} MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.MATCHES}`</p><p>- {#IFADMINSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.NOT_MATCHES}`</p><p>- {#IFOPERSTATUS} MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.MATCHES}`</p><p>- {#IFOPERSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.NOT_MATCHES}`</p><p>- {#IFNAME} MATCHES_REGEX `{$NET.IF.IFNAME.MATCHES}`</p><p>- {#IFNAME} NOT_MATCHES_REGEX `{$NET.IF.IFNAME.NOT_MATCHES}`</p><p>- {#IFDESCR} MATCHES_REGEX `{$NET.IF.IFDESCR.MATCHES}`</p><p>- {#IFDESCR} NOT_MATCHES_REGEX `{$NET.IF.IFDESCR.NOT_MATCHES}`</p><p>- {#IFALIAS} MATCHES_REGEX `{$NET.IF.IFALIAS.MATCHES}`</p><p>- {#IFALIAS} NOT_MATCHES_REGEX `{$NET.IF.IFALIAS.NOT_MATCHES}`</p><p>- {#IFTYPE} MATCHES_REGEX `{$NET.IF.IFTYPE.MATCHES}`</p><p>- {#IFTYPE} NOT_MATCHES_REGEX `{$NET.IF.IFTYPE.NOT_MATCHES}`</p> |
 |Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 |Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
-|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
 
 ## Items collected
 
@@ -137,14 +137,14 @@ There are no template links in this template.
 |Interface {#IFNAME}({#IFALIAS}): Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p><p>3. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CRS309-1G-8SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CRS309-1G-8SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CRS309-1G-8SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))`<p>Recovery expression:</p>`last(/MikroTik CRS309-1G-8SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0` |AVERAGE |<p>Manual close: YES</p> |
 |Interface {#IFNAME}({#IFALIAS}): High bandwidth usage (>{$IF.UTIL.MAX:"{#IFNAME}"}%) |<p>The network interface utilization is close to its estimated maximum bandwidth.</p> |`(avg(/MikroTik CRS309-1G-8SIN SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik CRS309-1G-8SIN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) or avg(/MikroTik CRS309-1G-8SIN SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik CRS309-1G-8SIN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])) and last(/MikroTik CRS309-1G-8SIN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0`<p>Recovery expression:</p>`avg(/MikroTik CRS309-1G-8SIN SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik CRS309-1G-8SIN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) and avg(/MikroTik CRS309-1G-8SIN SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik CRS309-1G-8SIN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |Interface {#IFNAME}({#IFALIAS}): High error rate (>{$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) |<p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p> |`min(/MikroTik CRS309-1G-8SIN SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"} or min(/MikroTik CRS309-1G-8SIN SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`max(/MikroTik CRS309-1G-8SIN SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8 and max(/MikroTik CRS309-1G-8SIN SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
-|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik CRS309-1G-8SIN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik CRS309-1G-8SIN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik CRS309-1G-8SIN SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik CRS309-1G-8SIN SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik CRS309-1G-8SIN SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik CRS309-1G-8SIN SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik CRS309-1G-8SIN SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik CRS309-1G-8SIN SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik CRS309-1G-8SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2) `<p>Recovery expression:</p>`(change(/MikroTik CRS309-1G-8SIN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik CRS309-1G-8SIN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik CRS309-1G-8SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2) ` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik CRS309-1G-8SIN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik CRS309-1G-8SIN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik CRS309-1G-8SIN SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik CRS309-1G-8SIN SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik CRS309-1G-8SIN SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik CRS309-1G-8SIN SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik CRS309-1G-8SIN SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik CRS309-1G-8SIN SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik CRS309-1G-8SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2)`<p>Recovery expression:</p>`(change(/MikroTik CRS309-1G-8SIN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik CRS309-1G-8SIN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik CRS309-1G-8SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2)` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |{HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/MikroTik CRS309-1G-8SIN SNMP/system.uptime[sysUpTime.0])<10m` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- No SNMP data collection</p> |
 |No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/MikroTik CRS309-1G-8SIN SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |Unavailable by ICMP ping |<p>Last three attempts returned timeout.  Please check device connectivity.</p> |`max(/MikroTik CRS309-1G-8SIN SNMP/icmpping,#3)=0` |HIGH | |
 |High ICMP ping loss |<p>-</p> |`min(/MikroTik CRS309-1G-8SIN SNMP/icmppingloss,5m)>{$ICMP_LOSS_WARN} and min(/MikroTik CRS309-1G-8SIN SNMP/icmppingloss,5m)<100` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |High ICMP ping response time |<p>-</p> |`avg(/MikroTik CRS309-1G-8SIN SNMP/icmppingsec,5m)>{$ICMP_RESPONSE_TIME_WARN}` |WARNING |<p>**Depends on**:</p><p>- High ICMP ping loss</p><p>- Unavailable by ICMP ping</p> |
-|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS309-1G-8SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS309-1G-8SIN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS309-1G-8SIN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS309-1G-8SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
-|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS309-1G-8SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS309-1G-8SIN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS309-1G-8SIN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CRS309-1G-8SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS309-1G-8SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS309-1G-8SIN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS309-1G-8SIN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS309-1G-8SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS309-1G-8SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS309-1G-8SIN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS309-1G-8SIN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CRS309-1G-8SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
 |CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS309-1G-8SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CRS309-1G-8SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
 |CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS309-1G-8SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CRS309-1G-8SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
 |CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik CRS309-1G-8SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik CRS309-1G-8SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
diff --git a/templates/net/mikrotik/mikrotik_CRS309-1G-8S+IN_snmp/template_net_mikrotik_CRS309-1G-8S+IN_snmp.yaml b/templates/net/mikrotik/mikrotik_CRS309-1G-8S+IN_snmp/template_net_mikrotik_CRS309-1G-8S+IN_snmp.yaml
index d322322de65..7b32f69bbb4 100644
--- a/templates/net/mikrotik/mikrotik_CRS309-1G-8S+IN_snmp/template_net_mikrotik_CRS309-1G-8S+IN_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_CRS309-1G-8S+IN_snmp/template_net_mikrotik_CRS309-1G-8S+IN_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:44:52Z'
+  date: '2022-01-26T09:47:48Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -35,8 +35,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 16bfb1a39fe54fa0b512ed93c8c3b00a
@@ -44,6 +47,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 3b909ebca73b4baa9364db355d5e59d7
           name: 'ICMP loss'
@@ -54,8 +61,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: d166ae7475f5416499b46a00cf5de374
@@ -67,6 +77,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CRS309-1G-8SIN SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 29d7a47ae93d4911991c092032c1ee9b
           name: 'ICMP response time'
@@ -77,8 +94,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: a59d0752d5724f01a783ef8b4131b9d4
@@ -93,6 +113,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CRS309-1G-8SIN SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 2c3c5ede40d241669525c556c59faa95
           name: 'SNMP traps (fallback)'
@@ -105,8 +132,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: 46ec5face2a247c68467116594f4ed53
           name: 'System contact details'
@@ -128,8 +155,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 6b823352365a4b4da3437839445f7373
           name: 'System description'
@@ -152,8 +179,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: a66560b690d544ef8fc657812a602157
           name: 'Firmware version'
@@ -174,8 +201,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 32127aca202644c5915255006e9544b5
@@ -185,6 +212,10 @@ zabbix_export:
               priority: INFO
               description: 'Firmware version has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: c8239bb961ee453da2885a8abef9be34
           name: 'Hardware model name'
@@ -203,8 +234,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
         -
           uuid: df405f764813407eb03d6f7a6308c5cc
           name: 'Hardware serial number'
@@ -226,8 +257,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 7bb01da1713c42c1ab28c1ae2adc1260
@@ -236,6 +267,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 0f0dfeaaac954d2fbc3a6b20dc756c59
           name: 'System location'
@@ -257,8 +292,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 0a4d7bb40fbb49c48d210e763b3f2426
           name: 'System name'
@@ -280,8 +315,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 01cb61daac1f42d3ab0a5fafd2b113a4
@@ -290,6 +325,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: a307185251ec4bb7a2fafc41fabf7eee
           name: 'System object ID'
@@ -310,8 +352,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 55775fa17c604dddb86c7644556830e6
           name: 'Operating system'
@@ -333,8 +375,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: os
           triggers:
             -
               uuid: 28568c2163ee4a0aa262241064922c7d
@@ -347,6 +389,10 @@ zabbix_export:
                 -
                   name: 'System name has changed (new name: {ITEM.VALUE})'
                   expression: 'last(/MikroTik CRS309-1G-8SIN SNMP/system.name,#1)<>last(/MikroTik CRS309-1G-8SIN SNMP/system.name,#2) and length(last(/MikroTik CRS309-1G-8SIN SNMP/system.name))>0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 0c36805ca5cd40d099060ee447cb85db
           name: Uptime
@@ -367,8 +413,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: a1d58fc2668b465a81a86536c1f646ad
@@ -381,6 +427,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/MikroTik CRS309-1G-8SIN SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 14aff8f369f9440aac2110a4a52e7eb5
           name: 'Total memory'
@@ -407,8 +457,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: cbe45fbc0f9e4b1a94966ccb859463ae
           name: 'Used memory'
@@ -427,8 +477,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 03626c0f7cf24394b47f24a1af36dcd0
           name: 'Memory utilization'
@@ -441,8 +491,8 @@ zabbix_export:
           description: 'Memory utilization in %'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: 7224d01c717a4dd3800fbd8d8e9399b8
@@ -450,6 +500,13 @@ zabbix_export:
               name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
               priority: AVERAGE
               description: 'The system is running out of free memory.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 1620fd9982ed4e27a2e4bfcff915765e
           name: 'SNMP agent availability'
@@ -466,8 +523,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: a564c084ec414271b212db6c9b301db7
@@ -480,6 +540,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CRS309-1G-8SIN SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: 3c978b9c2e4c4c01b7ec7ce7af02f27a
@@ -504,8 +568,8 @@ zabbix_export:
                 The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
               trigger_prototypes:
                 -
                   uuid: d6343a3648f0493bb786d598a8e51ab4
@@ -514,6 +578,10 @@ zabbix_export:
                   opdata: 'Current utilization: {ITEM.LASTVALUE1}'
                   priority: WARNING
                   description: 'CPU utilization is too high. The system might be slow to respond.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 00464f2edb3f47cdbd60b0801ffeff2a
@@ -558,8 +626,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 6b909503dc46413fad04d4cf4d7b6939
@@ -570,6 +638,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 94833673685645f68729a8f98b5a213e
                   expression: 'avg(/MikroTik CRS309-1G-8SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
@@ -584,6 +659,13 @@ zabbix_export:
                       name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
                       expression: 'avg(/MikroTik CRS309-1G-8SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
                       recovery_expression: 'max(/MikroTik CRS309-1G-8SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: aac8de5837494421a642793cc5a9009c
                   expression: 'avg(/MikroTik CRS309-1G-8SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
@@ -592,6 +674,13 @@ zabbix_export:
                   name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 24e13986d6224173bec425a3ca2562fa
           name: 'Temperature sensor discovery'
@@ -601,8 +690,7 @@ zabbix_export:
           delay: 1h
           description: |
             MIKROTIK-MIB::mtxrHlTemperature
-            Since temperature sensor is not available on all Mikrotik hardware,
-            this is done to avoid unsupported items.
+            Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.
           item_prototypes:
             -
               uuid: 9909cd00a6a24e7693bcee846e806bd2
@@ -626,8 +714,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 3d4dc47de9db4049a4baebf68df16b1e
@@ -638,6 +726,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: cf105fee78774aa7ae119f2638528423
                   expression: 'avg(/MikroTik CRS309-1G-8SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
@@ -652,6 +747,13 @@ zabbix_export:
                       name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
                       expression: 'avg(/MikroTik CRS309-1G-8SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
                       recovery_expression: 'max(/MikroTik CRS309-1G-8SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 1bf28981db8d414199c3fb7bd20e669a
                   expression: 'avg(/MikroTik CRS309-1G-8SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
@@ -660,6 +762,13 @@ zabbix_export:
                   name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 9acd8e04d272467c8c1cd0452068bf93
           name: 'LTE modem discovery'
@@ -694,14 +803,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRP Reference Signal Received Power.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: c27c37092c5f48f1944417cbd47f6c25
                   expression: 'max(/MikroTik CRS309-1G-8SIN SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: a418c6b3e88f45a398daf2c0fc529d13
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
@@ -716,14 +838,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 9525ed0ec7bb426587ffcf4879590d5b
                   expression: 'max(/MikroTik CRS309-1G-8SIN SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: e0659a14e4c14779a02bc4bd5fa2b8cf
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
@@ -738,14 +873,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: d7c501de314140aeb2b6f344bad2c501
                   expression: 'max(/MikroTik CRS309-1G-8SIN SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 2fe3fa0e2ec84a098add91a09ff9332d
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
@@ -760,14 +908,27 @@ zabbix_export:
                 mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: f124b3bbba784fff966adef3c722eb70
                   expression: 'max(/MikroTik CRS309-1G-8SIN SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 2c2721344ed74562912a7c7526f84314
@@ -828,8 +989,14 @@ zabbix_export:
                 mtxrWlApAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 2cac58114b934cd4bf6738db973f04e7
               name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
@@ -849,8 +1016,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: eb1304a13add439b8a0eba33f0be85bd
               name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
@@ -870,8 +1043,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 9135865a5f6341449f661b2effe38c19
               name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
@@ -890,8 +1069,14 @@ zabbix_export:
                     - 15m
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 10ca39f536ec49e081e0edc5c0b2972f
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -904,8 +1089,14 @@ zabbix_export:
                 mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
         -
           uuid: 2b6a52cd5f1b4786a6176b4ea11887fb
           name: 'CAPsMAN AP channel discovery'
@@ -938,8 +1129,14 @@ zabbix_export:
                 mtxrWlCMAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 17646c7e68fa4733a8ecccd3321513c5
               name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
@@ -959,8 +1156,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 3c0beda9dfe0447f953a3be51fba7e48
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -973,8 +1176,14 @@ zabbix_export:
                 mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: d327bafe453345468ed568b30c3c0ca5
               name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
@@ -994,8 +1203,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: aa16e2906256441bb0c6680e9c95f547
@@ -1003,6 +1218,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
                   priority: WARNING
                   description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: b761c3efd08042499f1a87cd73ee0cd1
           name: 'Network interfaces discovery'
@@ -1091,8 +1313,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 81c3d7ef1c7f414e8f19d8f4f8937e1b
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -1111,8 +1339,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 5f99d418a9d94f2d97656fa59604404c
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -1136,8 +1370,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 6a99973eda6a4005b28ff986e800b123
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -1160,8 +1400,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: e7f43353462e418188c3c00379138466
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -1180,8 +1426,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: fa23f5e5fbf847c2b1d6b5eb38e05a59
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -1205,8 +1457,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 5cfd077fd3484986a6888b6e2be6e5fa
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -1231,8 +1489,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: fef3726d05b346db9adb9f0b8e1f65e2
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -1254,8 +1518,14 @@ zabbix_export:
                 name: 'IF-MIB::ifOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: b810190964d44084b2294ea56c7b5ee5
@@ -1273,6 +1543,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 12cba2c25cab458f8792bcb7226cf714
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -1296,8 +1570,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           trigger_prototypes:
             -
               uuid: 370d7a702a62401ca9dd904b3c7ec39c
@@ -1327,6 +1607,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CRS309-1G-8SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CRS309-1G-8SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CRS309-1G-8SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CRS309-1G-8SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: b78e00216b3441fbb217d6b14cba2979
               expression: |
@@ -1347,6 +1631,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CRS309-1G-8SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CRS309-1G-8SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CRS309-1G-8SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CRS309-1G-8SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 921716eadabd441d87d23a53ea1ffa8e
               expression: |
@@ -1366,6 +1654,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CRS309-1G-8SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CRS309-1G-8SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CRS309-1G-8SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CRS309-1G-8SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: 5781cd59d9864144817fbe3a258d9cb6
@@ -1444,8 +1739,11 @@ zabbix_export:
               description: 'Space utilization in % for Disk-{#SNMPINDEX}'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 9bcda8136943432eaedfa8ed80dd48e7
               name: 'Disk-{#SNMPINDEX}: Total space'
@@ -1472,8 +1770,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 19b70b4990ca4813a0237a5bd6b8915b
               name: 'Disk-{#SNMPINDEX}: Used space'
@@ -1492,8 +1793,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
           trigger_prototypes:
             -
               uuid: 2d873bbec47d4b3281b1aa33c87c60a0
@@ -1509,6 +1813,13 @@ zabbix_export:
                  - The disk free space is less than 5G.
                  - The disk will be full in less than 24 hours.
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
             -
               uuid: 6bab52e75f8e4286a7c4ec7336a4d417
               expression: |
@@ -1529,6 +1840,13 @@ zabbix_export:
                   expression: |
                     last(/MikroTik CRS309-1G-8SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
                     ((last(/MikroTik CRS309-1G-8SIN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS309-1G-8SIN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS309-1G-8SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
           graph_prototypes:
             -
               uuid: 9a733d07f30643769872935987fbbc14
@@ -1552,6 +1870,16 @@ zabbix_export:
                   item:
                     host: 'MikroTik CRS309-1G-8SIN SNMP'
                     key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: crs309-1g-8splusin
+        -
+          tag: target
+          value: mikrotik
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/net/mikrotik/mikrotik_CRS312-4C+8XG-RM_snmp/README.md b/templates/net/mikrotik/mikrotik_CRS312-4C+8XG-RM_snmp/README.md
index 9fb6e9d969a..238eec23d80 100644
--- a/templates/net/mikrotik/mikrotik_CRS312-4C+8XG-RM_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_CRS312-4C+8XG-RM_snmp/README.md
@@ -71,7 +71,7 @@ There are no template links in this template.
 |Network interfaces discovery |<p>Discovering interfaces from IF-MIB.</p> |SNMP |net.if.discovery<p>**Filter**:</p>AND <p>- {#IFADMINSTATUS} MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.MATCHES}`</p><p>- {#IFADMINSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.NOT_MATCHES}`</p><p>- {#IFOPERSTATUS} MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.MATCHES}`</p><p>- {#IFOPERSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.NOT_MATCHES}`</p><p>- {#IFNAME} MATCHES_REGEX `{$NET.IF.IFNAME.MATCHES}`</p><p>- {#IFNAME} NOT_MATCHES_REGEX `{$NET.IF.IFNAME.NOT_MATCHES}`</p><p>- {#IFDESCR} MATCHES_REGEX `{$NET.IF.IFDESCR.MATCHES}`</p><p>- {#IFDESCR} NOT_MATCHES_REGEX `{$NET.IF.IFDESCR.NOT_MATCHES}`</p><p>- {#IFALIAS} MATCHES_REGEX `{$NET.IF.IFALIAS.MATCHES}`</p><p>- {#IFALIAS} NOT_MATCHES_REGEX `{$NET.IF.IFALIAS.NOT_MATCHES}`</p><p>- {#IFTYPE} MATCHES_REGEX `{$NET.IF.IFTYPE.MATCHES}`</p><p>- {#IFTYPE} NOT_MATCHES_REGEX `{$NET.IF.IFTYPE.NOT_MATCHES}`</p> |
 |Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 |Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
-|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
 
 ## Items collected
 
@@ -137,14 +137,14 @@ There are no template links in this template.
 |Interface {#IFNAME}({#IFALIAS}): Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p><p>3. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CRS312-4C8XG-RM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CRS312-4C8XG-RM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CRS312-4C8XG-RM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))`<p>Recovery expression:</p>`last(/MikroTik CRS312-4C8XG-RM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0` |AVERAGE |<p>Manual close: YES</p> |
 |Interface {#IFNAME}({#IFALIAS}): High bandwidth usage (>{$IF.UTIL.MAX:"{#IFNAME}"}%) |<p>The network interface utilization is close to its estimated maximum bandwidth.</p> |`(avg(/MikroTik CRS312-4C8XG-RM SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik CRS312-4C8XG-RM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) or avg(/MikroTik CRS312-4C8XG-RM SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik CRS312-4C8XG-RM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])) and last(/MikroTik CRS312-4C8XG-RM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0`<p>Recovery expression:</p>`avg(/MikroTik CRS312-4C8XG-RM SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik CRS312-4C8XG-RM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) and avg(/MikroTik CRS312-4C8XG-RM SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik CRS312-4C8XG-RM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |Interface {#IFNAME}({#IFALIAS}): High error rate (>{$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) |<p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p> |`min(/MikroTik CRS312-4C8XG-RM SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"} or min(/MikroTik CRS312-4C8XG-RM SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`max(/MikroTik CRS312-4C8XG-RM SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8 and max(/MikroTik CRS312-4C8XG-RM SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
-|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik CRS312-4C8XG-RM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik CRS312-4C8XG-RM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik CRS312-4C8XG-RM SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik CRS312-4C8XG-RM SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik CRS312-4C8XG-RM SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik CRS312-4C8XG-RM SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik CRS312-4C8XG-RM SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik CRS312-4C8XG-RM SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik CRS312-4C8XG-RM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2) `<p>Recovery expression:</p>`(change(/MikroTik CRS312-4C8XG-RM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik CRS312-4C8XG-RM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik CRS312-4C8XG-RM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2) ` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik CRS312-4C8XG-RM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik CRS312-4C8XG-RM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik CRS312-4C8XG-RM SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik CRS312-4C8XG-RM SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik CRS312-4C8XG-RM SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik CRS312-4C8XG-RM SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik CRS312-4C8XG-RM SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik CRS312-4C8XG-RM SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik CRS312-4C8XG-RM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2)`<p>Recovery expression:</p>`(change(/MikroTik CRS312-4C8XG-RM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik CRS312-4C8XG-RM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik CRS312-4C8XG-RM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2)` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |{HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/MikroTik CRS312-4C8XG-RM SNMP/system.uptime[sysUpTime.0])<10m` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- No SNMP data collection</p> |
 |No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/MikroTik CRS312-4C8XG-RM SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |Unavailable by ICMP ping |<p>Last three attempts returned timeout.  Please check device connectivity.</p> |`max(/MikroTik CRS312-4C8XG-RM SNMP/icmpping,#3)=0` |HIGH | |
 |High ICMP ping loss |<p>-</p> |`min(/MikroTik CRS312-4C8XG-RM SNMP/icmppingloss,5m)>{$ICMP_LOSS_WARN} and min(/MikroTik CRS312-4C8XG-RM SNMP/icmppingloss,5m)<100` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |High ICMP ping response time |<p>-</p> |`avg(/MikroTik CRS312-4C8XG-RM SNMP/icmppingsec,5m)>{$ICMP_RESPONSE_TIME_WARN}` |WARNING |<p>**Depends on**:</p><p>- High ICMP ping loss</p><p>- Unavailable by ICMP ping</p> |
-|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS312-4C8XG-RM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS312-4C8XG-RM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS312-4C8XG-RM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS312-4C8XG-RM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
-|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS312-4C8XG-RM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS312-4C8XG-RM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS312-4C8XG-RM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CRS312-4C8XG-RM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS312-4C8XG-RM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS312-4C8XG-RM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS312-4C8XG-RM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS312-4C8XG-RM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS312-4C8XG-RM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS312-4C8XG-RM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS312-4C8XG-RM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CRS312-4C8XG-RM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
 |CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS312-4C8XG-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CRS312-4C8XG-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
 |CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS312-4C8XG-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CRS312-4C8XG-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
 |CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik CRS312-4C8XG-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik CRS312-4C8XG-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
diff --git a/templates/net/mikrotik/mikrotik_CRS312-4C+8XG-RM_snmp/template_net_mikrotik_CRS312-4C+8XG-RM_snmp.yaml b/templates/net/mikrotik/mikrotik_CRS312-4C+8XG-RM_snmp/template_net_mikrotik_CRS312-4C+8XG-RM_snmp.yaml
index 6e8c1466ff5..f6fe1657d84 100644
--- a/templates/net/mikrotik/mikrotik_CRS312-4C+8XG-RM_snmp/template_net_mikrotik_CRS312-4C+8XG-RM_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_CRS312-4C+8XG-RM_snmp/template_net_mikrotik_CRS312-4C+8XG-RM_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:44:58Z'
+  date: '2022-01-26T10:45:35Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -35,8 +35,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: db42c8af11744c5ab3f47f72ebc4a510
@@ -44,6 +47,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: cf937bb3e6524714a037c79e3fd09982
           name: 'ICMP loss'
@@ -54,8 +61,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 844a3542770748cf9a99070e6f55fba6
@@ -67,6 +77,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CRS312-4C8XG-RM SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: f5b621e08b5e41949dde460f61ef5458
           name: 'ICMP response time'
@@ -77,8 +94,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 4b4911507b374dfc9c1b105c4c09e3b8
@@ -93,6 +113,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CRS312-4C8XG-RM SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: a018cf2626764f17853a526f5b6d574e
           name: 'SNMP traps (fallback)'
@@ -105,8 +132,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: 03af1591f3af444781a6a3e058de7dd6
           name: 'System contact details'
@@ -128,8 +155,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: c0f09ce0c4d7454dab1474a606de48a0
           name: 'System description'
@@ -152,8 +179,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 7befae11c37c415c821465a2b923d901
           name: 'Firmware version'
@@ -174,8 +201,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 58b860a92baa43158419a843ae89687f
@@ -185,6 +212,10 @@ zabbix_export:
               priority: INFO
               description: 'Firmware version has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: f533de2af2824b30a43995499f5ec467
           name: 'Hardware model name'
@@ -203,8 +234,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
         -
           uuid: 4cb71c3fa0aa4ca8aa4c2c03a017a28a
           name: 'Hardware serial number'
@@ -226,8 +257,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 54368f9d9e9f494ba55f8f5fac20196b
@@ -236,6 +267,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 50d138e88427408a858322b2a3d31d78
           name: 'System location'
@@ -257,8 +292,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 4c1fbb2ffa0246f7be58fd4d82f6009e
           name: 'System name'
@@ -280,8 +315,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: dc073a13e66f4d528af68db048184c2f
@@ -290,6 +325,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: 2d1e9c027c0e40faa7ba792de117eafb
           name: 'System object ID'
@@ -310,8 +352,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 1e0024446d5f4696919f3a246dda3868
           name: 'Operating system'
@@ -333,8 +375,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: os
           triggers:
             -
               uuid: dd39ada0b3b14009968866d766e9e16d
@@ -347,6 +389,10 @@ zabbix_export:
                 -
                   name: 'System name has changed (new name: {ITEM.VALUE})'
                   expression: 'last(/MikroTik CRS312-4C8XG-RM SNMP/system.name,#1)<>last(/MikroTik CRS312-4C8XG-RM SNMP/system.name,#2) and length(last(/MikroTik CRS312-4C8XG-RM SNMP/system.name))>0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 7bd86e80b5154212bc883dc5bd15cad7
           name: Uptime
@@ -367,8 +413,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 1cfae25fa7b041b98b5b97a5bca0796a
@@ -381,6 +427,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/MikroTik CRS312-4C8XG-RM SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 06bdef85cb3849819a6fa43dfcdf7ba1
           name: 'Total memory'
@@ -407,8 +457,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 05b7592dca7744e39bbea87e73b6062c
           name: 'Used memory'
@@ -427,8 +477,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: f39b87bfab3347b1bc016a35aa58f1be
           name: 'Memory utilization'
@@ -441,8 +491,8 @@ zabbix_export:
           description: 'Memory utilization in %'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: de55f957c95d404380cb490126f88e3d
@@ -450,6 +500,13 @@ zabbix_export:
               name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
               priority: AVERAGE
               description: 'The system is running out of free memory.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 3687b61660ab43ba9abd8be56f5de6aa
           name: 'SNMP agent availability'
@@ -466,8 +523,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: cb430613680b4bd087d79a4f1004f453
@@ -480,6 +540,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CRS312-4C8XG-RM SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: 9f244f13f1c346feb1852908e347a9ce
@@ -504,8 +568,8 @@ zabbix_export:
                 The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
               trigger_prototypes:
                 -
                   uuid: 693899638cc1411a9f178cdf6d53b22a
@@ -514,6 +578,10 @@ zabbix_export:
                   opdata: 'Current utilization: {ITEM.LASTVALUE1}'
                   priority: WARNING
                   description: 'CPU utilization is too high. The system might be slow to respond.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 57470db47a7543ae906b1a567f31b0df
@@ -558,8 +626,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 9084cab74227494d9ebd02ea9a4309d2
@@ -570,6 +638,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 5dc37a79bb254104a9a46383b14b0e3e
                   expression: 'avg(/MikroTik CRS312-4C8XG-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
@@ -584,6 +659,13 @@ zabbix_export:
                       name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
                       expression: 'avg(/MikroTik CRS312-4C8XG-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
                       recovery_expression: 'max(/MikroTik CRS312-4C8XG-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 35fd07bdd3d84ccab6172255af3989ac
                   expression: 'avg(/MikroTik CRS312-4C8XG-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
@@ -592,6 +674,13 @@ zabbix_export:
                   name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 0b6e7345eb5d48ce88d577f1023a7479
           name: 'Temperature sensor discovery'
@@ -601,8 +690,7 @@ zabbix_export:
           delay: 1h
           description: |
             MIKROTIK-MIB::mtxrHlTemperature
-            Since temperature sensor is not available on all Mikrotik hardware,
-            this is done to avoid unsupported items.
+            Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.
           item_prototypes:
             -
               uuid: 1e429d1a498044d3b95d2a73db924f77
@@ -626,8 +714,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: d26213a8d92e4845a7767a0a7fe340b6
@@ -638,6 +726,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 47e2acacb8414731b56ec86e1a9e3e3c
                   expression: 'avg(/MikroTik CRS312-4C8XG-RM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
@@ -652,6 +747,13 @@ zabbix_export:
                       name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
                       expression: 'avg(/MikroTik CRS312-4C8XG-RM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
                       recovery_expression: 'max(/MikroTik CRS312-4C8XG-RM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 69c54b6ef3a04343bd9df41153398067
                   expression: 'avg(/MikroTik CRS312-4C8XG-RM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
@@ -660,6 +762,13 @@ zabbix_export:
                   name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: e3d529ed5a1b4d89b156e1a2bdd73905
           name: 'LTE modem discovery'
@@ -694,14 +803,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRP Reference Signal Received Power.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 6e805c219d884cb38bcd51dde95af1a4
                   expression: 'max(/MikroTik CRS312-4C8XG-RM SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: fdffd7bb090b4acc85692c0fa113aed6
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
@@ -716,14 +838,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 93ca96ceac4043fbbd88004165d94c3a
                   expression: 'max(/MikroTik CRS312-4C8XG-RM SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: c8b7cde011cf45efbfbdb54a99f7afb9
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
@@ -738,14 +873,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 0f7f11abdba9495fa4fa33ad1a872244
                   expression: 'max(/MikroTik CRS312-4C8XG-RM SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: ce8dc75d99944f88afc937e1025f4bcc
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
@@ -760,14 +908,27 @@ zabbix_export:
                 mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: da0b1d4940d64a5c9b96c83600cb4963
                   expression: 'max(/MikroTik CRS312-4C8XG-RM SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 6223ee7e40ed4b0ebfeb64a48d8401b9
@@ -828,8 +989,14 @@ zabbix_export:
                 mtxrWlApAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 40aa76b4a7e74961a20a6891e5084fa6
               name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
@@ -849,8 +1016,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 34e0b4d61e954c5598df74624eec7de4
               name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
@@ -870,8 +1043,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 4484896071184e62992201bf6590ed4f
               name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
@@ -890,8 +1069,14 @@ zabbix_export:
                     - 15m
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 2fadfc227fbb418f9d0bccf1af2a871c
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -904,8 +1089,14 @@ zabbix_export:
                 mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
         -
           uuid: 009b58f603c74f66a5341db132e489ba
           name: 'CAPsMAN AP channel discovery'
@@ -938,8 +1129,14 @@ zabbix_export:
                 mtxrWlCMAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 2938eec3c8dd4dcf931d52d64191a68d
               name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
@@ -959,8 +1156,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 43db9c3fcc074d4d8c9d041ed0d40ade
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -973,8 +1176,14 @@ zabbix_export:
                 mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 231504212d1a4f688a35b77014e9ef20
               name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
@@ -994,8 +1203,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: b885a22b88114ea7a275f0758d82210c
@@ -1003,6 +1218,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
                   priority: WARNING
                   description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: fde8e6bf22cd489c8f0b0fb2ae359e98
           name: 'Network interfaces discovery'
@@ -1091,8 +1313,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 70a39d1297ea4264be096468bbd41d64
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -1111,8 +1339,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: b2e76644e59e40f79ef1c93922d5e8d1
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -1136,8 +1370,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 35321b8973694e488f903eb9e4168939
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -1160,8 +1400,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 3f7ded53a81d4dcc81250c8bc9a1da97
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -1180,8 +1426,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 17dc051e60bc41839e255b38353ef49f
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -1205,8 +1457,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 9cbf512a2f0e4bfa86f2df14393c10de
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -1231,8 +1489,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 291a3c4e906040d782ccdd15058a8fa1
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -1254,8 +1518,14 @@ zabbix_export:
                 name: 'IF-MIB::ifOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: b8325c85797b4b56a2ebb5f998751bcc
@@ -1273,6 +1543,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: f422f3fce9fb4413b3f1e6d2885959f6
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -1296,8 +1570,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           trigger_prototypes:
             -
               uuid: 3aa76bfc278a484387be9ef760005d55
@@ -1327,6 +1607,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CRS312-4C8XG-RM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CRS312-4C8XG-RM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CRS312-4C8XG-RM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CRS312-4C8XG-RM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 9b698eef38ca438383c7bc06c2589166
               expression: |
@@ -1347,6 +1631,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CRS312-4C8XG-RM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CRS312-4C8XG-RM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CRS312-4C8XG-RM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CRS312-4C8XG-RM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 71f098c03cf945cd9a5a9a26f46bb54e
               expression: |
@@ -1366,6 +1654,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CRS312-4C8XG-RM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CRS312-4C8XG-RM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CRS312-4C8XG-RM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CRS312-4C8XG-RM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: cfa3941d81bb423bb0d282cd87ffc599
@@ -1444,8 +1739,11 @@ zabbix_export:
               description: 'Space utilization in % for Disk-{#SNMPINDEX}'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 8b12975b2d1f4c03adce5fd9aaacd8e2
               name: 'Disk-{#SNMPINDEX}: Total space'
@@ -1472,8 +1770,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 4445602fc420442db98c58cd28d68b46
               name: 'Disk-{#SNMPINDEX}: Used space'
@@ -1492,8 +1793,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
           trigger_prototypes:
             -
               uuid: 49a1cefb001c47bbae541e71673d5eb5
@@ -1509,6 +1813,13 @@ zabbix_export:
                  - The disk free space is less than 5G.
                  - The disk will be full in less than 24 hours.
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
             -
               uuid: 5145ea5e4fb04f9c9dfc90d61ca65d1b
               expression: |
@@ -1529,6 +1840,13 @@ zabbix_export:
                   expression: |
                     last(/MikroTik CRS312-4C8XG-RM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
                     ((last(/MikroTik CRS312-4C8XG-RM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS312-4C8XG-RM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS312-4C8XG-RM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
           graph_prototypes:
             -
               uuid: 71de1b81db87432bbd66eafdc123e767
@@ -1552,6 +1870,16 @@ zabbix_export:
                   item:
                     host: 'MikroTik CRS312-4C8XG-RM SNMP'
                     key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: crs312-4cplus8xg-rm
+        -
+          tag: target
+          value: mikrotik
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/net/mikrotik/mikrotik_CRS317-1G-16S+RM_snmp/README.md b/templates/net/mikrotik/mikrotik_CRS317-1G-16S+RM_snmp/README.md
index ad76c3edf09..add0d0d7a3e 100644
--- a/templates/net/mikrotik/mikrotik_CRS317-1G-16S+RM_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_CRS317-1G-16S+RM_snmp/README.md
@@ -71,7 +71,7 @@ There are no template links in this template.
 |Network interfaces discovery |<p>Discovering interfaces from IF-MIB.</p> |SNMP |net.if.discovery<p>**Filter**:</p>AND <p>- {#IFADMINSTATUS} MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.MATCHES}`</p><p>- {#IFADMINSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.NOT_MATCHES}`</p><p>- {#IFOPERSTATUS} MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.MATCHES}`</p><p>- {#IFOPERSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.NOT_MATCHES}`</p><p>- {#IFNAME} MATCHES_REGEX `{$NET.IF.IFNAME.MATCHES}`</p><p>- {#IFNAME} NOT_MATCHES_REGEX `{$NET.IF.IFNAME.NOT_MATCHES}`</p><p>- {#IFDESCR} MATCHES_REGEX `{$NET.IF.IFDESCR.MATCHES}`</p><p>- {#IFDESCR} NOT_MATCHES_REGEX `{$NET.IF.IFDESCR.NOT_MATCHES}`</p><p>- {#IFALIAS} MATCHES_REGEX `{$NET.IF.IFALIAS.MATCHES}`</p><p>- {#IFALIAS} NOT_MATCHES_REGEX `{$NET.IF.IFALIAS.NOT_MATCHES}`</p><p>- {#IFTYPE} MATCHES_REGEX `{$NET.IF.IFTYPE.MATCHES}`</p><p>- {#IFTYPE} NOT_MATCHES_REGEX `{$NET.IF.IFTYPE.NOT_MATCHES}`</p> |
 |Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 |Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
-|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
 
 ## Items collected
 
@@ -137,14 +137,14 @@ There are no template links in this template.
 |Interface {#IFNAME}({#IFALIAS}): Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p><p>3. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CRS317-1G-16SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CRS317-1G-16SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CRS317-1G-16SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))`<p>Recovery expression:</p>`last(/MikroTik CRS317-1G-16SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0` |AVERAGE |<p>Manual close: YES</p> |
 |Interface {#IFNAME}({#IFALIAS}): High bandwidth usage (>{$IF.UTIL.MAX:"{#IFNAME}"}%) |<p>The network interface utilization is close to its estimated maximum bandwidth.</p> |`(avg(/MikroTik CRS317-1G-16SRM SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik CRS317-1G-16SRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) or avg(/MikroTik CRS317-1G-16SRM SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik CRS317-1G-16SRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])) and last(/MikroTik CRS317-1G-16SRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0`<p>Recovery expression:</p>`avg(/MikroTik CRS317-1G-16SRM SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik CRS317-1G-16SRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) and avg(/MikroTik CRS317-1G-16SRM SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik CRS317-1G-16SRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |Interface {#IFNAME}({#IFALIAS}): High error rate (>{$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) |<p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p> |`min(/MikroTik CRS317-1G-16SRM SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"} or min(/MikroTik CRS317-1G-16SRM SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`max(/MikroTik CRS317-1G-16SRM SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8 and max(/MikroTik CRS317-1G-16SRM SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
-|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik CRS317-1G-16SRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik CRS317-1G-16SRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik CRS317-1G-16SRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik CRS317-1G-16SRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik CRS317-1G-16SRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik CRS317-1G-16SRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik CRS317-1G-16SRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik CRS317-1G-16SRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik CRS317-1G-16SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2) `<p>Recovery expression:</p>`(change(/MikroTik CRS317-1G-16SRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik CRS317-1G-16SRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik CRS317-1G-16SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2) ` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik CRS317-1G-16SRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik CRS317-1G-16SRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik CRS317-1G-16SRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik CRS317-1G-16SRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik CRS317-1G-16SRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik CRS317-1G-16SRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik CRS317-1G-16SRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik CRS317-1G-16SRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik CRS317-1G-16SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2)`<p>Recovery expression:</p>`(change(/MikroTik CRS317-1G-16SRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik CRS317-1G-16SRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik CRS317-1G-16SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2)` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |{HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/MikroTik CRS317-1G-16SRM SNMP/system.uptime[sysUpTime.0])<10m` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- No SNMP data collection</p> |
 |No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/MikroTik CRS317-1G-16SRM SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |Unavailable by ICMP ping |<p>Last three attempts returned timeout.  Please check device connectivity.</p> |`max(/MikroTik CRS317-1G-16SRM SNMP/icmpping,#3)=0` |HIGH | |
 |High ICMP ping loss |<p>-</p> |`min(/MikroTik CRS317-1G-16SRM SNMP/icmppingloss,5m)>{$ICMP_LOSS_WARN} and min(/MikroTik CRS317-1G-16SRM SNMP/icmppingloss,5m)<100` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |High ICMP ping response time |<p>-</p> |`avg(/MikroTik CRS317-1G-16SRM SNMP/icmppingsec,5m)>{$ICMP_RESPONSE_TIME_WARN}` |WARNING |<p>**Depends on**:</p><p>- High ICMP ping loss</p><p>- Unavailable by ICMP ping</p> |
-|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS317-1G-16SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS317-1G-16SRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS317-1G-16SRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS317-1G-16SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
-|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS317-1G-16SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS317-1G-16SRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS317-1G-16SRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CRS317-1G-16SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS317-1G-16SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS317-1G-16SRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS317-1G-16SRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS317-1G-16SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS317-1G-16SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS317-1G-16SRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS317-1G-16SRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CRS317-1G-16SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
 |CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS317-1G-16SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CRS317-1G-16SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
 |CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS317-1G-16SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CRS317-1G-16SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
 |CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik CRS317-1G-16SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik CRS317-1G-16SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
diff --git a/templates/net/mikrotik/mikrotik_CRS317-1G-16S+RM_snmp/template_net_mikrotik_CRS317-1G-16S+RM_snmp.yaml b/templates/net/mikrotik/mikrotik_CRS317-1G-16S+RM_snmp/template_net_mikrotik_CRS317-1G-16S+RM_snmp.yaml
index 3cb2031adb3..105595b0f47 100644
--- a/templates/net/mikrotik/mikrotik_CRS317-1G-16S+RM_snmp/template_net_mikrotik_CRS317-1G-16S+RM_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_CRS317-1G-16S+RM_snmp/template_net_mikrotik_CRS317-1G-16S+RM_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:45:04Z'
+  date: '2022-01-26T10:22:34Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -35,8 +35,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: f4acabb314ea4a38935ebb722bf47ed9
@@ -44,6 +47,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 97c6159702a5412c87ee2d42602a4ead
           name: 'ICMP loss'
@@ -54,8 +61,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 629b35a8b5414240953062d4b4caad60
@@ -67,6 +77,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CRS317-1G-16SRM SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: fd7a6cdbb0b94c7d9d9584873427027d
           name: 'ICMP response time'
@@ -77,8 +94,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 28ce838e43004acebc74c42e782b65cb
@@ -93,6 +113,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CRS317-1G-16SRM SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 18144ae33c344636a8c8f496f9d31769
           name: 'SNMP traps (fallback)'
@@ -105,8 +132,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: 8e0533aa1f3e48ce8b5a6a2ad388cf32
           name: 'System contact details'
@@ -128,8 +155,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 23d51bb62dd24ddbb8d8332ddd62aac7
           name: 'System description'
@@ -152,8 +179,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: d2ae97a860254ce8935a939ad715d583
           name: 'Firmware version'
@@ -174,8 +201,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 0d646e6c03f14c259b81862187a6eec1
@@ -185,6 +212,10 @@ zabbix_export:
               priority: INFO
               description: 'Firmware version has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: bad88a688384478b841c24f935d5c3a1
           name: 'Hardware model name'
@@ -203,8 +234,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
         -
           uuid: dd694bbf5faf4c7a8a30d5ffd817b678
           name: 'Hardware serial number'
@@ -226,8 +257,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 992d3bd742224ad7abc375d20e60e1af
@@ -236,6 +267,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 10d7ca748c1c4363a7d0ea997de8bbb7
           name: 'System location'
@@ -257,8 +292,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 50e9e01258084593a5c0e55d5c3ea50b
           name: 'System name'
@@ -280,8 +315,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: f01bb34d5f30454bb72e6b00e187c066
@@ -290,6 +325,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: 5a20282446cc4ec797860f33e6767712
           name: 'System object ID'
@@ -310,8 +352,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 2906c09ebcc34c908a6ab8530804b67f
           name: 'Operating system'
@@ -333,8 +375,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: os
           triggers:
             -
               uuid: b3e063c9221d4bf69acb21a16859bb15
@@ -347,6 +389,10 @@ zabbix_export:
                 -
                   name: 'System name has changed (new name: {ITEM.VALUE})'
                   expression: 'last(/MikroTik CRS317-1G-16SRM SNMP/system.name,#1)<>last(/MikroTik CRS317-1G-16SRM SNMP/system.name,#2) and length(last(/MikroTik CRS317-1G-16SRM SNMP/system.name))>0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 61ada578e2654f2b9773e86ac7f9f5a7
           name: Uptime
@@ -367,8 +413,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: bd172615c09147ed8deb102f88eb8900
@@ -381,6 +427,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/MikroTik CRS317-1G-16SRM SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 6417f5bc08084fa29f2dab421c5093fd
           name: 'Total memory'
@@ -407,8 +457,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 01618781ca974f5e8b1bf58b65092038
           name: 'Used memory'
@@ -427,8 +477,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: ffee597574084c638b668fb11a735962
           name: 'Memory utilization'
@@ -441,8 +491,8 @@ zabbix_export:
           description: 'Memory utilization in %'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: 95ac8c277d8940ecb1545be2dc514c54
@@ -450,6 +500,13 @@ zabbix_export:
               name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
               priority: AVERAGE
               description: 'The system is running out of free memory.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 2dc35ca9c25146eb9d5955bdb338fbf4
           name: 'SNMP agent availability'
@@ -466,8 +523,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 1c20500d7efe42e59d3562c980201ef1
@@ -480,6 +540,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CRS317-1G-16SRM SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: 43a205f5dd7d4874a68c1a9930f43260
@@ -504,8 +568,8 @@ zabbix_export:
                 The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
               trigger_prototypes:
                 -
                   uuid: 9e5d5b925a5c42a2af13b3a6727a4cb9
@@ -514,6 +578,10 @@ zabbix_export:
                   opdata: 'Current utilization: {ITEM.LASTVALUE1}'
                   priority: WARNING
                   description: 'CPU utilization is too high. The system might be slow to respond.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: cd07ebaa31e84139be82ee2f018656ca
@@ -558,8 +626,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: ba13b39c8a6146bf9b3b6d46fb71fcc6
@@ -570,6 +638,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 3a469cd75bac4782b18aff3011c766b3
                   expression: 'avg(/MikroTik CRS317-1G-16SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
@@ -584,6 +659,13 @@ zabbix_export:
                       name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
                       expression: 'avg(/MikroTik CRS317-1G-16SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
                       recovery_expression: 'max(/MikroTik CRS317-1G-16SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 11f6f7f659a445e7930b7ab3532a8ebb
                   expression: 'avg(/MikroTik CRS317-1G-16SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
@@ -592,6 +674,13 @@ zabbix_export:
                   name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 33b7e69a7e3b44548c14b5d290518d23
           name: 'Temperature sensor discovery'
@@ -601,8 +690,7 @@ zabbix_export:
           delay: 1h
           description: |
             MIKROTIK-MIB::mtxrHlTemperature
-            Since temperature sensor is not available on all Mikrotik hardware,
-            this is done to avoid unsupported items.
+            Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.
           item_prototypes:
             -
               uuid: 2ba207937e5146adaa5e02903ae70b8b
@@ -626,8 +714,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 3392f74fc5974701b62673f5c51700d4
@@ -638,6 +726,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 0e4acbc3bad54347a362cbf57c0464e3
                   expression: 'avg(/MikroTik CRS317-1G-16SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
@@ -652,6 +747,13 @@ zabbix_export:
                       name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
                       expression: 'avg(/MikroTik CRS317-1G-16SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
                       recovery_expression: 'max(/MikroTik CRS317-1G-16SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 42c7cd22b6c74fc7b36f5b6593db02e5
                   expression: 'avg(/MikroTik CRS317-1G-16SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
@@ -660,6 +762,13 @@ zabbix_export:
                   name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 3824e4d95d2d47ea858f7885d3fadbb8
           name: 'LTE modem discovery'
@@ -694,14 +803,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRP Reference Signal Received Power.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 027b0481f1de4967973208e3477c0094
                   expression: 'max(/MikroTik CRS317-1G-16SRM SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 3728775b43bb4fd9927cc83b31441e73
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
@@ -716,14 +838,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 7dc5c0d4f77441a5a29239b1aa77d00b
                   expression: 'max(/MikroTik CRS317-1G-16SRM SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 25aeaf59b6a446428d81743da8fad36f
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
@@ -738,14 +873,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 95d3868b6d1c45629acc756865cf6f78
                   expression: 'max(/MikroTik CRS317-1G-16SRM SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 5696d89760ef4e168e79a68c9503a752
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
@@ -760,14 +908,27 @@ zabbix_export:
                 mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 94cb13b08f4f46c2bccd3b5ac22ccb3e
                   expression: 'max(/MikroTik CRS317-1G-16SRM SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 3691a1aa1379413ea25118524890d3be
@@ -828,8 +989,14 @@ zabbix_export:
                 mtxrWlApAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 1f5889a3511e423eba944249026cade2
               name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
@@ -849,8 +1016,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 116c9e2164244af7ac233192cc2c0fa8
               name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
@@ -870,8 +1043,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 7f66614630514280a2e4694f601527e1
               name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
@@ -890,8 +1069,14 @@ zabbix_export:
                     - 15m
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 6a1710f2a57546bbb825fa30dff7dfc6
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -904,8 +1089,14 @@ zabbix_export:
                 mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
         -
           uuid: ca977ba6126442d2b4fe511ccf78c021
           name: 'CAPsMAN AP channel discovery'
@@ -938,8 +1129,14 @@ zabbix_export:
                 mtxrWlCMAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 1bdcdd568543421e8e5cbd953698bbd2
               name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
@@ -959,8 +1156,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 8ea83d2c84144a209c0ed5592207027c
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -973,8 +1176,14 @@ zabbix_export:
                 mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 8525fbb691d4494b8e03eb7b1b4a7ecd
               name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
@@ -994,8 +1203,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 1317af27066547e2a07f2dd27923e22b
@@ -1003,6 +1218,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
                   priority: WARNING
                   description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: fd942651e7e0407682c5d092280413fb
           name: 'Network interfaces discovery'
@@ -1091,8 +1313,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: f18e8d58775a476a9e267ea510046b3b
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -1111,8 +1339,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 7c9a00d1ccc64ac2bbb299a2ef3f9f7b
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -1136,8 +1370,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: e7e15324c7884bafa830004c30c398ad
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -1160,8 +1400,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 7f752c82bf234f30b70a7ce19879963f
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -1180,8 +1426,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: d49de2ae77484870876f463f208ff1bb
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -1205,8 +1457,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: bb086f35ade448f5938f169ad6eaba94
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -1231,8 +1489,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 7a270cb32f7541678c6a6b3e32f6fba9
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -1254,8 +1518,14 @@ zabbix_export:
                 name: 'IF-MIB::ifOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 6251339e2940419994033e0689fa16a7
@@ -1273,6 +1543,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: dc8c468874464b2cad3435bc59b7f3e2
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -1296,8 +1570,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           trigger_prototypes:
             -
               uuid: 53447bc4ecb04af7b4d9ef6a57c78a29
@@ -1327,6 +1607,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CRS317-1G-16SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CRS317-1G-16SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CRS317-1G-16SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CRS317-1G-16SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 05e4dbc448fc431f90a831af90408113
               expression: |
@@ -1347,6 +1631,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CRS317-1G-16SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CRS317-1G-16SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CRS317-1G-16SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CRS317-1G-16SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 0af66a5ab69448549374ef932be1d57b
               expression: |
@@ -1366,6 +1654,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CRS317-1G-16SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CRS317-1G-16SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CRS317-1G-16SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CRS317-1G-16SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: defce00a7d8e47abbf3f3126d138c6bb
@@ -1444,8 +1739,11 @@ zabbix_export:
               description: 'Space utilization in % for Disk-{#SNMPINDEX}'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 20ca55174f764308933c395b1f8c25b6
               name: 'Disk-{#SNMPINDEX}: Total space'
@@ -1472,8 +1770,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: b1293070b58b4859b3cc730a08e24f1c
               name: 'Disk-{#SNMPINDEX}: Used space'
@@ -1492,8 +1793,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
           trigger_prototypes:
             -
               uuid: ee1e3d1444c947d2898cf120dc3fc53f
@@ -1509,6 +1813,13 @@ zabbix_export:
                  - The disk free space is less than 5G.
                  - The disk will be full in less than 24 hours.
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
             -
               uuid: a6f92ac3ee824ef486a82f441fb60a67
               expression: |
@@ -1529,6 +1840,13 @@ zabbix_export:
                   expression: |
                     last(/MikroTik CRS317-1G-16SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
                     ((last(/MikroTik CRS317-1G-16SRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS317-1G-16SRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS317-1G-16SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
           graph_prototypes:
             -
               uuid: 94e91ae74ed048fdaee82856f500f28b
@@ -1552,6 +1870,16 @@ zabbix_export:
                   item:
                     host: 'MikroTik CRS317-1G-16SRM SNMP'
                     key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: crs317-1g-16splusrm
+        -
+          tag: target
+          value: mikrotik
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/net/mikrotik/mikrotik_CRS326-24G-2S+IN_snmp/README.md b/templates/net/mikrotik/mikrotik_CRS326-24G-2S+IN_snmp/README.md
index 41ed7eed5ba..48a3b984982 100644
--- a/templates/net/mikrotik/mikrotik_CRS326-24G-2S+IN_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_CRS326-24G-2S+IN_snmp/README.md
@@ -71,7 +71,7 @@ There are no template links in this template.
 |Network interfaces discovery |<p>Discovering interfaces from IF-MIB.</p> |SNMP |net.if.discovery<p>**Filter**:</p>AND <p>- {#IFADMINSTATUS} MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.MATCHES}`</p><p>- {#IFADMINSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.NOT_MATCHES}`</p><p>- {#IFOPERSTATUS} MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.MATCHES}`</p><p>- {#IFOPERSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.NOT_MATCHES}`</p><p>- {#IFNAME} MATCHES_REGEX `{$NET.IF.IFNAME.MATCHES}`</p><p>- {#IFNAME} NOT_MATCHES_REGEX `{$NET.IF.IFNAME.NOT_MATCHES}`</p><p>- {#IFDESCR} MATCHES_REGEX `{$NET.IF.IFDESCR.MATCHES}`</p><p>- {#IFDESCR} NOT_MATCHES_REGEX `{$NET.IF.IFDESCR.NOT_MATCHES}`</p><p>- {#IFALIAS} MATCHES_REGEX `{$NET.IF.IFALIAS.MATCHES}`</p><p>- {#IFALIAS} NOT_MATCHES_REGEX `{$NET.IF.IFALIAS.NOT_MATCHES}`</p><p>- {#IFTYPE} MATCHES_REGEX `{$NET.IF.IFTYPE.MATCHES}`</p><p>- {#IFTYPE} NOT_MATCHES_REGEX `{$NET.IF.IFTYPE.NOT_MATCHES}`</p> |
 |Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 |Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
-|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
 
 ## Items collected
 
@@ -137,14 +137,14 @@ There are no template links in this template.
 |Interface {#IFNAME}({#IFALIAS}): Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p><p>3. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CRS326-24G-2SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CRS326-24G-2SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CRS326-24G-2SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))`<p>Recovery expression:</p>`last(/MikroTik CRS326-24G-2SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0` |AVERAGE |<p>Manual close: YES</p> |
 |Interface {#IFNAME}({#IFALIAS}): High bandwidth usage (>{$IF.UTIL.MAX:"{#IFNAME}"}%) |<p>The network interface utilization is close to its estimated maximum bandwidth.</p> |`(avg(/MikroTik CRS326-24G-2SIN SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik CRS326-24G-2SIN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) or avg(/MikroTik CRS326-24G-2SIN SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik CRS326-24G-2SIN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])) and last(/MikroTik CRS326-24G-2SIN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0`<p>Recovery expression:</p>`avg(/MikroTik CRS326-24G-2SIN SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik CRS326-24G-2SIN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) and avg(/MikroTik CRS326-24G-2SIN SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik CRS326-24G-2SIN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |Interface {#IFNAME}({#IFALIAS}): High error rate (>{$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) |<p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p> |`min(/MikroTik CRS326-24G-2SIN SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"} or min(/MikroTik CRS326-24G-2SIN SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`max(/MikroTik CRS326-24G-2SIN SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8 and max(/MikroTik CRS326-24G-2SIN SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
-|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik CRS326-24G-2SIN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik CRS326-24G-2SIN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik CRS326-24G-2SIN SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik CRS326-24G-2SIN SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik CRS326-24G-2SIN SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik CRS326-24G-2SIN SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik CRS326-24G-2SIN SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik CRS326-24G-2SIN SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik CRS326-24G-2SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2) `<p>Recovery expression:</p>`(change(/MikroTik CRS326-24G-2SIN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik CRS326-24G-2SIN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik CRS326-24G-2SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2) ` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik CRS326-24G-2SIN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik CRS326-24G-2SIN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik CRS326-24G-2SIN SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik CRS326-24G-2SIN SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik CRS326-24G-2SIN SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik CRS326-24G-2SIN SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik CRS326-24G-2SIN SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik CRS326-24G-2SIN SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik CRS326-24G-2SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2)`<p>Recovery expression:</p>`(change(/MikroTik CRS326-24G-2SIN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik CRS326-24G-2SIN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik CRS326-24G-2SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2)` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |{HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/MikroTik CRS326-24G-2SIN SNMP/system.uptime[sysUpTime.0])<10m` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- No SNMP data collection</p> |
 |No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/MikroTik CRS326-24G-2SIN SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |Unavailable by ICMP ping |<p>Last three attempts returned timeout.  Please check device connectivity.</p> |`max(/MikroTik CRS326-24G-2SIN SNMP/icmpping,#3)=0` |HIGH | |
 |High ICMP ping loss |<p>-</p> |`min(/MikroTik CRS326-24G-2SIN SNMP/icmppingloss,5m)>{$ICMP_LOSS_WARN} and min(/MikroTik CRS326-24G-2SIN SNMP/icmppingloss,5m)<100` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |High ICMP ping response time |<p>-</p> |`avg(/MikroTik CRS326-24G-2SIN SNMP/icmppingsec,5m)>{$ICMP_RESPONSE_TIME_WARN}` |WARNING |<p>**Depends on**:</p><p>- High ICMP ping loss</p><p>- Unavailable by ICMP ping</p> |
-|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS326-24G-2SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS326-24G-2SIN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS326-24G-2SIN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS326-24G-2SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
-|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS326-24G-2SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS326-24G-2SIN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS326-24G-2SIN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CRS326-24G-2SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS326-24G-2SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS326-24G-2SIN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS326-24G-2SIN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS326-24G-2SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS326-24G-2SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS326-24G-2SIN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS326-24G-2SIN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CRS326-24G-2SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
 |CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS326-24G-2SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CRS326-24G-2SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
 |CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS326-24G-2SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CRS326-24G-2SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
 |CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik CRS326-24G-2SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik CRS326-24G-2SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
diff --git a/templates/net/mikrotik/mikrotik_CRS326-24G-2S+IN_snmp/template_net_mikrotik_CRS326-24G-2S+IN_snmp.yaml b/templates/net/mikrotik/mikrotik_CRS326-24G-2S+IN_snmp/template_net_mikrotik_CRS326-24G-2S+IN_snmp.yaml
index 1ee8cf66208..775d0e348b0 100644
--- a/templates/net/mikrotik/mikrotik_CRS326-24G-2S+IN_snmp/template_net_mikrotik_CRS326-24G-2S+IN_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_CRS326-24G-2S+IN_snmp/template_net_mikrotik_CRS326-24G-2S+IN_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:45:09Z'
+  date: '2022-01-26T09:49:28Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -35,8 +35,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: d914dc20fb664be7832aae19f07df37f
@@ -44,6 +47,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 5408eda422114912937f6810b5746f71
           name: 'ICMP loss'
@@ -54,8 +61,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 70d6789335b74cdd87a1a23bf4a3f875
@@ -67,6 +77,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CRS326-24G-2SIN SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 5ec629ad1b1a44ceb3b138d84eb2d99d
           name: 'ICMP response time'
@@ -77,8 +94,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 49f77a9948164eb7aeffc3efe3f60ce1
@@ -93,6 +113,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CRS326-24G-2SIN SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 75bbba08fdf14ff190d0ea4f9e23d3bd
           name: 'SNMP traps (fallback)'
@@ -105,8 +132,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: 417db3f4da664196a5cd40b3f7d65caa
           name: 'System contact details'
@@ -128,8 +155,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: aff391166f0d4e13b3d047143446c9ff
           name: 'System description'
@@ -152,8 +179,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 8da4bc75729549f8ba60c5edd47f1419
           name: 'Firmware version'
@@ -174,8 +201,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 65e43afe1d04447fb334d5efbd76c185
@@ -185,6 +212,10 @@ zabbix_export:
               priority: INFO
               description: 'Firmware version has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 05352d9bfb6d48b682c4d5e23ff28daf
           name: 'Hardware model name'
@@ -203,8 +234,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
         -
           uuid: 19bfda7a644b462880226d790eebd154
           name: 'Hardware serial number'
@@ -226,8 +257,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 3a3ac7e0d5fc4feca67eb2447fcbcf34
@@ -236,6 +267,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 0e41c468f5db44bcab6f8e1a078e5309
           name: 'System location'
@@ -257,8 +292,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 72e38e1011654a3eb413f133169b3811
           name: 'System name'
@@ -280,8 +315,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 63f90de57f5f4b5b92d0db0b54d0b1d2
@@ -290,6 +325,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: b5c8153787384711ae6fde2c1d9cd45c
           name: 'System object ID'
@@ -310,8 +352,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: aca36fae2c2f4856a8cacf7348a31b54
           name: 'Operating system'
@@ -333,8 +375,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: os
           triggers:
             -
               uuid: 2f18268819414337aca3f919343d6577
@@ -347,6 +389,10 @@ zabbix_export:
                 -
                   name: 'System name has changed (new name: {ITEM.VALUE})'
                   expression: 'last(/MikroTik CRS326-24G-2SIN SNMP/system.name,#1)<>last(/MikroTik CRS326-24G-2SIN SNMP/system.name,#2) and length(last(/MikroTik CRS326-24G-2SIN SNMP/system.name))>0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: edbcea616a6d459898cae926963e9ee4
           name: Uptime
@@ -367,8 +413,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: b31c237e2046464c95b1ab70dc08e118
@@ -381,6 +427,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/MikroTik CRS326-24G-2SIN SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 2ee29a6f60eb45fdb1193283ed54e7bc
           name: 'Total memory'
@@ -407,8 +457,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: aef42cabe6cb4c8dbb0c6cea532c6a3f
           name: 'Used memory'
@@ -427,8 +477,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 0012d55c993c43f4b620e282a9799cd8
           name: 'Memory utilization'
@@ -441,8 +491,8 @@ zabbix_export:
           description: 'Memory utilization in %'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: cfd67344627840a081d286d8188c0888
@@ -450,6 +500,13 @@ zabbix_export:
               name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
               priority: AVERAGE
               description: 'The system is running out of free memory.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: ea1305a4dbf94c848271814a5c3d08c4
           name: 'SNMP agent availability'
@@ -466,8 +523,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 1b222c2531f140399fe94a54556c6422
@@ -480,6 +540,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CRS326-24G-2SIN SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: 55e1dad7a38743f2ba0ba1546a55638d
@@ -504,8 +568,8 @@ zabbix_export:
                 The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
               trigger_prototypes:
                 -
                   uuid: d9f63d9be04940949d9dd655cf1a7bd2
@@ -514,6 +578,10 @@ zabbix_export:
                   opdata: 'Current utilization: {ITEM.LASTVALUE1}'
                   priority: WARNING
                   description: 'CPU utilization is too high. The system might be slow to respond.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 5add7060d926465da9707003ba6e69e7
@@ -558,8 +626,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: bf5e439b3dfe4a5b82df00c0ed291895
@@ -570,6 +638,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: bc428b5477294722a18477dc061a59e9
                   expression: 'avg(/MikroTik CRS326-24G-2SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
@@ -584,6 +659,13 @@ zabbix_export:
                       name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
                       expression: 'avg(/MikroTik CRS326-24G-2SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
                       recovery_expression: 'max(/MikroTik CRS326-24G-2SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 21aa13901d7449a39f64a41cb151d687
                   expression: 'avg(/MikroTik CRS326-24G-2SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
@@ -592,6 +674,13 @@ zabbix_export:
                   name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 2298f69eb20647468f92dfee2740d653
           name: 'Temperature sensor discovery'
@@ -601,8 +690,7 @@ zabbix_export:
           delay: 1h
           description: |
             MIKROTIK-MIB::mtxrHlTemperature
-            Since temperature sensor is not available on all Mikrotik hardware,
-            this is done to avoid unsupported items.
+            Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.
           item_prototypes:
             -
               uuid: b22c36030deb4143a6843bfeb3ea1ebe
@@ -626,8 +714,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 0a2cde44b8ea45178e0859ae7c1125e5
@@ -638,6 +726,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 0379f91f1b4e40d1b35c30ac538a8b61
                   expression: 'avg(/MikroTik CRS326-24G-2SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
@@ -652,6 +747,13 @@ zabbix_export:
                       name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
                       expression: 'avg(/MikroTik CRS326-24G-2SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
                       recovery_expression: 'max(/MikroTik CRS326-24G-2SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 7d4b709e7b5c4e9aa68a9c6f8df69e75
                   expression: 'avg(/MikroTik CRS326-24G-2SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
@@ -660,6 +762,13 @@ zabbix_export:
                   name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 94742faea5cb4922af607bcf66494c75
           name: 'LTE modem discovery'
@@ -694,14 +803,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRP Reference Signal Received Power.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 4ae567c4a5be46a4a1a135a5f61aece8
                   expression: 'max(/MikroTik CRS326-24G-2SIN SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 9b636bb8baa54fec808391d5387affb1
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
@@ -716,14 +838,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 1e6aca20d3c140f69580920d37820c9a
                   expression: 'max(/MikroTik CRS326-24G-2SIN SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: ce63b34ac4ed4e98af2e9cf165fd4edd
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
@@ -738,14 +873,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 65a6c1de5d8e4a4d8857a4b97fcb1a7a
                   expression: 'max(/MikroTik CRS326-24G-2SIN SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 2879b1fddfa3422d81f3d54bf10eeba9
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
@@ -760,14 +908,27 @@ zabbix_export:
                 mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: df73d669f65940a79065915e11a3e3bf
                   expression: 'max(/MikroTik CRS326-24G-2SIN SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: b19bb2dd693444b8b1cfc5b3e53ef8e8
@@ -828,8 +989,14 @@ zabbix_export:
                 mtxrWlApAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: a29816c787c3404f8e2c2492b3c97fc3
               name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
@@ -849,8 +1016,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: da4acf2e97e44415951f9a22042e7722
               name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
@@ -870,8 +1043,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: b6a61875bfbb47ad9e1ffc93f11f533a
               name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
@@ -890,8 +1069,14 @@ zabbix_export:
                     - 15m
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 7c62e6580f44467e9d1ceaef77394a5e
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -904,8 +1089,14 @@ zabbix_export:
                 mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
         -
           uuid: c256b93e9a9d4c25a4c347ebd4ce87a0
           name: 'CAPsMAN AP channel discovery'
@@ -938,8 +1129,14 @@ zabbix_export:
                 mtxrWlCMAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: ae5c0adc6b05408ca1cf362d4c01eafe
               name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
@@ -959,8 +1156,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 321b92fdbbde4c5c91ca04c28861fe11
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -973,8 +1176,14 @@ zabbix_export:
                 mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: da85b9260e374c58946d337686158519
               name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
@@ -994,8 +1203,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 233fb21420794842b00c0fb12db86e51
@@ -1003,6 +1218,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
                   priority: WARNING
                   description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: b14afecca0b944cf9c8e6330ae80c530
           name: 'Network interfaces discovery'
@@ -1091,8 +1313,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 47237970af2d45208906b87fbc1f9339
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -1111,8 +1339,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 50caf27cd8ff4a349a888741a301e776
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -1136,8 +1370,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 22c2413e4100432ea8dc0e8816b31ba4
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -1160,8 +1400,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 6859685be5784fe3a3adc209d4b69b6e
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -1180,8 +1426,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: e3836dded4c84b218af72d2358e9c228
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -1205,8 +1457,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 25815a4b39e147e6be4cc7db9f79090d
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -1231,8 +1489,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 5193b82dafc14ef6905af63cc99ee7cf
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -1254,8 +1518,14 @@ zabbix_export:
                 name: 'IF-MIB::ifOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 2eed9a625d3c45b4bfd4fdd70b58461d
@@ -1273,6 +1543,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 17651e8aa6134c77868ee1c74a626209
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -1296,8 +1570,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           trigger_prototypes:
             -
               uuid: c05d1756423841658946ffaddf78ef79
@@ -1327,6 +1607,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CRS326-24G-2SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CRS326-24G-2SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CRS326-24G-2SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CRS326-24G-2SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: e08df3d8533c46a9aac0144486098b78
               expression: |
@@ -1347,6 +1631,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CRS326-24G-2SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CRS326-24G-2SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CRS326-24G-2SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CRS326-24G-2SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: dcd307c6b1074213976f0f26cb699699
               expression: |
@@ -1366,6 +1654,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CRS326-24G-2SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CRS326-24G-2SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CRS326-24G-2SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CRS326-24G-2SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: 35c60c8ed9ad40b3ae44021cb50649c6
@@ -1444,8 +1739,11 @@ zabbix_export:
               description: 'Space utilization in % for Disk-{#SNMPINDEX}'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: bf9374d0427c4e5493752ee648ee5bb1
               name: 'Disk-{#SNMPINDEX}: Total space'
@@ -1472,8 +1770,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: b8a263e710ad4864bd7406e637b44c21
               name: 'Disk-{#SNMPINDEX}: Used space'
@@ -1492,8 +1793,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
           trigger_prototypes:
             -
               uuid: 3e07aa63774040ef9369b3280cae156d
@@ -1509,6 +1813,13 @@ zabbix_export:
                  - The disk free space is less than 5G.
                  - The disk will be full in less than 24 hours.
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
             -
               uuid: caae865a278946958a38fa40a41f180f
               expression: |
@@ -1529,6 +1840,13 @@ zabbix_export:
                   expression: |
                     last(/MikroTik CRS326-24G-2SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
                     ((last(/MikroTik CRS326-24G-2SIN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS326-24G-2SIN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS326-24G-2SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
           graph_prototypes:
             -
               uuid: ae2d847c53c14a619217843f10c9695e
@@ -1552,6 +1870,16 @@ zabbix_export:
                   item:
                     host: 'MikroTik CRS326-24G-2SIN SNMP'
                     key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: crs326-24g-2splusin
+        -
+          tag: target
+          value: mikrotik
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/net/mikrotik/mikrotik_CRS326-24G-2S+RM_snmp/README.md b/templates/net/mikrotik/mikrotik_CRS326-24G-2S+RM_snmp/README.md
index 9d9ee606d06..8319326f66d 100644
--- a/templates/net/mikrotik/mikrotik_CRS326-24G-2S+RM_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_CRS326-24G-2S+RM_snmp/README.md
@@ -71,7 +71,7 @@ There are no template links in this template.
 |Network interfaces discovery |<p>Discovering interfaces from IF-MIB.</p> |SNMP |net.if.discovery<p>**Filter**:</p>AND <p>- {#IFADMINSTATUS} MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.MATCHES}`</p><p>- {#IFADMINSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.NOT_MATCHES}`</p><p>- {#IFOPERSTATUS} MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.MATCHES}`</p><p>- {#IFOPERSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.NOT_MATCHES}`</p><p>- {#IFNAME} MATCHES_REGEX `{$NET.IF.IFNAME.MATCHES}`</p><p>- {#IFNAME} NOT_MATCHES_REGEX `{$NET.IF.IFNAME.NOT_MATCHES}`</p><p>- {#IFDESCR} MATCHES_REGEX `{$NET.IF.IFDESCR.MATCHES}`</p><p>- {#IFDESCR} NOT_MATCHES_REGEX `{$NET.IF.IFDESCR.NOT_MATCHES}`</p><p>- {#IFALIAS} MATCHES_REGEX `{$NET.IF.IFALIAS.MATCHES}`</p><p>- {#IFALIAS} NOT_MATCHES_REGEX `{$NET.IF.IFALIAS.NOT_MATCHES}`</p><p>- {#IFTYPE} MATCHES_REGEX `{$NET.IF.IFTYPE.MATCHES}`</p><p>- {#IFTYPE} NOT_MATCHES_REGEX `{$NET.IF.IFTYPE.NOT_MATCHES}`</p> |
 |Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 |Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
-|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
 
 ## Items collected
 
@@ -137,14 +137,14 @@ There are no template links in this template.
 |Interface {#IFNAME}({#IFALIAS}): Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p><p>3. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CRS326-24G-2SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CRS326-24G-2SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CRS326-24G-2SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))`<p>Recovery expression:</p>`last(/MikroTik CRS326-24G-2SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0` |AVERAGE |<p>Manual close: YES</p> |
 |Interface {#IFNAME}({#IFALIAS}): High bandwidth usage (>{$IF.UTIL.MAX:"{#IFNAME}"}%) |<p>The network interface utilization is close to its estimated maximum bandwidth.</p> |`(avg(/MikroTik CRS326-24G-2SRM SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik CRS326-24G-2SRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) or avg(/MikroTik CRS326-24G-2SRM SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik CRS326-24G-2SRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])) and last(/MikroTik CRS326-24G-2SRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0`<p>Recovery expression:</p>`avg(/MikroTik CRS326-24G-2SRM SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik CRS326-24G-2SRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) and avg(/MikroTik CRS326-24G-2SRM SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik CRS326-24G-2SRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |Interface {#IFNAME}({#IFALIAS}): High error rate (>{$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) |<p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p> |`min(/MikroTik CRS326-24G-2SRM SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"} or min(/MikroTik CRS326-24G-2SRM SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`max(/MikroTik CRS326-24G-2SRM SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8 and max(/MikroTik CRS326-24G-2SRM SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
-|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik CRS326-24G-2SRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik CRS326-24G-2SRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik CRS326-24G-2SRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik CRS326-24G-2SRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik CRS326-24G-2SRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik CRS326-24G-2SRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik CRS326-24G-2SRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik CRS326-24G-2SRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik CRS326-24G-2SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2) `<p>Recovery expression:</p>`(change(/MikroTik CRS326-24G-2SRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik CRS326-24G-2SRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik CRS326-24G-2SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2) ` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik CRS326-24G-2SRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik CRS326-24G-2SRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik CRS326-24G-2SRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik CRS326-24G-2SRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik CRS326-24G-2SRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik CRS326-24G-2SRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik CRS326-24G-2SRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik CRS326-24G-2SRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik CRS326-24G-2SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2)`<p>Recovery expression:</p>`(change(/MikroTik CRS326-24G-2SRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik CRS326-24G-2SRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik CRS326-24G-2SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2)` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |{HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/MikroTik CRS326-24G-2SRM SNMP/system.uptime[sysUpTime.0])<10m` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- No SNMP data collection</p> |
 |No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/MikroTik CRS326-24G-2SRM SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |Unavailable by ICMP ping |<p>Last three attempts returned timeout.  Please check device connectivity.</p> |`max(/MikroTik CRS326-24G-2SRM SNMP/icmpping,#3)=0` |HIGH | |
 |High ICMP ping loss |<p>-</p> |`min(/MikroTik CRS326-24G-2SRM SNMP/icmppingloss,5m)>{$ICMP_LOSS_WARN} and min(/MikroTik CRS326-24G-2SRM SNMP/icmppingloss,5m)<100` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |High ICMP ping response time |<p>-</p> |`avg(/MikroTik CRS326-24G-2SRM SNMP/icmppingsec,5m)>{$ICMP_RESPONSE_TIME_WARN}` |WARNING |<p>**Depends on**:</p><p>- High ICMP ping loss</p><p>- Unavailable by ICMP ping</p> |
-|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS326-24G-2SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS326-24G-2SRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS326-24G-2SRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS326-24G-2SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
-|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS326-24G-2SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS326-24G-2SRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS326-24G-2SRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CRS326-24G-2SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS326-24G-2SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS326-24G-2SRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS326-24G-2SRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS326-24G-2SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS326-24G-2SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS326-24G-2SRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS326-24G-2SRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CRS326-24G-2SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
 |CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS326-24G-2SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CRS326-24G-2SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
 |CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS326-24G-2SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CRS326-24G-2SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
 |CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik CRS326-24G-2SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik CRS326-24G-2SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
diff --git a/templates/net/mikrotik/mikrotik_CRS326-24G-2S+RM_snmp/template_net_mikrotik_CRS326-24G-2S+RM_snmp.yaml b/templates/net/mikrotik/mikrotik_CRS326-24G-2S+RM_snmp/template_net_mikrotik_CRS326-24G-2S+RM_snmp.yaml
index ec36a797dac..e4ae836297e 100644
--- a/templates/net/mikrotik/mikrotik_CRS326-24G-2S+RM_snmp/template_net_mikrotik_CRS326-24G-2S+RM_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_CRS326-24G-2S+RM_snmp/template_net_mikrotik_CRS326-24G-2S+RM_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:45:16Z'
+  date: '2022-01-26T09:50:06Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -35,8 +35,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: b74334acbba2407d8baff550f0db6d64
@@ -44,6 +47,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 877d543f8a0040a7bf6b48c734f9622f
           name: 'ICMP loss'
@@ -54,8 +61,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 160e58bf2d05433882e3e0c8f187c42e
@@ -67,6 +77,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CRS326-24G-2SRM SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 689a05d4bdec404abea16439908b9b22
           name: 'ICMP response time'
@@ -77,8 +94,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: ee3f5dbb8f5848c888c0d599be2dd4fa
@@ -93,6 +113,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CRS326-24G-2SRM SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 237fc861aa3b4a33ac6b1b4aee3f05b0
           name: 'SNMP traps (fallback)'
@@ -105,8 +132,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: ee5e1ba0c8d94747a0da617ba01fd998
           name: 'System contact details'
@@ -128,8 +155,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 743f06984d5549d2832c55914d3cbc5e
           name: 'System description'
@@ -152,8 +179,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: b6b5e17543b54d32a6efac05a346717b
           name: 'Firmware version'
@@ -174,8 +201,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: f91e54b227304a688092ffcbabf88d41
@@ -185,6 +212,10 @@ zabbix_export:
               priority: INFO
               description: 'Firmware version has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: da7d1bace5b84ec59f2a669c090c3b1f
           name: 'Hardware model name'
@@ -203,8 +234,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
         -
           uuid: 903370300c154ba09796eaca48f5e54f
           name: 'Hardware serial number'
@@ -226,8 +257,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: aeb6d1d52ee24d7393a4a5a31f7267fb
@@ -236,6 +267,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: a8e5af6ef52d457098ff5a9cd10a30da
           name: 'System location'
@@ -257,8 +292,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 1db5d107bd1f4395b1e746ee9a345f21
           name: 'System name'
@@ -280,8 +315,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 635b2c749af2495aa87688001bd73a6c
@@ -290,6 +325,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: b1b6c41064924674b43851832fbb7b10
           name: 'System object ID'
@@ -310,8 +352,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 823e2b2060f64bed86d2a99d5e1487c5
           name: 'Operating system'
@@ -333,8 +375,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: os
           triggers:
             -
               uuid: be2544b8b967408288a750c82a8f9059
@@ -347,6 +389,10 @@ zabbix_export:
                 -
                   name: 'System name has changed (new name: {ITEM.VALUE})'
                   expression: 'last(/MikroTik CRS326-24G-2SRM SNMP/system.name,#1)<>last(/MikroTik CRS326-24G-2SRM SNMP/system.name,#2) and length(last(/MikroTik CRS326-24G-2SRM SNMP/system.name))>0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 83a1109159ca4513ba278a3c290d10b9
           name: Uptime
@@ -367,8 +413,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 869d6bd39ef1440193978c60518a91f7
@@ -381,6 +427,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/MikroTik CRS326-24G-2SRM SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: ef5f00c33dea46b59b756eda8bb62f26
           name: 'Total memory'
@@ -407,8 +457,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: da09619f39da49d59cf0125b45d567a6
           name: 'Used memory'
@@ -427,8 +477,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: ec6c40e7c02c49efbb7116bc6917b42b
           name: 'Memory utilization'
@@ -441,8 +491,8 @@ zabbix_export:
           description: 'Memory utilization in %'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: 4fbf859b65774291850b37f700945a36
@@ -450,6 +500,13 @@ zabbix_export:
               name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
               priority: AVERAGE
               description: 'The system is running out of free memory.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 8161db2e10c84693961e742fda8a7fa2
           name: 'SNMP agent availability'
@@ -466,8 +523,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 6ed1c046ba1a4246a6e30d5147e58250
@@ -480,6 +540,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CRS326-24G-2SRM SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: 4f4f6561dbaa4b89a77461a91339d552
@@ -504,8 +568,8 @@ zabbix_export:
                 The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
               trigger_prototypes:
                 -
                   uuid: 6b4d22ac23db45beb398d591a157782e
@@ -514,6 +578,10 @@ zabbix_export:
                   opdata: 'Current utilization: {ITEM.LASTVALUE1}'
                   priority: WARNING
                   description: 'CPU utilization is too high. The system might be slow to respond.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 355ef2168d414a4ebce1cc754e9f53e8
@@ -558,8 +626,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 519c8f4f6a62492fbf739c2303f76aa5
@@ -570,6 +638,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 4b2e16580fe6436aa3e37813c83fde98
                   expression: 'avg(/MikroTik CRS326-24G-2SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
@@ -584,6 +659,13 @@ zabbix_export:
                       name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
                       expression: 'avg(/MikroTik CRS326-24G-2SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
                       recovery_expression: 'max(/MikroTik CRS326-24G-2SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 6cf5bdc92724485ba64f5d06b01f4656
                   expression: 'avg(/MikroTik CRS326-24G-2SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
@@ -592,6 +674,13 @@ zabbix_export:
                   name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 732470e573084fd6b7d27d99189004ba
           name: 'Temperature sensor discovery'
@@ -601,8 +690,7 @@ zabbix_export:
           delay: 1h
           description: |
             MIKROTIK-MIB::mtxrHlTemperature
-            Since temperature sensor is not available on all Mikrotik hardware,
-            this is done to avoid unsupported items.
+            Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.
           item_prototypes:
             -
               uuid: ce36e933fd9146c29d9d46ebfef95489
@@ -626,8 +714,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 2218bd775d8c421992346f40d0b38fa4
@@ -638,6 +726,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 093386c3b35f45bab6cea6d6396064b1
                   expression: 'avg(/MikroTik CRS326-24G-2SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
@@ -652,6 +747,13 @@ zabbix_export:
                       name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
                       expression: 'avg(/MikroTik CRS326-24G-2SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
                       recovery_expression: 'max(/MikroTik CRS326-24G-2SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 17ac58cd999d49f1ae31bc6a9280f887
                   expression: 'avg(/MikroTik CRS326-24G-2SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
@@ -660,6 +762,13 @@ zabbix_export:
                   name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 846190a30b804bfda47b31796819f8fb
           name: 'LTE modem discovery'
@@ -694,14 +803,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRP Reference Signal Received Power.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 1f7f8781515a44b4b12db1a162e9a8f4
                   expression: 'max(/MikroTik CRS326-24G-2SRM SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: f6c1350d1a694bae98bf59d862ac8f59
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
@@ -716,14 +838,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 79166253631142cf87660a658c77169e
                   expression: 'max(/MikroTik CRS326-24G-2SRM SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 7242abcbe9314f23ac5512edbf4c39a1
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
@@ -738,14 +873,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: e5d37873211c44aca51f7926a9b2add6
                   expression: 'max(/MikroTik CRS326-24G-2SRM SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: fc2d8f9f26da4e4abb625394e66b194a
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
@@ -760,14 +908,27 @@ zabbix_export:
                 mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 51c15917a456414ca6fef2cc86156484
                   expression: 'max(/MikroTik CRS326-24G-2SRM SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 97b0559a53d64cd1aa0e0dfd1720c15b
@@ -828,8 +989,14 @@ zabbix_export:
                 mtxrWlApAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: f4c638ed14314c8790e34b9e32ee6f17
               name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
@@ -849,8 +1016,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 2986ecfb1d7641289cd1aca79e1f206f
               name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
@@ -870,8 +1043,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: f2ceea0e555440808c983d61d4cd620e
               name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
@@ -890,8 +1069,14 @@ zabbix_export:
                     - 15m
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 3f8622b3bd154ec5b2bf8fc75e35183f
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -904,8 +1089,14 @@ zabbix_export:
                 mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
         -
           uuid: c475a511980841b49b7615b93c873eae
           name: 'CAPsMAN AP channel discovery'
@@ -938,8 +1129,14 @@ zabbix_export:
                 mtxrWlCMAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 6ecceab4ba1345708fa806542ce85051
               name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
@@ -959,8 +1156,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 9da88d1a5d3649f0ac023319f529026d
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -973,8 +1176,14 @@ zabbix_export:
                 mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 2c0ffadf84784e20af33236fbe6aa763
               name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
@@ -994,8 +1203,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: e9057c50ee5148119a922bd170e7463f
@@ -1003,6 +1218,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
                   priority: WARNING
                   description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: a7da0c4a802f426293c53be9de92c2bd
           name: 'Network interfaces discovery'
@@ -1091,8 +1313,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 70d09c8adda84e20a2f88543d061bae1
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -1111,8 +1339,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 4dfaf66c7f4e4120a74f0c7732dc4607
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -1136,8 +1370,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 9de9d790a7b7413d9d5c846105f08e9c
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -1160,8 +1400,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: c99856d2f78e4de893717c70b4a5d71d
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -1180,8 +1426,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 658a5d7e0c9d49af99c8c1851d79660b
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -1205,8 +1457,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 30a84a0c28f84167aa4d59d456571071
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -1231,8 +1489,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: affe22bbc74b43ff8dc58e83d6a79f9c
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -1254,8 +1518,14 @@ zabbix_export:
                 name: 'IF-MIB::ifOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: f32914fd53134704a5c11b501decb57e
@@ -1273,6 +1543,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: ebcc896ec938477b830def5aceb7f211
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -1296,8 +1570,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           trigger_prototypes:
             -
               uuid: 4549b4a23bc24c0d8998f2dc6a77a520
@@ -1327,6 +1607,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CRS326-24G-2SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CRS326-24G-2SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CRS326-24G-2SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CRS326-24G-2SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 676efabc192b4583b60c52ce440d00f2
               expression: |
@@ -1347,6 +1631,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CRS326-24G-2SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CRS326-24G-2SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CRS326-24G-2SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CRS326-24G-2SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: cd633c8e31824cb1b38c6e9dad58ca7e
               expression: |
@@ -1366,6 +1654,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CRS326-24G-2SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CRS326-24G-2SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CRS326-24G-2SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CRS326-24G-2SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: 8063d2bd97224c4794ac9af17a724f85
@@ -1444,8 +1739,11 @@ zabbix_export:
               description: 'Space utilization in % for Disk-{#SNMPINDEX}'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 306d4dbbacd949b58631f178937c667e
               name: 'Disk-{#SNMPINDEX}: Total space'
@@ -1472,8 +1770,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 29c812f5a94f49a5a28690af05553bbf
               name: 'Disk-{#SNMPINDEX}: Used space'
@@ -1492,8 +1793,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
           trigger_prototypes:
             -
               uuid: c01561923734478abc70b7c02d2d9add
@@ -1509,6 +1813,13 @@ zabbix_export:
                  - The disk free space is less than 5G.
                  - The disk will be full in less than 24 hours.
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
             -
               uuid: e53a74871f2b4fadb8ff206f348fc90c
               expression: |
@@ -1529,6 +1840,13 @@ zabbix_export:
                   expression: |
                     last(/MikroTik CRS326-24G-2SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
                     ((last(/MikroTik CRS326-24G-2SRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS326-24G-2SRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS326-24G-2SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
           graph_prototypes:
             -
               uuid: 228fb326e5f94c4f8df119f610be831f
@@ -1552,6 +1870,16 @@ zabbix_export:
                   item:
                     host: 'MikroTik CRS326-24G-2SRM SNMP'
                     key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: crs326-24g-2splusrm
+        -
+          tag: target
+          value: mikrotik
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/net/mikrotik/mikrotik_CRS326-24S+2Q+RM_snmp/README.md b/templates/net/mikrotik/mikrotik_CRS326-24S+2Q+RM_snmp/README.md
index c812758927f..4d3536ede9e 100644
--- a/templates/net/mikrotik/mikrotik_CRS326-24S+2Q+RM_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_CRS326-24S+2Q+RM_snmp/README.md
@@ -71,7 +71,7 @@ There are no template links in this template.
 |Network interfaces discovery |<p>Discovering interfaces from IF-MIB.</p> |SNMP |net.if.discovery<p>**Filter**:</p>AND <p>- {#IFADMINSTATUS} MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.MATCHES}`</p><p>- {#IFADMINSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.NOT_MATCHES}`</p><p>- {#IFOPERSTATUS} MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.MATCHES}`</p><p>- {#IFOPERSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.NOT_MATCHES}`</p><p>- {#IFNAME} MATCHES_REGEX `{$NET.IF.IFNAME.MATCHES}`</p><p>- {#IFNAME} NOT_MATCHES_REGEX `{$NET.IF.IFNAME.NOT_MATCHES}`</p><p>- {#IFDESCR} MATCHES_REGEX `{$NET.IF.IFDESCR.MATCHES}`</p><p>- {#IFDESCR} NOT_MATCHES_REGEX `{$NET.IF.IFDESCR.NOT_MATCHES}`</p><p>- {#IFALIAS} MATCHES_REGEX `{$NET.IF.IFALIAS.MATCHES}`</p><p>- {#IFALIAS} NOT_MATCHES_REGEX `{$NET.IF.IFALIAS.NOT_MATCHES}`</p><p>- {#IFTYPE} MATCHES_REGEX `{$NET.IF.IFTYPE.MATCHES}`</p><p>- {#IFTYPE} NOT_MATCHES_REGEX `{$NET.IF.IFTYPE.NOT_MATCHES}`</p> |
 |Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 |Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
-|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
 
 ## Items collected
 
@@ -137,14 +137,14 @@ There are no template links in this template.
 |Interface {#IFNAME}({#IFALIAS}): Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p><p>3. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CRS326-24S2QRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CRS326-24S2QRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CRS326-24S2QRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))`<p>Recovery expression:</p>`last(/MikroTik CRS326-24S2QRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0` |AVERAGE |<p>Manual close: YES</p> |
 |Interface {#IFNAME}({#IFALIAS}): High bandwidth usage (>{$IF.UTIL.MAX:"{#IFNAME}"}%) |<p>The network interface utilization is close to its estimated maximum bandwidth.</p> |`(avg(/MikroTik CRS326-24S2QRM SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik CRS326-24S2QRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) or avg(/MikroTik CRS326-24S2QRM SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik CRS326-24S2QRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])) and last(/MikroTik CRS326-24S2QRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0`<p>Recovery expression:</p>`avg(/MikroTik CRS326-24S2QRM SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik CRS326-24S2QRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) and avg(/MikroTik CRS326-24S2QRM SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik CRS326-24S2QRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |Interface {#IFNAME}({#IFALIAS}): High error rate (>{$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) |<p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p> |`min(/MikroTik CRS326-24S2QRM SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"} or min(/MikroTik CRS326-24S2QRM SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`max(/MikroTik CRS326-24S2QRM SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8 and max(/MikroTik CRS326-24S2QRM SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
-|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik CRS326-24S2QRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik CRS326-24S2QRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik CRS326-24S2QRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik CRS326-24S2QRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik CRS326-24S2QRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik CRS326-24S2QRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik CRS326-24S2QRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik CRS326-24S2QRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik CRS326-24S2QRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2) `<p>Recovery expression:</p>`(change(/MikroTik CRS326-24S2QRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik CRS326-24S2QRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik CRS326-24S2QRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2) ` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik CRS326-24S2QRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik CRS326-24S2QRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik CRS326-24S2QRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik CRS326-24S2QRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik CRS326-24S2QRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik CRS326-24S2QRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik CRS326-24S2QRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik CRS326-24S2QRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik CRS326-24S2QRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2)`<p>Recovery expression:</p>`(change(/MikroTik CRS326-24S2QRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik CRS326-24S2QRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik CRS326-24S2QRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2)` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |{HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/MikroTik CRS326-24S2QRM SNMP/system.uptime[sysUpTime.0])<10m` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- No SNMP data collection</p> |
 |No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/MikroTik CRS326-24S2QRM SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |Unavailable by ICMP ping |<p>Last three attempts returned timeout.  Please check device connectivity.</p> |`max(/MikroTik CRS326-24S2QRM SNMP/icmpping,#3)=0` |HIGH | |
 |High ICMP ping loss |<p>-</p> |`min(/MikroTik CRS326-24S2QRM SNMP/icmppingloss,5m)>{$ICMP_LOSS_WARN} and min(/MikroTik CRS326-24S2QRM SNMP/icmppingloss,5m)<100` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |High ICMP ping response time |<p>-</p> |`avg(/MikroTik CRS326-24S2QRM SNMP/icmppingsec,5m)>{$ICMP_RESPONSE_TIME_WARN}` |WARNING |<p>**Depends on**:</p><p>- High ICMP ping loss</p><p>- Unavailable by ICMP ping</p> |
-|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS326-24S2QRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS326-24S2QRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS326-24S2QRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS326-24S2QRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
-|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS326-24S2QRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS326-24S2QRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS326-24S2QRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CRS326-24S2QRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS326-24S2QRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS326-24S2QRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS326-24S2QRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS326-24S2QRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS326-24S2QRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS326-24S2QRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS326-24S2QRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CRS326-24S2QRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
 |CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS326-24S2QRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CRS326-24S2QRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
 |CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS326-24S2QRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CRS326-24S2QRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
 |CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik CRS326-24S2QRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik CRS326-24S2QRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
diff --git a/templates/net/mikrotik/mikrotik_CRS326-24S+2Q+RM_snmp/template_net_mikrotik_CRS326-24S+2Q+RM_snmp.yaml b/templates/net/mikrotik/mikrotik_CRS326-24S+2Q+RM_snmp/template_net_mikrotik_CRS326-24S+2Q+RM_snmp.yaml
index fba38d9bef9..0e412d5e582 100644
--- a/templates/net/mikrotik/mikrotik_CRS326-24S+2Q+RM_snmp/template_net_mikrotik_CRS326-24S+2Q+RM_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_CRS326-24S+2Q+RM_snmp/template_net_mikrotik_CRS326-24S+2Q+RM_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:45:21Z'
+  date: '2022-01-26T09:52:12Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -35,8 +35,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: d81a92c3079b4d25be205b1e56b15a73
@@ -44,6 +47,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: e563c3cb4a254b70a6f034fc81c2f672
           name: 'ICMP loss'
@@ -54,8 +61,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: cd4376c2f8e449b9b4923720374198af
@@ -67,6 +77,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CRS326-24S2QRM SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: a3a45a21356644f7bccced62a2d8ce3b
           name: 'ICMP response time'
@@ -77,8 +94,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 9e00ffd6364d4e238985a4f23601e1c6
@@ -93,6 +113,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CRS326-24S2QRM SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 88f1d48a273f4400930efd1086b61b64
           name: 'SNMP traps (fallback)'
@@ -105,8 +132,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: e170bed368914833917c81d70fea7e1c
           name: 'System contact details'
@@ -128,8 +155,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: d668a2c3ee2b49629f4520b3627e5cc1
           name: 'System description'
@@ -152,8 +179,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 8ac79dd0cff146c9ae018a8ba626f9e7
           name: 'Firmware version'
@@ -174,8 +201,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: db665e87151d441395fce421949a9bb0
@@ -185,6 +212,10 @@ zabbix_export:
               priority: INFO
               description: 'Firmware version has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 8b6f433b2de14edcb0efb036c562b090
           name: 'Hardware model name'
@@ -203,8 +234,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
         -
           uuid: 484e12b0d4a24d19b9edfd300cfef958
           name: 'Hardware serial number'
@@ -226,8 +257,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: a5e267a8584a4d099f0d36d30ce17d0b
@@ -236,6 +267,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 8a856d5811924020a98ce56910cb52af
           name: 'System location'
@@ -257,8 +292,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 37b571d2c80e484d826ab688768d2036
           name: 'System name'
@@ -280,8 +315,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 968c0bef31dc4ae89426b7dee5b76ea1
@@ -290,6 +325,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: b2c67ce1f337481e9ffe6a1f3c467c8c
           name: 'System object ID'
@@ -310,8 +352,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 9c810b41d48243668158812fdfdea4f7
           name: 'Operating system'
@@ -333,8 +375,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: os
           triggers:
             -
               uuid: 9fe8a423c0a8411191337e48818cd835
@@ -347,6 +389,10 @@ zabbix_export:
                 -
                   name: 'System name has changed (new name: {ITEM.VALUE})'
                   expression: 'last(/MikroTik CRS326-24S2QRM SNMP/system.name,#1)<>last(/MikroTik CRS326-24S2QRM SNMP/system.name,#2) and length(last(/MikroTik CRS326-24S2QRM SNMP/system.name))>0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: d2fbbaae58704270b5fc8d04bca76209
           name: Uptime
@@ -367,8 +413,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 119f36d60a1141f5a5dee9ee3aba894b
@@ -381,6 +427,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/MikroTik CRS326-24S2QRM SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: b34dda68e02640f88df173b7eeab267f
           name: 'Total memory'
@@ -407,8 +457,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 561afbad2b3d4d20a3fbe9753abd8623
           name: 'Used memory'
@@ -427,8 +477,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: f605ea1480d947b3bad4d1592c215643
           name: 'Memory utilization'
@@ -441,8 +491,8 @@ zabbix_export:
           description: 'Memory utilization in %'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: ef73c971f14444f18a8b0956c8bd5796
@@ -450,6 +500,13 @@ zabbix_export:
               name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
               priority: AVERAGE
               description: 'The system is running out of free memory.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 641ccd0e5ec8454bb0bc62d3e8362cc2
           name: 'SNMP agent availability'
@@ -466,8 +523,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: cd1295131197495183bcc095622fb296
@@ -480,6 +540,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CRS326-24S2QRM SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: 315ea6f2b17e4bb5a019394e8cd50a59
@@ -504,8 +568,8 @@ zabbix_export:
                 The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
               trigger_prototypes:
                 -
                   uuid: 887bf529d1aa43dbaec9a92a390fc0cd
@@ -514,6 +578,10 @@ zabbix_export:
                   opdata: 'Current utilization: {ITEM.LASTVALUE1}'
                   priority: WARNING
                   description: 'CPU utilization is too high. The system might be slow to respond.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 22d8af79856d488a947501bb351d3431
@@ -558,8 +626,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 4ec904a360ff48668e5273ba4dd223fa
@@ -570,6 +638,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: c8dcfe797232437991ab8da001e9855e
                   expression: 'avg(/MikroTik CRS326-24S2QRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
@@ -584,6 +659,13 @@ zabbix_export:
                       name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
                       expression: 'avg(/MikroTik CRS326-24S2QRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
                       recovery_expression: 'max(/MikroTik CRS326-24S2QRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 90cea4e309944224abe0052a9eeb2e59
                   expression: 'avg(/MikroTik CRS326-24S2QRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
@@ -592,6 +674,13 @@ zabbix_export:
                   name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: b606e130e79e4664892e94f25bbdb7ee
           name: 'Temperature sensor discovery'
@@ -601,8 +690,7 @@ zabbix_export:
           delay: 1h
           description: |
             MIKROTIK-MIB::mtxrHlTemperature
-            Since temperature sensor is not available on all Mikrotik hardware,
-            this is done to avoid unsupported items.
+            Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.
           item_prototypes:
             -
               uuid: 32fa64de0bb44217907a3f8ca6683036
@@ -626,8 +714,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: b0718bee8c8d422683e5f9f2915a35c0
@@ -638,6 +726,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: bb57907f2cec4eeda6e7ace60d90a2f3
                   expression: 'avg(/MikroTik CRS326-24S2QRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
@@ -652,6 +747,13 @@ zabbix_export:
                       name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
                       expression: 'avg(/MikroTik CRS326-24S2QRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
                       recovery_expression: 'max(/MikroTik CRS326-24S2QRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 7c1161969d7f490fba58d113a7cf9da2
                   expression: 'avg(/MikroTik CRS326-24S2QRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
@@ -660,6 +762,13 @@ zabbix_export:
                   name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: d7a8644f9af749afa7194b9bda688f74
           name: 'LTE modem discovery'
@@ -694,14 +803,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRP Reference Signal Received Power.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: ce0b05960b714a03b34f626d262f410a
                   expression: 'max(/MikroTik CRS326-24S2QRM SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: b51fb106f4724770b841a0f604655d2e
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
@@ -716,14 +838,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: e97689431f51481db6836b937214a926
                   expression: 'max(/MikroTik CRS326-24S2QRM SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: b7520a6b109a421b8d2c051751c62aae
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
@@ -738,14 +873,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: de8a3e44f9494ae0b9506785386c0604
                   expression: 'max(/MikroTik CRS326-24S2QRM SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: eb86d792431b41b0ad214e5ddf37cafe
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
@@ -760,14 +908,27 @@ zabbix_export:
                 mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 4c4e3d9b71974e3192070aa344e37221
                   expression: 'max(/MikroTik CRS326-24S2QRM SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 895e92a3343f40a393cfae577148bc73
@@ -828,8 +989,14 @@ zabbix_export:
                 mtxrWlApAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 96176e87857f422fae7e82eb10b75037
               name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
@@ -849,8 +1016,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 6dc6a1f0f3254cd89cc643796480e820
               name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
@@ -870,8 +1043,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 8ef96b8baa8b4e1187479213a46aca29
               name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
@@ -890,8 +1069,14 @@ zabbix_export:
                     - 15m
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 8dd35e2eedf545399834152eba4ac03a
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -904,8 +1089,14 @@ zabbix_export:
                 mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
         -
           uuid: cc00fd051776439cb2267611af6d9b9b
           name: 'CAPsMAN AP channel discovery'
@@ -938,8 +1129,14 @@ zabbix_export:
                 mtxrWlCMAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: b73c3270404e4dd3a25bf128a6cc0ef2
               name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
@@ -959,8 +1156,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: fe0b8b2c15ef45b7b61a97e2624d40f8
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -973,8 +1176,14 @@ zabbix_export:
                 mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: f5080d802e114edea1a74513cad65043
               name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
@@ -994,8 +1203,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 034fd6289a4a4d549ea927ae48d8b225
@@ -1003,6 +1218,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
                   priority: WARNING
                   description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 83044efa2ab24bec9b9cba167429c1fe
           name: 'Network interfaces discovery'
@@ -1091,8 +1313,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 4080212fd8264ec99caa6559f69d4a81
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -1111,8 +1339,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 68b31566f60a4336a03893e01f72f32c
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -1136,8 +1370,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 17cadd22893c4266abe046e89925c570
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -1160,8 +1400,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 9ac86d8e79a74ec6ba6223e379a409cc
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -1180,8 +1426,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 4cae0453843645d4bc52f613f1622d28
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -1205,8 +1457,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: e84f616abb4e4e9ca5a278bf6f446508
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -1231,8 +1489,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: f3537d0d3dfd4cb1aff00930115f927d
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -1254,8 +1518,14 @@ zabbix_export:
                 name: 'IF-MIB::ifOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 066a5460a2964a7586a90494dcc29c4f
@@ -1273,6 +1543,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: a0c424489d3640d68027bd4e0f1a6a5f
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -1296,8 +1570,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           trigger_prototypes:
             -
               uuid: a14597e77d1a47cfae87df483df50d44
@@ -1327,6 +1607,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CRS326-24S2QRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CRS326-24S2QRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CRS326-24S2QRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CRS326-24S2QRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 86aee07149c9403eba4e32030c52ae0e
               expression: |
@@ -1347,6 +1631,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CRS326-24S2QRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CRS326-24S2QRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CRS326-24S2QRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CRS326-24S2QRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 2fa427f9d66548ee9574495847cd521a
               expression: |
@@ -1366,6 +1654,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CRS326-24S2QRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CRS326-24S2QRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CRS326-24S2QRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CRS326-24S2QRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: b88abc1dd12d46ce86ca491699c6bddf
@@ -1444,8 +1739,11 @@ zabbix_export:
               description: 'Space utilization in % for Disk-{#SNMPINDEX}'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 0fde6656cbcb41839171e972e6fea8ac
               name: 'Disk-{#SNMPINDEX}: Total space'
@@ -1472,8 +1770,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: a73e8eeae6044e6098e55abc93010a29
               name: 'Disk-{#SNMPINDEX}: Used space'
@@ -1492,8 +1793,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
           trigger_prototypes:
             -
               uuid: e6c0c2401c0940ef8edae9aa38aa49e3
@@ -1509,6 +1813,13 @@ zabbix_export:
                  - The disk free space is less than 5G.
                  - The disk will be full in less than 24 hours.
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
             -
               uuid: d72e1d5537ec498788f6e7e57e18f65d
               expression: |
@@ -1529,6 +1840,13 @@ zabbix_export:
                   expression: |
                     last(/MikroTik CRS326-24S2QRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
                     ((last(/MikroTik CRS326-24S2QRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS326-24S2QRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS326-24S2QRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
           graph_prototypes:
             -
               uuid: f93f28ba09be4fadac28a304b1050c00
@@ -1552,6 +1870,16 @@ zabbix_export:
                   item:
                     host: 'MikroTik CRS326-24S2QRM SNMP'
                     key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: crs326-24splus2qplusrm
+        -
+          tag: target
+          value: mikrotik
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/net/mikrotik/mikrotik_CRS328-24P-4S+RM_snmp/README.md b/templates/net/mikrotik/mikrotik_CRS328-24P-4S+RM_snmp/README.md
index c29fa95c055..06d85c0fee5 100644
--- a/templates/net/mikrotik/mikrotik_CRS328-24P-4S+RM_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_CRS328-24P-4S+RM_snmp/README.md
@@ -71,7 +71,7 @@ There are no template links in this template.
 |Network interfaces discovery |<p>Discovering interfaces from IF-MIB.</p> |SNMP |net.if.discovery<p>**Filter**:</p>AND <p>- {#IFADMINSTATUS} MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.MATCHES}`</p><p>- {#IFADMINSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.NOT_MATCHES}`</p><p>- {#IFOPERSTATUS} MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.MATCHES}`</p><p>- {#IFOPERSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.NOT_MATCHES}`</p><p>- {#IFNAME} MATCHES_REGEX `{$NET.IF.IFNAME.MATCHES}`</p><p>- {#IFNAME} NOT_MATCHES_REGEX `{$NET.IF.IFNAME.NOT_MATCHES}`</p><p>- {#IFDESCR} MATCHES_REGEX `{$NET.IF.IFDESCR.MATCHES}`</p><p>- {#IFDESCR} NOT_MATCHES_REGEX `{$NET.IF.IFDESCR.NOT_MATCHES}`</p><p>- {#IFALIAS} MATCHES_REGEX `{$NET.IF.IFALIAS.MATCHES}`</p><p>- {#IFALIAS} NOT_MATCHES_REGEX `{$NET.IF.IFALIAS.NOT_MATCHES}`</p><p>- {#IFTYPE} MATCHES_REGEX `{$NET.IF.IFTYPE.MATCHES}`</p><p>- {#IFTYPE} NOT_MATCHES_REGEX `{$NET.IF.IFTYPE.NOT_MATCHES}`</p> |
 |Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 |Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
-|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
 
 ## Items collected
 
@@ -137,14 +137,14 @@ There are no template links in this template.
 |Interface {#IFNAME}({#IFALIAS}): Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p><p>3. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CRS328-24P-4SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CRS328-24P-4SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CRS328-24P-4SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))`<p>Recovery expression:</p>`last(/MikroTik CRS328-24P-4SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0` |AVERAGE |<p>Manual close: YES</p> |
 |Interface {#IFNAME}({#IFALIAS}): High bandwidth usage (>{$IF.UTIL.MAX:"{#IFNAME}"}%) |<p>The network interface utilization is close to its estimated maximum bandwidth.</p> |`(avg(/MikroTik CRS328-24P-4SRM SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik CRS328-24P-4SRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) or avg(/MikroTik CRS328-24P-4SRM SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik CRS328-24P-4SRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])) and last(/MikroTik CRS328-24P-4SRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0`<p>Recovery expression:</p>`avg(/MikroTik CRS328-24P-4SRM SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik CRS328-24P-4SRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) and avg(/MikroTik CRS328-24P-4SRM SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik CRS328-24P-4SRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |Interface {#IFNAME}({#IFALIAS}): High error rate (>{$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) |<p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p> |`min(/MikroTik CRS328-24P-4SRM SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"} or min(/MikroTik CRS328-24P-4SRM SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`max(/MikroTik CRS328-24P-4SRM SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8 and max(/MikroTik CRS328-24P-4SRM SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
-|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik CRS328-24P-4SRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik CRS328-24P-4SRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik CRS328-24P-4SRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik CRS328-24P-4SRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik CRS328-24P-4SRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik CRS328-24P-4SRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik CRS328-24P-4SRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik CRS328-24P-4SRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik CRS328-24P-4SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2) `<p>Recovery expression:</p>`(change(/MikroTik CRS328-24P-4SRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik CRS328-24P-4SRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik CRS328-24P-4SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2) ` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik CRS328-24P-4SRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik CRS328-24P-4SRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik CRS328-24P-4SRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik CRS328-24P-4SRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik CRS328-24P-4SRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik CRS328-24P-4SRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik CRS328-24P-4SRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik CRS328-24P-4SRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik CRS328-24P-4SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2)`<p>Recovery expression:</p>`(change(/MikroTik CRS328-24P-4SRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik CRS328-24P-4SRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik CRS328-24P-4SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2)` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |{HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/MikroTik CRS328-24P-4SRM SNMP/system.uptime[sysUpTime.0])<10m` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- No SNMP data collection</p> |
 |No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/MikroTik CRS328-24P-4SRM SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |Unavailable by ICMP ping |<p>Last three attempts returned timeout.  Please check device connectivity.</p> |`max(/MikroTik CRS328-24P-4SRM SNMP/icmpping,#3)=0` |HIGH | |
 |High ICMP ping loss |<p>-</p> |`min(/MikroTik CRS328-24P-4SRM SNMP/icmppingloss,5m)>{$ICMP_LOSS_WARN} and min(/MikroTik CRS328-24P-4SRM SNMP/icmppingloss,5m)<100` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |High ICMP ping response time |<p>-</p> |`avg(/MikroTik CRS328-24P-4SRM SNMP/icmppingsec,5m)>{$ICMP_RESPONSE_TIME_WARN}` |WARNING |<p>**Depends on**:</p><p>- High ICMP ping loss</p><p>- Unavailable by ICMP ping</p> |
-|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS328-24P-4SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS328-24P-4SRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS328-24P-4SRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS328-24P-4SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
-|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS328-24P-4SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS328-24P-4SRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS328-24P-4SRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CRS328-24P-4SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS328-24P-4SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS328-24P-4SRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS328-24P-4SRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS328-24P-4SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS328-24P-4SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS328-24P-4SRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS328-24P-4SRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CRS328-24P-4SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
 |CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS328-24P-4SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CRS328-24P-4SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
 |CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS328-24P-4SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CRS328-24P-4SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
 |CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik CRS328-24P-4SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik CRS328-24P-4SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
diff --git a/templates/net/mikrotik/mikrotik_CRS328-24P-4S+RM_snmp/template_net_mikrotik_CRS328-24P-4S+RM_snmp.yaml b/templates/net/mikrotik/mikrotik_CRS328-24P-4S+RM_snmp/template_net_mikrotik_CRS328-24P-4S+RM_snmp.yaml
index ae7f62d1924..9d10bf84cdd 100644
--- a/templates/net/mikrotik/mikrotik_CRS328-24P-4S+RM_snmp/template_net_mikrotik_CRS328-24P-4S+RM_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_CRS328-24P-4S+RM_snmp/template_net_mikrotik_CRS328-24P-4S+RM_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:45:26Z'
+  date: '2022-01-26T09:46:36Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -35,8 +35,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 0f59da9697304abd8c074c51ce3a4bef
@@ -44,6 +47,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: ead664e6adfc4911854075c0c173ea88
           name: 'ICMP loss'
@@ -54,8 +61,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 14b723dee48541a3a8b36c128681a200
@@ -67,6 +77,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CRS328-24P-4SRM SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 95ca4a96e93d4d8cb4d1d9d97b711231
           name: 'ICMP response time'
@@ -77,8 +94,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: f8666db5e5a64d3fa7119deac48c317c
@@ -93,6 +113,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CRS328-24P-4SRM SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: a3e60d1ff0444f0485f3b41100f21c15
           name: 'SNMP traps (fallback)'
@@ -105,8 +132,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: 714588b12797482192a786a131dab9f6
           name: 'System contact details'
@@ -128,8 +155,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 1a35e1108dbd47b4bd818668e5523aec
           name: 'System description'
@@ -152,8 +179,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: a4b55762b7ad446fa5c213883b8eebd2
           name: 'Firmware version'
@@ -174,8 +201,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 98b8b373def34eec9e814c039dcfb20b
@@ -185,6 +212,10 @@ zabbix_export:
               priority: INFO
               description: 'Firmware version has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: f5c605a329274039883a04e6993d1e22
           name: 'Hardware model name'
@@ -203,8 +234,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
         -
           uuid: 1d0da69b54a24b938cc1e9b37163dca3
           name: 'Hardware serial number'
@@ -226,8 +257,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: da1a900485be412996f607b9669daf83
@@ -236,6 +267,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 4445d982dc354baf8c7649ab9250b3f9
           name: 'System location'
@@ -257,8 +292,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 53e45ee656db47afabc6ad18d3f61c37
           name: 'System name'
@@ -280,8 +315,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 375ba33fbee4425d97cbb15e410e52d3
@@ -290,6 +325,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: b6aacb1fd6b8413f837f2cb3b1977a22
           name: 'System object ID'
@@ -310,8 +352,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 8fe83ecd500341999fc23e74d61dcf6b
           name: 'Operating system'
@@ -333,8 +375,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: os
           triggers:
             -
               uuid: 41ec834afc7a49409cc9996459b15452
@@ -347,6 +389,10 @@ zabbix_export:
                 -
                   name: 'System name has changed (new name: {ITEM.VALUE})'
                   expression: 'last(/MikroTik CRS328-24P-4SRM SNMP/system.name,#1)<>last(/MikroTik CRS328-24P-4SRM SNMP/system.name,#2) and length(last(/MikroTik CRS328-24P-4SRM SNMP/system.name))>0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 54d630b4d80e4ac0a9942630a80b14d8
           name: Uptime
@@ -367,8 +413,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 4e0a9fd604b04e6295108f8edf7910a9
@@ -381,6 +427,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/MikroTik CRS328-24P-4SRM SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: f79fd8f841404f88aa130513c8264e27
           name: 'Total memory'
@@ -407,8 +457,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 05cfdd5f009843a3a2b80939fb6f773d
           name: 'Used memory'
@@ -427,8 +477,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 26765cfd258e46d18c3d085c170c1004
           name: 'Memory utilization'
@@ -441,8 +491,8 @@ zabbix_export:
           description: 'Memory utilization in %'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: 86bc4c3dbd024d8d84a90f25fa8c0932
@@ -450,6 +500,13 @@ zabbix_export:
               name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
               priority: AVERAGE
               description: 'The system is running out of free memory.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: bd170bcf34104168884e123da7ed93da
           name: 'SNMP agent availability'
@@ -466,8 +523,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 5ea3db8ebb2f49ab9fe7d38de50a4003
@@ -480,6 +540,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CRS328-24P-4SRM SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: 06ffa927f56746138f8bb938b1875c51
@@ -504,8 +568,8 @@ zabbix_export:
                 The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
               trigger_prototypes:
                 -
                   uuid: dfedf883e0e043a8924796421d0836da
@@ -514,6 +578,10 @@ zabbix_export:
                   opdata: 'Current utilization: {ITEM.LASTVALUE1}'
                   priority: WARNING
                   description: 'CPU utilization is too high. The system might be slow to respond.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 50d486acb91e4c3d801caa22b74d46d3
@@ -558,8 +626,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: cc60802009c449eaa49992f38c176f8c
@@ -570,6 +638,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: f83dac15be7a4f6a891406fe1e307074
                   expression: 'avg(/MikroTik CRS328-24P-4SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
@@ -584,6 +659,13 @@ zabbix_export:
                       name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
                       expression: 'avg(/MikroTik CRS328-24P-4SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
                       recovery_expression: 'max(/MikroTik CRS328-24P-4SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 7044f89f39fd4fa7ba1bc790e86fc960
                   expression: 'avg(/MikroTik CRS328-24P-4SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
@@ -592,6 +674,13 @@ zabbix_export:
                   name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 4376a8c9a1d94d9da621d66f41546644
           name: 'Temperature sensor discovery'
@@ -601,8 +690,7 @@ zabbix_export:
           delay: 1h
           description: |
             MIKROTIK-MIB::mtxrHlTemperature
-            Since temperature sensor is not available on all Mikrotik hardware,
-            this is done to avoid unsupported items.
+            Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.
           item_prototypes:
             -
               uuid: 4ee4e5b2384e48bd86df5e6f26d37e84
@@ -626,8 +714,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 2cc0f3a6c39340b78e6b1795b90ee052
@@ -638,6 +726,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 5f460952122241d5900e83f68e097e32
                   expression: 'avg(/MikroTik CRS328-24P-4SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
@@ -652,6 +747,13 @@ zabbix_export:
                       name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
                       expression: 'avg(/MikroTik CRS328-24P-4SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
                       recovery_expression: 'max(/MikroTik CRS328-24P-4SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: e729643fce2d43d8b5de5a5f3d0fa184
                   expression: 'avg(/MikroTik CRS328-24P-4SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
@@ -660,6 +762,13 @@ zabbix_export:
                   name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: bcf3a43092af4746bd6260c0fbc0961e
           name: 'LTE modem discovery'
@@ -694,14 +803,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRP Reference Signal Received Power.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: de98377f082840a0929e2f9024eb873d
                   expression: 'max(/MikroTik CRS328-24P-4SRM SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: c9ffc4c45804499aa820715d6d939448
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
@@ -716,14 +838,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 4cf201a794cf48dfbaf574a04f8111b6
                   expression: 'max(/MikroTik CRS328-24P-4SRM SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 26a591c37a114fd8bdcc16a7144aa92c
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
@@ -738,14 +873,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 3666c8cb456a4e4581c4ebac22db115a
                   expression: 'max(/MikroTik CRS328-24P-4SRM SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: cc7ca6b56a1f46ce9ed350511a8b2f17
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
@@ -760,14 +908,27 @@ zabbix_export:
                 mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 4b0a6c73bc1f4e7692cb9196dbdf059c
                   expression: 'max(/MikroTik CRS328-24P-4SRM SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: badd6b852574497db920e2fd65c42cf6
@@ -828,8 +989,14 @@ zabbix_export:
                 mtxrWlApAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: d41f53d1a100475699f3afa9ec75eb14
               name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
@@ -849,8 +1016,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: ab3b88358f934afb9f9f3d9be2d32ded
               name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
@@ -870,8 +1043,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 02bd9f30327d4061809dc2a6ec76d152
               name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
@@ -890,8 +1069,14 @@ zabbix_export:
                     - 15m
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: d4b928ebdc964a86a6e10b054d73bf1b
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -904,8 +1089,14 @@ zabbix_export:
                 mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
         -
           uuid: 054261dc7c2141c3b176c8692f1d9709
           name: 'CAPsMAN AP channel discovery'
@@ -938,8 +1129,14 @@ zabbix_export:
                 mtxrWlCMAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 0807ecb116b24ff09018962be0d0e457
               name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
@@ -959,8 +1156,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 27e9f662777645aa902981947c954800
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -973,8 +1176,14 @@ zabbix_export:
                 mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 679353503cb74edc85886f48b34d1f7d
               name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
@@ -994,8 +1203,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 26baba4f44aa436fbe96c86a4a511156
@@ -1003,6 +1218,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
                   priority: WARNING
                   description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 402036489b6644478c97aee607bbbad2
           name: 'Network interfaces discovery'
@@ -1091,8 +1313,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: c3765b5414de494bbbe33e866896540b
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -1111,8 +1339,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 2beecb8e00e847ca8c9362c8a46d1d45
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -1136,8 +1370,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: b76bd53b81f14ca2805bc5e602c31a3d
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -1160,8 +1400,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: adcc570a20814513b751b714f78e9671
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -1180,8 +1426,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 3eaffea1148549a8bea62b833b973af7
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -1205,8 +1457,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: a794f88cabf1479e99322684a617814a
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -1231,8 +1489,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: e85098b6a7f94975afb3c5089eff9018
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -1254,8 +1518,14 @@ zabbix_export:
                 name: 'IF-MIB::ifOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 073891fc4c8b4ec9b316deb9c4147cab
@@ -1273,6 +1543,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: d82342898fec45c69092e1cc925292cf
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -1296,8 +1570,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           trigger_prototypes:
             -
               uuid: eaa731129de3470e830007ac7ce932f5
@@ -1327,6 +1607,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CRS328-24P-4SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CRS328-24P-4SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CRS328-24P-4SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CRS328-24P-4SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 4060d8dedaac41c8bce5b82df01eb53c
               expression: |
@@ -1347,6 +1631,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CRS328-24P-4SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CRS328-24P-4SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CRS328-24P-4SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CRS328-24P-4SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 294c29c25bae472fa13f20d6c75442bf
               expression: |
@@ -1366,6 +1654,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CRS328-24P-4SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CRS328-24P-4SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CRS328-24P-4SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CRS328-24P-4SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: 6d1f89e29e334ce885510f21e327cec1
@@ -1444,8 +1739,11 @@ zabbix_export:
               description: 'Space utilization in % for Disk-{#SNMPINDEX}'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: f2329eab56e1412b89b33f7e4a39fe29
               name: 'Disk-{#SNMPINDEX}: Total space'
@@ -1472,8 +1770,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: ffd4528f23d14c55ad0cc37e96c0037d
               name: 'Disk-{#SNMPINDEX}: Used space'
@@ -1492,8 +1793,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
           trigger_prototypes:
             -
               uuid: e9f77bfbd9e64dc0a9549c0e54da0582
@@ -1509,6 +1813,13 @@ zabbix_export:
                  - The disk free space is less than 5G.
                  - The disk will be full in less than 24 hours.
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
             -
               uuid: ff9b2a577fc64bdeb0c8e1feaac80862
               expression: |
@@ -1529,6 +1840,13 @@ zabbix_export:
                   expression: |
                     last(/MikroTik CRS328-24P-4SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
                     ((last(/MikroTik CRS328-24P-4SRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS328-24P-4SRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS328-24P-4SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
           graph_prototypes:
             -
               uuid: 5d51c5894f3745c58fbd83fe408b38f8
@@ -1552,6 +1870,16 @@ zabbix_export:
                   item:
                     host: 'MikroTik CRS328-24P-4SRM SNMP'
                     key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: crs328-24p-4splusrm
+        -
+          tag: target
+          value: mikrotik
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/net/mikrotik/mikrotik_CRS328-4C-20S-4S+RM_snmp/README.md b/templates/net/mikrotik/mikrotik_CRS328-4C-20S-4S+RM_snmp/README.md
index 8c7379545c9..a974d2078d1 100644
--- a/templates/net/mikrotik/mikrotik_CRS328-4C-20S-4S+RM_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_CRS328-4C-20S-4S+RM_snmp/README.md
@@ -71,7 +71,7 @@ There are no template links in this template.
 |Network interfaces discovery |<p>Discovering interfaces from IF-MIB.</p> |SNMP |net.if.discovery<p>**Filter**:</p>AND <p>- {#IFADMINSTATUS} MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.MATCHES}`</p><p>- {#IFADMINSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.NOT_MATCHES}`</p><p>- {#IFOPERSTATUS} MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.MATCHES}`</p><p>- {#IFOPERSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.NOT_MATCHES}`</p><p>- {#IFNAME} MATCHES_REGEX `{$NET.IF.IFNAME.MATCHES}`</p><p>- {#IFNAME} NOT_MATCHES_REGEX `{$NET.IF.IFNAME.NOT_MATCHES}`</p><p>- {#IFDESCR} MATCHES_REGEX `{$NET.IF.IFDESCR.MATCHES}`</p><p>- {#IFDESCR} NOT_MATCHES_REGEX `{$NET.IF.IFDESCR.NOT_MATCHES}`</p><p>- {#IFALIAS} MATCHES_REGEX `{$NET.IF.IFALIAS.MATCHES}`</p><p>- {#IFALIAS} NOT_MATCHES_REGEX `{$NET.IF.IFALIAS.NOT_MATCHES}`</p><p>- {#IFTYPE} MATCHES_REGEX `{$NET.IF.IFTYPE.MATCHES}`</p><p>- {#IFTYPE} NOT_MATCHES_REGEX `{$NET.IF.IFTYPE.NOT_MATCHES}`</p> |
 |Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 |Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
-|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
 
 ## Items collected
 
@@ -137,14 +137,14 @@ There are no template links in this template.
 |Interface {#IFNAME}({#IFALIAS}): Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p><p>3. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CRS328-4C-20S-4SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CRS328-4C-20S-4SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CRS328-4C-20S-4SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))`<p>Recovery expression:</p>`last(/MikroTik CRS328-4C-20S-4SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0` |AVERAGE |<p>Manual close: YES</p> |
 |Interface {#IFNAME}({#IFALIAS}): High bandwidth usage (>{$IF.UTIL.MAX:"{#IFNAME}"}%) |<p>The network interface utilization is close to its estimated maximum bandwidth.</p> |`(avg(/MikroTik CRS328-4C-20S-4SRM SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik CRS328-4C-20S-4SRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) or avg(/MikroTik CRS328-4C-20S-4SRM SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik CRS328-4C-20S-4SRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])) and last(/MikroTik CRS328-4C-20S-4SRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0`<p>Recovery expression:</p>`avg(/MikroTik CRS328-4C-20S-4SRM SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik CRS328-4C-20S-4SRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) and avg(/MikroTik CRS328-4C-20S-4SRM SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik CRS328-4C-20S-4SRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |Interface {#IFNAME}({#IFALIAS}): High error rate (>{$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) |<p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p> |`min(/MikroTik CRS328-4C-20S-4SRM SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"} or min(/MikroTik CRS328-4C-20S-4SRM SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`max(/MikroTik CRS328-4C-20S-4SRM SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8 and max(/MikroTik CRS328-4C-20S-4SRM SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
-|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik CRS328-4C-20S-4SRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik CRS328-4C-20S-4SRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik CRS328-4C-20S-4SRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik CRS328-4C-20S-4SRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik CRS328-4C-20S-4SRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik CRS328-4C-20S-4SRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik CRS328-4C-20S-4SRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik CRS328-4C-20S-4SRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik CRS328-4C-20S-4SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2) `<p>Recovery expression:</p>`(change(/MikroTik CRS328-4C-20S-4SRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik CRS328-4C-20S-4SRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik CRS328-4C-20S-4SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2) ` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik CRS328-4C-20S-4SRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik CRS328-4C-20S-4SRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik CRS328-4C-20S-4SRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik CRS328-4C-20S-4SRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik CRS328-4C-20S-4SRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik CRS328-4C-20S-4SRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik CRS328-4C-20S-4SRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik CRS328-4C-20S-4SRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik CRS328-4C-20S-4SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2)`<p>Recovery expression:</p>`(change(/MikroTik CRS328-4C-20S-4SRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik CRS328-4C-20S-4SRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik CRS328-4C-20S-4SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2)` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |{HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/MikroTik CRS328-4C-20S-4SRM SNMP/system.uptime[sysUpTime.0])<10m` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- No SNMP data collection</p> |
 |No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/MikroTik CRS328-4C-20S-4SRM SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |Unavailable by ICMP ping |<p>Last three attempts returned timeout.  Please check device connectivity.</p> |`max(/MikroTik CRS328-4C-20S-4SRM SNMP/icmpping,#3)=0` |HIGH | |
 |High ICMP ping loss |<p>-</p> |`min(/MikroTik CRS328-4C-20S-4SRM SNMP/icmppingloss,5m)>{$ICMP_LOSS_WARN} and min(/MikroTik CRS328-4C-20S-4SRM SNMP/icmppingloss,5m)<100` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |High ICMP ping response time |<p>-</p> |`avg(/MikroTik CRS328-4C-20S-4SRM SNMP/icmppingsec,5m)>{$ICMP_RESPONSE_TIME_WARN}` |WARNING |<p>**Depends on**:</p><p>- High ICMP ping loss</p><p>- Unavailable by ICMP ping</p> |
-|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS328-4C-20S-4SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS328-4C-20S-4SRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS328-4C-20S-4SRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS328-4C-20S-4SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
-|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS328-4C-20S-4SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS328-4C-20S-4SRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS328-4C-20S-4SRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CRS328-4C-20S-4SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS328-4C-20S-4SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS328-4C-20S-4SRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS328-4C-20S-4SRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS328-4C-20S-4SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS328-4C-20S-4SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS328-4C-20S-4SRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS328-4C-20S-4SRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CRS328-4C-20S-4SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
 |CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS328-4C-20S-4SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CRS328-4C-20S-4SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
 |CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS328-4C-20S-4SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CRS328-4C-20S-4SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
 |CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik CRS328-4C-20S-4SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik CRS328-4C-20S-4SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
diff --git a/templates/net/mikrotik/mikrotik_CRS328-4C-20S-4S+RM_snmp/template_net_mikrotik_CRS328-4C-20S-4S+RM_snmp.yaml b/templates/net/mikrotik/mikrotik_CRS328-4C-20S-4S+RM_snmp/template_net_mikrotik_CRS328-4C-20S-4S+RM_snmp.yaml
index f74acb5db43..6af8122b9c2 100644
--- a/templates/net/mikrotik/mikrotik_CRS328-4C-20S-4S+RM_snmp/template_net_mikrotik_CRS328-4C-20S-4S+RM_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_CRS328-4C-20S-4S+RM_snmp/template_net_mikrotik_CRS328-4C-20S-4S+RM_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:45:31Z'
+  date: '2022-01-26T09:48:52Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -35,8 +35,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: fa71a2bcc742439a8eb76923db6dd34c
@@ -44,6 +47,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: ec3285050dd44b47b648f9c61ab8c9e4
           name: 'ICMP loss'
@@ -54,8 +61,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: c315770210b94fe39126514c41d6fa5d
@@ -67,6 +77,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CRS328-4C-20S-4SRM SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: b71903a18c4246238d7e9a8e99904794
           name: 'ICMP response time'
@@ -77,8 +94,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: fe1eba68b565403a968bec8561362376
@@ -93,6 +113,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CRS328-4C-20S-4SRM SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 6460447c65a6427cafd53e618d5d7bc1
           name: 'SNMP traps (fallback)'
@@ -105,8 +132,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: bb4b0528c6c946b49f5b7a8da8cbabe0
           name: 'System contact details'
@@ -128,8 +155,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 1caa3bcecbf441d4bdea4e1adcfd399d
           name: 'System description'
@@ -152,8 +179,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 1b876d8c8ea3422a82e4b571853bee64
           name: 'Firmware version'
@@ -174,8 +201,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 656a970a84fd4f65adc021b317f8db04
@@ -185,6 +212,10 @@ zabbix_export:
               priority: INFO
               description: 'Firmware version has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: ecb890a4585f47989973617ca4fcce42
           name: 'Hardware model name'
@@ -203,8 +234,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
         -
           uuid: c283b3b41d074d9596145d97f33d132b
           name: 'Hardware serial number'
@@ -226,8 +257,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: ba6f7f02b3dc47b6a15a40f81c86ee1e
@@ -236,6 +267,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 8539d2a032e741b1845d6423772600ec
           name: 'System location'
@@ -257,8 +292,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 7731343e3a584e4cba4241f6114f1b12
           name: 'System name'
@@ -280,8 +315,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: caff4557fe8d4e0cb994c16a4d1c3eae
@@ -290,6 +325,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: fa9788e34ffe4107bf7b1d72008af5e6
           name: 'System object ID'
@@ -310,8 +352,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: f2e20d27ca50462c88220e91f24b11c8
           name: 'Operating system'
@@ -333,8 +375,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: os
           triggers:
             -
               uuid: b720a6b27e14473db885682085ce07e1
@@ -347,6 +389,10 @@ zabbix_export:
                 -
                   name: 'System name has changed (new name: {ITEM.VALUE})'
                   expression: 'last(/MikroTik CRS328-4C-20S-4SRM SNMP/system.name,#1)<>last(/MikroTik CRS328-4C-20S-4SRM SNMP/system.name,#2) and length(last(/MikroTik CRS328-4C-20S-4SRM SNMP/system.name))>0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 38d674115439443a848b43c72e71a345
           name: Uptime
@@ -367,8 +413,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 661c463acbed4777b8269b9277a255fc
@@ -381,6 +427,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/MikroTik CRS328-4C-20S-4SRM SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 9c917c649b6e4a849283c5cd8c9f3c93
           name: 'Total memory'
@@ -407,8 +457,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 357a2467154c4dd283f76b9cdbdff62e
           name: 'Used memory'
@@ -427,8 +477,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: e5e85e7c2e0440cb90dcff96deffd559
           name: 'Memory utilization'
@@ -441,8 +491,8 @@ zabbix_export:
           description: 'Memory utilization in %'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: 6d68e3acb5a34a9eb68f6ea1e329241d
@@ -450,6 +500,13 @@ zabbix_export:
               name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
               priority: AVERAGE
               description: 'The system is running out of free memory.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 4087946c74884ef085a79fe174495646
           name: 'SNMP agent availability'
@@ -466,8 +523,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: eaa6f1c7bd334122af4cb08af35ebd86
@@ -480,6 +540,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CRS328-4C-20S-4SRM SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: 06aae70f34df4409af34ca144482a0eb
@@ -504,8 +568,8 @@ zabbix_export:
                 The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
               trigger_prototypes:
                 -
                   uuid: 000c63d6cf4d44f28c2705098ce88918
@@ -514,6 +578,10 @@ zabbix_export:
                   opdata: 'Current utilization: {ITEM.LASTVALUE1}'
                   priority: WARNING
                   description: 'CPU utilization is too high. The system might be slow to respond.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 8153f104b6d54637a07df2a38faade77
@@ -558,8 +626,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 23eaad92fd06421a94ed77347ed7805f
@@ -570,6 +638,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: e596c08e59974762a21d5e7c2bb06eb5
                   expression: 'avg(/MikroTik CRS328-4C-20S-4SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
@@ -584,6 +659,13 @@ zabbix_export:
                       name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
                       expression: 'avg(/MikroTik CRS328-4C-20S-4SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
                       recovery_expression: 'max(/MikroTik CRS328-4C-20S-4SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 8faa5c80c64545b8bde41c02bf450288
                   expression: 'avg(/MikroTik CRS328-4C-20S-4SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
@@ -592,6 +674,13 @@ zabbix_export:
                   name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 3d3d5ab7c4d54019bdf8030ed47bad6a
           name: 'Temperature sensor discovery'
@@ -601,8 +690,7 @@ zabbix_export:
           delay: 1h
           description: |
             MIKROTIK-MIB::mtxrHlTemperature
-            Since temperature sensor is not available on all Mikrotik hardware,
-            this is done to avoid unsupported items.
+            Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.
           item_prototypes:
             -
               uuid: 4b18f19aca9e44d6bad22909cb335657
@@ -626,8 +714,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 6e77737e71a640b1b0832fb8a317a848
@@ -638,6 +726,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 9ea2d3a683994dcc816d7210cfda6f38
                   expression: 'avg(/MikroTik CRS328-4C-20S-4SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
@@ -652,6 +747,13 @@ zabbix_export:
                       name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
                       expression: 'avg(/MikroTik CRS328-4C-20S-4SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
                       recovery_expression: 'max(/MikroTik CRS328-4C-20S-4SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 82fc4ea36e9e4a388e38bf4fb5d46148
                   expression: 'avg(/MikroTik CRS328-4C-20S-4SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
@@ -660,6 +762,13 @@ zabbix_export:
                   name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: b50ab71d8aea456cb6f9c9248d4f7dbf
           name: 'LTE modem discovery'
@@ -694,14 +803,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRP Reference Signal Received Power.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: eab50deb6a2e45e8b7bcd447dc6c28e9
                   expression: 'max(/MikroTik CRS328-4C-20S-4SRM SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 4c8305bf9bdf40a8bade711fe408f825
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
@@ -716,14 +838,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: a12e8f4ef8c2496aacc7cbc35b9ede34
                   expression: 'max(/MikroTik CRS328-4C-20S-4SRM SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: bdca12c838c045d487053f390a6d8722
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
@@ -738,14 +873,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 32cb826e59324b90910717b778a714f2
                   expression: 'max(/MikroTik CRS328-4C-20S-4SRM SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 9d3604bde08943debef2b5e7c794c902
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
@@ -760,14 +908,27 @@ zabbix_export:
                 mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 4220c67e66074f048261a4b42092c381
                   expression: 'max(/MikroTik CRS328-4C-20S-4SRM SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: e95b0db7e92b43fa8bd9c357027c4fcb
@@ -828,8 +989,14 @@ zabbix_export:
                 mtxrWlApAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 1ba331166f2443f1940863a41904f241
               name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
@@ -849,8 +1016,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: c5dd9be7abc0465c8fbacf67f1ad5267
               name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
@@ -870,8 +1043,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 02aa0fbddbd34a9db73896ea41e35045
               name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
@@ -890,8 +1069,14 @@ zabbix_export:
                     - 15m
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 5a3e0dbe67f74cad870becbb1363a577
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -904,8 +1089,14 @@ zabbix_export:
                 mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
         -
           uuid: 2ea30a7ef6064f93967dc2c6e33eeb3a
           name: 'CAPsMAN AP channel discovery'
@@ -938,8 +1129,14 @@ zabbix_export:
                 mtxrWlCMAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 8ab55cb0548f41c0ad2a98bd409be417
               name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
@@ -959,8 +1156,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: f95630ccf4364ac995854d22918a0dbf
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -973,8 +1176,14 @@ zabbix_export:
                 mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 5f9ad684c36e4050beb3e6fd5851ec30
               name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
@@ -994,8 +1203,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: bd6dc784f23746d19a09b6ea322ecf24
@@ -1003,6 +1218,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
                   priority: WARNING
                   description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: a7df21169dd443bcae6bb4c346303978
           name: 'Network interfaces discovery'
@@ -1091,8 +1313,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 3bd86398a02c4356ad9067fcd1c1c730
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -1111,8 +1339,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: a4f73343bffa45baa82d1b6d8dfaf831
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -1136,8 +1370,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: e44d0375cae641418ccda6e57a932035
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -1160,8 +1400,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 7503b03c728f4f1e804e7af9eda7b040
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -1180,8 +1426,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 171c12b008354e6aab1ec60320a8425a
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -1205,8 +1457,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: d2dc748e268d42ffbe47775201a26e8c
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -1231,8 +1489,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 5e4c53dcbfd34740af71944828ca7450
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -1254,8 +1518,14 @@ zabbix_export:
                 name: 'IF-MIB::ifOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: d007eb009f2d4b699cf5af8a0ccedfe9
@@ -1273,6 +1543,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: ec088a3b0bac441294cb5cefffb87818
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -1296,8 +1570,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           trigger_prototypes:
             -
               uuid: 332308663e4e478d97383a638b2b1d02
@@ -1327,6 +1607,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CRS328-4C-20S-4SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CRS328-4C-20S-4SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CRS328-4C-20S-4SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CRS328-4C-20S-4SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: c854aedfd3594f21b40bd227de48c871
               expression: |
@@ -1347,6 +1631,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CRS328-4C-20S-4SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CRS328-4C-20S-4SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CRS328-4C-20S-4SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CRS328-4C-20S-4SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: f74f365e18d64e2096a326456622b3e1
               expression: |
@@ -1366,6 +1654,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CRS328-4C-20S-4SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CRS328-4C-20S-4SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CRS328-4C-20S-4SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CRS328-4C-20S-4SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: 447b17f420a143e0ace94d75858e28fd
@@ -1444,8 +1739,11 @@ zabbix_export:
               description: 'Space utilization in % for Disk-{#SNMPINDEX}'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: fec4bc35fb504363b8dac0473735b1d9
               name: 'Disk-{#SNMPINDEX}: Total space'
@@ -1472,8 +1770,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: d4cc931928874bed96935faa743aaff2
               name: 'Disk-{#SNMPINDEX}: Used space'
@@ -1492,8 +1793,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
           trigger_prototypes:
             -
               uuid: 708c6b4a613c4795bd2b3c8b10b9fed4
@@ -1509,6 +1813,13 @@ zabbix_export:
                  - The disk free space is less than 5G.
                  - The disk will be full in less than 24 hours.
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
             -
               uuid: 1220479e0e0b4dbbb7590ec2b8359009
               expression: |
@@ -1529,6 +1840,13 @@ zabbix_export:
                   expression: |
                     last(/MikroTik CRS328-4C-20S-4SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
                     ((last(/MikroTik CRS328-4C-20S-4SRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS328-4C-20S-4SRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS328-4C-20S-4SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
           graph_prototypes:
             -
               uuid: 3ce597bd788841829b006adfc17034a2
@@ -1552,6 +1870,16 @@ zabbix_export:
                   item:
                     host: 'MikroTik CRS328-4C-20S-4SRM SNMP'
                     key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: crs328-4c-20s-4splusrm
+        -
+          tag: target
+          value: mikrotik
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/net/mikrotik/mikrotik_CRS354-48G-4S+2Q+RM_snmp/README.md b/templates/net/mikrotik/mikrotik_CRS354-48G-4S+2Q+RM_snmp/README.md
index 33d24845b9e..e1c3a636169 100644
--- a/templates/net/mikrotik/mikrotik_CRS354-48G-4S+2Q+RM_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_CRS354-48G-4S+2Q+RM_snmp/README.md
@@ -71,7 +71,7 @@ There are no template links in this template.
 |Network interfaces discovery |<p>Discovering interfaces from IF-MIB.</p> |SNMP |net.if.discovery<p>**Filter**:</p>AND <p>- {#IFADMINSTATUS} MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.MATCHES}`</p><p>- {#IFADMINSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.NOT_MATCHES}`</p><p>- {#IFOPERSTATUS} MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.MATCHES}`</p><p>- {#IFOPERSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.NOT_MATCHES}`</p><p>- {#IFNAME} MATCHES_REGEX `{$NET.IF.IFNAME.MATCHES}`</p><p>- {#IFNAME} NOT_MATCHES_REGEX `{$NET.IF.IFNAME.NOT_MATCHES}`</p><p>- {#IFDESCR} MATCHES_REGEX `{$NET.IF.IFDESCR.MATCHES}`</p><p>- {#IFDESCR} NOT_MATCHES_REGEX `{$NET.IF.IFDESCR.NOT_MATCHES}`</p><p>- {#IFALIAS} MATCHES_REGEX `{$NET.IF.IFALIAS.MATCHES}`</p><p>- {#IFALIAS} NOT_MATCHES_REGEX `{$NET.IF.IFALIAS.NOT_MATCHES}`</p><p>- {#IFTYPE} MATCHES_REGEX `{$NET.IF.IFTYPE.MATCHES}`</p><p>- {#IFTYPE} NOT_MATCHES_REGEX `{$NET.IF.IFTYPE.NOT_MATCHES}`</p> |
 |Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 |Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
-|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
 
 ## Items collected
 
@@ -137,14 +137,14 @@ There are no template links in this template.
 |Interface {#IFNAME}({#IFALIAS}): Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p><p>3. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CRS354-48G-4S2QRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CRS354-48G-4S2QRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CRS354-48G-4S2QRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))`<p>Recovery expression:</p>`last(/MikroTik CRS354-48G-4S2QRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0` |AVERAGE |<p>Manual close: YES</p> |
 |Interface {#IFNAME}({#IFALIAS}): High bandwidth usage (>{$IF.UTIL.MAX:"{#IFNAME}"}%) |<p>The network interface utilization is close to its estimated maximum bandwidth.</p> |`(avg(/MikroTik CRS354-48G-4S2QRM SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik CRS354-48G-4S2QRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) or avg(/MikroTik CRS354-48G-4S2QRM SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik CRS354-48G-4S2QRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])) and last(/MikroTik CRS354-48G-4S2QRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0`<p>Recovery expression:</p>`avg(/MikroTik CRS354-48G-4S2QRM SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik CRS354-48G-4S2QRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) and avg(/MikroTik CRS354-48G-4S2QRM SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik CRS354-48G-4S2QRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |Interface {#IFNAME}({#IFALIAS}): High error rate (>{$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) |<p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p> |`min(/MikroTik CRS354-48G-4S2QRM SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"} or min(/MikroTik CRS354-48G-4S2QRM SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`max(/MikroTik CRS354-48G-4S2QRM SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8 and max(/MikroTik CRS354-48G-4S2QRM SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
-|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik CRS354-48G-4S2QRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik CRS354-48G-4S2QRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik CRS354-48G-4S2QRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik CRS354-48G-4S2QRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik CRS354-48G-4S2QRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik CRS354-48G-4S2QRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik CRS354-48G-4S2QRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik CRS354-48G-4S2QRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik CRS354-48G-4S2QRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2) `<p>Recovery expression:</p>`(change(/MikroTik CRS354-48G-4S2QRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik CRS354-48G-4S2QRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik CRS354-48G-4S2QRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2) ` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik CRS354-48G-4S2QRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik CRS354-48G-4S2QRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik CRS354-48G-4S2QRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik CRS354-48G-4S2QRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik CRS354-48G-4S2QRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik CRS354-48G-4S2QRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik CRS354-48G-4S2QRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik CRS354-48G-4S2QRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik CRS354-48G-4S2QRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2)`<p>Recovery expression:</p>`(change(/MikroTik CRS354-48G-4S2QRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik CRS354-48G-4S2QRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik CRS354-48G-4S2QRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2)` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |{HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/MikroTik CRS354-48G-4S2QRM SNMP/system.uptime[sysUpTime.0])<10m` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- No SNMP data collection</p> |
 |No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/MikroTik CRS354-48G-4S2QRM SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |Unavailable by ICMP ping |<p>Last three attempts returned timeout.  Please check device connectivity.</p> |`max(/MikroTik CRS354-48G-4S2QRM SNMP/icmpping,#3)=0` |HIGH | |
 |High ICMP ping loss |<p>-</p> |`min(/MikroTik CRS354-48G-4S2QRM SNMP/icmppingloss,5m)>{$ICMP_LOSS_WARN} and min(/MikroTik CRS354-48G-4S2QRM SNMP/icmppingloss,5m)<100` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |High ICMP ping response time |<p>-</p> |`avg(/MikroTik CRS354-48G-4S2QRM SNMP/icmppingsec,5m)>{$ICMP_RESPONSE_TIME_WARN}` |WARNING |<p>**Depends on**:</p><p>- High ICMP ping loss</p><p>- Unavailable by ICMP ping</p> |
-|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS354-48G-4S2QRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS354-48G-4S2QRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS354-48G-4S2QRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS354-48G-4S2QRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
-|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS354-48G-4S2QRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS354-48G-4S2QRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS354-48G-4S2QRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CRS354-48G-4S2QRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS354-48G-4S2QRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS354-48G-4S2QRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS354-48G-4S2QRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS354-48G-4S2QRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS354-48G-4S2QRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS354-48G-4S2QRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS354-48G-4S2QRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CRS354-48G-4S2QRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
 |CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS354-48G-4S2QRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CRS354-48G-4S2QRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
 |CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS354-48G-4S2QRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CRS354-48G-4S2QRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
 |CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik CRS354-48G-4S2QRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik CRS354-48G-4S2QRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
diff --git a/templates/net/mikrotik/mikrotik_CRS354-48G-4S+2Q+RM_snmp/template_net_mikrotik_CRS354-48G-4S+2Q+RM_snmp.yaml b/templates/net/mikrotik/mikrotik_CRS354-48G-4S+2Q+RM_snmp/template_net_mikrotik_CRS354-48G-4S+2Q+RM_snmp.yaml
index 58a27b3f0cc..ce6e5e46098 100644
--- a/templates/net/mikrotik/mikrotik_CRS354-48G-4S+2Q+RM_snmp/template_net_mikrotik_CRS354-48G-4S+2Q+RM_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_CRS354-48G-4S+2Q+RM_snmp/template_net_mikrotik_CRS354-48G-4S+2Q+RM_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:45:36Z'
+  date: '2022-01-26T09:49:38Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -35,8 +35,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 987ae7ade202464ba51fd8fcc67d3a19
@@ -44,6 +47,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 80ab3090289a481da72c0d93764eb18a
           name: 'ICMP loss'
@@ -54,8 +61,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: bf7a369d3b2a455496f8920177666d91
@@ -67,6 +77,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CRS354-48G-4S2QRM SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 15552636da9a40b6b2bec461798f3c0d
           name: 'ICMP response time'
@@ -77,8 +94,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 9a35ff4d142640e387f247a8ae5021bc
@@ -93,6 +113,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CRS354-48G-4S2QRM SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 197098286a9b4b6bac5bd79a4f0eb522
           name: 'SNMP traps (fallback)'
@@ -105,8 +132,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: 9ad920cf294a4fcbaa78ea4f01385588
           name: 'System contact details'
@@ -128,8 +155,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: d0db3ce8a567414a96bbe5b02b1967dd
           name: 'System description'
@@ -152,8 +179,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: e24fe19f052f4901aeb9feab8199e461
           name: 'Firmware version'
@@ -174,8 +201,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 7e708c7bf76445959909bf03adf676dc
@@ -185,6 +212,10 @@ zabbix_export:
               priority: INFO
               description: 'Firmware version has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: f054bfb710c14307ade4081fb441e840
           name: 'Hardware model name'
@@ -203,8 +234,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
         -
           uuid: 941a740a1dcc40cf88dd56039f26cf92
           name: 'Hardware serial number'
@@ -226,8 +257,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 0b2e29ba173346248fb4d799f7e16cf1
@@ -236,6 +267,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: cd48a08f2b4a4dd3961488a00424fcce
           name: 'System location'
@@ -257,8 +292,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 139496c157af4e12b28ca337ca60c7fa
           name: 'System name'
@@ -280,8 +315,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 135707c751764f9087ebd32e1fe0b7ba
@@ -290,6 +325,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: 78f353c258764fa69637afe7f8ab440b
           name: 'System object ID'
@@ -310,8 +352,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 73fd8a7f00b2442c8d5bfab913d8eff9
           name: 'Operating system'
@@ -333,8 +375,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: os
           triggers:
             -
               uuid: b0c3673f0aee4a23a7811f54416924bf
@@ -347,6 +389,10 @@ zabbix_export:
                 -
                   name: 'System name has changed (new name: {ITEM.VALUE})'
                   expression: 'last(/MikroTik CRS354-48G-4S2QRM SNMP/system.name,#1)<>last(/MikroTik CRS354-48G-4S2QRM SNMP/system.name,#2) and length(last(/MikroTik CRS354-48G-4S2QRM SNMP/system.name))>0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 3137916543634345a5688f631657fa30
           name: Uptime
@@ -367,8 +413,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 1906ad6961664c74a2de31d20cd279b2
@@ -381,6 +427,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/MikroTik CRS354-48G-4S2QRM SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 011ea07e21a24cd1a4b42149ffe128db
           name: 'Total memory'
@@ -407,8 +457,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 902a71cc5c094a62a2a7f735d07643cf
           name: 'Used memory'
@@ -427,8 +477,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 4ae4d4e6fe0d4bf290f96e1d430f2655
           name: 'Memory utilization'
@@ -441,8 +491,8 @@ zabbix_export:
           description: 'Memory utilization in %'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: 5e104649223b40cdadeaa338321ca690
@@ -450,6 +500,13 @@ zabbix_export:
               name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
               priority: AVERAGE
               description: 'The system is running out of free memory.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: e01e3b3a9db44d2db55ae6d289d963c4
           name: 'SNMP agent availability'
@@ -466,8 +523,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 239d876c15fe45ccb33ca87aba3a170f
@@ -480,6 +540,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CRS354-48G-4S2QRM SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: 506fab7cb3c045f890437a7e959f2171
@@ -504,8 +568,8 @@ zabbix_export:
                 The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
               trigger_prototypes:
                 -
                   uuid: f8801c652f414d4b881715e10d1a69ac
@@ -514,6 +578,10 @@ zabbix_export:
                   opdata: 'Current utilization: {ITEM.LASTVALUE1}'
                   priority: WARNING
                   description: 'CPU utilization is too high. The system might be slow to respond.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: f44de058c1ac47a182203d3ebb97e1ad
@@ -558,8 +626,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 5e2a48b70bb5491791e1e796d9b57700
@@ -570,6 +638,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 6064422d708f4ee3a54dd0dccd6c2ef4
                   expression: 'avg(/MikroTik CRS354-48G-4S2QRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
@@ -584,6 +659,13 @@ zabbix_export:
                       name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
                       expression: 'avg(/MikroTik CRS354-48G-4S2QRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
                       recovery_expression: 'max(/MikroTik CRS354-48G-4S2QRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: b61c653ea25c47f397288e7a6c88c343
                   expression: 'avg(/MikroTik CRS354-48G-4S2QRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
@@ -592,6 +674,13 @@ zabbix_export:
                   name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: aa5a9445830441ee9795763529df49ae
           name: 'Temperature sensor discovery'
@@ -601,8 +690,7 @@ zabbix_export:
           delay: 1h
           description: |
             MIKROTIK-MIB::mtxrHlTemperature
-            Since temperature sensor is not available on all Mikrotik hardware,
-            this is done to avoid unsupported items.
+            Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.
           item_prototypes:
             -
               uuid: 454aab3736a24babaa379f7526a41e5d
@@ -626,8 +714,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 7f1abc774f4e48928a52a755f9655d33
@@ -638,6 +726,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 4c3b3b0c4e4c4903856c673ed34c32b2
                   expression: 'avg(/MikroTik CRS354-48G-4S2QRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
@@ -652,6 +747,13 @@ zabbix_export:
                       name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
                       expression: 'avg(/MikroTik CRS354-48G-4S2QRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
                       recovery_expression: 'max(/MikroTik CRS354-48G-4S2QRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 46ce97f9fd33406996e21d7c4cfe4615
                   expression: 'avg(/MikroTik CRS354-48G-4S2QRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
@@ -660,6 +762,13 @@ zabbix_export:
                   name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 714fc311cc2a46659cb42859cb196902
           name: 'LTE modem discovery'
@@ -694,14 +803,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRP Reference Signal Received Power.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 5caa686e721a40e991d0f4b71eaecc7f
                   expression: 'max(/MikroTik CRS354-48G-4S2QRM SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: bfceb2b2627a467ba9a3916b3c34d27f
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
@@ -716,14 +838,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: ce67126d64254dabb9d5df68dcdb5a69
                   expression: 'max(/MikroTik CRS354-48G-4S2QRM SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 7284e5a86c6e43c485e8c7b9ec633cad
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
@@ -738,14 +873,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 7401d1955be04599b1d0e5dfb3d2a4f5
                   expression: 'max(/MikroTik CRS354-48G-4S2QRM SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 8309561fc4f14ccdb69da3728c4fb0eb
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
@@ -760,14 +908,27 @@ zabbix_export:
                 mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: d668e892231d4614af5673f11d8070cf
                   expression: 'max(/MikroTik CRS354-48G-4S2QRM SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 417c7efde3d44f27894d47ac2f6ce025
@@ -828,8 +989,14 @@ zabbix_export:
                 mtxrWlApAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 48bba64f95304974819ef7a15bbbce85
               name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
@@ -849,8 +1016,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 401390a283de4ec29bfb1c0c99820a7e
               name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
@@ -870,8 +1043,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: b67454e3882d4c16bb51094017775630
               name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
@@ -890,8 +1069,14 @@ zabbix_export:
                     - 15m
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: db3274433926415b97f8e34a9f04a9ac
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -904,8 +1089,14 @@ zabbix_export:
                 mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
         -
           uuid: 1512667e82b743f09392103d73374861
           name: 'CAPsMAN AP channel discovery'
@@ -938,8 +1129,14 @@ zabbix_export:
                 mtxrWlCMAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: c1d0e3150e5a4ad39f39cebe0a381aaa
               name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
@@ -959,8 +1156,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: c176e70d536e42c9aa62f4952e166c9b
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -973,8 +1176,14 @@ zabbix_export:
                 mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: df1e4f1603d14e07b5308d5fd5eb55b0
               name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
@@ -994,8 +1203,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: a5ac3a7a8ac447bdb1d35b9456351624
@@ -1003,6 +1218,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
                   priority: WARNING
                   description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 71ccfba5cc2d432e9414023d0f75b8db
           name: 'Network interfaces discovery'
@@ -1091,8 +1313,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 5b408d3188a04d30a5897746bd27feb8
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -1111,8 +1339,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 28c8d1007d794e2c90f3303ed05bfba9
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -1136,8 +1370,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 2529b37765ea41d8a780f20e37e49add
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -1160,8 +1400,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 95533937102b46f4bc862f326b555913
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -1180,8 +1426,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 7cf5ce8e6ade4a0dbbe5491cbc50797a
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -1205,8 +1457,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 484b2b4b18724db8a2e718a24546686a
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -1231,8 +1489,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: ba7998aa6ff34a4d828aa37aba12f55a
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -1254,8 +1518,14 @@ zabbix_export:
                 name: 'IF-MIB::ifOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 914bfdb045554132902dff8f910878d4
@@ -1273,6 +1543,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 5f0fc074d5144155a8bc67208bdb24ea
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -1296,8 +1570,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           trigger_prototypes:
             -
               uuid: f1c3a3541f9948eb890816493e6251e5
@@ -1327,6 +1607,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CRS354-48G-4S2QRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CRS354-48G-4S2QRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CRS354-48G-4S2QRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CRS354-48G-4S2QRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: ec1a319bff034c6387ed43d083c0ca85
               expression: |
@@ -1347,6 +1631,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CRS354-48G-4S2QRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CRS354-48G-4S2QRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CRS354-48G-4S2QRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CRS354-48G-4S2QRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 1d46257a2eb14abf8f3dddae5e3974ca
               expression: |
@@ -1366,6 +1654,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CRS354-48G-4S2QRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CRS354-48G-4S2QRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CRS354-48G-4S2QRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CRS354-48G-4S2QRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: 7b2f6006d6a64efe96366c1dfa220f1e
@@ -1444,8 +1739,11 @@ zabbix_export:
               description: 'Space utilization in % for Disk-{#SNMPINDEX}'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 8303806786424c7499d013d4a55d4b6a
               name: 'Disk-{#SNMPINDEX}: Total space'
@@ -1472,8 +1770,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: f9361907c6b944a0b282fc8ecabe050f
               name: 'Disk-{#SNMPINDEX}: Used space'
@@ -1492,8 +1793,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
           trigger_prototypes:
             -
               uuid: adf6f10ebb2e42989ed41b69e3411431
@@ -1509,6 +1813,13 @@ zabbix_export:
                  - The disk free space is less than 5G.
                  - The disk will be full in less than 24 hours.
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
             -
               uuid: da4dd8436d6f4787801e6d2f10b59a47
               expression: |
@@ -1529,6 +1840,13 @@ zabbix_export:
                   expression: |
                     last(/MikroTik CRS354-48G-4S2QRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
                     ((last(/MikroTik CRS354-48G-4S2QRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS354-48G-4S2QRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS354-48G-4S2QRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
           graph_prototypes:
             -
               uuid: f85b7f7ab6a4454ebd777f5b8cc00900
@@ -1552,6 +1870,16 @@ zabbix_export:
                   item:
                     host: 'MikroTik CRS354-48G-4S2QRM SNMP'
                     key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: crs354-48g-4splus2qplusrm
+        -
+          tag: target
+          value: mikrotik
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/net/mikrotik/mikrotik_CRS354-48P-4S+2Q+RM_snmp/README.md b/templates/net/mikrotik/mikrotik_CRS354-48P-4S+2Q+RM_snmp/README.md
index bef778bddd7..02ca542175b 100644
--- a/templates/net/mikrotik/mikrotik_CRS354-48P-4S+2Q+RM_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_CRS354-48P-4S+2Q+RM_snmp/README.md
@@ -71,7 +71,7 @@ There are no template links in this template.
 |Network interfaces discovery |<p>Discovering interfaces from IF-MIB.</p> |SNMP |net.if.discovery<p>**Filter**:</p>AND <p>- {#IFADMINSTATUS} MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.MATCHES}`</p><p>- {#IFADMINSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.NOT_MATCHES}`</p><p>- {#IFOPERSTATUS} MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.MATCHES}`</p><p>- {#IFOPERSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.NOT_MATCHES}`</p><p>- {#IFNAME} MATCHES_REGEX `{$NET.IF.IFNAME.MATCHES}`</p><p>- {#IFNAME} NOT_MATCHES_REGEX `{$NET.IF.IFNAME.NOT_MATCHES}`</p><p>- {#IFDESCR} MATCHES_REGEX `{$NET.IF.IFDESCR.MATCHES}`</p><p>- {#IFDESCR} NOT_MATCHES_REGEX `{$NET.IF.IFDESCR.NOT_MATCHES}`</p><p>- {#IFALIAS} MATCHES_REGEX `{$NET.IF.IFALIAS.MATCHES}`</p><p>- {#IFALIAS} NOT_MATCHES_REGEX `{$NET.IF.IFALIAS.NOT_MATCHES}`</p><p>- {#IFTYPE} MATCHES_REGEX `{$NET.IF.IFTYPE.MATCHES}`</p><p>- {#IFTYPE} NOT_MATCHES_REGEX `{$NET.IF.IFTYPE.NOT_MATCHES}`</p> |
 |Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 |Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
-|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
 
 ## Items collected
 
@@ -137,14 +137,14 @@ There are no template links in this template.
 |Interface {#IFNAME}({#IFALIAS}): Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p><p>3. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CRS354-48P-4S2QRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CRS354-48P-4S2QRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CRS354-48P-4S2QRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))`<p>Recovery expression:</p>`last(/MikroTik CRS354-48P-4S2QRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0` |AVERAGE |<p>Manual close: YES</p> |
 |Interface {#IFNAME}({#IFALIAS}): High bandwidth usage (>{$IF.UTIL.MAX:"{#IFNAME}"}%) |<p>The network interface utilization is close to its estimated maximum bandwidth.</p> |`(avg(/MikroTik CRS354-48P-4S2QRM SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik CRS354-48P-4S2QRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) or avg(/MikroTik CRS354-48P-4S2QRM SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik CRS354-48P-4S2QRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])) and last(/MikroTik CRS354-48P-4S2QRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0`<p>Recovery expression:</p>`avg(/MikroTik CRS354-48P-4S2QRM SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik CRS354-48P-4S2QRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) and avg(/MikroTik CRS354-48P-4S2QRM SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik CRS354-48P-4S2QRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |Interface {#IFNAME}({#IFALIAS}): High error rate (>{$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) |<p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p> |`min(/MikroTik CRS354-48P-4S2QRM SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"} or min(/MikroTik CRS354-48P-4S2QRM SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`max(/MikroTik CRS354-48P-4S2QRM SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8 and max(/MikroTik CRS354-48P-4S2QRM SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
-|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik CRS354-48P-4S2QRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik CRS354-48P-4S2QRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik CRS354-48P-4S2QRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik CRS354-48P-4S2QRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik CRS354-48P-4S2QRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik CRS354-48P-4S2QRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik CRS354-48P-4S2QRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik CRS354-48P-4S2QRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik CRS354-48P-4S2QRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2) `<p>Recovery expression:</p>`(change(/MikroTik CRS354-48P-4S2QRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik CRS354-48P-4S2QRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik CRS354-48P-4S2QRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2) ` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik CRS354-48P-4S2QRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik CRS354-48P-4S2QRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik CRS354-48P-4S2QRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik CRS354-48P-4S2QRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik CRS354-48P-4S2QRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik CRS354-48P-4S2QRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik CRS354-48P-4S2QRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik CRS354-48P-4S2QRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik CRS354-48P-4S2QRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2)`<p>Recovery expression:</p>`(change(/MikroTik CRS354-48P-4S2QRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik CRS354-48P-4S2QRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik CRS354-48P-4S2QRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2)` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |{HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/MikroTik CRS354-48P-4S2QRM SNMP/system.uptime[sysUpTime.0])<10m` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- No SNMP data collection</p> |
 |No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/MikroTik CRS354-48P-4S2QRM SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |Unavailable by ICMP ping |<p>Last three attempts returned timeout.  Please check device connectivity.</p> |`max(/MikroTik CRS354-48P-4S2QRM SNMP/icmpping,#3)=0` |HIGH | |
 |High ICMP ping loss |<p>-</p> |`min(/MikroTik CRS354-48P-4S2QRM SNMP/icmppingloss,5m)>{$ICMP_LOSS_WARN} and min(/MikroTik CRS354-48P-4S2QRM SNMP/icmppingloss,5m)<100` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |High ICMP ping response time |<p>-</p> |`avg(/MikroTik CRS354-48P-4S2QRM SNMP/icmppingsec,5m)>{$ICMP_RESPONSE_TIME_WARN}` |WARNING |<p>**Depends on**:</p><p>- High ICMP ping loss</p><p>- Unavailable by ICMP ping</p> |
-|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS354-48P-4S2QRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS354-48P-4S2QRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS354-48P-4S2QRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS354-48P-4S2QRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
-|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS354-48P-4S2QRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS354-48P-4S2QRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS354-48P-4S2QRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CRS354-48P-4S2QRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS354-48P-4S2QRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS354-48P-4S2QRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS354-48P-4S2QRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS354-48P-4S2QRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS354-48P-4S2QRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS354-48P-4S2QRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS354-48P-4S2QRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CRS354-48P-4S2QRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
 |CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS354-48P-4S2QRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CRS354-48P-4S2QRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
 |CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS354-48P-4S2QRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CRS354-48P-4S2QRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
 |CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik CRS354-48P-4S2QRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik CRS354-48P-4S2QRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
diff --git a/templates/net/mikrotik/mikrotik_CRS354-48P-4S+2Q+RM_snmp/template_net_mikrotik_CRS354-48P-4S+2Q+RM_snmp.yaml b/templates/net/mikrotik/mikrotik_CRS354-48P-4S+2Q+RM_snmp/template_net_mikrotik_CRS354-48P-4S+2Q+RM_snmp.yaml
index 0100a156b47..a4182eab8bc 100644
--- a/templates/net/mikrotik/mikrotik_CRS354-48P-4S+2Q+RM_snmp/template_net_mikrotik_CRS354-48P-4S+2Q+RM_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_CRS354-48P-4S+2Q+RM_snmp/template_net_mikrotik_CRS354-48P-4S+2Q+RM_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:45:41Z'
+  date: '2022-01-26T09:53:23Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -35,8 +35,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 94618414658d4f5bad5f1cf544fba55d
@@ -44,6 +47,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 513874d2dce848fca9d5be0f8a698a27
           name: 'ICMP loss'
@@ -54,8 +61,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: ecb0d03f65144dbe8e8e22339576fe1a
@@ -67,6 +77,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CRS354-48P-4S2QRM SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 5261e46912184a41a32c3d309cd8554c
           name: 'ICMP response time'
@@ -77,8 +94,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: bb70a4e882224f9d8302f8726ff81a8d
@@ -93,6 +113,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CRS354-48P-4S2QRM SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 93d399db31b64d36bfe87a1f99195663
           name: 'SNMP traps (fallback)'
@@ -105,8 +132,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: d83e355ae790441594a2ca6d5ec37de0
           name: 'System contact details'
@@ -128,8 +155,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 38a1523e8ce54611842e76fd4f614c15
           name: 'System description'
@@ -152,8 +179,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 397dce267b79414fb563dc2f184d2930
           name: 'Firmware version'
@@ -174,8 +201,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 9b20e7d8a4c844069a75adc95dcb6223
@@ -185,6 +212,10 @@ zabbix_export:
               priority: INFO
               description: 'Firmware version has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: cc3d781f3ba64faa9914d34a4d450fd6
           name: 'Hardware model name'
@@ -203,8 +234,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
         -
           uuid: d611ea9fbcff489e9175dcb6f0ffe2d1
           name: 'Hardware serial number'
@@ -226,8 +257,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: ec99b185eb1d4af2943cd49f4b1e3dcf
@@ -236,6 +267,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 49a731f14f3b4bae8f16eb6a7a5d3b7a
           name: 'System location'
@@ -257,8 +292,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 2f54cf3f5bfd41d29b46887c8de02df3
           name: 'System name'
@@ -280,8 +315,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: f4c43870fa484e4088c1d9c973387140
@@ -290,6 +325,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: 45d0902fc8764108983d75f51a7c13ca
           name: 'System object ID'
@@ -310,8 +352,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 4257226c6b90413baaa7a2b8beeb3c01
           name: 'Operating system'
@@ -333,8 +375,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: os
           triggers:
             -
               uuid: 54ca398b57a8450ba004aa15a310f599
@@ -347,6 +389,10 @@ zabbix_export:
                 -
                   name: 'System name has changed (new name: {ITEM.VALUE})'
                   expression: 'last(/MikroTik CRS354-48P-4S2QRM SNMP/system.name,#1)<>last(/MikroTik CRS354-48P-4S2QRM SNMP/system.name,#2) and length(last(/MikroTik CRS354-48P-4S2QRM SNMP/system.name))>0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: bce151f2eece481ab9ff10bd492ec514
           name: Uptime
@@ -367,8 +413,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: ec03a67de5ca4d8d834e1689a1cd28bf
@@ -381,6 +427,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/MikroTik CRS354-48P-4S2QRM SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: b319b01c532f453aa0b39c6cac9c06e8
           name: 'Total memory'
@@ -407,8 +457,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 7522d72e76254a60b59fc2c67590701a
           name: 'Used memory'
@@ -427,8 +477,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 4b9d180956ca4f17abc9c232856f1a78
           name: 'Memory utilization'
@@ -441,8 +491,8 @@ zabbix_export:
           description: 'Memory utilization in %'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: a60e5b95514e4a6ba5bdc1d2bc95818c
@@ -450,6 +500,13 @@ zabbix_export:
               name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
               priority: AVERAGE
               description: 'The system is running out of free memory.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 7c119d5bedb542f288fe4a04dc629b94
           name: 'SNMP agent availability'
@@ -466,8 +523,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: ce74c74936194791b8f8a09acd9d5501
@@ -480,6 +540,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CRS354-48P-4S2QRM SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: 95a34c80dcd848e3b5ccad0f57a06532
@@ -504,8 +568,8 @@ zabbix_export:
                 The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
               trigger_prototypes:
                 -
                   uuid: c5ddc3a0e73943ef939341972db502e1
@@ -514,6 +578,10 @@ zabbix_export:
                   opdata: 'Current utilization: {ITEM.LASTVALUE1}'
                   priority: WARNING
                   description: 'CPU utilization is too high. The system might be slow to respond.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: c23045bfa1ef442490ecc2d3c9120018
@@ -558,8 +626,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 963f7342ba58427189be8e5d482bd1db
@@ -570,6 +638,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 3bc320302ce64512bf5cabdddbf8827a
                   expression: 'avg(/MikroTik CRS354-48P-4S2QRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
@@ -584,6 +659,13 @@ zabbix_export:
                       name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
                       expression: 'avg(/MikroTik CRS354-48P-4S2QRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
                       recovery_expression: 'max(/MikroTik CRS354-48P-4S2QRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 2341cc2581aa47629ba79efb0dde8f12
                   expression: 'avg(/MikroTik CRS354-48P-4S2QRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
@@ -592,6 +674,13 @@ zabbix_export:
                   name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 2ed1bdac264e4d05b1873e69c17cc288
           name: 'Temperature sensor discovery'
@@ -601,8 +690,7 @@ zabbix_export:
           delay: 1h
           description: |
             MIKROTIK-MIB::mtxrHlTemperature
-            Since temperature sensor is not available on all Mikrotik hardware,
-            this is done to avoid unsupported items.
+            Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.
           item_prototypes:
             -
               uuid: 1d1fbc3838c341cc9b874721a824deef
@@ -626,8 +714,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 310fc63d695d4d79adb61b152467dc6b
@@ -638,6 +726,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 45d51b9e79ce4086934b7a93837855fd
                   expression: 'avg(/MikroTik CRS354-48P-4S2QRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
@@ -652,6 +747,13 @@ zabbix_export:
                       name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
                       expression: 'avg(/MikroTik CRS354-48P-4S2QRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
                       recovery_expression: 'max(/MikroTik CRS354-48P-4S2QRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 84ea7da850864101a35eb96acb475dec
                   expression: 'avg(/MikroTik CRS354-48P-4S2QRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
@@ -660,6 +762,13 @@ zabbix_export:
                   name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 1250fe89b2b645adb6d8a444e286c34a
           name: 'LTE modem discovery'
@@ -694,14 +803,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRP Reference Signal Received Power.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 832ceaf8547b4395a4495ad2d64c9f3e
                   expression: 'max(/MikroTik CRS354-48P-4S2QRM SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: da6ebd895cb7465d964de43bb1f97125
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
@@ -716,14 +838,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 64e8b603db0240bda81435df0ec8f275
                   expression: 'max(/MikroTik CRS354-48P-4S2QRM SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 817d4b9c195c4b74a986dee3f509d56f
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
@@ -738,14 +873,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 8085843742774a44ada60c14cf33aeb4
                   expression: 'max(/MikroTik CRS354-48P-4S2QRM SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 3031a59f08914941ae9f7fc8f494b132
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
@@ -760,14 +908,27 @@ zabbix_export:
                 mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: e315b7387f1943eb9432986565aee291
                   expression: 'max(/MikroTik CRS354-48P-4S2QRM SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 5e4a66d716554e8da4f9d85f5a5ba138
@@ -828,8 +989,14 @@ zabbix_export:
                 mtxrWlApAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 18664eb3c8dd4e768f9de382ee8bba85
               name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
@@ -849,8 +1016,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: a6badb125d8d412a8d9142882ab4b956
               name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
@@ -870,8 +1043,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: bb2ad51473f04db188bd4e335591b94b
               name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
@@ -890,8 +1069,14 @@ zabbix_export:
                     - 15m
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 8afb3efbe69e4541bc74760ab4ba3130
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -904,8 +1089,14 @@ zabbix_export:
                 mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
         -
           uuid: 829a233a44aa4cd2880732ad863d2d27
           name: 'CAPsMAN AP channel discovery'
@@ -938,8 +1129,14 @@ zabbix_export:
                 mtxrWlCMAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 7e4ba0da31a24287b12f07940f449131
               name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
@@ -959,8 +1156,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 30511ea997e740d2a6313005e7f56a71
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -973,8 +1176,14 @@ zabbix_export:
                 mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 01e691a3d2fb401484af4e768cab09b7
               name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
@@ -994,8 +1203,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 611cb0ad354a4ac0b52715483b4426ad
@@ -1003,6 +1218,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
                   priority: WARNING
                   description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 71bd3db236e245299334bf7b03e3b7da
           name: 'Network interfaces discovery'
@@ -1091,8 +1313,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: f28824308896450f8e9b2842dd103db6
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -1111,8 +1339,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: ae10194c5e7f465b902f0cb20f7b8776
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -1136,8 +1370,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: b07c109994db4a5eaa065589c54edcc1
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -1160,8 +1400,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 90b82a51bd104a79804213b1b566fb5a
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -1180,8 +1426,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 65dfa7a917a24279823f3c5bac76c1d9
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -1205,8 +1457,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: b19861fbf90c474c99f644c6880cf813
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -1231,8 +1489,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: cf3c4275cfe1466ab07d672031bac4af
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -1254,8 +1518,14 @@ zabbix_export:
                 name: 'IF-MIB::ifOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 2426c10e34db430a946528f02ae605d4
@@ -1273,6 +1543,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 91c1bbf2dd264ee3a0f741d4398cf02a
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -1296,8 +1570,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           trigger_prototypes:
             -
               uuid: 0eca316085f046599bd3db8ce7b186f1
@@ -1327,6 +1607,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CRS354-48P-4S2QRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CRS354-48P-4S2QRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CRS354-48P-4S2QRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CRS354-48P-4S2QRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 417ef3b4a8814b01bcb4715248df543c
               expression: |
@@ -1347,6 +1631,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CRS354-48P-4S2QRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CRS354-48P-4S2QRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CRS354-48P-4S2QRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CRS354-48P-4S2QRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: a674f655342a42b094b0084fab1bde99
               expression: |
@@ -1366,6 +1654,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CRS354-48P-4S2QRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CRS354-48P-4S2QRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CRS354-48P-4S2QRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CRS354-48P-4S2QRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: 5921d8fc6ee94d1d9d8f96ba34215c1c
@@ -1444,8 +1739,11 @@ zabbix_export:
               description: 'Space utilization in % for Disk-{#SNMPINDEX}'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 435c8ca87deb4fbfad0df451c9b3dc57
               name: 'Disk-{#SNMPINDEX}: Total space'
@@ -1472,8 +1770,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 5c7b4cf01d2d4b8f9cb5022a54b4593d
               name: 'Disk-{#SNMPINDEX}: Used space'
@@ -1492,8 +1793,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
           trigger_prototypes:
             -
               uuid: 63d24ac83bc24eb5b64ecc47c75c1c4a
@@ -1509,6 +1813,13 @@ zabbix_export:
                  - The disk free space is less than 5G.
                  - The disk will be full in less than 24 hours.
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
             -
               uuid: ed3c082e9f264f20862f9cd20d4e9724
               expression: |
@@ -1529,6 +1840,13 @@ zabbix_export:
                   expression: |
                     last(/MikroTik CRS354-48P-4S2QRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
                     ((last(/MikroTik CRS354-48P-4S2QRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS354-48P-4S2QRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS354-48P-4S2QRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
           graph_prototypes:
             -
               uuid: 17e8f43e55f74e8a9d648003153eae55
@@ -1552,6 +1870,16 @@ zabbix_export:
                   item:
                     host: 'MikroTik CRS354-48P-4S2QRM SNMP'
                     key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: crs354-48p-4splus2qplusrm
+        -
+          tag: target
+          value: mikrotik
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/net/mikrotik/mikrotik_CSS326-24G-2S+RM_snmp/README.md b/templates/net/mikrotik/mikrotik_CSS326-24G-2S+RM_snmp/README.md
index d0ff3b83c0b..09c40e525b8 100644
--- a/templates/net/mikrotik/mikrotik_CSS326-24G-2S+RM_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_CSS326-24G-2S+RM_snmp/README.md
@@ -71,7 +71,7 @@ There are no template links in this template.
 |Network interfaces discovery |<p>Discovering interfaces from IF-MIB.</p> |SNMP |net.if.discovery<p>**Filter**:</p>AND <p>- {#IFADMINSTATUS} MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.MATCHES}`</p><p>- {#IFADMINSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.NOT_MATCHES}`</p><p>- {#IFOPERSTATUS} MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.MATCHES}`</p><p>- {#IFOPERSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.NOT_MATCHES}`</p><p>- {#IFNAME} MATCHES_REGEX `{$NET.IF.IFNAME.MATCHES}`</p><p>- {#IFNAME} NOT_MATCHES_REGEX `{$NET.IF.IFNAME.NOT_MATCHES}`</p><p>- {#IFDESCR} MATCHES_REGEX `{$NET.IF.IFDESCR.MATCHES}`</p><p>- {#IFDESCR} NOT_MATCHES_REGEX `{$NET.IF.IFDESCR.NOT_MATCHES}`</p><p>- {#IFALIAS} MATCHES_REGEX `{$NET.IF.IFALIAS.MATCHES}`</p><p>- {#IFALIAS} NOT_MATCHES_REGEX `{$NET.IF.IFALIAS.NOT_MATCHES}`</p><p>- {#IFTYPE} MATCHES_REGEX `{$NET.IF.IFTYPE.MATCHES}`</p><p>- {#IFTYPE} NOT_MATCHES_REGEX `{$NET.IF.IFTYPE.NOT_MATCHES}`</p> |
 |Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 |Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
-|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
 
 ## Items collected
 
@@ -137,14 +137,14 @@ There are no template links in this template.
 |Interface {#IFNAME}({#IFALIAS}): Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p><p>3. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CSS326-24G-2SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CSS326-24G-2SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CSS326-24G-2SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))`<p>Recovery expression:</p>`last(/MikroTik CSS326-24G-2SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0` |AVERAGE |<p>Manual close: YES</p> |
 |Interface {#IFNAME}({#IFALIAS}): High bandwidth usage (>{$IF.UTIL.MAX:"{#IFNAME}"}%) |<p>The network interface utilization is close to its estimated maximum bandwidth.</p> |`(avg(/MikroTik CSS326-24G-2SRM SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik CSS326-24G-2SRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) or avg(/MikroTik CSS326-24G-2SRM SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik CSS326-24G-2SRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])) and last(/MikroTik CSS326-24G-2SRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0`<p>Recovery expression:</p>`avg(/MikroTik CSS326-24G-2SRM SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik CSS326-24G-2SRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) and avg(/MikroTik CSS326-24G-2SRM SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik CSS326-24G-2SRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |Interface {#IFNAME}({#IFALIAS}): High error rate (>{$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) |<p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p> |`min(/MikroTik CSS326-24G-2SRM SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"} or min(/MikroTik CSS326-24G-2SRM SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`max(/MikroTik CSS326-24G-2SRM SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8 and max(/MikroTik CSS326-24G-2SRM SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
-|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik CSS326-24G-2SRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik CSS326-24G-2SRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik CSS326-24G-2SRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik CSS326-24G-2SRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik CSS326-24G-2SRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik CSS326-24G-2SRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik CSS326-24G-2SRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik CSS326-24G-2SRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik CSS326-24G-2SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2) `<p>Recovery expression:</p>`(change(/MikroTik CSS326-24G-2SRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik CSS326-24G-2SRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik CSS326-24G-2SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2) ` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik CSS326-24G-2SRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik CSS326-24G-2SRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik CSS326-24G-2SRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik CSS326-24G-2SRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik CSS326-24G-2SRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik CSS326-24G-2SRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik CSS326-24G-2SRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik CSS326-24G-2SRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik CSS326-24G-2SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2)`<p>Recovery expression:</p>`(change(/MikroTik CSS326-24G-2SRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik CSS326-24G-2SRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik CSS326-24G-2SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2)` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |{HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/MikroTik CSS326-24G-2SRM SNMP/system.uptime[sysUpTime.0])<10m` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- No SNMP data collection</p> |
 |No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/MikroTik CSS326-24G-2SRM SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |Unavailable by ICMP ping |<p>Last three attempts returned timeout.  Please check device connectivity.</p> |`max(/MikroTik CSS326-24G-2SRM SNMP/icmpping,#3)=0` |HIGH | |
 |High ICMP ping loss |<p>-</p> |`min(/MikroTik CSS326-24G-2SRM SNMP/icmppingloss,5m)>{$ICMP_LOSS_WARN} and min(/MikroTik CSS326-24G-2SRM SNMP/icmppingloss,5m)<100` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |High ICMP ping response time |<p>-</p> |`avg(/MikroTik CSS326-24G-2SRM SNMP/icmppingsec,5m)>{$ICMP_RESPONSE_TIME_WARN}` |WARNING |<p>**Depends on**:</p><p>- High ICMP ping loss</p><p>- Unavailable by ICMP ping</p> |
-|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CSS326-24G-2SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CSS326-24G-2SRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CSS326-24G-2SRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CSS326-24G-2SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
-|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CSS326-24G-2SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CSS326-24G-2SRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CSS326-24G-2SRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CSS326-24G-2SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CSS326-24G-2SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CSS326-24G-2SRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CSS326-24G-2SRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CSS326-24G-2SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CSS326-24G-2SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CSS326-24G-2SRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CSS326-24G-2SRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CSS326-24G-2SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
 |CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CSS326-24G-2SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CSS326-24G-2SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
 |CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CSS326-24G-2SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CSS326-24G-2SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
 |CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik CSS326-24G-2SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik CSS326-24G-2SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
diff --git a/templates/net/mikrotik/mikrotik_CSS326-24G-2S+RM_snmp/template_net_mikrotik_CSS326-24G-2S+RM_snmp.yaml b/templates/net/mikrotik/mikrotik_CSS326-24G-2S+RM_snmp/template_net_mikrotik_CSS326-24G-2S+RM_snmp.yaml
index a8aeea8df78..47d1ac40080 100644
--- a/templates/net/mikrotik/mikrotik_CSS326-24G-2S+RM_snmp/template_net_mikrotik_CSS326-24G-2S+RM_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_CSS326-24G-2S+RM_snmp/template_net_mikrotik_CSS326-24G-2S+RM_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:45:45Z'
+  date: '2022-01-26T09:47:57Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -35,8 +35,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 7c5ac0cbe19b4a119e8cd02802169849
@@ -44,6 +47,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 581804928209426ab53c232419f0d201
           name: 'ICMP loss'
@@ -54,8 +61,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 4b63a258093a4b5f8c7f415c054e290c
@@ -67,6 +77,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CSS326-24G-2SRM SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 919171c77ef34d96b071d04c279d467f
           name: 'ICMP response time'
@@ -77,8 +94,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 8d37fb7e0f32438ea1b1f55389c4c024
@@ -93,6 +113,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CSS326-24G-2SRM SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 0f21accc1a4247e9951b6c0d8b9a49af
           name: 'SNMP traps (fallback)'
@@ -105,8 +132,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: a79df3796e4b4f5183a8ee38d554843f
           name: 'System contact details'
@@ -128,8 +155,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 4d3eab41a8c845a7bfbe5dbb3b6fd45b
           name: 'System description'
@@ -152,8 +179,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: ac47dac361224d288e4455e9a689d690
           name: 'Firmware version'
@@ -174,8 +201,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 6be0e3bc49134d8c9823736e1c4dcb98
@@ -185,6 +212,10 @@ zabbix_export:
               priority: INFO
               description: 'Firmware version has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 01ef36b50b394e4bb9670abd48a05369
           name: 'Hardware model name'
@@ -203,8 +234,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
         -
           uuid: 2321d2d106f6432a9de5b5a633315e5e
           name: 'Hardware serial number'
@@ -226,8 +257,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: a6c0fe000ca34b7490c4a56f5c57346b
@@ -236,6 +267,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: dd009a8b6f2d409c89cd5f5c60bea1b8
           name: 'System location'
@@ -257,8 +292,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 52a05ea08b8640f784861b5b2b75dfa8
           name: 'System name'
@@ -280,8 +315,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 23b043f4b2344b8ea9140387454e6b02
@@ -290,6 +325,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: 06a2d329ae384c8fb773719c34593d0f
           name: 'System object ID'
@@ -310,8 +352,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: ae9626b78f3e4e89842fb82592e2f520
           name: 'Operating system'
@@ -333,8 +375,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: os
           triggers:
             -
               uuid: 660fbce28f334bb79afc6a9ba8596316
@@ -347,6 +389,10 @@ zabbix_export:
                 -
                   name: 'System name has changed (new name: {ITEM.VALUE})'
                   expression: 'last(/MikroTik CSS326-24G-2SRM SNMP/system.name,#1)<>last(/MikroTik CSS326-24G-2SRM SNMP/system.name,#2) and length(last(/MikroTik CSS326-24G-2SRM SNMP/system.name))>0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 848026e8f903413d8faecf0233d69a8e
           name: Uptime
@@ -367,8 +413,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: e2283150bf9e4248aa9bb5bd9cc1881e
@@ -381,6 +427,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/MikroTik CSS326-24G-2SRM SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 4972cad8ac8f44d8a3d01278d602b21d
           name: 'Total memory'
@@ -407,8 +457,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: a66e0f5458094b13bbdb7c9193b334e5
           name: 'Used memory'
@@ -427,8 +477,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 5c095d3737054b68a32f491e34f4ab32
           name: 'Memory utilization'
@@ -441,8 +491,8 @@ zabbix_export:
           description: 'Memory utilization in %'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: ac97984b2153426c89247bd88797b4a2
@@ -450,6 +500,13 @@ zabbix_export:
               name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
               priority: AVERAGE
               description: 'The system is running out of free memory.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: e77993cb5e6f4b71a7fb71cd85ea548a
           name: 'SNMP agent availability'
@@ -466,8 +523,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 8d9d64c66ffe48899e799bf720182b6c
@@ -480,6 +540,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CSS326-24G-2SRM SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: a67f85c892114c60bf0daac055b2a8b4
@@ -504,8 +568,8 @@ zabbix_export:
                 The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
               trigger_prototypes:
                 -
                   uuid: 62fb5cb70674493ea1c7db4df42cf8f4
@@ -514,6 +578,10 @@ zabbix_export:
                   opdata: 'Current utilization: {ITEM.LASTVALUE1}'
                   priority: WARNING
                   description: 'CPU utilization is too high. The system might be slow to respond.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: b14c854295504c2fbbb0481bebd5db00
@@ -558,8 +626,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 43a5c40a58f541faa120a514dc47451e
@@ -570,6 +638,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: bb4a5e936ba74269b8a8fa2e1ca2b27e
                   expression: 'avg(/MikroTik CSS326-24G-2SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
@@ -584,6 +659,13 @@ zabbix_export:
                       name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
                       expression: 'avg(/MikroTik CSS326-24G-2SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
                       recovery_expression: 'max(/MikroTik CSS326-24G-2SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 46754e9a44b04fdeabc9d6a1370505dc
                   expression: 'avg(/MikroTik CSS326-24G-2SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
@@ -592,6 +674,13 @@ zabbix_export:
                   name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: be5b2f204fa545d4b581201dfbf57335
           name: 'Temperature sensor discovery'
@@ -601,8 +690,7 @@ zabbix_export:
           delay: 1h
           description: |
             MIKROTIK-MIB::mtxrHlTemperature
-            Since temperature sensor is not available on all Mikrotik hardware,
-            this is done to avoid unsupported items.
+            Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.
           item_prototypes:
             -
               uuid: a3c4ebcac6134235a5f51ad0a825acae
@@ -626,8 +714,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 5b25032a33c3443585d74f3412f13d3e
@@ -638,6 +726,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 44f2b8515564492c9b2e68985f753cf9
                   expression: 'avg(/MikroTik CSS326-24G-2SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
@@ -652,6 +747,13 @@ zabbix_export:
                       name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
                       expression: 'avg(/MikroTik CSS326-24G-2SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
                       recovery_expression: 'max(/MikroTik CSS326-24G-2SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: cd9978c41951477c9d3ef44f7d4d717c
                   expression: 'avg(/MikroTik CSS326-24G-2SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
@@ -660,6 +762,13 @@ zabbix_export:
                   name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 92d612ae6ba74d01a369713b27732da4
           name: 'LTE modem discovery'
@@ -694,14 +803,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRP Reference Signal Received Power.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 889e25ecd5104014bd798cb577f59bd5
                   expression: 'max(/MikroTik CSS326-24G-2SRM SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 932b36d99dea4cc6b41daef5b452adb2
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
@@ -716,14 +838,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 8733d8912d8d400b9dafcc845854cb3a
                   expression: 'max(/MikroTik CSS326-24G-2SRM SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: e2d2db403dce4b8e980dce441399c31c
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
@@ -738,14 +873,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: a801c0260917479f9f905a8b32085fc6
                   expression: 'max(/MikroTik CSS326-24G-2SRM SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 18d7874870c74f9e93bafba284a038d2
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
@@ -760,14 +908,27 @@ zabbix_export:
                 mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: cfcecfe761064f5baa312a0c54633261
                   expression: 'max(/MikroTik CSS326-24G-2SRM SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 0e692d0869b14d84a2aafd12aa424d29
@@ -828,8 +989,14 @@ zabbix_export:
                 mtxrWlApAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 57f41aedeaf947c7b2b99e11a8f5f6a9
               name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
@@ -849,8 +1016,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 46026e2ec35649f181707026f49055a3
               name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
@@ -870,8 +1043,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 885b452398fd4131a80ae84b484018ac
               name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
@@ -890,8 +1069,14 @@ zabbix_export:
                     - 15m
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: b685866be093464f96fc8731e6cb24a6
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -904,8 +1089,14 @@ zabbix_export:
                 mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
         -
           uuid: 6177e332ddf1464a843560c8aaef03f8
           name: 'CAPsMAN AP channel discovery'
@@ -938,8 +1129,14 @@ zabbix_export:
                 mtxrWlCMAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 4249cd712d244445a4d69affa771b387
               name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
@@ -959,8 +1156,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 78346d4d85e045bdb151fb51108d81ed
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -973,8 +1176,14 @@ zabbix_export:
                 mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: f836d1e069cc40fa9e31fd12456a9155
               name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
@@ -994,8 +1203,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 0a36e10a866e455f98f1954b4c663d64
@@ -1003,6 +1218,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
                   priority: WARNING
                   description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 127a96854d2b41e98054deefcb4ae611
           name: 'Network interfaces discovery'
@@ -1091,8 +1313,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: e460dc068df843b186d0deb849b6dcc3
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -1111,8 +1339,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: c1a647eb08494764b278d2d37c2ff95b
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -1136,8 +1370,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: ec3b763a78cd4fe2bd32270d8d6dd13f
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -1160,8 +1400,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: c51489ce84b74371bea2a5c366a2dc5d
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -1180,8 +1426,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 397ab9b47b9c47b19238e468f5258c1d
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -1205,8 +1457,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 9f6c72493ee74c208834fedd93e4b593
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -1231,8 +1489,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 30a4494efd164dad8df7975cf4f67d0a
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -1254,8 +1518,14 @@ zabbix_export:
                 name: 'IF-MIB::ifOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: a0071a9d0e604160af201436b9879256
@@ -1273,6 +1543,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: f6163d52349d48938752e4a46595026b
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -1296,8 +1570,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           trigger_prototypes:
             -
               uuid: 2215de4000e640c3b34a5333dfb3ec79
@@ -1327,6 +1607,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CSS326-24G-2SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CSS326-24G-2SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CSS326-24G-2SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CSS326-24G-2SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 1b7348beb2044c2cbb59904cde8fc02b
               expression: |
@@ -1347,6 +1631,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CSS326-24G-2SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CSS326-24G-2SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CSS326-24G-2SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CSS326-24G-2SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: cd7fe7efe80241efae4e7dd2952313bc
               expression: |
@@ -1366,6 +1654,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CSS326-24G-2SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CSS326-24G-2SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CSS326-24G-2SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CSS326-24G-2SRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: 2db7e672a25341008a6928fca2bb0c81
@@ -1444,8 +1739,11 @@ zabbix_export:
               description: 'Space utilization in % for Disk-{#SNMPINDEX}'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 0496f8a356b14caa8a06ec4be8b04e65
               name: 'Disk-{#SNMPINDEX}: Total space'
@@ -1472,8 +1770,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 7805deb172f0405ca211e47bb49eb557
               name: 'Disk-{#SNMPINDEX}: Used space'
@@ -1492,8 +1793,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
           trigger_prototypes:
             -
               uuid: 7e550dcc8005425db0c20785d3818466
@@ -1509,6 +1813,13 @@ zabbix_export:
                  - The disk free space is less than 5G.
                  - The disk will be full in less than 24 hours.
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
             -
               uuid: 92d4b209c4e249fcab9d72eae2da160d
               expression: |
@@ -1529,6 +1840,13 @@ zabbix_export:
                   expression: |
                     last(/MikroTik CSS326-24G-2SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
                     ((last(/MikroTik CSS326-24G-2SRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CSS326-24G-2SRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CSS326-24G-2SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
           graph_prototypes:
             -
               uuid: a6a6dffb9d24445aaf4de5d0c5f386e0
@@ -1552,6 +1870,16 @@ zabbix_export:
                   item:
                     host: 'MikroTik CSS326-24G-2SRM SNMP'
                     key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: css326-24g-2splusrm
+        -
+          tag: target
+          value: mikrotik
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/net/mikrotik/mikrotik_CSS610-8G-2S+IN_snmp/README.md b/templates/net/mikrotik/mikrotik_CSS610-8G-2S+IN_snmp/README.md
index e363bfeced4..a05695158db 100644
--- a/templates/net/mikrotik/mikrotik_CSS610-8G-2S+IN_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_CSS610-8G-2S+IN_snmp/README.md
@@ -71,7 +71,7 @@ There are no template links in this template.
 |Network interfaces discovery |<p>Discovering interfaces from IF-MIB.</p> |SNMP |net.if.discovery<p>**Filter**:</p>AND <p>- {#IFADMINSTATUS} MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.MATCHES}`</p><p>- {#IFADMINSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.NOT_MATCHES}`</p><p>- {#IFOPERSTATUS} MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.MATCHES}`</p><p>- {#IFOPERSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.NOT_MATCHES}`</p><p>- {#IFNAME} MATCHES_REGEX `{$NET.IF.IFNAME.MATCHES}`</p><p>- {#IFNAME} NOT_MATCHES_REGEX `{$NET.IF.IFNAME.NOT_MATCHES}`</p><p>- {#IFDESCR} MATCHES_REGEX `{$NET.IF.IFDESCR.MATCHES}`</p><p>- {#IFDESCR} NOT_MATCHES_REGEX `{$NET.IF.IFDESCR.NOT_MATCHES}`</p><p>- {#IFALIAS} MATCHES_REGEX `{$NET.IF.IFALIAS.MATCHES}`</p><p>- {#IFALIAS} NOT_MATCHES_REGEX `{$NET.IF.IFALIAS.NOT_MATCHES}`</p><p>- {#IFTYPE} MATCHES_REGEX `{$NET.IF.IFTYPE.MATCHES}`</p><p>- {#IFTYPE} NOT_MATCHES_REGEX `{$NET.IF.IFTYPE.NOT_MATCHES}`</p> |
 |Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 |Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
-|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
 
 ## Items collected
 
@@ -137,14 +137,14 @@ There are no template links in this template.
 |Interface {#IFNAME}({#IFALIAS}): Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p><p>3. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CSS610-8G-2SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CSS610-8G-2SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CSS610-8G-2SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))`<p>Recovery expression:</p>`last(/MikroTik CSS610-8G-2SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0` |AVERAGE |<p>Manual close: YES</p> |
 |Interface {#IFNAME}({#IFALIAS}): High bandwidth usage (>{$IF.UTIL.MAX:"{#IFNAME}"}%) |<p>The network interface utilization is close to its estimated maximum bandwidth.</p> |`(avg(/MikroTik CSS610-8G-2SIN SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik CSS610-8G-2SIN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) or avg(/MikroTik CSS610-8G-2SIN SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik CSS610-8G-2SIN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])) and last(/MikroTik CSS610-8G-2SIN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0`<p>Recovery expression:</p>`avg(/MikroTik CSS610-8G-2SIN SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik CSS610-8G-2SIN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) and avg(/MikroTik CSS610-8G-2SIN SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik CSS610-8G-2SIN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |Interface {#IFNAME}({#IFALIAS}): High error rate (>{$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) |<p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p> |`min(/MikroTik CSS610-8G-2SIN SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"} or min(/MikroTik CSS610-8G-2SIN SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`max(/MikroTik CSS610-8G-2SIN SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8 and max(/MikroTik CSS610-8G-2SIN SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
-|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik CSS610-8G-2SIN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik CSS610-8G-2SIN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik CSS610-8G-2SIN SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik CSS610-8G-2SIN SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik CSS610-8G-2SIN SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik CSS610-8G-2SIN SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik CSS610-8G-2SIN SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik CSS610-8G-2SIN SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik CSS610-8G-2SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2) `<p>Recovery expression:</p>`(change(/MikroTik CSS610-8G-2SIN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik CSS610-8G-2SIN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik CSS610-8G-2SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2) ` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik CSS610-8G-2SIN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik CSS610-8G-2SIN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik CSS610-8G-2SIN SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik CSS610-8G-2SIN SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik CSS610-8G-2SIN SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik CSS610-8G-2SIN SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik CSS610-8G-2SIN SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik CSS610-8G-2SIN SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik CSS610-8G-2SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2)`<p>Recovery expression:</p>`(change(/MikroTik CSS610-8G-2SIN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik CSS610-8G-2SIN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik CSS610-8G-2SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2)` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |{HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/MikroTik CSS610-8G-2SIN SNMP/system.uptime[sysUpTime.0])<10m` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- No SNMP data collection</p> |
 |No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/MikroTik CSS610-8G-2SIN SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |Unavailable by ICMP ping |<p>Last three attempts returned timeout.  Please check device connectivity.</p> |`max(/MikroTik CSS610-8G-2SIN SNMP/icmpping,#3)=0` |HIGH | |
 |High ICMP ping loss |<p>-</p> |`min(/MikroTik CSS610-8G-2SIN SNMP/icmppingloss,5m)>{$ICMP_LOSS_WARN} and min(/MikroTik CSS610-8G-2SIN SNMP/icmppingloss,5m)<100` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |High ICMP ping response time |<p>-</p> |`avg(/MikroTik CSS610-8G-2SIN SNMP/icmppingsec,5m)>{$ICMP_RESPONSE_TIME_WARN}` |WARNING |<p>**Depends on**:</p><p>- High ICMP ping loss</p><p>- Unavailable by ICMP ping</p> |
-|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CSS610-8G-2SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CSS610-8G-2SIN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CSS610-8G-2SIN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CSS610-8G-2SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
-|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CSS610-8G-2SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CSS610-8G-2SIN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CSS610-8G-2SIN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CSS610-8G-2SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CSS610-8G-2SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CSS610-8G-2SIN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CSS610-8G-2SIN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CSS610-8G-2SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CSS610-8G-2SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CSS610-8G-2SIN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CSS610-8G-2SIN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CSS610-8G-2SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
 |CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CSS610-8G-2SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CSS610-8G-2SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
 |CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CSS610-8G-2SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CSS610-8G-2SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
 |CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik CSS610-8G-2SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik CSS610-8G-2SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
diff --git a/templates/net/mikrotik/mikrotik_CSS610-8G-2S+IN_snmp/template_net_mikrotik_CSS610-8G-2S+IN_snmp.yaml b/templates/net/mikrotik/mikrotik_CSS610-8G-2S+IN_snmp/template_net_mikrotik_CSS610-8G-2S+IN_snmp.yaml
index 458a9eb76db..3e4a91a44c6 100644
--- a/templates/net/mikrotik/mikrotik_CSS610-8G-2S+IN_snmp/template_net_mikrotik_CSS610-8G-2S+IN_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_CSS610-8G-2S+IN_snmp/template_net_mikrotik_CSS610-8G-2S+IN_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:45:50Z'
+  date: '2022-01-26T09:53:56Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -35,8 +35,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 4c4560f84de94f36a3e7d4941ded2cba
@@ -44,6 +47,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 8173ce900a384eb6be5941be7ab89b15
           name: 'ICMP loss'
@@ -54,8 +61,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 44efdc627091496baa1fbe4bbe078e6f
@@ -67,6 +77,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CSS610-8G-2SIN SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: ad7aa85d14834683b63b43cf48222259
           name: 'ICMP response time'
@@ -77,8 +94,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 0a8c65b849dd4cb1a0d740d57323f76c
@@ -93,6 +113,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CSS610-8G-2SIN SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: b5d724ef958b4716b09dcbda5ae0ced7
           name: 'SNMP traps (fallback)'
@@ -105,8 +132,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: 44ae86def1564418a90f4c4a4c0b9e85
           name: 'System contact details'
@@ -128,8 +155,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: b8f058b9f1cb493798fb971c1d06f0d8
           name: 'System description'
@@ -152,8 +179,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: c7582351ce394433b50aef17cc01b5b2
           name: 'Firmware version'
@@ -174,8 +201,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 1a920e11feb447deba1aa2d8fbb24f85
@@ -185,6 +212,10 @@ zabbix_export:
               priority: INFO
               description: 'Firmware version has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 9e5fac593cf94a9d973ba8b604e1dfd2
           name: 'Hardware model name'
@@ -203,8 +234,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
         -
           uuid: f5531013912c4ed68e6b0b4d89165803
           name: 'Hardware serial number'
@@ -226,8 +257,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 1167a5bf26e24eb89479904841ef890b
@@ -236,6 +267,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 6ee460010096474e9a574efba9f5a321
           name: 'System location'
@@ -257,8 +292,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 05efe5444887488cad6e765f29c8872a
           name: 'System name'
@@ -280,8 +315,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 56b334cfbcf54eba95c229b097e3cfd7
@@ -290,6 +325,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: 2cdbeb7f0c09494996884bcfd5d97df0
           name: 'System object ID'
@@ -310,8 +352,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 86323c3d935642f980f158e5868f35e0
           name: 'Operating system'
@@ -333,8 +375,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: os
           triggers:
             -
               uuid: 4a1aacf6350844e5858c3eed35b544eb
@@ -347,6 +389,10 @@ zabbix_export:
                 -
                   name: 'System name has changed (new name: {ITEM.VALUE})'
                   expression: 'last(/MikroTik CSS610-8G-2SIN SNMP/system.name,#1)<>last(/MikroTik CSS610-8G-2SIN SNMP/system.name,#2) and length(last(/MikroTik CSS610-8G-2SIN SNMP/system.name))>0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: bc75baec3ea248e5a287b00906e18775
           name: Uptime
@@ -367,8 +413,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 3afcbbeb91004c2dae24efaf37fec710
@@ -381,6 +427,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/MikroTik CSS610-8G-2SIN SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 3ab4fc5c9fba4e098977500051a8ac98
           name: 'Total memory'
@@ -407,8 +457,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: df10ebd3cfa44fe6838889ff81e8cab0
           name: 'Used memory'
@@ -427,8 +477,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 132ff52c4648491c9743bcf11b680236
           name: 'Memory utilization'
@@ -441,8 +491,8 @@ zabbix_export:
           description: 'Memory utilization in %'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: f58eb093a57948f1bf674be6a207b0d3
@@ -450,6 +500,13 @@ zabbix_export:
               name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
               priority: AVERAGE
               description: 'The system is running out of free memory.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 5534d6b602624c7a99c70c3b75e4478b
           name: 'SNMP agent availability'
@@ -466,8 +523,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: a63e914da20a47ef9d478b53d5e18042
@@ -480,6 +540,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik CSS610-8G-2SIN SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: fc9d85ea9e364ae58f4bd34dc702bd29
@@ -504,8 +568,8 @@ zabbix_export:
                 The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
               trigger_prototypes:
                 -
                   uuid: 4a30b05ebe764253bfe646c3d68aef41
@@ -514,6 +578,10 @@ zabbix_export:
                   opdata: 'Current utilization: {ITEM.LASTVALUE1}'
                   priority: WARNING
                   description: 'CPU utilization is too high. The system might be slow to respond.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 1d1ce73e95dc4ad9b20d19010e524344
@@ -558,8 +626,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 7475c0fe7374472db189a828aeca7b60
@@ -570,6 +638,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 225e0c1c96c94a32a84511107b71ea6d
                   expression: 'avg(/MikroTik CSS610-8G-2SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
@@ -584,6 +659,13 @@ zabbix_export:
                       name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
                       expression: 'avg(/MikroTik CSS610-8G-2SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
                       recovery_expression: 'max(/MikroTik CSS610-8G-2SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: b5300fdf6fe8405d84fdd7a8821ac504
                   expression: 'avg(/MikroTik CSS610-8G-2SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
@@ -592,6 +674,13 @@ zabbix_export:
                   name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 4b3d7a1cf06e4fa184403f3796c3ed13
           name: 'Temperature sensor discovery'
@@ -601,8 +690,7 @@ zabbix_export:
           delay: 1h
           description: |
             MIKROTIK-MIB::mtxrHlTemperature
-            Since temperature sensor is not available on all Mikrotik hardware,
-            this is done to avoid unsupported items.
+            Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.
           item_prototypes:
             -
               uuid: 0cb6b32ae5a84259ab847d0cc802f16c
@@ -626,8 +714,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: e208be80d815435ea6fc35df960bd2f6
@@ -638,6 +726,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 7153cf7699df438d8d04e5d3163e37b3
                   expression: 'avg(/MikroTik CSS610-8G-2SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
@@ -652,6 +747,13 @@ zabbix_export:
                       name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
                       expression: 'avg(/MikroTik CSS610-8G-2SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
                       recovery_expression: 'max(/MikroTik CSS610-8G-2SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 30adf35ae2764123a80f64e81c11c9dd
                   expression: 'avg(/MikroTik CSS610-8G-2SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
@@ -660,6 +762,13 @@ zabbix_export:
                   name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 7040fb77df5b4300bc9084b76b901940
           name: 'LTE modem discovery'
@@ -694,14 +803,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRP Reference Signal Received Power.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 35142b5bd9064d63a661b07b24381564
                   expression: 'max(/MikroTik CSS610-8G-2SIN SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: cfb4d7bc97054f2fa76d9b945f65f151
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
@@ -716,14 +838,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: ddd0efc2e01e4b6ca2948a5d3973dcd5
                   expression: 'max(/MikroTik CSS610-8G-2SIN SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 8d134db6ad6342308926fa1de66a1f42
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
@@ -738,14 +873,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 90f360f3394d49a19413dcbf0dc0eab6
                   expression: 'max(/MikroTik CSS610-8G-2SIN SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: de1b466fd287481cacebcbea3339d984
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
@@ -760,14 +908,27 @@ zabbix_export:
                 mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: f753e8c0d5fe43779fc3c427fcb087dd
                   expression: 'max(/MikroTik CSS610-8G-2SIN SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: d1ff1951fe214755acf84088b44616cd
@@ -828,8 +989,14 @@ zabbix_export:
                 mtxrWlApAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 9132dd54ff2f44cc8ddcb152c892ee06
               name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
@@ -849,8 +1016,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 867d40ce9bf44892b0f70f8465f727b0
               name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
@@ -870,8 +1043,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: f16dcddcb1344f3db732c7e794bd5bad
               name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
@@ -890,8 +1069,14 @@ zabbix_export:
                     - 15m
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: cfe19d4825d14a91975023848a7464d8
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -904,8 +1089,14 @@ zabbix_export:
                 mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
         -
           uuid: 6059d2ecbecd480b85d1c4e94eb65059
           name: 'CAPsMAN AP channel discovery'
@@ -938,8 +1129,14 @@ zabbix_export:
                 mtxrWlCMAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 71332c155c18442ab89d0f3bf49a11e3
               name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
@@ -959,8 +1156,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 706ba145d130418995b4e61b19df3a6d
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -973,8 +1176,14 @@ zabbix_export:
                 mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: a852223b28574abc9d76dc0053699209
               name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
@@ -994,8 +1203,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 0ec46a410f97442fb9308a0922d43648
@@ -1003,6 +1218,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
                   priority: WARNING
                   description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 32198eb34e2c4b0583718f70453c07af
           name: 'Network interfaces discovery'
@@ -1091,8 +1313,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: df4b1fb0cd1c496f899f72a71912a0e8
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -1111,8 +1339,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 9c94e7fea09a4564a8badee716956faf
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -1136,8 +1370,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 20f2f1af873a4a669cb3a26c04dc9ffb
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -1160,8 +1400,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 951aabf89c3f40fab81974e3b7f05a3f
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -1180,8 +1426,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 240c2875c51a4ed9b417e86a2d00ef58
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -1205,8 +1457,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 9a5ce33805674092ab3040890f753ca6
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -1231,8 +1489,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: d13d7eaba7314f4a8b387b373cca5c6f
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -1254,8 +1518,14 @@ zabbix_export:
                 name: 'IF-MIB::ifOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: a50ddafe680c447db056a9a9012faead
@@ -1273,6 +1543,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 66553455009c4044bbd0cd4c259bd3b4
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -1296,8 +1570,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           trigger_prototypes:
             -
               uuid: 426f6a84191544c79eeabfbfb7590a35
@@ -1327,6 +1607,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CSS610-8G-2SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CSS610-8G-2SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CSS610-8G-2SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CSS610-8G-2SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 69788ba37d1147c2b67d4dbbc9b33eff
               expression: |
@@ -1347,6 +1631,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CSS610-8G-2SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CSS610-8G-2SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CSS610-8G-2SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CSS610-8G-2SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 376cee5b35f840d68db5d1daed510eb3
               expression: |
@@ -1366,6 +1654,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik CSS610-8G-2SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik CSS610-8G-2SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik CSS610-8G-2SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik CSS610-8G-2SIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: a99459605b774ff19684b24f62b1c5fd
@@ -1444,8 +1739,11 @@ zabbix_export:
               description: 'Space utilization in % for Disk-{#SNMPINDEX}'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: acd377f6db0f4a7eab0c1289309b69ad
               name: 'Disk-{#SNMPINDEX}: Total space'
@@ -1472,8 +1770,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 7a66d6925e3d48c6aae02daaf1051860
               name: 'Disk-{#SNMPINDEX}: Used space'
@@ -1492,8 +1793,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
           trigger_prototypes:
             -
               uuid: 1f6e2a2bdf04499eabb18118fdbfcc4f
@@ -1509,6 +1813,13 @@ zabbix_export:
                  - The disk free space is less than 5G.
                  - The disk will be full in less than 24 hours.
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
             -
               uuid: 7fe3563d08ad470f909545c146b1b2c1
               expression: |
@@ -1529,6 +1840,13 @@ zabbix_export:
                   expression: |
                     last(/MikroTik CSS610-8G-2SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
                     ((last(/MikroTik CSS610-8G-2SIN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CSS610-8G-2SIN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CSS610-8G-2SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
           graph_prototypes:
             -
               uuid: b3730be1499f4aa094217acb7a84148f
@@ -1552,6 +1870,16 @@ zabbix_export:
                   item:
                     host: 'MikroTik CSS610-8G-2SIN SNMP'
                     key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: css610-8g-2splusin
+        -
+          tag: target
+          value: mikrotik
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/net/mikrotik/mikrotik_FiberBox_snmp/README.md b/templates/net/mikrotik/mikrotik_FiberBox_snmp/README.md
index b6811ee4052..2086ceebc51 100644
--- a/templates/net/mikrotik/mikrotik_FiberBox_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_FiberBox_snmp/README.md
@@ -71,7 +71,7 @@ There are no template links in this template.
 |Network interfaces discovery |<p>Discovering interfaces from IF-MIB.</p> |SNMP |net.if.discovery<p>**Filter**:</p>AND <p>- {#IFADMINSTATUS} MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.MATCHES}`</p><p>- {#IFADMINSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.NOT_MATCHES}`</p><p>- {#IFOPERSTATUS} MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.MATCHES}`</p><p>- {#IFOPERSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.NOT_MATCHES}`</p><p>- {#IFNAME} MATCHES_REGEX `{$NET.IF.IFNAME.MATCHES}`</p><p>- {#IFNAME} NOT_MATCHES_REGEX `{$NET.IF.IFNAME.NOT_MATCHES}`</p><p>- {#IFDESCR} MATCHES_REGEX `{$NET.IF.IFDESCR.MATCHES}`</p><p>- {#IFDESCR} NOT_MATCHES_REGEX `{$NET.IF.IFDESCR.NOT_MATCHES}`</p><p>- {#IFALIAS} MATCHES_REGEX `{$NET.IF.IFALIAS.MATCHES}`</p><p>- {#IFALIAS} NOT_MATCHES_REGEX `{$NET.IF.IFALIAS.NOT_MATCHES}`</p><p>- {#IFTYPE} MATCHES_REGEX `{$NET.IF.IFTYPE.MATCHES}`</p><p>- {#IFTYPE} NOT_MATCHES_REGEX `{$NET.IF.IFTYPE.NOT_MATCHES}`</p> |
 |Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 |Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
-|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
 
 ## Items collected
 
@@ -137,14 +137,14 @@ There are no template links in this template.
 |Interface {#IFNAME}({#IFALIAS}): Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p><p>3. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik FiberBox SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik FiberBox SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik FiberBox SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))`<p>Recovery expression:</p>`last(/MikroTik FiberBox SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0` |AVERAGE |<p>Manual close: YES</p> |
 |Interface {#IFNAME}({#IFALIAS}): High bandwidth usage (>{$IF.UTIL.MAX:"{#IFNAME}"}%) |<p>The network interface utilization is close to its estimated maximum bandwidth.</p> |`(avg(/MikroTik FiberBox SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik FiberBox SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) or avg(/MikroTik FiberBox SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik FiberBox SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])) and last(/MikroTik FiberBox SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0`<p>Recovery expression:</p>`avg(/MikroTik FiberBox SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik FiberBox SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) and avg(/MikroTik FiberBox SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik FiberBox SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |Interface {#IFNAME}({#IFALIAS}): High error rate (>{$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) |<p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p> |`min(/MikroTik FiberBox SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"} or min(/MikroTik FiberBox SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`max(/MikroTik FiberBox SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8 and max(/MikroTik FiberBox SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
-|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik FiberBox SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik FiberBox SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik FiberBox SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik FiberBox SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik FiberBox SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik FiberBox SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik FiberBox SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik FiberBox SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik FiberBox SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2) `<p>Recovery expression:</p>`(change(/MikroTik FiberBox SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik FiberBox SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik FiberBox SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2) ` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik FiberBox SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik FiberBox SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik FiberBox SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik FiberBox SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik FiberBox SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik FiberBox SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik FiberBox SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik FiberBox SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik FiberBox SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2)`<p>Recovery expression:</p>`(change(/MikroTik FiberBox SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik FiberBox SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik FiberBox SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2)` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |{HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/MikroTik FiberBox SNMP/system.uptime[sysUpTime.0])<10m` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- No SNMP data collection</p> |
 |No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/MikroTik FiberBox SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |Unavailable by ICMP ping |<p>Last three attempts returned timeout.  Please check device connectivity.</p> |`max(/MikroTik FiberBox SNMP/icmpping,#3)=0` |HIGH | |
 |High ICMP ping loss |<p>-</p> |`min(/MikroTik FiberBox SNMP/icmppingloss,5m)>{$ICMP_LOSS_WARN} and min(/MikroTik FiberBox SNMP/icmppingloss,5m)<100` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |High ICMP ping response time |<p>-</p> |`avg(/MikroTik FiberBox SNMP/icmppingsec,5m)>{$ICMP_RESPONSE_TIME_WARN}` |WARNING |<p>**Depends on**:</p><p>- High ICMP ping loss</p><p>- Unavailable by ICMP ping</p> |
-|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik FiberBox SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik FiberBox SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik FiberBox SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik FiberBox SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
-|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik FiberBox SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik FiberBox SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik FiberBox SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik FiberBox SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik FiberBox SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik FiberBox SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik FiberBox SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik FiberBox SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik FiberBox SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik FiberBox SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik FiberBox SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik FiberBox SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
 |CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik FiberBox SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik FiberBox SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
 |CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik FiberBox SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik FiberBox SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
 |CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik FiberBox SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik FiberBox SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
diff --git a/templates/net/mikrotik/mikrotik_FiberBox_snmp/template_net_mikrotik_FiberBox_snmp.yaml b/templates/net/mikrotik/mikrotik_FiberBox_snmp/template_net_mikrotik_FiberBox_snmp.yaml
index 273c2b45cf6..adb2202beb3 100644
--- a/templates/net/mikrotik/mikrotik_FiberBox_snmp/template_net_mikrotik_FiberBox_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_FiberBox_snmp/template_net_mikrotik_FiberBox_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:45:55Z'
+  date: '2022-01-26T09:46:45Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -35,8 +35,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 6a7f532a2e4a4b4cbe9435e560f8d281
@@ -44,6 +47,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 99b96d870f9e473f82d753e73e5a0662
           name: 'ICMP loss'
@@ -54,8 +61,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 17c92f554c45423eb5b44bd08f34ad7f
@@ -67,6 +77,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik FiberBox SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 02d39b670ab94ee2a915c2b33aae5b47
           name: 'ICMP response time'
@@ -77,8 +94,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 3b093888ce154887afaa6f738218d718
@@ -93,6 +113,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik FiberBox SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: d933122252654a9f9f9c6eb8a62f2de0
           name: 'SNMP traps (fallback)'
@@ -105,8 +132,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: 6e1f3e5e1fd2426eb057cd3e6d857826
           name: 'System contact details'
@@ -128,8 +155,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 98e095b208874cadb7de6380a0b28166
           name: 'System description'
@@ -152,8 +179,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 079bddb94e6d427b9b4232ba4da15b53
           name: 'Firmware version'
@@ -174,8 +201,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 2a00f0a84a274bf98254d1bbb9f1ad93
@@ -185,6 +212,10 @@ zabbix_export:
               priority: INFO
               description: 'Firmware version has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: c787c308e66348c2a2041c612ef70513
           name: 'Hardware model name'
@@ -203,8 +234,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
         -
           uuid: 87b44381d4154c34bb1de1d8e56bc0f9
           name: 'Hardware serial number'
@@ -226,8 +257,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 519f97f0275f4e9caf7e320e932ee911
@@ -236,6 +267,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 2e0fbbb7dc1d42a199b04261af201a07
           name: 'System location'
@@ -257,8 +292,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 59b1e8b64a30407b9e503f94c4b13b8a
           name: 'System name'
@@ -280,8 +315,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: dd116049df75471b8aacbedd082f2634
@@ -290,6 +325,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: 6f192955e5c64c958f6c7a0564a51d0a
           name: 'System object ID'
@@ -310,8 +352,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 3a8bf0dd575f4718a87c007408f98a80
           name: 'Operating system'
@@ -333,8 +375,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: os
           triggers:
             -
               uuid: 97933a27c0eb4e0cb67fceb9877641d9
@@ -347,6 +389,10 @@ zabbix_export:
                 -
                   name: 'System name has changed (new name: {ITEM.VALUE})'
                   expression: 'last(/MikroTik FiberBox SNMP/system.name,#1)<>last(/MikroTik FiberBox SNMP/system.name,#2) and length(last(/MikroTik FiberBox SNMP/system.name))>0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: c952f3c5768d4bdfa671ffb047968fd6
           name: Uptime
@@ -367,8 +413,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 63045c3ca20d4cd390b1247dfd3876c4
@@ -381,6 +427,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/MikroTik FiberBox SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: f5291559b3da497ba0cb9d7d36f531aa
           name: 'Total memory'
@@ -407,8 +457,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 40578c7f19bd4d2b9045abb2ccdd247f
           name: 'Used memory'
@@ -427,8 +477,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: f076a1ed65f340579771f6f9c6f5d724
           name: 'Memory utilization'
@@ -441,8 +491,8 @@ zabbix_export:
           description: 'Memory utilization in %'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: 72662034829d4d008f19cd3231b18bd1
@@ -450,6 +500,13 @@ zabbix_export:
               name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
               priority: AVERAGE
               description: 'The system is running out of free memory.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: ac42b3af7d964b16a44b8553e09b5e4e
           name: 'SNMP agent availability'
@@ -466,8 +523,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 7b8af02b531842e2b7f50037a8b3679a
@@ -480,6 +540,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik FiberBox SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: 169cb8a2290645ef8b19b1fb559471cd
@@ -504,8 +568,8 @@ zabbix_export:
                 The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
               trigger_prototypes:
                 -
                   uuid: c5c743eec5fd430385a3ab3f1b9ccd61
@@ -514,6 +578,10 @@ zabbix_export:
                   opdata: 'Current utilization: {ITEM.LASTVALUE1}'
                   priority: WARNING
                   description: 'CPU utilization is too high. The system might be slow to respond.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: cc63e64026b24e5ea1324ecc1049f5e9
@@ -558,8 +626,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 788f637f7c28499cb0b8227bbcfddbf6
@@ -570,6 +638,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: f2952ccdadf0474a85e626eeae67ee8f
                   expression: 'avg(/MikroTik FiberBox SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
@@ -584,6 +659,13 @@ zabbix_export:
                       name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
                       expression: 'avg(/MikroTik FiberBox SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
                       recovery_expression: 'max(/MikroTik FiberBox SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: fbd7daacdcde41fa9395a3dba62c7365
                   expression: 'avg(/MikroTik FiberBox SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
@@ -592,6 +674,13 @@ zabbix_export:
                   name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: bd5ed76fb50d44e0925cf59b9f7b33b2
           name: 'Temperature sensor discovery'
@@ -601,8 +690,7 @@ zabbix_export:
           delay: 1h
           description: |
             MIKROTIK-MIB::mtxrHlTemperature
-            Since temperature sensor is not available on all Mikrotik hardware,
-            this is done to avoid unsupported items.
+            Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.
           item_prototypes:
             -
               uuid: 3bcaff90977a4c68812498d86efdb0c4
@@ -626,8 +714,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 732a162ce6aa424e8660882cccfaf40b
@@ -638,6 +726,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 64daf72dc6824976bbc28c0e76b9318c
                   expression: 'avg(/MikroTik FiberBox SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
@@ -652,6 +747,13 @@ zabbix_export:
                       name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
                       expression: 'avg(/MikroTik FiberBox SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
                       recovery_expression: 'max(/MikroTik FiberBox SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 3a6e8742e68d4e4cb77931acec6202f2
                   expression: 'avg(/MikroTik FiberBox SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
@@ -660,6 +762,13 @@ zabbix_export:
                   name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 7ff8e43421a3408d99e3cf038cd1d32c
           name: 'LTE modem discovery'
@@ -694,14 +803,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRP Reference Signal Received Power.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 89422cbc4e294e5392352b3daa42a27b
                   expression: 'max(/MikroTik FiberBox SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 6044310bd6814fcea1bfc496fdb4e1cd
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
@@ -716,14 +838,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 1f5dbc7e06fb4a48a516f21095ad95eb
                   expression: 'max(/MikroTik FiberBox SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: a34aaedb745d46c3b60a53ba3f4619fd
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
@@ -738,14 +873,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 13229b29783c42119d9242d4e2d795ef
                   expression: 'max(/MikroTik FiberBox SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 777ea9e79ab24c9b9cc524317c5d7a3e
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
@@ -760,14 +908,27 @@ zabbix_export:
                 mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: acdd956a5d49476a86ced8d9ac561979
                   expression: 'max(/MikroTik FiberBox SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: c0d3b6d20f554a9c8014d9cf9d0f9055
@@ -828,8 +989,14 @@ zabbix_export:
                 mtxrWlApAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 02f7b1b3fb6f4a66bc4b02dedc2e08dd
               name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
@@ -849,8 +1016,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 59a008e602744b87a435d43ffcbd7270
               name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
@@ -870,8 +1043,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 41d0a02df0d6474895eb69c559da7d86
               name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
@@ -890,8 +1069,14 @@ zabbix_export:
                     - 15m
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 479ac2c04b3144ababdeddb75a0437f8
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -904,8 +1089,14 @@ zabbix_export:
                 mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
         -
           uuid: 03b7a6369c624c169416d85d6bdd8bd3
           name: 'CAPsMAN AP channel discovery'
@@ -938,8 +1129,14 @@ zabbix_export:
                 mtxrWlCMAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 54de59401d8b40f3b6446780d13a89f8
               name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
@@ -959,8 +1156,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: d32f654355f64421aeae49b6fbedd976
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -973,8 +1176,14 @@ zabbix_export:
                 mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: b5341b9ed36045ce951f455232b74983
               name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
@@ -994,8 +1203,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: a6f2bfc1407f4b96ac51aa7ec69b234d
@@ -1003,6 +1218,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
                   priority: WARNING
                   description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 2f7a46aee66e4dbf997ac51362f2bb55
           name: 'Network interfaces discovery'
@@ -1091,8 +1313,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: c802ca6e2ecc4d149b877eca9a01190e
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -1111,8 +1339,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: dfcec8edd17a4865b75df11c0929ce68
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -1136,8 +1370,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 01c46647d3e34f04bef49464f3ecee7a
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -1160,8 +1400,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 89b2e0e05b51489881bd3999cff7460e
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -1180,8 +1426,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 0e299540733d41f7a31fca8c834d4a64
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -1205,8 +1457,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 031c50df657944dd86e736d2747a3d6e
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -1231,8 +1489,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 3d0785af532942398bbc7c71f1c902ad
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -1254,8 +1518,14 @@ zabbix_export:
                 name: 'IF-MIB::ifOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 1dec7dd2894f4296963217dc13c78abe
@@ -1273,6 +1543,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: d3f08b8e8b5f440a9ce30440b96ee2cc
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -1296,8 +1570,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           trigger_prototypes:
             -
               uuid: 9d517af24f104293b6ca6b2b8de70d3b
@@ -1327,6 +1607,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik FiberBox SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik FiberBox SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik FiberBox SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik FiberBox SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: a95105e0711543388452fdb960bd2caf
               expression: |
@@ -1347,6 +1631,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik FiberBox SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik FiberBox SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik FiberBox SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik FiberBox SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 1881f3af98ec450cb15b88ac749bacf6
               expression: |
@@ -1366,6 +1654,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik FiberBox SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik FiberBox SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik FiberBox SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik FiberBox SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: ff833b0eb23a4e5d9ae1eb534d7ef0f3
@@ -1444,8 +1739,11 @@ zabbix_export:
               description: 'Space utilization in % for Disk-{#SNMPINDEX}'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 1065889d15ad41cea31648c789a72035
               name: 'Disk-{#SNMPINDEX}: Total space'
@@ -1472,8 +1770,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 8eb65066ede74a32968a87485801775a
               name: 'Disk-{#SNMPINDEX}: Used space'
@@ -1492,8 +1793,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
           trigger_prototypes:
             -
               uuid: d48fafd1402e4774a5e7c2d854e3ebbc
@@ -1509,6 +1813,13 @@ zabbix_export:
                  - The disk free space is less than 5G.
                  - The disk will be full in less than 24 hours.
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
             -
               uuid: 802aa708fd8e42fdaa61d1aa3394c58b
               expression: |
@@ -1529,6 +1840,13 @@ zabbix_export:
                   expression: |
                     last(/MikroTik FiberBox SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
                     ((last(/MikroTik FiberBox SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik FiberBox SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik FiberBox SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
           graph_prototypes:
             -
               uuid: 2a6511d5067b4377936d922609939d6c
@@ -1552,6 +1870,16 @@ zabbix_export:
                   item:
                     host: 'MikroTik FiberBox SNMP'
                     key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: fiberbox
+        -
+          tag: target
+          value: mikrotik
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/net/mikrotik/mikrotik_PowerBox_Pro_snmp/README.md b/templates/net/mikrotik/mikrotik_PowerBox_Pro_snmp/README.md
index cebb4ff3a0c..9b5225afed9 100644
--- a/templates/net/mikrotik/mikrotik_PowerBox_Pro_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_PowerBox_Pro_snmp/README.md
@@ -71,7 +71,7 @@ There are no template links in this template.
 |Network interfaces discovery |<p>Discovering interfaces from IF-MIB.</p> |SNMP |net.if.discovery<p>**Filter**:</p>AND <p>- {#IFADMINSTATUS} MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.MATCHES}`</p><p>- {#IFADMINSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.NOT_MATCHES}`</p><p>- {#IFOPERSTATUS} MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.MATCHES}`</p><p>- {#IFOPERSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.NOT_MATCHES}`</p><p>- {#IFNAME} MATCHES_REGEX `{$NET.IF.IFNAME.MATCHES}`</p><p>- {#IFNAME} NOT_MATCHES_REGEX `{$NET.IF.IFNAME.NOT_MATCHES}`</p><p>- {#IFDESCR} MATCHES_REGEX `{$NET.IF.IFDESCR.MATCHES}`</p><p>- {#IFDESCR} NOT_MATCHES_REGEX `{$NET.IF.IFDESCR.NOT_MATCHES}`</p><p>- {#IFALIAS} MATCHES_REGEX `{$NET.IF.IFALIAS.MATCHES}`</p><p>- {#IFALIAS} NOT_MATCHES_REGEX `{$NET.IF.IFALIAS.NOT_MATCHES}`</p><p>- {#IFTYPE} MATCHES_REGEX `{$NET.IF.IFTYPE.MATCHES}`</p><p>- {#IFTYPE} NOT_MATCHES_REGEX `{$NET.IF.IFTYPE.NOT_MATCHES}`</p> |
 |Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 |Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
-|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
 
 ## Items collected
 
@@ -137,14 +137,14 @@ There are no template links in this template.
 |Interface {#IFNAME}({#IFALIAS}): Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p><p>3. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik PowerBox Pro SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik PowerBox Pro SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik PowerBox Pro SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))`<p>Recovery expression:</p>`last(/MikroTik PowerBox Pro SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0` |AVERAGE |<p>Manual close: YES</p> |
 |Interface {#IFNAME}({#IFALIAS}): High bandwidth usage (>{$IF.UTIL.MAX:"{#IFNAME}"}%) |<p>The network interface utilization is close to its estimated maximum bandwidth.</p> |`(avg(/MikroTik PowerBox Pro SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik PowerBox Pro SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) or avg(/MikroTik PowerBox Pro SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik PowerBox Pro SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])) and last(/MikroTik PowerBox Pro SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0`<p>Recovery expression:</p>`avg(/MikroTik PowerBox Pro SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik PowerBox Pro SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) and avg(/MikroTik PowerBox Pro SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik PowerBox Pro SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |Interface {#IFNAME}({#IFALIAS}): High error rate (>{$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) |<p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p> |`min(/MikroTik PowerBox Pro SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"} or min(/MikroTik PowerBox Pro SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`max(/MikroTik PowerBox Pro SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8 and max(/MikroTik PowerBox Pro SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
-|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik PowerBox Pro SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik PowerBox Pro SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik PowerBox Pro SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik PowerBox Pro SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik PowerBox Pro SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik PowerBox Pro SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik PowerBox Pro SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik PowerBox Pro SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik PowerBox Pro SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2) `<p>Recovery expression:</p>`(change(/MikroTik PowerBox Pro SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik PowerBox Pro SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik PowerBox Pro SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2) ` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik PowerBox Pro SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik PowerBox Pro SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik PowerBox Pro SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik PowerBox Pro SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik PowerBox Pro SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik PowerBox Pro SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik PowerBox Pro SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik PowerBox Pro SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik PowerBox Pro SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2)`<p>Recovery expression:</p>`(change(/MikroTik PowerBox Pro SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik PowerBox Pro SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik PowerBox Pro SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2)` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |{HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/MikroTik PowerBox Pro SNMP/system.uptime[sysUpTime.0])<10m` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- No SNMP data collection</p> |
 |No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/MikroTik PowerBox Pro SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |Unavailable by ICMP ping |<p>Last three attempts returned timeout.  Please check device connectivity.</p> |`max(/MikroTik PowerBox Pro SNMP/icmpping,#3)=0` |HIGH | |
 |High ICMP ping loss |<p>-</p> |`min(/MikroTik PowerBox Pro SNMP/icmppingloss,5m)>{$ICMP_LOSS_WARN} and min(/MikroTik PowerBox Pro SNMP/icmppingloss,5m)<100` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |High ICMP ping response time |<p>-</p> |`avg(/MikroTik PowerBox Pro SNMP/icmppingsec,5m)>{$ICMP_RESPONSE_TIME_WARN}` |WARNING |<p>**Depends on**:</p><p>- High ICMP ping loss</p><p>- Unavailable by ICMP ping</p> |
-|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik PowerBox Pro SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik PowerBox Pro SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik PowerBox Pro SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik PowerBox Pro SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
-|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik PowerBox Pro SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik PowerBox Pro SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik PowerBox Pro SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik PowerBox Pro SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik PowerBox Pro SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik PowerBox Pro SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik PowerBox Pro SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik PowerBox Pro SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik PowerBox Pro SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik PowerBox Pro SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik PowerBox Pro SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik PowerBox Pro SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
 |CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik PowerBox Pro SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik PowerBox Pro SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
 |CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik PowerBox Pro SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik PowerBox Pro SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
 |CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik PowerBox Pro SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik PowerBox Pro SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
diff --git a/templates/net/mikrotik/mikrotik_PowerBox_Pro_snmp/template_net_mikrotik_PowerBox_Pro_snmp.yaml b/templates/net/mikrotik/mikrotik_PowerBox_Pro_snmp/template_net_mikrotik_PowerBox_Pro_snmp.yaml
index 478bbdef222..adae4f7f624 100644
--- a/templates/net/mikrotik/mikrotik_PowerBox_Pro_snmp/template_net_mikrotik_PowerBox_Pro_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_PowerBox_Pro_snmp/template_net_mikrotik_PowerBox_Pro_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:46:38Z'
+  date: '2022-01-26T09:58:36Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -35,8 +35,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: a3fbb030723c45208c51c923ca11fe1c
@@ -44,6 +47,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 4d2850a0021b47f581630fdfbba20ea2
           name: 'ICMP loss'
@@ -54,8 +61,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 6e46f7a198bb4cbcb4555e80a4ce7045
@@ -67,6 +77,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik PowerBox Pro SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 8c4bc8d2cbcc4433bb59db4137f9ae9d
           name: 'ICMP response time'
@@ -77,8 +94,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 1ac1be3472d04dddaadfa68228997594
@@ -93,6 +113,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik PowerBox Pro SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: c9683aa4310744b7889c2e5f8ca7d967
           name: 'SNMP traps (fallback)'
@@ -105,8 +132,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: 6c3eb8d3da7d437eb04be7c3782c9322
           name: 'System contact details'
@@ -128,8 +155,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: bc3fea02652d4c5d82c2179313cc8987
           name: 'System description'
@@ -152,8 +179,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 0647d4e175d8467ca7f7579f92c56b82
           name: 'Firmware version'
@@ -174,8 +201,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: fe286c10b77a4178b53136d088c09977
@@ -185,6 +212,10 @@ zabbix_export:
               priority: INFO
               description: 'Firmware version has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 1237d193c49a4110bce86971e3c142f1
           name: 'Hardware model name'
@@ -203,8 +234,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
         -
           uuid: 2e56609d113d4e7ab304ac20c4debb97
           name: 'Hardware serial number'
@@ -226,8 +257,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: b84f0bcdae4a4ef7887877b7f054ca3c
@@ -236,6 +267,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 72ed8c2083474e38823957e17ca41971
           name: 'System location'
@@ -257,8 +292,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 967b9b8b943d4fb79ff7075d6bb1e31a
           name: 'System name'
@@ -280,8 +315,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 39c5e6d11d4c4866adac2a145a18dfb7
@@ -290,6 +325,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: 277a7aa61ce241c089dc5367e9a5e0c3
           name: 'System object ID'
@@ -310,8 +352,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 3013805399d449c9ac4469b1310504db
           name: 'Operating system'
@@ -333,8 +375,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: os
           triggers:
             -
               uuid: 8d2847030c154c958ae3cc72841f7b73
@@ -347,6 +389,10 @@ zabbix_export:
                 -
                   name: 'System name has changed (new name: {ITEM.VALUE})'
                   expression: 'last(/MikroTik PowerBox Pro SNMP/system.name,#1)<>last(/MikroTik PowerBox Pro SNMP/system.name,#2) and length(last(/MikroTik PowerBox Pro SNMP/system.name))>0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 35e0a5603e7c43609c0405135dbaa957
           name: Uptime
@@ -367,8 +413,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: b3004ef6450848c8bb55e7c802c2bd96
@@ -381,6 +427,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/MikroTik PowerBox Pro SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 2d7199ec103340b280154f08de8699f6
           name: 'Total memory'
@@ -407,8 +457,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 54c72d743ada42dcaa0c39e9493517f8
           name: 'Used memory'
@@ -427,8 +477,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 9aa6bb105738415e8971772cdb9273cc
           name: 'Memory utilization'
@@ -441,8 +491,8 @@ zabbix_export:
           description: 'Memory utilization in %'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: 4e4df5360a9b40b5a4f6d1aa706d23d7
@@ -450,6 +500,13 @@ zabbix_export:
               name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
               priority: AVERAGE
               description: 'The system is running out of free memory.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 0604fe933a364f40bf3f964f2ba7f6d7
           name: 'SNMP agent availability'
@@ -466,8 +523,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 67cd4c3273394776a7e7497ec8c1a091
@@ -480,6 +540,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik PowerBox Pro SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: 25d6d157fcd943fb9f0c56077cd77c9b
@@ -504,8 +568,8 @@ zabbix_export:
                 The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
               trigger_prototypes:
                 -
                   uuid: 4d838f76e7d14c73a89a6a8cab585e77
@@ -514,6 +578,10 @@ zabbix_export:
                   opdata: 'Current utilization: {ITEM.LASTVALUE1}'
                   priority: WARNING
                   description: 'CPU utilization is too high. The system might be slow to respond.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: b98fcdee076b497e84bb8613d2697b6e
@@ -558,8 +626,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 70bcead0c721429ea2140eb12e32e5a9
@@ -570,6 +638,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 04687ea5280b4448844b17afa9c655c6
                   expression: 'avg(/MikroTik PowerBox Pro SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
@@ -584,6 +659,13 @@ zabbix_export:
                       name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
                       expression: 'avg(/MikroTik PowerBox Pro SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
                       recovery_expression: 'max(/MikroTik PowerBox Pro SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 62fd1bbcbe9e4db7851ad08b75d9f54f
                   expression: 'avg(/MikroTik PowerBox Pro SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
@@ -592,6 +674,13 @@ zabbix_export:
                   name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 46b03489e77c4100b49aa05c9e860879
           name: 'Temperature sensor discovery'
@@ -601,8 +690,7 @@ zabbix_export:
           delay: 1h
           description: |
             MIKROTIK-MIB::mtxrHlTemperature
-            Since temperature sensor is not available on all Mikrotik hardware,
-            this is done to avoid unsupported items.
+            Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.
           item_prototypes:
             -
               uuid: 02b57d8b31cf4a618daa8021b8c926b6
@@ -626,8 +714,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 9d035691d2344fa0bd64e6724828626e
@@ -638,6 +726,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 869eb891b56e4d499586a9e40fdb5f95
                   expression: 'avg(/MikroTik PowerBox Pro SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
@@ -652,6 +747,13 @@ zabbix_export:
                       name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
                       expression: 'avg(/MikroTik PowerBox Pro SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
                       recovery_expression: 'max(/MikroTik PowerBox Pro SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 5d18aa2f47154e999e9077f3cb06e3ed
                   expression: 'avg(/MikroTik PowerBox Pro SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
@@ -660,6 +762,13 @@ zabbix_export:
                   name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 11214845bb78433d85ffbc220a53384a
           name: 'LTE modem discovery'
@@ -694,14 +803,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRP Reference Signal Received Power.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: bca448bbec634737adbc1935bfb96395
                   expression: 'max(/MikroTik PowerBox Pro SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 668dc62196eb4aae90a39ca3dc039b07
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
@@ -716,14 +838,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: d7894ea315a24f42936eb44d85f60a8a
                   expression: 'max(/MikroTik PowerBox Pro SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 2d38d81dfcf24505962a0f6b03c7734d
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
@@ -738,14 +873,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: fb73c03756734684b5b1078de2d485ab
                   expression: 'max(/MikroTik PowerBox Pro SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 191ddb89d1bb47a3bed0dc8b22eb2234
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
@@ -760,14 +908,27 @@ zabbix_export:
                 mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: c0bc438b1ee248109e3471d6af153c14
                   expression: 'max(/MikroTik PowerBox Pro SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 1a664f38671a469793eab15850dda3a5
@@ -828,8 +989,14 @@ zabbix_export:
                 mtxrWlApAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 1bd56573eac644f7b76ec3dd1099e6ea
               name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
@@ -849,8 +1016,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 729b8bf1472c4ddda72ccb601740ccbb
               name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
@@ -870,8 +1043,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: fcd60ae4386a4eb2bac72c7544d915df
               name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
@@ -890,8 +1069,14 @@ zabbix_export:
                     - 15m
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 9089bdc9a64a41f9b4b69b241ae27b5b
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -904,8 +1089,14 @@ zabbix_export:
                 mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
         -
           uuid: 54e807c66d9e42089ace3bae82bce367
           name: 'CAPsMAN AP channel discovery'
@@ -938,8 +1129,14 @@ zabbix_export:
                 mtxrWlCMAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 790cae75cd274f279c221854015e2ba0
               name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
@@ -959,8 +1156,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: ab549ccfcdb7413a913ed6fe33430cc8
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -973,8 +1176,14 @@ zabbix_export:
                 mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: e773a8468b604062b7838b19039a21c4
               name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
@@ -994,8 +1203,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 91ea1c2de293413c9b24932282a673ee
@@ -1003,6 +1218,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
                   priority: WARNING
                   description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 066b2690d6234e2cb2bffd715f4ec4b9
           name: 'Network interfaces discovery'
@@ -1091,8 +1313,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: f3d75b29bee14d779c94707322dd682a
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -1111,8 +1339,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: a4e9ed82f52043378d6304178c3e3f78
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -1136,8 +1370,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 37cc5408843b4a35b3817b099fd1e420
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -1160,8 +1400,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: e8f7113e11d34e7bb15ba4ab5e2691f6
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -1180,8 +1426,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 97827ffc7fae4320a9c1553d4c0490b8
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -1205,8 +1457,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: c8c2482534994abaa5d0cf23ad5cb62f
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -1231,8 +1489,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 17bc03edd5fd42a0844e9105109c14e4
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -1254,8 +1518,14 @@ zabbix_export:
                 name: 'IF-MIB::ifOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: e2c87fe418e342699ac14d1f9755258c
@@ -1273,6 +1543,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 6246d2dd236d4ebe820cf85d690e847d
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -1296,8 +1570,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           trigger_prototypes:
             -
               uuid: 2a68840307594164a2ca408decd6dba5
@@ -1327,6 +1607,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik PowerBox Pro SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik PowerBox Pro SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik PowerBox Pro SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik PowerBox Pro SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: fe4d3130c3284b46b649a92b019a712b
               expression: |
@@ -1347,6 +1631,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik PowerBox Pro SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik PowerBox Pro SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik PowerBox Pro SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik PowerBox Pro SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 22d8b44c4e6d467298c3528d98b02e1d
               expression: |
@@ -1366,6 +1654,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik PowerBox Pro SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik PowerBox Pro SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik PowerBox Pro SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik PowerBox Pro SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: 1dde48f425814a8391c26327dab3d9e3
@@ -1444,8 +1739,11 @@ zabbix_export:
               description: 'Space utilization in % for Disk-{#SNMPINDEX}'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: d581f883c370430ba37c89a43a7ffab6
               name: 'Disk-{#SNMPINDEX}: Total space'
@@ -1472,8 +1770,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: e36052b8960b4107a1222cda719dfb35
               name: 'Disk-{#SNMPINDEX}: Used space'
@@ -1492,8 +1793,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
           trigger_prototypes:
             -
               uuid: 21b45f8f32344ed9a2323ef940fdb564
@@ -1509,6 +1813,13 @@ zabbix_export:
                  - The disk free space is less than 5G.
                  - The disk will be full in less than 24 hours.
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
             -
               uuid: 13db9f1c26754199937d4447976591ce
               expression: |
@@ -1529,6 +1840,13 @@ zabbix_export:
                   expression: |
                     last(/MikroTik PowerBox Pro SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
                     ((last(/MikroTik PowerBox Pro SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik PowerBox Pro SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik PowerBox Pro SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
           graph_prototypes:
             -
               uuid: 35d96744ce7f47e292c09f85c114c549
@@ -1552,6 +1870,16 @@ zabbix_export:
                   item:
                     host: 'MikroTik PowerBox Pro SNMP'
                     key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: mikrotik
+        -
+          tag: target
+          value: powerbox-pro
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/net/mikrotik/mikrotik_PowerBox_snmp/README.md b/templates/net/mikrotik/mikrotik_PowerBox_snmp/README.md
index a4f13b54bfc..d999df97964 100644
--- a/templates/net/mikrotik/mikrotik_PowerBox_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_PowerBox_snmp/README.md
@@ -71,7 +71,7 @@ There are no template links in this template.
 |Network interfaces discovery |<p>Discovering interfaces from IF-MIB.</p> |SNMP |net.if.discovery<p>**Filter**:</p>AND <p>- {#IFADMINSTATUS} MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.MATCHES}`</p><p>- {#IFADMINSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.NOT_MATCHES}`</p><p>- {#IFOPERSTATUS} MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.MATCHES}`</p><p>- {#IFOPERSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.NOT_MATCHES}`</p><p>- {#IFNAME} MATCHES_REGEX `{$NET.IF.IFNAME.MATCHES}`</p><p>- {#IFNAME} NOT_MATCHES_REGEX `{$NET.IF.IFNAME.NOT_MATCHES}`</p><p>- {#IFDESCR} MATCHES_REGEX `{$NET.IF.IFDESCR.MATCHES}`</p><p>- {#IFDESCR} NOT_MATCHES_REGEX `{$NET.IF.IFDESCR.NOT_MATCHES}`</p><p>- {#IFALIAS} MATCHES_REGEX `{$NET.IF.IFALIAS.MATCHES}`</p><p>- {#IFALIAS} NOT_MATCHES_REGEX `{$NET.IF.IFALIAS.NOT_MATCHES}`</p><p>- {#IFTYPE} MATCHES_REGEX `{$NET.IF.IFTYPE.MATCHES}`</p><p>- {#IFTYPE} NOT_MATCHES_REGEX `{$NET.IF.IFTYPE.NOT_MATCHES}`</p> |
 |Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 |Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
-|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
 
 ## Items collected
 
@@ -137,14 +137,14 @@ There are no template links in this template.
 |Interface {#IFNAME}({#IFALIAS}): Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p><p>3. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik PowerBox SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik PowerBox SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik PowerBox SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))`<p>Recovery expression:</p>`last(/MikroTik PowerBox SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0` |AVERAGE |<p>Manual close: YES</p> |
 |Interface {#IFNAME}({#IFALIAS}): High bandwidth usage (>{$IF.UTIL.MAX:"{#IFNAME}"}%) |<p>The network interface utilization is close to its estimated maximum bandwidth.</p> |`(avg(/MikroTik PowerBox SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik PowerBox SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) or avg(/MikroTik PowerBox SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik PowerBox SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])) and last(/MikroTik PowerBox SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0`<p>Recovery expression:</p>`avg(/MikroTik PowerBox SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik PowerBox SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) and avg(/MikroTik PowerBox SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik PowerBox SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |Interface {#IFNAME}({#IFALIAS}): High error rate (>{$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) |<p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p> |`min(/MikroTik PowerBox SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"} or min(/MikroTik PowerBox SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`max(/MikroTik PowerBox SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8 and max(/MikroTik PowerBox SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
-|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik PowerBox SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik PowerBox SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik PowerBox SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik PowerBox SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik PowerBox SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik PowerBox SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik PowerBox SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik PowerBox SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik PowerBox SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2) `<p>Recovery expression:</p>`(change(/MikroTik PowerBox SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik PowerBox SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik PowerBox SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2) ` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik PowerBox SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik PowerBox SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik PowerBox SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik PowerBox SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik PowerBox SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik PowerBox SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik PowerBox SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik PowerBox SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik PowerBox SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2)`<p>Recovery expression:</p>`(change(/MikroTik PowerBox SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik PowerBox SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik PowerBox SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2)` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |{HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/MikroTik PowerBox SNMP/system.uptime[sysUpTime.0])<10m` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- No SNMP data collection</p> |
 |No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/MikroTik PowerBox SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |Unavailable by ICMP ping |<p>Last three attempts returned timeout.  Please check device connectivity.</p> |`max(/MikroTik PowerBox SNMP/icmpping,#3)=0` |HIGH | |
 |High ICMP ping loss |<p>-</p> |`min(/MikroTik PowerBox SNMP/icmppingloss,5m)>{$ICMP_LOSS_WARN} and min(/MikroTik PowerBox SNMP/icmppingloss,5m)<100` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |High ICMP ping response time |<p>-</p> |`avg(/MikroTik PowerBox SNMP/icmppingsec,5m)>{$ICMP_RESPONSE_TIME_WARN}` |WARNING |<p>**Depends on**:</p><p>- High ICMP ping loss</p><p>- Unavailable by ICMP ping</p> |
-|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik PowerBox SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik PowerBox SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik PowerBox SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik PowerBox SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
-|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik PowerBox SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik PowerBox SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik PowerBox SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik PowerBox SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik PowerBox SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik PowerBox SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik PowerBox SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik PowerBox SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik PowerBox SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik PowerBox SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik PowerBox SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik PowerBox SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
 |CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik PowerBox SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik PowerBox SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
 |CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik PowerBox SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik PowerBox SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
 |CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik PowerBox SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik PowerBox SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
diff --git a/templates/net/mikrotik/mikrotik_PowerBox_snmp/template_net_mikrotik_PowerBox_snmp.yaml b/templates/net/mikrotik/mikrotik_PowerBox_snmp/template_net_mikrotik_PowerBox_snmp.yaml
index 13f52d5f0d5..c0f46dcf4a8 100644
--- a/templates/net/mikrotik/mikrotik_PowerBox_snmp/template_net_mikrotik_PowerBox_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_PowerBox_snmp/template_net_mikrotik_PowerBox_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:46:44Z'
+  date: '2022-01-26T09:49:47Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -35,8 +35,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: b1a43fa0251248fa897994575b8a27ac
@@ -44,6 +47,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 7b58dc12021b466a9d4d66eb12cfa15d
           name: 'ICMP loss'
@@ -54,8 +61,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 740b195a7246457ea28635c4b8ef0f83
@@ -67,6 +77,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik PowerBox SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: e6054de71dfe487f81f652af7105b63c
           name: 'ICMP response time'
@@ -77,8 +94,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: d85b8d94139d44c69349898d2149e7bd
@@ -93,6 +113,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik PowerBox SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: d2a55d810c9e484fa230d90b7a5d78a2
           name: 'SNMP traps (fallback)'
@@ -105,8 +132,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: 369c73ea224941c7acc8519bb4a561f1
           name: 'System contact details'
@@ -128,8 +155,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 9dcc1a8373424d52be6e79ec2e1d2ce5
           name: 'System description'
@@ -152,8 +179,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: f44c0f3952034baab2a7051ef835ad6a
           name: 'Firmware version'
@@ -174,8 +201,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 2deae9223199442b895df43cb2b0904c
@@ -185,6 +212,10 @@ zabbix_export:
               priority: INFO
               description: 'Firmware version has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: d1826b39b0004104bb5e81b3c6a5e944
           name: 'Hardware model name'
@@ -203,8 +234,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
         -
           uuid: ddd2fc89869f4feca6141ed16d6cfe1c
           name: 'Hardware serial number'
@@ -226,8 +257,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: ae8533bd4fa84d8f8e8969498d5530ed
@@ -236,6 +267,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 85358d92f1ce45c6adb0eb8fa269f8c6
           name: 'System location'
@@ -257,8 +292,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 84a2ef84a1614afba525253263fcdea4
           name: 'System name'
@@ -280,8 +315,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 90a6f09f02ba4a36b019c6624ad13812
@@ -290,6 +325,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: 58d2b5fae1fa41149eed29d761d7e3f7
           name: 'System object ID'
@@ -310,8 +352,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 2e106a43efd24438adb62bec628e2176
           name: 'Operating system'
@@ -333,8 +375,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: os
           triggers:
             -
               uuid: b0b935a8197e4188962b7d859d2b412b
@@ -347,6 +389,10 @@ zabbix_export:
                 -
                   name: 'System name has changed (new name: {ITEM.VALUE})'
                   expression: 'last(/MikroTik PowerBox SNMP/system.name,#1)<>last(/MikroTik PowerBox SNMP/system.name,#2) and length(last(/MikroTik PowerBox SNMP/system.name))>0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: fea0f7388a314d939626739b0ddf5186
           name: Uptime
@@ -367,8 +413,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 2d0d281a078546959a644e758ede97d6
@@ -381,6 +427,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/MikroTik PowerBox SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 3067b57e3dd841959b11a972903b8f35
           name: 'Total memory'
@@ -407,8 +457,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 981a289b960f4df19cc0e2728618bb3e
           name: 'Used memory'
@@ -427,8 +477,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 477247613d5546bc95b4d2b7e1695743
           name: 'Memory utilization'
@@ -441,8 +491,8 @@ zabbix_export:
           description: 'Memory utilization in %'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: f9d7f4390619408eb5a20baa5e4ebbfe
@@ -450,6 +500,13 @@ zabbix_export:
               name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
               priority: AVERAGE
               description: 'The system is running out of free memory.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 642ca5d699a248cb9a354c1a4b0aaed7
           name: 'SNMP agent availability'
@@ -466,8 +523,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 36ee677a31184b738cd02b91aee5ff78
@@ -480,6 +540,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik PowerBox SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: c3b780f997184c4582d1f78ab246ee5b
@@ -504,8 +568,8 @@ zabbix_export:
                 The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
               trigger_prototypes:
                 -
                   uuid: acf19a5a27674b8db8b4913257534506
@@ -514,6 +578,10 @@ zabbix_export:
                   opdata: 'Current utilization: {ITEM.LASTVALUE1}'
                   priority: WARNING
                   description: 'CPU utilization is too high. The system might be slow to respond.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: ff17c33d5a8743f8aff8a2b2a0ab314e
@@ -558,8 +626,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 93deb16896994ddf8509332b293f078a
@@ -570,6 +638,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: bbe383abfe5a48ad8a0b4a9c943cfd11
                   expression: 'avg(/MikroTik PowerBox SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
@@ -584,6 +659,13 @@ zabbix_export:
                       name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
                       expression: 'avg(/MikroTik PowerBox SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
                       recovery_expression: 'max(/MikroTik PowerBox SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 915d9a838c0945d0bad74aa2fb79da79
                   expression: 'avg(/MikroTik PowerBox SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
@@ -592,6 +674,13 @@ zabbix_export:
                   name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: a221763ac5874a0ab8b9c76aa10809e6
           name: 'Temperature sensor discovery'
@@ -601,8 +690,7 @@ zabbix_export:
           delay: 1h
           description: |
             MIKROTIK-MIB::mtxrHlTemperature
-            Since temperature sensor is not available on all Mikrotik hardware,
-            this is done to avoid unsupported items.
+            Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.
           item_prototypes:
             -
               uuid: 02fed23773644b0ea25f5363cf732b45
@@ -626,8 +714,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 9b3e19c885d34128b47b87d071d959f1
@@ -638,6 +726,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 921ad5dc74e44e139a523ef11dd2743e
                   expression: 'avg(/MikroTik PowerBox SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
@@ -652,6 +747,13 @@ zabbix_export:
                       name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
                       expression: 'avg(/MikroTik PowerBox SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
                       recovery_expression: 'max(/MikroTik PowerBox SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 0501798bf83342c5ac1f960649163a58
                   expression: 'avg(/MikroTik PowerBox SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
@@ -660,6 +762,13 @@ zabbix_export:
                   name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 4fede59bf19241c6a0b730ca22a41a95
           name: 'LTE modem discovery'
@@ -694,14 +803,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRP Reference Signal Received Power.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: c5709dbe38eb40e1ae8ae0cc564543b4
                   expression: 'max(/MikroTik PowerBox SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: c091457e6f3c40afa1ccc9bf925d3051
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
@@ -716,14 +838,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 96e644aa6f2c4399853ab05a7ada5afa
                   expression: 'max(/MikroTik PowerBox SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 9e7ace2975934b8ba3e30af079be073d
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
@@ -738,14 +873,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: d4e38db917ca40da8ebd3da22442696e
                   expression: 'max(/MikroTik PowerBox SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 6b58214098e54179b47c797dc6ef24d9
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
@@ -760,14 +908,27 @@ zabbix_export:
                 mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 5837ae05e1694017ad026d215af06683
                   expression: 'max(/MikroTik PowerBox SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 72f1bbbe190e48d8a45c4b2bf13e9f19
@@ -828,8 +989,14 @@ zabbix_export:
                 mtxrWlApAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 04eae1230e61488d8dff502aa879182d
               name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
@@ -849,8 +1016,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 4eb4222707b14888b9385a8d39711a52
               name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
@@ -870,8 +1043,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 0cfca6cd2419475d94a3f6ca8dfdfe90
               name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
@@ -890,8 +1069,14 @@ zabbix_export:
                     - 15m
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 956eb6d3e03143edb7b1c23e5a081842
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -904,8 +1089,14 @@ zabbix_export:
                 mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
         -
           uuid: 53309eb8dfcb4772a0adb0c81cb4f155
           name: 'CAPsMAN AP channel discovery'
@@ -938,8 +1129,14 @@ zabbix_export:
                 mtxrWlCMAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 3c0821c1de9d43e58780de3729fb27c4
               name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
@@ -959,8 +1156,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 6fd532b46b944a7d8b8f188f9d0b11d1
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -973,8 +1176,14 @@ zabbix_export:
                 mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 38a6aba4e8df4833926424670f198be4
               name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
@@ -994,8 +1203,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 722a78d3b55d4a66be1dba0b705704d8
@@ -1003,6 +1218,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
                   priority: WARNING
                   description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: e637baa779224aca9006590a39346f00
           name: 'Network interfaces discovery'
@@ -1091,8 +1313,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: cb7b2f212cba40ad80cca243b05c3bc0
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -1111,8 +1339,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 8b0d5ae995c546779eedfe926e2063ad
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -1136,8 +1370,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: b47a007b7bff429b91347a937cbefa45
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -1160,8 +1400,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 5358ca10aa794e298fd4e8571abe654d
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -1180,8 +1426,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 6e9189d7a23d4b5eb08e6b9a36a6a740
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -1205,8 +1457,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 0faeb4dc5e144f9794519f37a1ca26e6
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -1231,8 +1489,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 10a37f86af134370838f58c09edd4e58
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -1254,8 +1518,14 @@ zabbix_export:
                 name: 'IF-MIB::ifOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 018a5f1c3af44b64a6d31e095fce0dfc
@@ -1273,6 +1543,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 908cd9a188eb480fa50e90bb17e99575
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -1296,8 +1570,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           trigger_prototypes:
             -
               uuid: 6ca7d0731b294e1081e95cb6cf2a122d
@@ -1327,6 +1607,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik PowerBox SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik PowerBox SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik PowerBox SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik PowerBox SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 4d7141f9e9e34656a89b011b20453494
               expression: |
@@ -1347,6 +1631,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik PowerBox SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik PowerBox SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik PowerBox SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik PowerBox SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 01d85d1674674c7b9fc0fbaf96814160
               expression: |
@@ -1366,6 +1654,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik PowerBox SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik PowerBox SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik PowerBox SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik PowerBox SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: d87bbff565484898a444d2015bcefd56
@@ -1444,8 +1739,11 @@ zabbix_export:
               description: 'Space utilization in % for Disk-{#SNMPINDEX}'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 1107dc2e53fa47d6ab9678e50b824d7f
               name: 'Disk-{#SNMPINDEX}: Total space'
@@ -1472,8 +1770,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: da751c6f6d0d4c1ea7615f96f0213113
               name: 'Disk-{#SNMPINDEX}: Used space'
@@ -1492,8 +1793,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
           trigger_prototypes:
             -
               uuid: 3e812901cab94bbc9d5f15e8b70da4a0
@@ -1509,6 +1813,13 @@ zabbix_export:
                  - The disk free space is less than 5G.
                  - The disk will be full in less than 24 hours.
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
             -
               uuid: bee86ff10a084f76b4b266aa5e20df22
               expression: |
@@ -1529,6 +1840,13 @@ zabbix_export:
                   expression: |
                     last(/MikroTik PowerBox SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
                     ((last(/MikroTik PowerBox SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik PowerBox SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik PowerBox SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
           graph_prototypes:
             -
               uuid: d2c0b6dba77f4a9b99dc4e3693227514
@@ -1552,6 +1870,16 @@ zabbix_export:
                   item:
                     host: 'MikroTik PowerBox SNMP'
                     key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: mikrotik
+        -
+          tag: target
+          value: powerbox
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/net/mikrotik/mikrotik_RB1100AHx4_Dude_Edition_snmp/README.md b/templates/net/mikrotik/mikrotik_RB1100AHx4_Dude_Edition_snmp/README.md
index 216b3531cff..10f98bb0d94 100644
--- a/templates/net/mikrotik/mikrotik_RB1100AHx4_Dude_Edition_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_RB1100AHx4_Dude_Edition_snmp/README.md
@@ -71,7 +71,7 @@ There are no template links in this template.
 |Network interfaces discovery |<p>Discovering interfaces from IF-MIB.</p> |SNMP |net.if.discovery<p>**Filter**:</p>AND <p>- {#IFADMINSTATUS} MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.MATCHES}`</p><p>- {#IFADMINSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.NOT_MATCHES}`</p><p>- {#IFOPERSTATUS} MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.MATCHES}`</p><p>- {#IFOPERSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.NOT_MATCHES}`</p><p>- {#IFNAME} MATCHES_REGEX `{$NET.IF.IFNAME.MATCHES}`</p><p>- {#IFNAME} NOT_MATCHES_REGEX `{$NET.IF.IFNAME.NOT_MATCHES}`</p><p>- {#IFDESCR} MATCHES_REGEX `{$NET.IF.IFDESCR.MATCHES}`</p><p>- {#IFDESCR} NOT_MATCHES_REGEX `{$NET.IF.IFDESCR.NOT_MATCHES}`</p><p>- {#IFALIAS} MATCHES_REGEX `{$NET.IF.IFALIAS.MATCHES}`</p><p>- {#IFALIAS} NOT_MATCHES_REGEX `{$NET.IF.IFALIAS.NOT_MATCHES}`</p><p>- {#IFTYPE} MATCHES_REGEX `{$NET.IF.IFTYPE.MATCHES}`</p><p>- {#IFTYPE} NOT_MATCHES_REGEX `{$NET.IF.IFTYPE.NOT_MATCHES}`</p> |
 |Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 |Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
-|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
 
 ## Items collected
 
@@ -137,14 +137,14 @@ There are no template links in this template.
 |Interface {#IFNAME}({#IFALIAS}): Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p><p>3. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik RB1100AHx4 Dude Edition SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik RB1100AHx4 Dude Edition SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik RB1100AHx4 Dude Edition SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))`<p>Recovery expression:</p>`last(/MikroTik RB1100AHx4 Dude Edition SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0` |AVERAGE |<p>Manual close: YES</p> |
 |Interface {#IFNAME}({#IFALIAS}): High bandwidth usage (>{$IF.UTIL.MAX:"{#IFNAME}"}%) |<p>The network interface utilization is close to its estimated maximum bandwidth.</p> |`(avg(/MikroTik RB1100AHx4 Dude Edition SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik RB1100AHx4 Dude Edition SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) or avg(/MikroTik RB1100AHx4 Dude Edition SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik RB1100AHx4 Dude Edition SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])) and last(/MikroTik RB1100AHx4 Dude Edition SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0`<p>Recovery expression:</p>`avg(/MikroTik RB1100AHx4 Dude Edition SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik RB1100AHx4 Dude Edition SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) and avg(/MikroTik RB1100AHx4 Dude Edition SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik RB1100AHx4 Dude Edition SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |Interface {#IFNAME}({#IFALIAS}): High error rate (>{$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) |<p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p> |`min(/MikroTik RB1100AHx4 Dude Edition SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"} or min(/MikroTik RB1100AHx4 Dude Edition SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`max(/MikroTik RB1100AHx4 Dude Edition SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8 and max(/MikroTik RB1100AHx4 Dude Edition SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
-|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik RB1100AHx4 Dude Edition SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik RB1100AHx4 Dude Edition SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik RB1100AHx4 Dude Edition SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik RB1100AHx4 Dude Edition SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik RB1100AHx4 Dude Edition SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik RB1100AHx4 Dude Edition SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik RB1100AHx4 Dude Edition SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik RB1100AHx4 Dude Edition SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik RB1100AHx4 Dude Edition SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2) `<p>Recovery expression:</p>`(change(/MikroTik RB1100AHx4 Dude Edition SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik RB1100AHx4 Dude Edition SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik RB1100AHx4 Dude Edition SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2) ` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik RB1100AHx4 Dude Edition SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik RB1100AHx4 Dude Edition SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik RB1100AHx4 Dude Edition SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik RB1100AHx4 Dude Edition SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik RB1100AHx4 Dude Edition SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik RB1100AHx4 Dude Edition SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik RB1100AHx4 Dude Edition SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik RB1100AHx4 Dude Edition SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik RB1100AHx4 Dude Edition SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2)`<p>Recovery expression:</p>`(change(/MikroTik RB1100AHx4 Dude Edition SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik RB1100AHx4 Dude Edition SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik RB1100AHx4 Dude Edition SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2)` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |{HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/MikroTik RB1100AHx4 Dude Edition SNMP/system.uptime[sysUpTime.0])<10m` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- No SNMP data collection</p> |
 |No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/MikroTik RB1100AHx4 Dude Edition SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |Unavailable by ICMP ping |<p>Last three attempts returned timeout.  Please check device connectivity.</p> |`max(/MikroTik RB1100AHx4 Dude Edition SNMP/icmpping,#3)=0` |HIGH | |
 |High ICMP ping loss |<p>-</p> |`min(/MikroTik RB1100AHx4 Dude Edition SNMP/icmppingloss,5m)>{$ICMP_LOSS_WARN} and min(/MikroTik RB1100AHx4 Dude Edition SNMP/icmppingloss,5m)<100` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |High ICMP ping response time |<p>-</p> |`avg(/MikroTik RB1100AHx4 Dude Edition SNMP/icmppingsec,5m)>{$ICMP_RESPONSE_TIME_WARN}` |WARNING |<p>**Depends on**:</p><p>- High ICMP ping loss</p><p>- Unavailable by ICMP ping</p> |
-|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik RB1100AHx4 Dude Edition SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik RB1100AHx4 Dude Edition SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB1100AHx4 Dude Edition SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik RB1100AHx4 Dude Edition SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
-|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik RB1100AHx4 Dude Edition SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik RB1100AHx4 Dude Edition SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB1100AHx4 Dude Edition SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik RB1100AHx4 Dude Edition SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik RB1100AHx4 Dude Edition SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik RB1100AHx4 Dude Edition SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB1100AHx4 Dude Edition SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik RB1100AHx4 Dude Edition SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik RB1100AHx4 Dude Edition SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik RB1100AHx4 Dude Edition SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB1100AHx4 Dude Edition SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik RB1100AHx4 Dude Edition SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
 |CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik RB1100AHx4 Dude Edition SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik RB1100AHx4 Dude Edition SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
 |CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik RB1100AHx4 Dude Edition SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik RB1100AHx4 Dude Edition SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
 |CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik RB1100AHx4 Dude Edition SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik RB1100AHx4 Dude Edition SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
diff --git a/templates/net/mikrotik/mikrotik_RB1100AHx4_Dude_Edition_snmp/template_net_mikrotik_RB1100AHx4_Dude_Edition_snmp.yaml b/templates/net/mikrotik/mikrotik_RB1100AHx4_Dude_Edition_snmp/template_net_mikrotik_RB1100AHx4_Dude_Edition_snmp.yaml
index 91772914391..a4d679aa4d2 100644
--- a/templates/net/mikrotik/mikrotik_RB1100AHx4_Dude_Edition_snmp/template_net_mikrotik_RB1100AHx4_Dude_Edition_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_RB1100AHx4_Dude_Edition_snmp/template_net_mikrotik_RB1100AHx4_Dude_Edition_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:46:49Z'
+  date: '2022-01-26T09:49:01Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -35,8 +35,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: c093758529824015be966f41e9e27757
@@ -44,6 +47,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 6573dd2d23f4490f85d5fffe19e388da
           name: 'ICMP loss'
@@ -54,8 +61,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 05873e7bbc8347f48daf707af0a3a1df
@@ -67,6 +77,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik RB1100AHx4 Dude Edition SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 09e3d93e5dd542ab8436b5b712f77e48
           name: 'ICMP response time'
@@ -77,8 +94,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: f0a1435b054f46a3a496ab8c92591d96
@@ -93,6 +113,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik RB1100AHx4 Dude Edition SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 9578f10764514cd68325646e82d44697
           name: 'SNMP traps (fallback)'
@@ -105,8 +132,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: 45e9507c2cf1476784a4797dd380e048
           name: 'System contact details'
@@ -128,8 +155,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 0bee0b14582d47b091304be4fb9b8ba1
           name: 'System description'
@@ -152,8 +179,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: fea2d45d484c40d5bbd0a63bbcf32f38
           name: 'Firmware version'
@@ -174,8 +201,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 9f571e3e7d7b4025a62cb4d61684a63f
@@ -185,6 +212,10 @@ zabbix_export:
               priority: INFO
               description: 'Firmware version has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 21aa5025c29a45d4ac5961d07f03f5ca
           name: 'Hardware model name'
@@ -203,8 +234,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
         -
           uuid: e2160944535143e5a9768b9dc1041bb9
           name: 'Hardware serial number'
@@ -226,8 +257,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 6c56d13df5a84f8c81e3b11b5979fe2f
@@ -236,6 +267,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: a7ceef9763e24dd890f5d4bc0a4074d3
           name: 'System location'
@@ -257,8 +292,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 85d210e692744fbb94d8a794bbc2034a
           name: 'System name'
@@ -280,8 +315,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 64b6467c681f43f4954a24d7bc326588
@@ -290,6 +325,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: b95e62bdc53a40a9b4bfc4b023a34067
           name: 'System object ID'
@@ -310,8 +352,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: c1b8a435332a4608a833703409c3844e
           name: 'Operating system'
@@ -333,8 +375,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: os
           triggers:
             -
               uuid: cbc5e573f7ff4d4186782e18abb18323
@@ -347,6 +389,10 @@ zabbix_export:
                 -
                   name: 'System name has changed (new name: {ITEM.VALUE})'
                   expression: 'last(/MikroTik RB1100AHx4 Dude Edition SNMP/system.name,#1)<>last(/MikroTik RB1100AHx4 Dude Edition SNMP/system.name,#2) and length(last(/MikroTik RB1100AHx4 Dude Edition SNMP/system.name))>0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 7e01891bd9194635931778fba9b45fd0
           name: Uptime
@@ -367,8 +413,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 81a1b9e9630c4b28b035da3b9fa7e6d7
@@ -381,6 +427,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/MikroTik RB1100AHx4 Dude Edition SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 0f96c2050b2d407d9355406ff3ba57da
           name: 'Total memory'
@@ -407,8 +457,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: a4ba4c5b3c2e48b08231bd8f1ca9acf1
           name: 'Used memory'
@@ -427,8 +477,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 0b6a0a9ba8c5454594c7b6dff8b32963
           name: 'Memory utilization'
@@ -441,8 +491,8 @@ zabbix_export:
           description: 'Memory utilization in %'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: 41dc7494d2d04e2e8fd9f31d744cdf94
@@ -450,6 +500,13 @@ zabbix_export:
               name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
               priority: AVERAGE
               description: 'The system is running out of free memory.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 7e0d82664c024f0fbeefb38cd4f91bec
           name: 'SNMP agent availability'
@@ -466,8 +523,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 289a3d4d39e14627bb26817d21221c05
@@ -480,6 +540,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik RB1100AHx4 Dude Edition SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: 430a8cab45af4c24b72972d6373fccd9
@@ -504,8 +568,8 @@ zabbix_export:
                 The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
               trigger_prototypes:
                 -
                   uuid: 40af64475bf54290b74ac2ed6f3183f2
@@ -514,6 +578,10 @@ zabbix_export:
                   opdata: 'Current utilization: {ITEM.LASTVALUE1}'
                   priority: WARNING
                   description: 'CPU utilization is too high. The system might be slow to respond.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: e1da6708532c4582a7404ccce8e5f1c0
@@ -558,8 +626,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: a1116b45b6e341dabc44b226c4741f97
@@ -570,6 +638,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 7b61f191e2634044a81981627fb52483
                   expression: 'avg(/MikroTik RB1100AHx4 Dude Edition SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
@@ -584,6 +659,13 @@ zabbix_export:
                       name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
                       expression: 'avg(/MikroTik RB1100AHx4 Dude Edition SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
                       recovery_expression: 'max(/MikroTik RB1100AHx4 Dude Edition SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: c62859952edc45fd8c09a267e6badab9
                   expression: 'avg(/MikroTik RB1100AHx4 Dude Edition SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
@@ -592,6 +674,13 @@ zabbix_export:
                   name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 7add1dd4dfd84661b86fcf3f932e3ffb
           name: 'Temperature sensor discovery'
@@ -601,8 +690,7 @@ zabbix_export:
           delay: 1h
           description: |
             MIKROTIK-MIB::mtxrHlTemperature
-            Since temperature sensor is not available on all Mikrotik hardware,
-            this is done to avoid unsupported items.
+            Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.
           item_prototypes:
             -
               uuid: ce006f12a6d342539ee9f2f20ff987aa
@@ -626,8 +714,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 9980a1f6561c4b16935e204dfdf67c65
@@ -638,6 +726,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: c0be5c2bae7f45e780addd984a3f77c4
                   expression: 'avg(/MikroTik RB1100AHx4 Dude Edition SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
@@ -652,6 +747,13 @@ zabbix_export:
                       name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
                       expression: 'avg(/MikroTik RB1100AHx4 Dude Edition SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
                       recovery_expression: 'max(/MikroTik RB1100AHx4 Dude Edition SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: ee368004b1f24293b8162d78b456a6d0
                   expression: 'avg(/MikroTik RB1100AHx4 Dude Edition SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
@@ -660,6 +762,13 @@ zabbix_export:
                   name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: fe42e32d477d4718bf37ff36ff630bb7
           name: 'LTE modem discovery'
@@ -694,14 +803,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRP Reference Signal Received Power.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 6b1a507739c940ffb528a41d5af76069
                   expression: 'max(/MikroTik RB1100AHx4 Dude Edition SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 4d1753721a72454f8681ca87affad3a9
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
@@ -716,14 +838,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 0b2b0b8cdf964cc48d7ece2be62d115e
                   expression: 'max(/MikroTik RB1100AHx4 Dude Edition SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: ea0e06c8297147bc9afb9c878f757efe
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
@@ -738,14 +873,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 4d271b81500f4513a1408dfa8f0e1e29
                   expression: 'max(/MikroTik RB1100AHx4 Dude Edition SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 6c9e70511a6c400a968eee3119cb32a3
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
@@ -760,14 +908,27 @@ zabbix_export:
                 mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 8875480665294938bee208b23d416d34
                   expression: 'max(/MikroTik RB1100AHx4 Dude Edition SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 1bc26beb83ed42d1a5818082ca17e1e5
@@ -828,8 +989,14 @@ zabbix_export:
                 mtxrWlApAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 1d48037aa1f844d49029ed722defe80e
               name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
@@ -849,8 +1016,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 554c6d88b86641a1a9fc6d1bde08eeb9
               name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
@@ -870,8 +1043,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 44f03138eed845a693b071a9d7171c68
               name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
@@ -890,8 +1069,14 @@ zabbix_export:
                     - 15m
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 41192738c7564ca0ad454ab525046438
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -904,8 +1089,14 @@ zabbix_export:
                 mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
         -
           uuid: 1d8f0b4f75a044a0a5d8547471514346
           name: 'CAPsMAN AP channel discovery'
@@ -938,8 +1129,14 @@ zabbix_export:
                 mtxrWlCMAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: a23cdf72497c47769a089496d4b06773
               name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
@@ -959,8 +1156,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 94a9518972d041a4b82e9237311c6ff4
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -973,8 +1176,14 @@ zabbix_export:
                 mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: c88218013c5242dc934d0d92775f27e3
               name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
@@ -994,8 +1203,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: c529624e4a254ecba9659fc9d43f9df4
@@ -1003,6 +1218,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
                   priority: WARNING
                   description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: ee778a5b20f6482d87d473212b740cf5
           name: 'Network interfaces discovery'
@@ -1091,8 +1313,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 4ee2f3a994dc4cbdb733a0c949775b2b
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -1111,8 +1339,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: f6498742503a431e94f84271b58d5dcf
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -1136,8 +1370,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 6e7823dd59b84368afc4cfa354c740a0
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -1160,8 +1400,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: e2c2d9926c384963b950578e6cc11b8f
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -1180,8 +1426,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 87badc6ee6b74dc5807a6879d0803754
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -1205,8 +1457,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: fe56f8b25da34c9da8b0506357f4f3d8
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -1231,8 +1489,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: d9ef7b596d2c4b02a0b499deef12ded9
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -1254,8 +1518,14 @@ zabbix_export:
                 name: 'IF-MIB::ifOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 789cf81a742c41dfa356b253b01faeca
@@ -1273,6 +1543,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 85384a663bdb4dabb33a941c52e90843
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -1296,8 +1570,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           trigger_prototypes:
             -
               uuid: bf2dcee19ae44de98fed1b9f41d80ea9
@@ -1327,6 +1607,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik RB1100AHx4 Dude Edition SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik RB1100AHx4 Dude Edition SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik RB1100AHx4 Dude Edition SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik RB1100AHx4 Dude Edition SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 92470dac23d7480f817f1d903e6ba869
               expression: |
@@ -1347,6 +1631,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik RB1100AHx4 Dude Edition SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik RB1100AHx4 Dude Edition SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik RB1100AHx4 Dude Edition SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik RB1100AHx4 Dude Edition SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 7ab169c391b142afa4fd1441d1cb7595
               expression: |
@@ -1366,6 +1654,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik RB1100AHx4 Dude Edition SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik RB1100AHx4 Dude Edition SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik RB1100AHx4 Dude Edition SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik RB1100AHx4 Dude Edition SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: aaaa92c62d944ee9a09f600af7ec1e03
@@ -1444,8 +1739,11 @@ zabbix_export:
               description: 'Space utilization in % for Disk-{#SNMPINDEX}'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 0b10047762544ca4b56a3fa543257cfd
               name: 'Disk-{#SNMPINDEX}: Total space'
@@ -1472,8 +1770,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 149563c5cf7e42a18f3aaed2cc32c6bd
               name: 'Disk-{#SNMPINDEX}: Used space'
@@ -1492,8 +1793,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
           trigger_prototypes:
             -
               uuid: 47a1f1bee8f64507900f48de26bba052
@@ -1509,6 +1813,13 @@ zabbix_export:
                  - The disk free space is less than 5G.
                  - The disk will be full in less than 24 hours.
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
             -
               uuid: 419bd5a8f90d4e879be3707a3ad3f551
               expression: |
@@ -1529,6 +1840,13 @@ zabbix_export:
                   expression: |
                     last(/MikroTik RB1100AHx4 Dude Edition SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
                     ((last(/MikroTik RB1100AHx4 Dude Edition SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB1100AHx4 Dude Edition SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik RB1100AHx4 Dude Edition SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
           graph_prototypes:
             -
               uuid: c64a26d248d344d5bf8f64d7265fd7f9
@@ -1552,6 +1870,16 @@ zabbix_export:
                   item:
                     host: 'MikroTik RB1100AHx4 Dude Edition SNMP'
                     key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: mikrotik
+        -
+          tag: target
+          value: rb1100ahx4-dude-edition
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/net/mikrotik/mikrotik_RB1100AHx4_snmp/README.md b/templates/net/mikrotik/mikrotik_RB1100AHx4_snmp/README.md
index fb5c55787d3..9063ef4286d 100644
--- a/templates/net/mikrotik/mikrotik_RB1100AHx4_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_RB1100AHx4_snmp/README.md
@@ -71,7 +71,7 @@ There are no template links in this template.
 |Network interfaces discovery |<p>Discovering interfaces from IF-MIB.</p> |SNMP |net.if.discovery<p>**Filter**:</p>AND <p>- {#IFADMINSTATUS} MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.MATCHES}`</p><p>- {#IFADMINSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.NOT_MATCHES}`</p><p>- {#IFOPERSTATUS} MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.MATCHES}`</p><p>- {#IFOPERSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.NOT_MATCHES}`</p><p>- {#IFNAME} MATCHES_REGEX `{$NET.IF.IFNAME.MATCHES}`</p><p>- {#IFNAME} NOT_MATCHES_REGEX `{$NET.IF.IFNAME.NOT_MATCHES}`</p><p>- {#IFDESCR} MATCHES_REGEX `{$NET.IF.IFDESCR.MATCHES}`</p><p>- {#IFDESCR} NOT_MATCHES_REGEX `{$NET.IF.IFDESCR.NOT_MATCHES}`</p><p>- {#IFALIAS} MATCHES_REGEX `{$NET.IF.IFALIAS.MATCHES}`</p><p>- {#IFALIAS} NOT_MATCHES_REGEX `{$NET.IF.IFALIAS.NOT_MATCHES}`</p><p>- {#IFTYPE} MATCHES_REGEX `{$NET.IF.IFTYPE.MATCHES}`</p><p>- {#IFTYPE} NOT_MATCHES_REGEX `{$NET.IF.IFTYPE.NOT_MATCHES}`</p> |
 |Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 |Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
-|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
 
 ## Items collected
 
@@ -137,14 +137,14 @@ There are no template links in this template.
 |Interface {#IFNAME}({#IFALIAS}): Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p><p>3. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik RB1100AHx4 SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik RB1100AHx4 SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik RB1100AHx4 SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))`<p>Recovery expression:</p>`last(/MikroTik RB1100AHx4 SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0` |AVERAGE |<p>Manual close: YES</p> |
 |Interface {#IFNAME}({#IFALIAS}): High bandwidth usage (>{$IF.UTIL.MAX:"{#IFNAME}"}%) |<p>The network interface utilization is close to its estimated maximum bandwidth.</p> |`(avg(/MikroTik RB1100AHx4 SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik RB1100AHx4 SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) or avg(/MikroTik RB1100AHx4 SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik RB1100AHx4 SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])) and last(/MikroTik RB1100AHx4 SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0`<p>Recovery expression:</p>`avg(/MikroTik RB1100AHx4 SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik RB1100AHx4 SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) and avg(/MikroTik RB1100AHx4 SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik RB1100AHx4 SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |Interface {#IFNAME}({#IFALIAS}): High error rate (>{$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) |<p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p> |`min(/MikroTik RB1100AHx4 SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"} or min(/MikroTik RB1100AHx4 SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`max(/MikroTik RB1100AHx4 SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8 and max(/MikroTik RB1100AHx4 SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
-|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik RB1100AHx4 SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik RB1100AHx4 SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik RB1100AHx4 SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik RB1100AHx4 SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik RB1100AHx4 SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik RB1100AHx4 SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik RB1100AHx4 SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik RB1100AHx4 SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik RB1100AHx4 SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2) `<p>Recovery expression:</p>`(change(/MikroTik RB1100AHx4 SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik RB1100AHx4 SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik RB1100AHx4 SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2) ` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik RB1100AHx4 SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik RB1100AHx4 SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik RB1100AHx4 SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik RB1100AHx4 SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik RB1100AHx4 SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik RB1100AHx4 SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik RB1100AHx4 SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik RB1100AHx4 SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik RB1100AHx4 SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2)`<p>Recovery expression:</p>`(change(/MikroTik RB1100AHx4 SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik RB1100AHx4 SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik RB1100AHx4 SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2)` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |{HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/MikroTik RB1100AHx4 SNMP/system.uptime[sysUpTime.0])<10m` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- No SNMP data collection</p> |
 |No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/MikroTik RB1100AHx4 SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |Unavailable by ICMP ping |<p>Last three attempts returned timeout.  Please check device connectivity.</p> |`max(/MikroTik RB1100AHx4 SNMP/icmpping,#3)=0` |HIGH | |
 |High ICMP ping loss |<p>-</p> |`min(/MikroTik RB1100AHx4 SNMP/icmppingloss,5m)>{$ICMP_LOSS_WARN} and min(/MikroTik RB1100AHx4 SNMP/icmppingloss,5m)<100` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |High ICMP ping response time |<p>-</p> |`avg(/MikroTik RB1100AHx4 SNMP/icmppingsec,5m)>{$ICMP_RESPONSE_TIME_WARN}` |WARNING |<p>**Depends on**:</p><p>- High ICMP ping loss</p><p>- Unavailable by ICMP ping</p> |
-|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik RB1100AHx4 SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik RB1100AHx4 SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB1100AHx4 SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik RB1100AHx4 SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
-|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik RB1100AHx4 SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik RB1100AHx4 SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB1100AHx4 SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik RB1100AHx4 SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik RB1100AHx4 SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik RB1100AHx4 SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB1100AHx4 SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik RB1100AHx4 SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik RB1100AHx4 SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik RB1100AHx4 SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB1100AHx4 SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik RB1100AHx4 SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
 |CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik RB1100AHx4 SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik RB1100AHx4 SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
 |CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik RB1100AHx4 SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik RB1100AHx4 SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
 |CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik RB1100AHx4 SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik RB1100AHx4 SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
diff --git a/templates/net/mikrotik/mikrotik_RB1100AHx4_snmp/template_net_mikrotik_RB1100AHx4_snmp.yaml b/templates/net/mikrotik/mikrotik_RB1100AHx4_snmp/template_net_mikrotik_RB1100AHx4_snmp.yaml
index fb18259967c..b571ef1b019 100644
--- a/templates/net/mikrotik/mikrotik_RB1100AHx4_snmp/template_net_mikrotik_RB1100AHx4_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_RB1100AHx4_snmp/template_net_mikrotik_RB1100AHx4_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:46:55Z'
+  date: '2022-01-26T09:51:13Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -35,8 +35,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 169edfa3b9c94c61899cc540a5f4bd5c
@@ -44,6 +47,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: e2e270cb27ab438da77094dbeed276c5
           name: 'ICMP loss'
@@ -54,8 +61,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: cb4bbbd51e854ac5b6877b85fd7b8bf5
@@ -67,6 +77,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik RB1100AHx4 SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: e0d6d460bcd34360a627851069e354ef
           name: 'ICMP response time'
@@ -77,8 +94,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 01e6c7a1fc2243dcabfd5ac1dec841ad
@@ -93,6 +113,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik RB1100AHx4 SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 82a936c79d154070a261078bff07cd50
           name: 'SNMP traps (fallback)'
@@ -105,8 +132,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: 628cf911c63948b3acc96071099ee33a
           name: 'System contact details'
@@ -128,8 +155,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 915a3a0b5beb4b04b9cf2cf452625e4b
           name: 'System description'
@@ -152,8 +179,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 3442b390250b480f887e1311b369c54e
           name: 'Firmware version'
@@ -174,8 +201,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 9c552d88fc734c2d8b9976831396dcc4
@@ -185,6 +212,10 @@ zabbix_export:
               priority: INFO
               description: 'Firmware version has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 3f580252fdf44bd4a1172a73ea1b681f
           name: 'Hardware model name'
@@ -203,8 +234,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
         -
           uuid: 737a739207f142e292cbce0d6f7208d5
           name: 'Hardware serial number'
@@ -226,8 +257,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 59393bfb9a2b4fe9acf09735ab9b6dd7
@@ -236,6 +267,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 245703e1e1ec43fd9a4cd2aa687e8062
           name: 'System location'
@@ -257,8 +292,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: fb2143870ae849f38d6349bf97678506
           name: 'System name'
@@ -280,8 +315,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 53e27314562746fb803664ddbd13876f
@@ -290,6 +325,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: 6521da361f8c4d1383256b2297cbf637
           name: 'System object ID'
@@ -310,8 +352,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: b9fc7b36a3394404be56c55176b20e39
           name: 'Operating system'
@@ -333,8 +375,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: os
           triggers:
             -
               uuid: d517281567044119bdc82dccb20c9724
@@ -347,6 +389,10 @@ zabbix_export:
                 -
                   name: 'System name has changed (new name: {ITEM.VALUE})'
                   expression: 'last(/MikroTik RB1100AHx4 SNMP/system.name,#1)<>last(/MikroTik RB1100AHx4 SNMP/system.name,#2) and length(last(/MikroTik RB1100AHx4 SNMP/system.name))>0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: f16dcd469ae44e0bb1a3bf5cd7745172
           name: Uptime
@@ -367,8 +413,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: f71809adab344e60a2f6260548359167
@@ -381,6 +427,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/MikroTik RB1100AHx4 SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 73ce1c102e3a4d4885438c16eff34ddf
           name: 'Total memory'
@@ -407,8 +457,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 9e2ee7cca26b49d3990b832eda44ee2a
           name: 'Used memory'
@@ -427,8 +477,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 7b1572625e04447eb308be35061921f2
           name: 'Memory utilization'
@@ -441,8 +491,8 @@ zabbix_export:
           description: 'Memory utilization in %'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: ce1f7003b6dc4ca6a0e435c06aba6e1a
@@ -450,6 +500,13 @@ zabbix_export:
               name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
               priority: AVERAGE
               description: 'The system is running out of free memory.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: d8be2555490b4eb68a8b8c7ea20eacb8
           name: 'SNMP agent availability'
@@ -466,8 +523,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: a462a1b6a16e4636aa3a70bbed7cc1cd
@@ -480,6 +540,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik RB1100AHx4 SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: 4d7e84f0ed08471d8ec0717c93d410dc
@@ -504,8 +568,8 @@ zabbix_export:
                 The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
               trigger_prototypes:
                 -
                   uuid: 8ab046f6fb47499ebe6d34ad8ce20f59
@@ -514,6 +578,10 @@ zabbix_export:
                   opdata: 'Current utilization: {ITEM.LASTVALUE1}'
                   priority: WARNING
                   description: 'CPU utilization is too high. The system might be slow to respond.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: ee998c9684054b1299161b15b243729f
@@ -558,8 +626,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 75e1b534632a42d08535fc863c280536
@@ -570,6 +638,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 117c3a91044a4d6da15b235017caf99f
                   expression: 'avg(/MikroTik RB1100AHx4 SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
@@ -584,6 +659,13 @@ zabbix_export:
                       name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
                       expression: 'avg(/MikroTik RB1100AHx4 SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
                       recovery_expression: 'max(/MikroTik RB1100AHx4 SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: b20c703b353f444bb6d77d45433108fe
                   expression: 'avg(/MikroTik RB1100AHx4 SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
@@ -592,6 +674,13 @@ zabbix_export:
                   name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 7d8c3e389a3d44c1999028b92464a607
           name: 'Temperature sensor discovery'
@@ -601,8 +690,7 @@ zabbix_export:
           delay: 1h
           description: |
             MIKROTIK-MIB::mtxrHlTemperature
-            Since temperature sensor is not available on all Mikrotik hardware,
-            this is done to avoid unsupported items.
+            Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.
           item_prototypes:
             -
               uuid: 5674848e4bc44f81942d8fd5a1d08397
@@ -626,8 +714,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: f63a8665f1bb4fce930c8e6d68ca9bc4
@@ -638,6 +726,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 61ef8b6e39fa4dfa9ad0398acab924a9
                   expression: 'avg(/MikroTik RB1100AHx4 SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
@@ -652,6 +747,13 @@ zabbix_export:
                       name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
                       expression: 'avg(/MikroTik RB1100AHx4 SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
                       recovery_expression: 'max(/MikroTik RB1100AHx4 SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 92626f1037574adf9e25e175b6e5781b
                   expression: 'avg(/MikroTik RB1100AHx4 SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
@@ -660,6 +762,13 @@ zabbix_export:
                   name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 95cfcb66e6fb440d99b960637adfca93
           name: 'LTE modem discovery'
@@ -694,14 +803,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRP Reference Signal Received Power.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 3a29ebeb278444eb9940c6840b2e0a4e
                   expression: 'max(/MikroTik RB1100AHx4 SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 9f0442c4c061485080d0f8ff5f7c831f
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
@@ -716,14 +838,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 4c0dfdccda7a4a0a9b889b4a643d02e4
                   expression: 'max(/MikroTik RB1100AHx4 SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 7eda5e5f336a4366801c4cf98cf13520
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
@@ -738,14 +873,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 858fcf334125405aaed104a0f50d4097
                   expression: 'max(/MikroTik RB1100AHx4 SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 79d3b5dad8af46c7972b28b208a439f6
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
@@ -760,14 +908,27 @@ zabbix_export:
                 mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: d6e6ca097afd4c1fa12e1c67f9a575db
                   expression: 'max(/MikroTik RB1100AHx4 SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: bc3bcbb9babe4f3d8a27de335ab2352e
@@ -828,8 +989,14 @@ zabbix_export:
                 mtxrWlApAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: f1f871ee559e4cebb1fd1f535a38e01d
               name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
@@ -849,8 +1016,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 0d04c1ee59454dc2a6207ef39dfbcc1b
               name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
@@ -870,8 +1043,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: e0f09269707249ff95ccf4024c907f2f
               name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
@@ -890,8 +1069,14 @@ zabbix_export:
                     - 15m
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 3df5076b23ef4e05aa6bf24be663f6f0
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -904,8 +1089,14 @@ zabbix_export:
                 mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
         -
           uuid: cbd4c9b8a0f64ea394f9d2d542aa25ef
           name: 'CAPsMAN AP channel discovery'
@@ -938,8 +1129,14 @@ zabbix_export:
                 mtxrWlCMAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 774b0b02798a40fd95127ad17e182a03
               name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
@@ -959,8 +1156,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: fffdd563250347e4b489c9fa4d61bc87
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -973,8 +1176,14 @@ zabbix_export:
                 mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 3c94839027f64bddbc6b3d5abd0cc0bf
               name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
@@ -994,8 +1203,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: f0f924ded1064d70964e5669eb1e3a62
@@ -1003,6 +1218,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
                   priority: WARNING
                   description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 60b595ded1d14e9885d8d34fcf3efa6f
           name: 'Network interfaces discovery'
@@ -1091,8 +1313,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 25c32c5de7be49f6a2f3144ed8e17122
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -1111,8 +1339,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 21369947f18c4f019cde51713440cddf
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -1136,8 +1370,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 79b84574a2b04137aad734b482ac5847
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -1160,8 +1400,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: c4dc8fc4c8aa41a288b3b5335f9ff546
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -1180,8 +1426,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 6c578490506b46a8b801d6fe294ce194
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -1205,8 +1457,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 395fd1b9e5834ffb93594140f5a0ef09
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -1231,8 +1489,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 04c3ebee2ed24e64b3b8c3f347908913
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -1254,8 +1518,14 @@ zabbix_export:
                 name: 'IF-MIB::ifOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: b41b12e1ed5148cbbd97a0bcf838ef44
@@ -1273,6 +1543,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: ebdbf3ee4cdd4e7c84d5aeb2cfeba519
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -1296,8 +1570,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           trigger_prototypes:
             -
               uuid: 4558a208b2ef4376a1f33db1383c62b6
@@ -1327,6 +1607,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik RB1100AHx4 SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik RB1100AHx4 SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik RB1100AHx4 SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik RB1100AHx4 SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 13c5c29276ae4d2293dd3a178131608e
               expression: |
@@ -1347,6 +1631,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik RB1100AHx4 SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik RB1100AHx4 SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik RB1100AHx4 SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik RB1100AHx4 SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: e22b4649dbd94b3982636622b92212a8
               expression: |
@@ -1366,6 +1654,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik RB1100AHx4 SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik RB1100AHx4 SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik RB1100AHx4 SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik RB1100AHx4 SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: aeecc40859234efd954770c664faabc4
@@ -1444,8 +1739,11 @@ zabbix_export:
               description: 'Space utilization in % for Disk-{#SNMPINDEX}'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 89ebfc327e5b4b63ae6571bd671489d9
               name: 'Disk-{#SNMPINDEX}: Total space'
@@ -1472,8 +1770,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 94c3ff07a2aa4e1f9e7a5fcd35ae0d33
               name: 'Disk-{#SNMPINDEX}: Used space'
@@ -1492,8 +1793,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
           trigger_prototypes:
             -
               uuid: e665c0343ae140d08b8ae96b6c28f4d4
@@ -1509,6 +1813,13 @@ zabbix_export:
                  - The disk free space is less than 5G.
                  - The disk will be full in less than 24 hours.
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
             -
               uuid: c685347700044a78a38e4e892d3dfec4
               expression: |
@@ -1529,6 +1840,13 @@ zabbix_export:
                   expression: |
                     last(/MikroTik RB1100AHx4 SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
                     ((last(/MikroTik RB1100AHx4 SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB1100AHx4 SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik RB1100AHx4 SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
           graph_prototypes:
             -
               uuid: 15c1c509c03540449b26d7ae9ce99cdd
@@ -1552,6 +1870,16 @@ zabbix_export:
                   item:
                     host: 'MikroTik RB1100AHx4 SNMP'
                     key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: mikrotik
+        -
+          tag: target
+          value: rb1100ahx4
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/net/mikrotik/mikrotik_RB2011UiAS-IN_snmp/README.md b/templates/net/mikrotik/mikrotik_RB2011UiAS-IN_snmp/README.md
index 59ff8c6ea6d..3cbae4d2254 100644
--- a/templates/net/mikrotik/mikrotik_RB2011UiAS-IN_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_RB2011UiAS-IN_snmp/README.md
@@ -71,7 +71,7 @@ There are no template links in this template.
 |Network interfaces discovery |<p>Discovering interfaces from IF-MIB.</p> |SNMP |net.if.discovery<p>**Filter**:</p>AND <p>- {#IFADMINSTATUS} MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.MATCHES}`</p><p>- {#IFADMINSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.NOT_MATCHES}`</p><p>- {#IFOPERSTATUS} MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.MATCHES}`</p><p>- {#IFOPERSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.NOT_MATCHES}`</p><p>- {#IFNAME} MATCHES_REGEX `{$NET.IF.IFNAME.MATCHES}`</p><p>- {#IFNAME} NOT_MATCHES_REGEX `{$NET.IF.IFNAME.NOT_MATCHES}`</p><p>- {#IFDESCR} MATCHES_REGEX `{$NET.IF.IFDESCR.MATCHES}`</p><p>- {#IFDESCR} NOT_MATCHES_REGEX `{$NET.IF.IFDESCR.NOT_MATCHES}`</p><p>- {#IFALIAS} MATCHES_REGEX `{$NET.IF.IFALIAS.MATCHES}`</p><p>- {#IFALIAS} NOT_MATCHES_REGEX `{$NET.IF.IFALIAS.NOT_MATCHES}`</p><p>- {#IFTYPE} MATCHES_REGEX `{$NET.IF.IFTYPE.MATCHES}`</p><p>- {#IFTYPE} NOT_MATCHES_REGEX `{$NET.IF.IFTYPE.NOT_MATCHES}`</p> |
 |Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 |Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
-|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
 
 ## Items collected
 
@@ -137,14 +137,14 @@ There are no template links in this template.
 |Interface {#IFNAME}({#IFALIAS}): Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p><p>3. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik RB2011UiAS-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik RB2011UiAS-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik RB2011UiAS-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))`<p>Recovery expression:</p>`last(/MikroTik RB2011UiAS-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0` |AVERAGE |<p>Manual close: YES</p> |
 |Interface {#IFNAME}({#IFALIAS}): High bandwidth usage (>{$IF.UTIL.MAX:"{#IFNAME}"}%) |<p>The network interface utilization is close to its estimated maximum bandwidth.</p> |`(avg(/MikroTik RB2011UiAS-IN SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik RB2011UiAS-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) or avg(/MikroTik RB2011UiAS-IN SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik RB2011UiAS-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])) and last(/MikroTik RB2011UiAS-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0`<p>Recovery expression:</p>`avg(/MikroTik RB2011UiAS-IN SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik RB2011UiAS-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) and avg(/MikroTik RB2011UiAS-IN SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik RB2011UiAS-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |Interface {#IFNAME}({#IFALIAS}): High error rate (>{$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) |<p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p> |`min(/MikroTik RB2011UiAS-IN SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"} or min(/MikroTik RB2011UiAS-IN SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`max(/MikroTik RB2011UiAS-IN SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8 and max(/MikroTik RB2011UiAS-IN SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
-|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik RB2011UiAS-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik RB2011UiAS-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik RB2011UiAS-IN SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik RB2011UiAS-IN SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik RB2011UiAS-IN SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik RB2011UiAS-IN SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik RB2011UiAS-IN SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik RB2011UiAS-IN SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik RB2011UiAS-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2) `<p>Recovery expression:</p>`(change(/MikroTik RB2011UiAS-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik RB2011UiAS-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik RB2011UiAS-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2) ` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik RB2011UiAS-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik RB2011UiAS-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik RB2011UiAS-IN SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik RB2011UiAS-IN SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik RB2011UiAS-IN SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik RB2011UiAS-IN SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik RB2011UiAS-IN SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik RB2011UiAS-IN SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik RB2011UiAS-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2)`<p>Recovery expression:</p>`(change(/MikroTik RB2011UiAS-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik RB2011UiAS-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik RB2011UiAS-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2)` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |{HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/MikroTik RB2011UiAS-IN SNMP/system.uptime[sysUpTime.0])<10m` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- No SNMP data collection</p> |
 |No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/MikroTik RB2011UiAS-IN SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |Unavailable by ICMP ping |<p>Last three attempts returned timeout.  Please check device connectivity.</p> |`max(/MikroTik RB2011UiAS-IN SNMP/icmpping,#3)=0` |HIGH | |
 |High ICMP ping loss |<p>-</p> |`min(/MikroTik RB2011UiAS-IN SNMP/icmppingloss,5m)>{$ICMP_LOSS_WARN} and min(/MikroTik RB2011UiAS-IN SNMP/icmppingloss,5m)<100` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |High ICMP ping response time |<p>-</p> |`avg(/MikroTik RB2011UiAS-IN SNMP/icmppingsec,5m)>{$ICMP_RESPONSE_TIME_WARN}` |WARNING |<p>**Depends on**:</p><p>- High ICMP ping loss</p><p>- Unavailable by ICMP ping</p> |
-|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik RB2011UiAS-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik RB2011UiAS-IN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB2011UiAS-IN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik RB2011UiAS-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
-|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik RB2011UiAS-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik RB2011UiAS-IN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB2011UiAS-IN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik RB2011UiAS-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik RB2011UiAS-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik RB2011UiAS-IN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB2011UiAS-IN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik RB2011UiAS-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik RB2011UiAS-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik RB2011UiAS-IN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB2011UiAS-IN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik RB2011UiAS-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
 |CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik RB2011UiAS-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik RB2011UiAS-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
 |CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik RB2011UiAS-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik RB2011UiAS-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
 |CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik RB2011UiAS-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik RB2011UiAS-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
diff --git a/templates/net/mikrotik/mikrotik_RB2011UiAS-IN_snmp/template_net_mikrotik_RB2011UiAS-IN_snmp.yaml b/templates/net/mikrotik/mikrotik_RB2011UiAS-IN_snmp/template_net_mikrotik_RB2011UiAS-IN_snmp.yaml
index ddd9d6ffe55..692c006879e 100644
--- a/templates/net/mikrotik/mikrotik_RB2011UiAS-IN_snmp/template_net_mikrotik_RB2011UiAS-IN_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_RB2011UiAS-IN_snmp/template_net_mikrotik_RB2011UiAS-IN_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:47:19Z'
+  date: '2022-01-26T09:45:05Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -35,8 +35,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: f38f2bf1b3954e87afaae1b24f051705
@@ -44,6 +47,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 71dc309a3c174cac8d4e5d97fb385252
           name: 'ICMP loss'
@@ -54,8 +61,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 2384103bcdef45e48026fbb913a09e41
@@ -67,6 +77,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik RB2011UiAS-IN SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 8084778076a444728f47b436237aa265
           name: 'ICMP response time'
@@ -77,8 +94,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 492c760974924a489adf628a78facf20
@@ -93,6 +113,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik RB2011UiAS-IN SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: fa9062eeb9eb4ea5878c8da04bf728fe
           name: 'SNMP traps (fallback)'
@@ -105,8 +132,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: d843cbacd73648d79c3f002ad7d2510b
           name: 'System contact details'
@@ -128,8 +155,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: cd5897cf9ef2423fbcc9ef483e556677
           name: 'System description'
@@ -152,8 +179,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 1dfd38ddc91a4e70980734a4cfcc38e0
           name: 'Firmware version'
@@ -174,8 +201,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 84b149555c7a4ba896260eef821e65e4
@@ -185,6 +212,10 @@ zabbix_export:
               priority: INFO
               description: 'Firmware version has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: e85420056601495aa0b7da67042a941a
           name: 'Hardware model name'
@@ -203,8 +234,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
         -
           uuid: 4b177e4109404eebaa6674b8fc36953b
           name: 'Hardware serial number'
@@ -226,8 +257,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 5444e9d45fd5482b9913f33a0e46afac
@@ -236,6 +267,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 50bcd5f286db4540a6070fb7815b47f5
           name: 'System location'
@@ -257,8 +292,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 02354807e4ca4a049866fe8f793007ff
           name: 'System name'
@@ -280,8 +315,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 2783c5306701462290c245ff68ce0804
@@ -290,6 +325,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: 7eb0b2b9722f4f2c8d0ce0adc189b2f9
           name: 'System object ID'
@@ -310,8 +352,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 54cf84706fad45a2af8d42f928108c4d
           name: 'Operating system'
@@ -333,8 +375,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: os
           triggers:
             -
               uuid: 7297756962334a7e92bec8fba24cc346
@@ -347,6 +389,10 @@ zabbix_export:
                 -
                   name: 'System name has changed (new name: {ITEM.VALUE})'
                   expression: 'last(/MikroTik RB2011UiAS-IN SNMP/system.name,#1)<>last(/MikroTik RB2011UiAS-IN SNMP/system.name,#2) and length(last(/MikroTik RB2011UiAS-IN SNMP/system.name))>0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 72507c577f1748078be97e4e9080b6c9
           name: Uptime
@@ -367,8 +413,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: f96b1dcd1cf84538a0d7729c5e4c683b
@@ -381,6 +427,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/MikroTik RB2011UiAS-IN SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 21c6ba2b92674bec82e2d438bcfc9bc0
           name: 'Total memory'
@@ -407,8 +457,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 23d7f8ca24e44c41a92fefa63b41e176
           name: 'Used memory'
@@ -427,8 +477,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 3008075b5b134c3db792e591ae7ca316
           name: 'Memory utilization'
@@ -441,8 +491,8 @@ zabbix_export:
           description: 'Memory utilization in %'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: 3f856c135f7a4124b606a368ddbaea70
@@ -450,6 +500,13 @@ zabbix_export:
               name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
               priority: AVERAGE
               description: 'The system is running out of free memory.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 7a7f3e558ca84e6ebd3279ec7ddaf6ab
           name: 'SNMP agent availability'
@@ -466,8 +523,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 8a6f02ead39b4b42be807585266c1fec
@@ -480,6 +540,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik RB2011UiAS-IN SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: b8d5bf8f5a274ef68254b5ba1bf2e06e
@@ -504,8 +568,8 @@ zabbix_export:
                 The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
               trigger_prototypes:
                 -
                   uuid: 660252e504e242f39a8116ef95593088
@@ -514,6 +578,10 @@ zabbix_export:
                   opdata: 'Current utilization: {ITEM.LASTVALUE1}'
                   priority: WARNING
                   description: 'CPU utilization is too high. The system might be slow to respond.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: ae1265d4feac404f874035b440c0704b
@@ -558,8 +626,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 8c905104ec08406bbb9eef074386d533
@@ -570,6 +638,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: b78a65cb7a81475390b652bb998bad77
                   expression: 'avg(/MikroTik RB2011UiAS-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
@@ -584,6 +659,13 @@ zabbix_export:
                       name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
                       expression: 'avg(/MikroTik RB2011UiAS-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
                       recovery_expression: 'max(/MikroTik RB2011UiAS-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: d86c54c62fcd456aa879a23aa539fdc7
                   expression: 'avg(/MikroTik RB2011UiAS-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
@@ -592,6 +674,13 @@ zabbix_export:
                   name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: d1f11d8c8a4e42a9b77fe3c263c43d00
           name: 'Temperature sensor discovery'
@@ -601,8 +690,7 @@ zabbix_export:
           delay: 1h
           description: |
             MIKROTIK-MIB::mtxrHlTemperature
-            Since temperature sensor is not available on all Mikrotik hardware,
-            this is done to avoid unsupported items.
+            Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.
           item_prototypes:
             -
               uuid: b6d115a3a9d84dfbbf6800b35a8988d5
@@ -626,8 +714,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 0ce7d965b0ce4e259dad9ef1c964cf75
@@ -638,6 +726,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: e6e1ac1371c8479a8c9b30513f10c57b
                   expression: 'avg(/MikroTik RB2011UiAS-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
@@ -652,6 +747,13 @@ zabbix_export:
                       name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
                       expression: 'avg(/MikroTik RB2011UiAS-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
                       recovery_expression: 'max(/MikroTik RB2011UiAS-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 5f04a5beb30c4fc48c3553f41631ec8e
                   expression: 'avg(/MikroTik RB2011UiAS-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
@@ -660,6 +762,13 @@ zabbix_export:
                   name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: f2ae9156eac7461183251fe44606a804
           name: 'LTE modem discovery'
@@ -694,14 +803,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRP Reference Signal Received Power.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 9e5b175a657040acb532677e5e3efd4e
                   expression: 'max(/MikroTik RB2011UiAS-IN SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 575cdf6fe364405d8f5815d6f511f551
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
@@ -716,14 +838,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 3e5f0494aec9433ab7d7637fab2095f2
                   expression: 'max(/MikroTik RB2011UiAS-IN SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 91fd8a8ecde749a8a689da2014049c76
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
@@ -738,14 +873,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 52cfc831296f4ebbb9bb9d66a164c129
                   expression: 'max(/MikroTik RB2011UiAS-IN SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 46641f0183c24377a291635a57fb5b15
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
@@ -760,14 +908,27 @@ zabbix_export:
                 mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 22da96573bbd471785f694bbdbca7cd1
                   expression: 'max(/MikroTik RB2011UiAS-IN SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: ab60feb4736e4a50988b1d721e1caacf
@@ -828,8 +989,14 @@ zabbix_export:
                 mtxrWlApAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 7a0f50f929db4a38985261b221885ea2
               name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
@@ -849,8 +1016,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: e2113b513f02404c81ae0a924d51596d
               name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
@@ -870,8 +1043,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 18cb28a2ab264dc1acbb998f94a505ec
               name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
@@ -890,8 +1069,14 @@ zabbix_export:
                     - 15m
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: ff5d2e77f98e444690506781950f0421
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -904,8 +1089,14 @@ zabbix_export:
                 mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
         -
           uuid: ed8e11b608b84f5a803e37c11d22253c
           name: 'CAPsMAN AP channel discovery'
@@ -938,8 +1129,14 @@ zabbix_export:
                 mtxrWlCMAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: b931d7192a004ec9bd0986617bf7d61e
               name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
@@ -959,8 +1156,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: d09039bc2f7f4f8b8ba5263c5e44bde1
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -973,8 +1176,14 @@ zabbix_export:
                 mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 6939f8f2f12342ca8ef18c87ed5e78d0
               name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
@@ -994,8 +1203,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: c5d53608ecb34d68a3d1ffbe5807dabb
@@ -1003,6 +1218,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
                   priority: WARNING
                   description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 611b4a16aeea48fdb0aac0a14f390f00
           name: 'Network interfaces discovery'
@@ -1091,8 +1313,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: b341e196860b4b388bfb2ee5c10d6494
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -1111,8 +1339,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 27eca86b5b7b43cdb5363a5d93939922
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -1136,8 +1370,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 976a674793c640448cf897084b641b0a
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -1160,8 +1400,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 78e7ff29409042a0b792c8eca8d18aea
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -1180,8 +1426,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 5a6b30537bf34d249ed55b477414172e
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -1205,8 +1457,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 45c1a8fd813d4341bf2c0346aa6af0cf
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -1231,8 +1489,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 090b099f4b894d91bd12a8ea9cdf92a2
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -1254,8 +1518,14 @@ zabbix_export:
                 name: 'IF-MIB::ifOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 5ca938e575294b8283154e162968d00d
@@ -1273,6 +1543,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 9613cbdf5e204ea98955cc0f63edd137
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -1296,8 +1570,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           trigger_prototypes:
             -
               uuid: 246b22c8fee74df3af90178f1015eabd
@@ -1327,6 +1607,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik RB2011UiAS-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik RB2011UiAS-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik RB2011UiAS-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik RB2011UiAS-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 80a39aa88bc14897ad94816f088fee1d
               expression: |
@@ -1347,6 +1631,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik RB2011UiAS-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik RB2011UiAS-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik RB2011UiAS-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik RB2011UiAS-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 5f15f82f958040f59ad31151a464d023
               expression: |
@@ -1366,6 +1654,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik RB2011UiAS-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik RB2011UiAS-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik RB2011UiAS-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik RB2011UiAS-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: f0e06f6423b4486f8d56c7fb7cf210d6
@@ -1444,8 +1739,11 @@ zabbix_export:
               description: 'Space utilization in % for Disk-{#SNMPINDEX}'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: ca68df704e444123a01895d9256b1f97
               name: 'Disk-{#SNMPINDEX}: Total space'
@@ -1472,8 +1770,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 32c7e5e885304b859f223bc0575c92e1
               name: 'Disk-{#SNMPINDEX}: Used space'
@@ -1492,8 +1793,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
           trigger_prototypes:
             -
               uuid: 388504f73df94d21bea32bdbda0fadb7
@@ -1509,6 +1813,13 @@ zabbix_export:
                  - The disk free space is less than 5G.
                  - The disk will be full in less than 24 hours.
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
             -
               uuid: ef0ef8ddead24672adf8e65eed13f60f
               expression: |
@@ -1529,6 +1840,13 @@ zabbix_export:
                   expression: |
                     last(/MikroTik RB2011UiAS-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
                     ((last(/MikroTik RB2011UiAS-IN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB2011UiAS-IN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik RB2011UiAS-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
           graph_prototypes:
             -
               uuid: 34f9709c906243f0bc22557121a55f03
@@ -1552,6 +1870,16 @@ zabbix_export:
                   item:
                     host: 'MikroTik RB2011UiAS-IN SNMP'
                     key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: mikrotik
+        -
+          tag: target
+          value: rb2011uias-in
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/net/mikrotik/mikrotik_RB2011UiAS-RM_snmp/README.md b/templates/net/mikrotik/mikrotik_RB2011UiAS-RM_snmp/README.md
index e828ae367a1..4d42c3eb288 100644
--- a/templates/net/mikrotik/mikrotik_RB2011UiAS-RM_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_RB2011UiAS-RM_snmp/README.md
@@ -71,7 +71,7 @@ There are no template links in this template.
 |Network interfaces discovery |<p>Discovering interfaces from IF-MIB.</p> |SNMP |net.if.discovery<p>**Filter**:</p>AND <p>- {#IFADMINSTATUS} MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.MATCHES}`</p><p>- {#IFADMINSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.NOT_MATCHES}`</p><p>- {#IFOPERSTATUS} MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.MATCHES}`</p><p>- {#IFOPERSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.NOT_MATCHES}`</p><p>- {#IFNAME} MATCHES_REGEX `{$NET.IF.IFNAME.MATCHES}`</p><p>- {#IFNAME} NOT_MATCHES_REGEX `{$NET.IF.IFNAME.NOT_MATCHES}`</p><p>- {#IFDESCR} MATCHES_REGEX `{$NET.IF.IFDESCR.MATCHES}`</p><p>- {#IFDESCR} NOT_MATCHES_REGEX `{$NET.IF.IFDESCR.NOT_MATCHES}`</p><p>- {#IFALIAS} MATCHES_REGEX `{$NET.IF.IFALIAS.MATCHES}`</p><p>- {#IFALIAS} NOT_MATCHES_REGEX `{$NET.IF.IFALIAS.NOT_MATCHES}`</p><p>- {#IFTYPE} MATCHES_REGEX `{$NET.IF.IFTYPE.MATCHES}`</p><p>- {#IFTYPE} NOT_MATCHES_REGEX `{$NET.IF.IFTYPE.NOT_MATCHES}`</p> |
 |Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 |Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
-|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
 
 ## Items collected
 
@@ -137,14 +137,14 @@ There are no template links in this template.
 |Interface {#IFNAME}({#IFALIAS}): Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p><p>3. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik RB2011UiAS-RM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik RB2011UiAS-RM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik RB2011UiAS-RM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))`<p>Recovery expression:</p>`last(/MikroTik RB2011UiAS-RM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0` |AVERAGE |<p>Manual close: YES</p> |
 |Interface {#IFNAME}({#IFALIAS}): High bandwidth usage (>{$IF.UTIL.MAX:"{#IFNAME}"}%) |<p>The network interface utilization is close to its estimated maximum bandwidth.</p> |`(avg(/MikroTik RB2011UiAS-RM SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik RB2011UiAS-RM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) or avg(/MikroTik RB2011UiAS-RM SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik RB2011UiAS-RM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])) and last(/MikroTik RB2011UiAS-RM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0`<p>Recovery expression:</p>`avg(/MikroTik RB2011UiAS-RM SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik RB2011UiAS-RM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) and avg(/MikroTik RB2011UiAS-RM SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik RB2011UiAS-RM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |Interface {#IFNAME}({#IFALIAS}): High error rate (>{$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) |<p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p> |`min(/MikroTik RB2011UiAS-RM SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"} or min(/MikroTik RB2011UiAS-RM SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`max(/MikroTik RB2011UiAS-RM SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8 and max(/MikroTik RB2011UiAS-RM SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
-|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik RB2011UiAS-RM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik RB2011UiAS-RM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik RB2011UiAS-RM SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik RB2011UiAS-RM SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik RB2011UiAS-RM SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik RB2011UiAS-RM SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik RB2011UiAS-RM SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik RB2011UiAS-RM SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik RB2011UiAS-RM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2) `<p>Recovery expression:</p>`(change(/MikroTik RB2011UiAS-RM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik RB2011UiAS-RM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik RB2011UiAS-RM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2) ` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik RB2011UiAS-RM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik RB2011UiAS-RM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik RB2011UiAS-RM SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik RB2011UiAS-RM SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik RB2011UiAS-RM SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik RB2011UiAS-RM SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik RB2011UiAS-RM SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik RB2011UiAS-RM SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik RB2011UiAS-RM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2)`<p>Recovery expression:</p>`(change(/MikroTik RB2011UiAS-RM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik RB2011UiAS-RM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik RB2011UiAS-RM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2)` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |{HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/MikroTik RB2011UiAS-RM SNMP/system.uptime[sysUpTime.0])<10m` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- No SNMP data collection</p> |
 |No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/MikroTik RB2011UiAS-RM SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |Unavailable by ICMP ping |<p>Last three attempts returned timeout.  Please check device connectivity.</p> |`max(/MikroTik RB2011UiAS-RM SNMP/icmpping,#3)=0` |HIGH | |
 |High ICMP ping loss |<p>-</p> |`min(/MikroTik RB2011UiAS-RM SNMP/icmppingloss,5m)>{$ICMP_LOSS_WARN} and min(/MikroTik RB2011UiAS-RM SNMP/icmppingloss,5m)<100` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |High ICMP ping response time |<p>-</p> |`avg(/MikroTik RB2011UiAS-RM SNMP/icmppingsec,5m)>{$ICMP_RESPONSE_TIME_WARN}` |WARNING |<p>**Depends on**:</p><p>- High ICMP ping loss</p><p>- Unavailable by ICMP ping</p> |
-|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik RB2011UiAS-RM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik RB2011UiAS-RM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB2011UiAS-RM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik RB2011UiAS-RM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
-|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik RB2011UiAS-RM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik RB2011UiAS-RM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB2011UiAS-RM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik RB2011UiAS-RM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik RB2011UiAS-RM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik RB2011UiAS-RM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB2011UiAS-RM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik RB2011UiAS-RM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik RB2011UiAS-RM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik RB2011UiAS-RM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB2011UiAS-RM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik RB2011UiAS-RM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
 |CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik RB2011UiAS-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik RB2011UiAS-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
 |CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik RB2011UiAS-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik RB2011UiAS-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
 |CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik RB2011UiAS-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik RB2011UiAS-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
diff --git a/templates/net/mikrotik/mikrotik_RB2011UiAS-RM_snmp/template_net_mikrotik_RB2011UiAS-RM_snmp.yaml b/templates/net/mikrotik/mikrotik_RB2011UiAS-RM_snmp/template_net_mikrotik_RB2011UiAS-RM_snmp.yaml
index cad1bb65ec2..ba31ed8dc48 100644
--- a/templates/net/mikrotik/mikrotik_RB2011UiAS-RM_snmp/template_net_mikrotik_RB2011UiAS-RM_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_RB2011UiAS-RM_snmp/template_net_mikrotik_RB2011UiAS-RM_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:47:24Z'
+  date: '2022-01-26T09:54:50Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -35,8 +35,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: ec9cc9ca00754d17a9ee8ff38e4aca2f
@@ -44,6 +47,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: bc20ba68642a441c90bac530b8847386
           name: 'ICMP loss'
@@ -54,8 +61,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 1377c7e423284ac487afdeac6252f1e7
@@ -67,6 +77,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik RB2011UiAS-RM SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 5c929e46faef4f0c8ee90fe5a34e9092
           name: 'ICMP response time'
@@ -77,8 +94,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 143e8c34dc344611ace63e6bcfbfa556
@@ -93,6 +113,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik RB2011UiAS-RM SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 92854c9aff57441b9754ba9aabb4ade7
           name: 'SNMP traps (fallback)'
@@ -105,8 +132,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: 38753c1261dd42fd8500e843985fdea3
           name: 'System contact details'
@@ -128,8 +155,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 9ae03f4d4bcf424e936430198f0762f3
           name: 'System description'
@@ -152,8 +179,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: df95ed3cd37c4460bf643d9c1ec30cae
           name: 'Firmware version'
@@ -174,8 +201,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: e0f5e6575df14242a14813cf95f763d2
@@ -185,6 +212,10 @@ zabbix_export:
               priority: INFO
               description: 'Firmware version has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 5e688e8e57d84ec79f78cad69914ea96
           name: 'Hardware model name'
@@ -203,8 +234,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
         -
           uuid: a4028eb828784fef80489e16e3d78659
           name: 'Hardware serial number'
@@ -226,8 +257,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 09d6eff5d5e24ba9801d29a594913c5e
@@ -236,6 +267,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 1f119c891ad74776b71c6858adcb67e3
           name: 'System location'
@@ -257,8 +292,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 788f52304f4c480c9e32b7f089279f66
           name: 'System name'
@@ -280,8 +315,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: ecfbc704498740ee89afbffd1a2db22d
@@ -290,6 +325,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: 61c2671ecc0b4fbcb40866ebc30f5ffe
           name: 'System object ID'
@@ -310,8 +352,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 7c089e6fa1464c92ae25265351e46c61
           name: 'Operating system'
@@ -333,8 +375,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: os
           triggers:
             -
               uuid: 2cfe859d44ee4088b3a62f832391091f
@@ -347,6 +389,10 @@ zabbix_export:
                 -
                   name: 'System name has changed (new name: {ITEM.VALUE})'
                   expression: 'last(/MikroTik RB2011UiAS-RM SNMP/system.name,#1)<>last(/MikroTik RB2011UiAS-RM SNMP/system.name,#2) and length(last(/MikroTik RB2011UiAS-RM SNMP/system.name))>0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: b7517cd5156c4693865edc871df8f7c5
           name: Uptime
@@ -367,8 +413,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: e2afe16e11e14b80aa4a228eb9182f6a
@@ -381,6 +427,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/MikroTik RB2011UiAS-RM SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 796e3dc988dd43ff8a7ea11a8eeac257
           name: 'Total memory'
@@ -407,8 +457,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 456b72f5cd6d4a64871345d150068244
           name: 'Used memory'
@@ -427,8 +477,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 5e68cf8cdbed4517a7b6828be1cc4aab
           name: 'Memory utilization'
@@ -441,8 +491,8 @@ zabbix_export:
           description: 'Memory utilization in %'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: f32f4750dd6f469d84560e0a27dad550
@@ -450,6 +500,13 @@ zabbix_export:
               name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
               priority: AVERAGE
               description: 'The system is running out of free memory.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: e4f4e0c0df9343a483a186f54d59caaf
           name: 'SNMP agent availability'
@@ -466,8 +523,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 7d47b1df3a984db891811b14832ba2ee
@@ -480,6 +540,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik RB2011UiAS-RM SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: 670bb575294046a48f794a2dc778a5da
@@ -504,8 +568,8 @@ zabbix_export:
                 The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
               trigger_prototypes:
                 -
                   uuid: 544c2e61e9b0434e962823246974ede8
@@ -514,6 +578,10 @@ zabbix_export:
                   opdata: 'Current utilization: {ITEM.LASTVALUE1}'
                   priority: WARNING
                   description: 'CPU utilization is too high. The system might be slow to respond.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 7fe947fc9d9e480a8d0fa0eac5c893ba
@@ -558,8 +626,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 1dc430575d5546c188615191fdc50ae7
@@ -570,6 +638,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 04ef546dd200411d84f167a5e1ffd8ce
                   expression: 'avg(/MikroTik RB2011UiAS-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
@@ -584,6 +659,13 @@ zabbix_export:
                       name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
                       expression: 'avg(/MikroTik RB2011UiAS-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
                       recovery_expression: 'max(/MikroTik RB2011UiAS-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: f24798b46eea407cb2bd9e38068e68d9
                   expression: 'avg(/MikroTik RB2011UiAS-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
@@ -592,6 +674,13 @@ zabbix_export:
                   name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 5ac26b1da21e436fa20f5234304acc75
           name: 'Temperature sensor discovery'
@@ -601,8 +690,7 @@ zabbix_export:
           delay: 1h
           description: |
             MIKROTIK-MIB::mtxrHlTemperature
-            Since temperature sensor is not available on all Mikrotik hardware,
-            this is done to avoid unsupported items.
+            Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.
           item_prototypes:
             -
               uuid: ae93311998d34ec9bd1ce91b895d758d
@@ -626,8 +714,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 81e424e84231418d888ca1a9126c29fa
@@ -638,6 +726,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 53bc0055eacf4e9d931498e89811e86e
                   expression: 'avg(/MikroTik RB2011UiAS-RM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
@@ -652,6 +747,13 @@ zabbix_export:
                       name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
                       expression: 'avg(/MikroTik RB2011UiAS-RM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
                       recovery_expression: 'max(/MikroTik RB2011UiAS-RM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 9635cda9637b4216adb68675640639c2
                   expression: 'avg(/MikroTik RB2011UiAS-RM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
@@ -660,6 +762,13 @@ zabbix_export:
                   name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 70b4d26ec96d45e781afeebe746ba1e7
           name: 'LTE modem discovery'
@@ -694,14 +803,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRP Reference Signal Received Power.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: bd8b0cbb30b144bc82b91f508de543e1
                   expression: 'max(/MikroTik RB2011UiAS-RM SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: b93fca52bea34a168af7374f8d2c04ee
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
@@ -716,14 +838,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: b2c222622bd8405a8f3f8138969e4d00
                   expression: 'max(/MikroTik RB2011UiAS-RM SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 67cae98893f642d2b0c4bdf11db1a30b
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
@@ -738,14 +873,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 3fe7fc4d601143a58ebd8affe7ee78a5
                   expression: 'max(/MikroTik RB2011UiAS-RM SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 6c149338df7843e6bd195558d9d12ee8
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
@@ -760,14 +908,27 @@ zabbix_export:
                 mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: c70991ad8d2b460bb2b4860b16ba45b4
                   expression: 'max(/MikroTik RB2011UiAS-RM SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: a48cfa3fb1e443448d7b2a2d5f93ac3b
@@ -828,8 +989,14 @@ zabbix_export:
                 mtxrWlApAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: e6fdab57c4ac4d7db29e020ca2be465a
               name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
@@ -849,8 +1016,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 9a9a7b48404b47b1bca12b6aace8a025
               name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
@@ -870,8 +1043,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 70d5dd712b5b4993bf050410fccd1794
               name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
@@ -890,8 +1069,14 @@ zabbix_export:
                     - 15m
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 99ae41fb9ba84763884d3eb02f70de96
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -904,8 +1089,14 @@ zabbix_export:
                 mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
         -
           uuid: bae34f809a49486193684d22232e315a
           name: 'CAPsMAN AP channel discovery'
@@ -938,8 +1129,14 @@ zabbix_export:
                 mtxrWlCMAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: ed5ba3fc1d4142f5a42dd75e57bf5583
               name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
@@ -959,8 +1156,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: fbb5e46eab824ff894528a54702ac824
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -973,8 +1176,14 @@ zabbix_export:
                 mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: c0b897b0fee1406fa0fe6a5d50debd27
               name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
@@ -994,8 +1203,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 555d5c8083fe42f09096097e1bb87499
@@ -1003,6 +1218,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
                   priority: WARNING
                   description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 65c99a07936d4b19a2dbd2694b116184
           name: 'Network interfaces discovery'
@@ -1091,8 +1313,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: bf32bcb3bdc74f14a1764799cf8e0d8d
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -1111,8 +1339,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: cabd4bf8a6194e7382099e3ea9b5ec9e
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -1136,8 +1370,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 06c282bad0f548ad8d0f9d574ded79f0
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -1160,8 +1400,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 1b4edb82855a423c88ba3d15da04fb73
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -1180,8 +1426,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 59208d42b7bf44889d415d7faee1f1e0
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -1205,8 +1457,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 5c85ca41d6bb4f5e8f2b7ee576aa7d45
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -1231,8 +1489,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: f9f0e97c0ad446c2ae7839352993c51c
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -1254,8 +1518,14 @@ zabbix_export:
                 name: 'IF-MIB::ifOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: e3a3b7bdfec649dab8e51cf2ba9685d6
@@ -1273,6 +1543,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 9666b77845214d02af4fd8a9561e51dc
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -1296,8 +1570,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           trigger_prototypes:
             -
               uuid: 48212db512234a48863444e08dd6ac8d
@@ -1327,6 +1607,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik RB2011UiAS-RM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik RB2011UiAS-RM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik RB2011UiAS-RM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik RB2011UiAS-RM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: d658285fc06f498dbdb4ff3e02fdbb9c
               expression: |
@@ -1347,6 +1631,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik RB2011UiAS-RM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik RB2011UiAS-RM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik RB2011UiAS-RM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik RB2011UiAS-RM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 49fc7dbdc2294a92a52a30125d4f12a5
               expression: |
@@ -1366,6 +1654,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik RB2011UiAS-RM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik RB2011UiAS-RM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik RB2011UiAS-RM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik RB2011UiAS-RM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: 7352b3dabe82417b9dc31bafdd28e555
@@ -1444,8 +1739,11 @@ zabbix_export:
               description: 'Space utilization in % for Disk-{#SNMPINDEX}'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 40724614055e428db71f41bd19d4924a
               name: 'Disk-{#SNMPINDEX}: Total space'
@@ -1472,8 +1770,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 350d841e1f99454283606a8af07f20d8
               name: 'Disk-{#SNMPINDEX}: Used space'
@@ -1492,8 +1793,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
           trigger_prototypes:
             -
               uuid: 728a9e55d14b4b859caf170cc910879e
@@ -1509,6 +1813,13 @@ zabbix_export:
                  - The disk free space is less than 5G.
                  - The disk will be full in less than 24 hours.
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
             -
               uuid: 12ffbe36a2e14c139f5d662ea509912d
               expression: |
@@ -1529,6 +1840,13 @@ zabbix_export:
                   expression: |
                     last(/MikroTik RB2011UiAS-RM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
                     ((last(/MikroTik RB2011UiAS-RM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB2011UiAS-RM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik RB2011UiAS-RM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
           graph_prototypes:
             -
               uuid: 9f02d5eaea4c4b7cbc3211d80841fa58
@@ -1552,6 +1870,16 @@ zabbix_export:
                   item:
                     host: 'MikroTik RB2011UiAS-RM SNMP'
                     key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: mikrotik
+        -
+          tag: target
+          value: rb2011uias-rm
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/net/mikrotik/mikrotik_RB2011iL-IN_snmp/README.md b/templates/net/mikrotik/mikrotik_RB2011iL-IN_snmp/README.md
index dc3f19bdb70..b605ec8480c 100644
--- a/templates/net/mikrotik/mikrotik_RB2011iL-IN_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_RB2011iL-IN_snmp/README.md
@@ -71,7 +71,7 @@ There are no template links in this template.
 |Network interfaces discovery |<p>Discovering interfaces from IF-MIB.</p> |SNMP |net.if.discovery<p>**Filter**:</p>AND <p>- {#IFADMINSTATUS} MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.MATCHES}`</p><p>- {#IFADMINSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.NOT_MATCHES}`</p><p>- {#IFOPERSTATUS} MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.MATCHES}`</p><p>- {#IFOPERSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.NOT_MATCHES}`</p><p>- {#IFNAME} MATCHES_REGEX `{$NET.IF.IFNAME.MATCHES}`</p><p>- {#IFNAME} NOT_MATCHES_REGEX `{$NET.IF.IFNAME.NOT_MATCHES}`</p><p>- {#IFDESCR} MATCHES_REGEX `{$NET.IF.IFDESCR.MATCHES}`</p><p>- {#IFDESCR} NOT_MATCHES_REGEX `{$NET.IF.IFDESCR.NOT_MATCHES}`</p><p>- {#IFALIAS} MATCHES_REGEX `{$NET.IF.IFALIAS.MATCHES}`</p><p>- {#IFALIAS} NOT_MATCHES_REGEX `{$NET.IF.IFALIAS.NOT_MATCHES}`</p><p>- {#IFTYPE} MATCHES_REGEX `{$NET.IF.IFTYPE.MATCHES}`</p><p>- {#IFTYPE} NOT_MATCHES_REGEX `{$NET.IF.IFTYPE.NOT_MATCHES}`</p> |
 |Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 |Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
-|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
 
 ## Items collected
 
@@ -137,14 +137,14 @@ There are no template links in this template.
 |Interface {#IFNAME}({#IFALIAS}): Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p><p>3. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik RB2011iL-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik RB2011iL-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik RB2011iL-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))`<p>Recovery expression:</p>`last(/MikroTik RB2011iL-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0` |AVERAGE |<p>Manual close: YES</p> |
 |Interface {#IFNAME}({#IFALIAS}): High bandwidth usage (>{$IF.UTIL.MAX:"{#IFNAME}"}%) |<p>The network interface utilization is close to its estimated maximum bandwidth.</p> |`(avg(/MikroTik RB2011iL-IN SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik RB2011iL-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) or avg(/MikroTik RB2011iL-IN SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik RB2011iL-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])) and last(/MikroTik RB2011iL-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0`<p>Recovery expression:</p>`avg(/MikroTik RB2011iL-IN SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik RB2011iL-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) and avg(/MikroTik RB2011iL-IN SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik RB2011iL-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |Interface {#IFNAME}({#IFALIAS}): High error rate (>{$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) |<p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p> |`min(/MikroTik RB2011iL-IN SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"} or min(/MikroTik RB2011iL-IN SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`max(/MikroTik RB2011iL-IN SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8 and max(/MikroTik RB2011iL-IN SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
-|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik RB2011iL-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik RB2011iL-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik RB2011iL-IN SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik RB2011iL-IN SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik RB2011iL-IN SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik RB2011iL-IN SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik RB2011iL-IN SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik RB2011iL-IN SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik RB2011iL-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2) `<p>Recovery expression:</p>`(change(/MikroTik RB2011iL-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik RB2011iL-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik RB2011iL-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2) ` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik RB2011iL-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik RB2011iL-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik RB2011iL-IN SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik RB2011iL-IN SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik RB2011iL-IN SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik RB2011iL-IN SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik RB2011iL-IN SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik RB2011iL-IN SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik RB2011iL-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2)`<p>Recovery expression:</p>`(change(/MikroTik RB2011iL-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik RB2011iL-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik RB2011iL-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2)` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |{HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/MikroTik RB2011iL-IN SNMP/system.uptime[sysUpTime.0])<10m` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- No SNMP data collection</p> |
 |No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/MikroTik RB2011iL-IN SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |Unavailable by ICMP ping |<p>Last three attempts returned timeout.  Please check device connectivity.</p> |`max(/MikroTik RB2011iL-IN SNMP/icmpping,#3)=0` |HIGH | |
 |High ICMP ping loss |<p>-</p> |`min(/MikroTik RB2011iL-IN SNMP/icmppingloss,5m)>{$ICMP_LOSS_WARN} and min(/MikroTik RB2011iL-IN SNMP/icmppingloss,5m)<100` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |High ICMP ping response time |<p>-</p> |`avg(/MikroTik RB2011iL-IN SNMP/icmppingsec,5m)>{$ICMP_RESPONSE_TIME_WARN}` |WARNING |<p>**Depends on**:</p><p>- High ICMP ping loss</p><p>- Unavailable by ICMP ping</p> |
-|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik RB2011iL-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik RB2011iL-IN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB2011iL-IN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik RB2011iL-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
-|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik RB2011iL-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik RB2011iL-IN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB2011iL-IN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik RB2011iL-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik RB2011iL-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik RB2011iL-IN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB2011iL-IN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik RB2011iL-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik RB2011iL-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik RB2011iL-IN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB2011iL-IN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik RB2011iL-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
 |CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik RB2011iL-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik RB2011iL-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
 |CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik RB2011iL-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik RB2011iL-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
 |CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik RB2011iL-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik RB2011iL-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
diff --git a/templates/net/mikrotik/mikrotik_RB2011iL-IN_snmp/template_net_mikrotik_RB2011iL-IN_snmp.yaml b/templates/net/mikrotik/mikrotik_RB2011iL-IN_snmp/template_net_mikrotik_RB2011iL-IN_snmp.yaml
index 048c0b7cca7..e0e68c798f3 100644
--- a/templates/net/mikrotik/mikrotik_RB2011iL-IN_snmp/template_net_mikrotik_RB2011iL-IN_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_RB2011iL-IN_snmp/template_net_mikrotik_RB2011iL-IN_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:47:03Z'
+  date: '2022-01-26T10:44:19Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -35,8 +35,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 5dea6d7aa1344f27b66dbdce2350e93a
@@ -44,6 +47,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 74855f44b9ab4d008bcef0c81a1bf9b2
           name: 'ICMP loss'
@@ -54,8 +61,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: a8d51531113a4017b732eb8d7247c777
@@ -67,6 +77,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik RB2011iL-IN SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 8ff37956cfc544029ac3cbe2c2076156
           name: 'ICMP response time'
@@ -77,8 +94,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 7acce40acf3a4eb28af79fc6d95bf190
@@ -93,6 +113,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik RB2011iL-IN SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: ca7ea780520d42788007c25b181ecf6e
           name: 'SNMP traps (fallback)'
@@ -105,8 +132,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: 70ead6c2139a4ac1a9a52d127920bfda
           name: 'System contact details'
@@ -128,8 +155,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: bcda47c141cc4b71a80ba54ad8e195df
           name: 'System description'
@@ -152,8 +179,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: fce13abb920940cdb20cdf70f2e94d90
           name: 'Firmware version'
@@ -174,8 +201,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 0bc8753d55d047cd870eb7bd2db7849c
@@ -185,6 +212,10 @@ zabbix_export:
               priority: INFO
               description: 'Firmware version has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 45bdf887a0a3433cbb77a9ce792f2fec
           name: 'Hardware model name'
@@ -203,8 +234,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
         -
           uuid: 2f862ca4d6854c9bb56c46303cb5fd0a
           name: 'Hardware serial number'
@@ -226,8 +257,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 4a87af156bc44861bcd76514d60183f5
@@ -236,6 +267,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: cb46cc279c9d4622931cc4dd4536d076
           name: 'System location'
@@ -257,8 +292,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 96a7343422ae4c16a0dc8636965209b7
           name: 'System name'
@@ -280,8 +315,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: e09f00f0ad144e7a96e3abb38e4ab109
@@ -290,6 +325,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: c806691d31554b558ce6b940725269ba
           name: 'System object ID'
@@ -310,8 +352,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 71a6d0a5cfd94c14b97af236ce4fc1c9
           name: 'Operating system'
@@ -333,8 +375,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: os
           triggers:
             -
               uuid: b5b061ff649547e6b63bdd9dc545c652
@@ -347,6 +389,10 @@ zabbix_export:
                 -
                   name: 'System name has changed (new name: {ITEM.VALUE})'
                   expression: 'last(/MikroTik RB2011iL-IN SNMP/system.name,#1)<>last(/MikroTik RB2011iL-IN SNMP/system.name,#2) and length(last(/MikroTik RB2011iL-IN SNMP/system.name))>0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: a86251203418473f805f71c7661bcd5b
           name: Uptime
@@ -367,8 +413,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 27e64b9d917d4163b2f66c6f790b5a44
@@ -381,6 +427,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/MikroTik RB2011iL-IN SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 54b4475f0bfb4c02b1f4fc68d4288bb7
           name: 'Total memory'
@@ -407,8 +457,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 2e60d597dcc94824bea105b5e51e5d06
           name: 'Used memory'
@@ -427,8 +477,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 700227d0426b44ee87a5f33ef5b5b29e
           name: 'Memory utilization'
@@ -441,8 +491,8 @@ zabbix_export:
           description: 'Memory utilization in %'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: 8e0b50b2687a4259ba9b9457c6a2d911
@@ -450,6 +500,13 @@ zabbix_export:
               name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
               priority: AVERAGE
               description: 'The system is running out of free memory.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 011c6ec5f5df442890da5b669efbe5dc
           name: 'SNMP agent availability'
@@ -466,8 +523,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 096f1ccc1fd24cffb48720def5297031
@@ -480,6 +540,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik RB2011iL-IN SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: e909a37161a04c1794f5f27f817ef870
@@ -504,8 +568,8 @@ zabbix_export:
                 The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
               trigger_prototypes:
                 -
                   uuid: c90699faebaa41ccb0910a08ca56c014
@@ -514,6 +578,10 @@ zabbix_export:
                   opdata: 'Current utilization: {ITEM.LASTVALUE1}'
                   priority: WARNING
                   description: 'CPU utilization is too high. The system might be slow to respond.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 9334f197c1014cdcbc079895467af3dc
@@ -558,8 +626,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 216c4b7093ce4b1688c24031c61b9e53
@@ -570,6 +638,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 2c1aefbb49d84198b9dc5b633cc510cb
                   expression: 'avg(/MikroTik RB2011iL-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
@@ -584,6 +659,13 @@ zabbix_export:
                       name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
                       expression: 'avg(/MikroTik RB2011iL-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
                       recovery_expression: 'max(/MikroTik RB2011iL-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: e56cea52d6d64a62a02856a74e32601b
                   expression: 'avg(/MikroTik RB2011iL-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
@@ -592,6 +674,13 @@ zabbix_export:
                   name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 65646365a9fe475fa4aaa70dfd653fb9
           name: 'Temperature sensor discovery'
@@ -601,8 +690,7 @@ zabbix_export:
           delay: 1h
           description: |
             MIKROTIK-MIB::mtxrHlTemperature
-            Since temperature sensor is not available on all Mikrotik hardware,
-            this is done to avoid unsupported items.
+            Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.
           item_prototypes:
             -
               uuid: 69a55949c8df47d0894f6bdd2247c728
@@ -626,8 +714,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 77015cbdfaf8411ea08a78982b15885c
@@ -638,6 +726,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: c3a882d877f94cf7965984128c314f99
                   expression: 'avg(/MikroTik RB2011iL-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
@@ -652,6 +747,13 @@ zabbix_export:
                       name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
                       expression: 'avg(/MikroTik RB2011iL-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
                       recovery_expression: 'max(/MikroTik RB2011iL-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 9c97fd1e8cb94e53a8f8d1bd15b94dcf
                   expression: 'avg(/MikroTik RB2011iL-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
@@ -660,6 +762,13 @@ zabbix_export:
                   name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 057ce43acaf24b6a970d0a6368c16092
           name: 'LTE modem discovery'
@@ -694,14 +803,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRP Reference Signal Received Power.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 40ec9ac31c784b6f8de50945dff9f414
                   expression: 'max(/MikroTik RB2011iL-IN SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: b638cb8d9d014947ae1937b3fae245c8
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
@@ -716,14 +838,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: e29bb10956c64db1ba0809112449de26
                   expression: 'max(/MikroTik RB2011iL-IN SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: e7e5263b25a34b2fa176101cbb3d79c6
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
@@ -738,14 +873,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: ae6d45eb89244d67b38408dcaf20424f
                   expression: 'max(/MikroTik RB2011iL-IN SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 1b3914c1eb1d4e53b38dc9d16670b61f
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
@@ -760,14 +908,27 @@ zabbix_export:
                 mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: a02267b7d6d4497b98c1c2e465f92796
                   expression: 'max(/MikroTik RB2011iL-IN SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 847089ea1c2245b198b3a176b2d27fab
@@ -828,8 +989,14 @@ zabbix_export:
                 mtxrWlApAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 589dcc0883b94ab59cd9d549242aa01d
               name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
@@ -849,8 +1016,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: b7013da0523b4257ad6cf10919d2e446
               name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
@@ -870,8 +1043,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 1cfeb4f0b1c84205b20c007d52a20fdb
               name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
@@ -890,8 +1069,14 @@ zabbix_export:
                     - 15m
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: d79f7c775cdb48f39909b6ca7e4ef9d3
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -904,8 +1089,14 @@ zabbix_export:
                 mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
         -
           uuid: e8d6873c8ba344398cefa2b7cf0510ba
           name: 'CAPsMAN AP channel discovery'
@@ -938,8 +1129,14 @@ zabbix_export:
                 mtxrWlCMAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: c24334458fd446c9b9b72f10c10df63b
               name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
@@ -959,8 +1156,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 9d1fa283c578496b8dc757b277af72a4
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -973,8 +1176,14 @@ zabbix_export:
                 mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 2f13b2d5685640fc8290692c26261144
               name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
@@ -994,8 +1203,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 58d63b8b9c404a5382b44e25bf091feb
@@ -1003,6 +1218,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
                   priority: WARNING
                   description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: b115d18980cb4523a6d9a1541a279588
           name: 'Network interfaces discovery'
@@ -1091,8 +1313,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: bb2665aff8fa4f709dd619c759a6d854
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -1111,8 +1339,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 5d456ea5d19840f395e0daffe4eab09d
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -1136,8 +1370,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 9daf559ebf0d4156b5668c71b796c0f0
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -1160,8 +1400,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 18f9e0bd4d614ac09ccef19d220352bd
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -1180,8 +1426,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: b3425f3b387047d09641cceb422677bb
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -1205,8 +1457,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 4b7aa43124084e32a7af56128a6b7969
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -1231,8 +1489,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 950a0a505f0748098d67fd9408728508
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -1254,8 +1518,14 @@ zabbix_export:
                 name: 'IF-MIB::ifOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: f5085ef8cfde4046a423c59d977258d4
@@ -1273,6 +1543,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 311017c930b940a38ce0959f5c145916
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -1296,8 +1570,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           trigger_prototypes:
             -
               uuid: 24edc4d534254e638458cb08d0fb7492
@@ -1327,6 +1607,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik RB2011iL-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik RB2011iL-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik RB2011iL-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik RB2011iL-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 358f84761e004f48ba31aed484cdc947
               expression: |
@@ -1347,6 +1631,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik RB2011iL-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik RB2011iL-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik RB2011iL-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik RB2011iL-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: c14516c2c7f24762af7d6555f9f38158
               expression: |
@@ -1366,6 +1654,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik RB2011iL-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik RB2011iL-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik RB2011iL-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik RB2011iL-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: 53a5526a801b4c01853a7bcfac8245be
@@ -1444,8 +1739,11 @@ zabbix_export:
               description: 'Space utilization in % for Disk-{#SNMPINDEX}'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: c999deba04d846b38c31642447806540
               name: 'Disk-{#SNMPINDEX}: Total space'
@@ -1472,8 +1770,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: b64d80a23f57425385d5fb8e36c015ad
               name: 'Disk-{#SNMPINDEX}: Used space'
@@ -1492,8 +1793,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
           trigger_prototypes:
             -
               uuid: a140f5a63cba423c8f59439efd8d501f
@@ -1509,6 +1813,13 @@ zabbix_export:
                  - The disk free space is less than 5G.
                  - The disk will be full in less than 24 hours.
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
             -
               uuid: c3e3d8a9bcac473e8c641f116355ccbb
               expression: |
@@ -1529,6 +1840,13 @@ zabbix_export:
                   expression: |
                     last(/MikroTik RB2011iL-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
                     ((last(/MikroTik RB2011iL-IN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB2011iL-IN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik RB2011iL-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
           graph_prototypes:
             -
               uuid: 3e3f290cf0054136af76e39706d521ad
@@ -1552,6 +1870,16 @@ zabbix_export:
                   item:
                     host: 'MikroTik RB2011iL-IN SNMP'
                     key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: mikrotik
+        -
+          tag: target
+          value: rb2011il-in
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/net/mikrotik/mikrotik_RB2011iL-RM_snmp/README.md b/templates/net/mikrotik/mikrotik_RB2011iL-RM_snmp/README.md
index 1fd73e684df..36827099de1 100644
--- a/templates/net/mikrotik/mikrotik_RB2011iL-RM_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_RB2011iL-RM_snmp/README.md
@@ -71,7 +71,7 @@ There are no template links in this template.
 |Network interfaces discovery |<p>Discovering interfaces from IF-MIB.</p> |SNMP |net.if.discovery<p>**Filter**:</p>AND <p>- {#IFADMINSTATUS} MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.MATCHES}`</p><p>- {#IFADMINSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.NOT_MATCHES}`</p><p>- {#IFOPERSTATUS} MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.MATCHES}`</p><p>- {#IFOPERSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.NOT_MATCHES}`</p><p>- {#IFNAME} MATCHES_REGEX `{$NET.IF.IFNAME.MATCHES}`</p><p>- {#IFNAME} NOT_MATCHES_REGEX `{$NET.IF.IFNAME.NOT_MATCHES}`</p><p>- {#IFDESCR} MATCHES_REGEX `{$NET.IF.IFDESCR.MATCHES}`</p><p>- {#IFDESCR} NOT_MATCHES_REGEX `{$NET.IF.IFDESCR.NOT_MATCHES}`</p><p>- {#IFALIAS} MATCHES_REGEX `{$NET.IF.IFALIAS.MATCHES}`</p><p>- {#IFALIAS} NOT_MATCHES_REGEX `{$NET.IF.IFALIAS.NOT_MATCHES}`</p><p>- {#IFTYPE} MATCHES_REGEX `{$NET.IF.IFTYPE.MATCHES}`</p><p>- {#IFTYPE} NOT_MATCHES_REGEX `{$NET.IF.IFTYPE.NOT_MATCHES}`</p> |
 |Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 |Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
-|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
 
 ## Items collected
 
@@ -137,14 +137,14 @@ There are no template links in this template.
 |Interface {#IFNAME}({#IFALIAS}): Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p><p>3. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik RB2011iL-RM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik RB2011iL-RM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik RB2011iL-RM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))`<p>Recovery expression:</p>`last(/MikroTik RB2011iL-RM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0` |AVERAGE |<p>Manual close: YES</p> |
 |Interface {#IFNAME}({#IFALIAS}): High bandwidth usage (>{$IF.UTIL.MAX:"{#IFNAME}"}%) |<p>The network interface utilization is close to its estimated maximum bandwidth.</p> |`(avg(/MikroTik RB2011iL-RM SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik RB2011iL-RM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) or avg(/MikroTik RB2011iL-RM SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik RB2011iL-RM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])) and last(/MikroTik RB2011iL-RM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0`<p>Recovery expression:</p>`avg(/MikroTik RB2011iL-RM SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik RB2011iL-RM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) and avg(/MikroTik RB2011iL-RM SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik RB2011iL-RM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |Interface {#IFNAME}({#IFALIAS}): High error rate (>{$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) |<p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p> |`min(/MikroTik RB2011iL-RM SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"} or min(/MikroTik RB2011iL-RM SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`max(/MikroTik RB2011iL-RM SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8 and max(/MikroTik RB2011iL-RM SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
-|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik RB2011iL-RM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik RB2011iL-RM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik RB2011iL-RM SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik RB2011iL-RM SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik RB2011iL-RM SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik RB2011iL-RM SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik RB2011iL-RM SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik RB2011iL-RM SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik RB2011iL-RM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2) `<p>Recovery expression:</p>`(change(/MikroTik RB2011iL-RM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik RB2011iL-RM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik RB2011iL-RM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2) ` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik RB2011iL-RM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik RB2011iL-RM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik RB2011iL-RM SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik RB2011iL-RM SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik RB2011iL-RM SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik RB2011iL-RM SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik RB2011iL-RM SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik RB2011iL-RM SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik RB2011iL-RM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2)`<p>Recovery expression:</p>`(change(/MikroTik RB2011iL-RM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik RB2011iL-RM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik RB2011iL-RM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2)` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |{HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/MikroTik RB2011iL-RM SNMP/system.uptime[sysUpTime.0])<10m` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- No SNMP data collection</p> |
 |No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/MikroTik RB2011iL-RM SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |Unavailable by ICMP ping |<p>Last three attempts returned timeout.  Please check device connectivity.</p> |`max(/MikroTik RB2011iL-RM SNMP/icmpping,#3)=0` |HIGH | |
 |High ICMP ping loss |<p>-</p> |`min(/MikroTik RB2011iL-RM SNMP/icmppingloss,5m)>{$ICMP_LOSS_WARN} and min(/MikroTik RB2011iL-RM SNMP/icmppingloss,5m)<100` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |High ICMP ping response time |<p>-</p> |`avg(/MikroTik RB2011iL-RM SNMP/icmppingsec,5m)>{$ICMP_RESPONSE_TIME_WARN}` |WARNING |<p>**Depends on**:</p><p>- High ICMP ping loss</p><p>- Unavailable by ICMP ping</p> |
-|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik RB2011iL-RM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik RB2011iL-RM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB2011iL-RM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik RB2011iL-RM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
-|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik RB2011iL-RM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik RB2011iL-RM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB2011iL-RM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik RB2011iL-RM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik RB2011iL-RM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik RB2011iL-RM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB2011iL-RM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik RB2011iL-RM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik RB2011iL-RM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik RB2011iL-RM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB2011iL-RM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik RB2011iL-RM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
 |CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik RB2011iL-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik RB2011iL-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
 |CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik RB2011iL-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik RB2011iL-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
 |CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik RB2011iL-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik RB2011iL-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
diff --git a/templates/net/mikrotik/mikrotik_RB2011iL-RM_snmp/template_net_mikrotik_RB2011iL-RM_snmp.yaml b/templates/net/mikrotik/mikrotik_RB2011iL-RM_snmp/template_net_mikrotik_RB2011iL-RM_snmp.yaml
index d5c8dc44ae0..a26a992da7e 100644
--- a/templates/net/mikrotik/mikrotik_RB2011iL-RM_snmp/template_net_mikrotik_RB2011iL-RM_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_RB2011iL-RM_snmp/template_net_mikrotik_RB2011iL-RM_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:47:09Z'
+  date: '2022-01-26T09:44:40Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -35,8 +35,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 5ec7bb4a650f4c53a76ec3f89769952d
@@ -44,6 +47,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 7a77bc7a86684b7e965c0ec344435336
           name: 'ICMP loss'
@@ -54,8 +61,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 66718f4417324cd7a88de35776b26c64
@@ -67,6 +77,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik RB2011iL-RM SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 17bd0b5a70754d7eba3c4428ac9b58db
           name: 'ICMP response time'
@@ -77,8 +94,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 95b144dfafeb40be96155e0a6e53515e
@@ -93,6 +113,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik RB2011iL-RM SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: c5f15688308f44528a7ed495fce07a94
           name: 'SNMP traps (fallback)'
@@ -105,8 +132,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: de67cf0e735944ba9380730d88b86d06
           name: 'System contact details'
@@ -128,8 +155,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 23382e5a72fa4769832c7fa5ee357153
           name: 'System description'
@@ -152,8 +179,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: cb60ed419a0e4d43bd63fda86f86c12a
           name: 'Firmware version'
@@ -174,8 +201,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 5924d076b0724fbcaa2090c786b20068
@@ -185,6 +212,10 @@ zabbix_export:
               priority: INFO
               description: 'Firmware version has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: ba01d10fe2254462b4c2eabaa6cf9d6c
           name: 'Hardware model name'
@@ -203,8 +234,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
         -
           uuid: fc5c04dc408f47708d69d04e51f25d7c
           name: 'Hardware serial number'
@@ -226,8 +257,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 5df5c72272694a7f8a698ddda7b662cb
@@ -236,6 +267,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: cdca0920185f4aaf95ee88b13982ba50
           name: 'System location'
@@ -257,8 +292,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: f5f63d603edf48febfbde03d7d223f1e
           name: 'System name'
@@ -280,8 +315,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 5d609e8337b94830a52752ef8db4fd75
@@ -290,6 +325,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: ff6a6d61e4f24bc5a0832562ea3b13e0
           name: 'System object ID'
@@ -310,8 +352,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 6bc59bf95f73427eaea0c59598d0deb3
           name: 'Operating system'
@@ -333,8 +375,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: os
           triggers:
             -
               uuid: 18fce4771aad421e949e78ec9484a888
@@ -347,6 +389,10 @@ zabbix_export:
                 -
                   name: 'System name has changed (new name: {ITEM.VALUE})'
                   expression: 'last(/MikroTik RB2011iL-RM SNMP/system.name,#1)<>last(/MikroTik RB2011iL-RM SNMP/system.name,#2) and length(last(/MikroTik RB2011iL-RM SNMP/system.name))>0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: f97078f111d54ab7b091f59870baa4a5
           name: Uptime
@@ -367,8 +413,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 0dcc036b17de4d00bf7d51b7b6076e3c
@@ -381,6 +427,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/MikroTik RB2011iL-RM SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 4b0e4a132da94cd4b20e1f4ab4428405
           name: 'Total memory'
@@ -407,8 +457,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 501e0023828440498faed0e1214efe1c
           name: 'Used memory'
@@ -427,8 +477,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 3ddbf0f659724782a930dd42154eb64a
           name: 'Memory utilization'
@@ -441,8 +491,8 @@ zabbix_export:
           description: 'Memory utilization in %'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: 454c77360eb44d6aacf067327d1aecbe
@@ -450,6 +500,13 @@ zabbix_export:
               name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
               priority: AVERAGE
               description: 'The system is running out of free memory.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 2c0f53dbcfa447aea2e9550d502cb111
           name: 'SNMP agent availability'
@@ -466,8 +523,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: c36eb285f1a94d29a40afb4bb8e923d4
@@ -480,6 +540,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik RB2011iL-RM SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: 822fd977341648b0a79966a714e58257
@@ -504,8 +568,8 @@ zabbix_export:
                 The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
               trigger_prototypes:
                 -
                   uuid: 00f27ff850b046faabdaeeae1b2a2fcd
@@ -514,6 +578,10 @@ zabbix_export:
                   opdata: 'Current utilization: {ITEM.LASTVALUE1}'
                   priority: WARNING
                   description: 'CPU utilization is too high. The system might be slow to respond.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: d49245850291438f9eb06c588a2f28cd
@@ -558,8 +626,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: d4d0bf767e7741fc98d9f930ade655f3
@@ -570,6 +638,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 4299f4f1519a46ed86d4727cefa01c1e
                   expression: 'avg(/MikroTik RB2011iL-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
@@ -584,6 +659,13 @@ zabbix_export:
                       name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
                       expression: 'avg(/MikroTik RB2011iL-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
                       recovery_expression: 'max(/MikroTik RB2011iL-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 3cc5640941bc491e9cc23cc9b467952e
                   expression: 'avg(/MikroTik RB2011iL-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
@@ -592,6 +674,13 @@ zabbix_export:
                   name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 05b63a97b9f248098a9ab7c586f8a866
           name: 'Temperature sensor discovery'
@@ -601,8 +690,7 @@ zabbix_export:
           delay: 1h
           description: |
             MIKROTIK-MIB::mtxrHlTemperature
-            Since temperature sensor is not available on all Mikrotik hardware,
-            this is done to avoid unsupported items.
+            Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.
           item_prototypes:
             -
               uuid: 249a48a839cc4961a8949ee8323a6202
@@ -626,8 +714,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 420f9002f53646729666658f193c733e
@@ -638,6 +726,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: af33ef97881a4ab48686aa63676c7a2d
                   expression: 'avg(/MikroTik RB2011iL-RM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
@@ -652,6 +747,13 @@ zabbix_export:
                       name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
                       expression: 'avg(/MikroTik RB2011iL-RM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
                       recovery_expression: 'max(/MikroTik RB2011iL-RM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 8aa51a89c64f4626aa8646f9e1717669
                   expression: 'avg(/MikroTik RB2011iL-RM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
@@ -660,6 +762,13 @@ zabbix_export:
                   name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: c08a3dd904394cf29846630497e87d5a
           name: 'LTE modem discovery'
@@ -694,14 +803,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRP Reference Signal Received Power.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 32cb8289aea54c4099ee36d58dd31b72
                   expression: 'max(/MikroTik RB2011iL-RM SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 4e4ca30922404b0ea9dd78e47b26385a
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
@@ -716,14 +838,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 32764a33204e41bfb1c5395a52302c27
                   expression: 'max(/MikroTik RB2011iL-RM SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: b006482c393f4f0790f25497b5da6c31
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
@@ -738,14 +873,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: eab70beb20504b1d98be8d7cd82031fa
                   expression: 'max(/MikroTik RB2011iL-RM SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 55bb3ead60744b758a12b42c021d0e85
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
@@ -760,14 +908,27 @@ zabbix_export:
                 mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: c08f7ab1fb374e7db4f4c0525009cd93
                   expression: 'max(/MikroTik RB2011iL-RM SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: f1de2d4d636e4fafa6ec513988f3eac2
@@ -828,8 +989,14 @@ zabbix_export:
                 mtxrWlApAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: e70a0e3c001f47bf93fa7458d8a30bf8
               name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
@@ -849,8 +1016,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 3555a29c614e4927b577349e0ba3efc5
               name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
@@ -870,8 +1043,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 1f07e24ab5e446cabd93af0936878ca6
               name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
@@ -890,8 +1069,14 @@ zabbix_export:
                     - 15m
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: c48101c768414fb09a948bd237086107
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -904,8 +1089,14 @@ zabbix_export:
                 mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
         -
           uuid: 8b4de033e601487eb8a97e5cdbb3ac88
           name: 'CAPsMAN AP channel discovery'
@@ -938,8 +1129,14 @@ zabbix_export:
                 mtxrWlCMAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: b1af2acef4104aa5bff253add659c027
               name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
@@ -959,8 +1156,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 09b1511e2cd34810a2468ac47e36560e
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -973,8 +1176,14 @@ zabbix_export:
                 mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 846f7fb0449542b8b4081a98eebe3dd1
               name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
@@ -994,8 +1203,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 04bd0420c7474d90b10045328c5027a0
@@ -1003,6 +1218,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
                   priority: WARNING
                   description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: f984abdb831647d4aff155d0b24ae954
           name: 'Network interfaces discovery'
@@ -1091,8 +1313,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 04bbdf422aa04d68a9ee43add64517d2
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -1111,8 +1339,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 2c87ca86d3af453db42ab47399e4e578
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -1136,8 +1370,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: c3ce7b6ff39b4e2da36a180b1012ede2
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -1160,8 +1400,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 0afe36d6d0a348cab7e370b9d3692ef8
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -1180,8 +1426,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 2beebac52d2042868aeac37131890501
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -1205,8 +1457,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: e2033425d53e4448947f0f89a751520e
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -1231,8 +1489,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 33498ba5cdb2475dadc64a13bfdda78f
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -1254,8 +1518,14 @@ zabbix_export:
                 name: 'IF-MIB::ifOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 72ef5c7b0bb74f1fb88085616293169c
@@ -1273,6 +1543,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 0e7454246fda4867b3dab1c7151ea085
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -1296,8 +1570,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           trigger_prototypes:
             -
               uuid: 9f31bde8ab2e4edd8a142cdf0e4274d0
@@ -1327,6 +1607,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik RB2011iL-RM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik RB2011iL-RM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik RB2011iL-RM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik RB2011iL-RM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 794d401f1b66402cb9309d9acd63321c
               expression: |
@@ -1347,6 +1631,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik RB2011iL-RM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik RB2011iL-RM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik RB2011iL-RM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik RB2011iL-RM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: df2b99f9fcfc4df195b500cc637fb4d6
               expression: |
@@ -1366,6 +1654,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik RB2011iL-RM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik RB2011iL-RM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik RB2011iL-RM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik RB2011iL-RM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: 977ce93695aa468b88f4cf33d2fdc79d
@@ -1444,8 +1739,11 @@ zabbix_export:
               description: 'Space utilization in % for Disk-{#SNMPINDEX}'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: a71336fb643e4c85b67e3fb18244df4b
               name: 'Disk-{#SNMPINDEX}: Total space'
@@ -1472,8 +1770,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 669704d6f48f429eb4a872d8937dd00a
               name: 'Disk-{#SNMPINDEX}: Used space'
@@ -1492,8 +1793,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
           trigger_prototypes:
             -
               uuid: a4a3e86a03684038ba779bac1041eaec
@@ -1509,6 +1813,13 @@ zabbix_export:
                  - The disk free space is less than 5G.
                  - The disk will be full in less than 24 hours.
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
             -
               uuid: 7202bab5700444f58d4eabd9433f0efd
               expression: |
@@ -1529,6 +1840,13 @@ zabbix_export:
                   expression: |
                     last(/MikroTik RB2011iL-RM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
                     ((last(/MikroTik RB2011iL-RM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB2011iL-RM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik RB2011iL-RM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
           graph_prototypes:
             -
               uuid: 1c6cfa9ff24044cebe60949a50aae44d
@@ -1552,6 +1870,16 @@ zabbix_export:
                   item:
                     host: 'MikroTik RB2011iL-RM SNMP'
                     key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: mikrotik
+        -
+          tag: target
+          value: rb2011il-rm
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/net/mikrotik/mikrotik_RB2011iLS-IN_snmp/README.md b/templates/net/mikrotik/mikrotik_RB2011iLS-IN_snmp/README.md
index c2a1da8b6dd..5a84d8d4e8c 100644
--- a/templates/net/mikrotik/mikrotik_RB2011iLS-IN_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_RB2011iLS-IN_snmp/README.md
@@ -71,7 +71,7 @@ There are no template links in this template.
 |Network interfaces discovery |<p>Discovering interfaces from IF-MIB.</p> |SNMP |net.if.discovery<p>**Filter**:</p>AND <p>- {#IFADMINSTATUS} MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.MATCHES}`</p><p>- {#IFADMINSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.NOT_MATCHES}`</p><p>- {#IFOPERSTATUS} MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.MATCHES}`</p><p>- {#IFOPERSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.NOT_MATCHES}`</p><p>- {#IFNAME} MATCHES_REGEX `{$NET.IF.IFNAME.MATCHES}`</p><p>- {#IFNAME} NOT_MATCHES_REGEX `{$NET.IF.IFNAME.NOT_MATCHES}`</p><p>- {#IFDESCR} MATCHES_REGEX `{$NET.IF.IFDESCR.MATCHES}`</p><p>- {#IFDESCR} NOT_MATCHES_REGEX `{$NET.IF.IFDESCR.NOT_MATCHES}`</p><p>- {#IFALIAS} MATCHES_REGEX `{$NET.IF.IFALIAS.MATCHES}`</p><p>- {#IFALIAS} NOT_MATCHES_REGEX `{$NET.IF.IFALIAS.NOT_MATCHES}`</p><p>- {#IFTYPE} MATCHES_REGEX `{$NET.IF.IFTYPE.MATCHES}`</p><p>- {#IFTYPE} NOT_MATCHES_REGEX `{$NET.IF.IFTYPE.NOT_MATCHES}`</p> |
 |Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 |Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
-|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
 
 ## Items collected
 
@@ -137,14 +137,14 @@ There are no template links in this template.
 |Interface {#IFNAME}({#IFALIAS}): Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p><p>3. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik RB2011iLS-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik RB2011iLS-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik RB2011iLS-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))`<p>Recovery expression:</p>`last(/MikroTik RB2011iLS-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0` |AVERAGE |<p>Manual close: YES</p> |
 |Interface {#IFNAME}({#IFALIAS}): High bandwidth usage (>{$IF.UTIL.MAX:"{#IFNAME}"}%) |<p>The network interface utilization is close to its estimated maximum bandwidth.</p> |`(avg(/MikroTik RB2011iLS-IN SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik RB2011iLS-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) or avg(/MikroTik RB2011iLS-IN SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik RB2011iLS-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])) and last(/MikroTik RB2011iLS-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0`<p>Recovery expression:</p>`avg(/MikroTik RB2011iLS-IN SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik RB2011iLS-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) and avg(/MikroTik RB2011iLS-IN SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik RB2011iLS-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |Interface {#IFNAME}({#IFALIAS}): High error rate (>{$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) |<p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p> |`min(/MikroTik RB2011iLS-IN SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"} or min(/MikroTik RB2011iLS-IN SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`max(/MikroTik RB2011iLS-IN SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8 and max(/MikroTik RB2011iLS-IN SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
-|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik RB2011iLS-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik RB2011iLS-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik RB2011iLS-IN SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik RB2011iLS-IN SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik RB2011iLS-IN SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik RB2011iLS-IN SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik RB2011iLS-IN SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik RB2011iLS-IN SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik RB2011iLS-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2) `<p>Recovery expression:</p>`(change(/MikroTik RB2011iLS-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik RB2011iLS-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik RB2011iLS-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2) ` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik RB2011iLS-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik RB2011iLS-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik RB2011iLS-IN SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik RB2011iLS-IN SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik RB2011iLS-IN SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik RB2011iLS-IN SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik RB2011iLS-IN SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik RB2011iLS-IN SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik RB2011iLS-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2)`<p>Recovery expression:</p>`(change(/MikroTik RB2011iLS-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik RB2011iLS-IN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik RB2011iLS-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2)` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |{HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/MikroTik RB2011iLS-IN SNMP/system.uptime[sysUpTime.0])<10m` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- No SNMP data collection</p> |
 |No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/MikroTik RB2011iLS-IN SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |Unavailable by ICMP ping |<p>Last three attempts returned timeout.  Please check device connectivity.</p> |`max(/MikroTik RB2011iLS-IN SNMP/icmpping,#3)=0` |HIGH | |
 |High ICMP ping loss |<p>-</p> |`min(/MikroTik RB2011iLS-IN SNMP/icmppingloss,5m)>{$ICMP_LOSS_WARN} and min(/MikroTik RB2011iLS-IN SNMP/icmppingloss,5m)<100` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |High ICMP ping response time |<p>-</p> |`avg(/MikroTik RB2011iLS-IN SNMP/icmppingsec,5m)>{$ICMP_RESPONSE_TIME_WARN}` |WARNING |<p>**Depends on**:</p><p>- High ICMP ping loss</p><p>- Unavailable by ICMP ping</p> |
-|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik RB2011iLS-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik RB2011iLS-IN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB2011iLS-IN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik RB2011iLS-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
-|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik RB2011iLS-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik RB2011iLS-IN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB2011iLS-IN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik RB2011iLS-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik RB2011iLS-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik RB2011iLS-IN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB2011iLS-IN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik RB2011iLS-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik RB2011iLS-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik RB2011iLS-IN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB2011iLS-IN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik RB2011iLS-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
 |CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik RB2011iLS-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik RB2011iLS-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
 |CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik RB2011iLS-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik RB2011iLS-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
 |CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik RB2011iLS-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik RB2011iLS-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
diff --git a/templates/net/mikrotik/mikrotik_RB2011iLS-IN_snmp/template_net_mikrotik_RB2011iLS-IN_snmp.yaml b/templates/net/mikrotik/mikrotik_RB2011iLS-IN_snmp/template_net_mikrotik_RB2011iLS-IN_snmp.yaml
index 296fff32adf..703c97dbf45 100644
--- a/templates/net/mikrotik/mikrotik_RB2011iLS-IN_snmp/template_net_mikrotik_RB2011iLS-IN_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_RB2011iLS-IN_snmp/template_net_mikrotik_RB2011iLS-IN_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:47:14Z'
+  date: '2022-01-26T09:48:25Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -35,8 +35,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 7257cb86a65547b5901cac08cacee3aa
@@ -44,6 +47,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 783ce77b38434492a9944dc5b3531a35
           name: 'ICMP loss'
@@ -54,8 +61,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: ae82608801a642d9b3ef8ddd06cee7f6
@@ -67,6 +77,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik RB2011iLS-IN SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: bc7299499e2847eeb8d4e9ebcbc2519a
           name: 'ICMP response time'
@@ -77,8 +94,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: d2f60c5c4a124a549eb02f62874dba8b
@@ -93,6 +113,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik RB2011iLS-IN SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 397dd775fe6d4046aa91dfca36d3be96
           name: 'SNMP traps (fallback)'
@@ -105,8 +132,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: 30bc4fcfe70a45ceb6b3a8b945779e31
           name: 'System contact details'
@@ -128,8 +155,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 042947145fd142f3a1f6ae86826480eb
           name: 'System description'
@@ -152,8 +179,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: ed51e55b8fa64c5599399fc93d81d329
           name: 'Firmware version'
@@ -174,8 +201,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 2349e4eac44548349cc9f7806f8726db
@@ -185,6 +212,10 @@ zabbix_export:
               priority: INFO
               description: 'Firmware version has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 692ccc1f29fe4f15ae7ca0bee54bf6b6
           name: 'Hardware model name'
@@ -203,8 +234,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
         -
           uuid: 0645ecb1a28040d9b89af280ca3093ea
           name: 'Hardware serial number'
@@ -226,8 +257,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: f43a3aa77c8e4e9f81add08ac624be88
@@ -236,6 +267,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 59b84e78871849fd8e2da3608c4fd45f
           name: 'System location'
@@ -257,8 +292,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: e68119b9b48e4a49a4ff3ce41b8bf613
           name: 'System name'
@@ -280,8 +315,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: f64be38a3557482087d75ed423ced500
@@ -290,6 +325,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: 08476c93ef374c8baba1e6f80c5544cf
           name: 'System object ID'
@@ -310,8 +352,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 551f25631a13497b924c1b285b93ee5f
           name: 'Operating system'
@@ -333,8 +375,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: os
           triggers:
             -
               uuid: 76d4c429deaf491982b7b1049634550a
@@ -347,6 +389,10 @@ zabbix_export:
                 -
                   name: 'System name has changed (new name: {ITEM.VALUE})'
                   expression: 'last(/MikroTik RB2011iLS-IN SNMP/system.name,#1)<>last(/MikroTik RB2011iLS-IN SNMP/system.name,#2) and length(last(/MikroTik RB2011iLS-IN SNMP/system.name))>0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 56f939dcf88843fda2fe4b062cca2d6a
           name: Uptime
@@ -367,8 +413,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 2139aea23b214169a369b4776865f501
@@ -381,6 +427,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/MikroTik RB2011iLS-IN SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: c077abb2ecc84c88b2173bff8e9ab9aa
           name: 'Total memory'
@@ -407,8 +457,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 4029907022564beeb405c065ae4febff
           name: 'Used memory'
@@ -427,8 +477,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 5521e149584846118dcb280496b3aca4
           name: 'Memory utilization'
@@ -441,8 +491,8 @@ zabbix_export:
           description: 'Memory utilization in %'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: cfca5a71a1534e199e9c3b867b8c6c3b
@@ -450,6 +500,13 @@ zabbix_export:
               name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
               priority: AVERAGE
               description: 'The system is running out of free memory.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 33e8ea0575174bc69002753a5e5d90bd
           name: 'SNMP agent availability'
@@ -466,8 +523,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 81af7d744ebf422ba065308fcb3c225a
@@ -480,6 +540,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik RB2011iLS-IN SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: 4de6b86871874118b83ed7cfd31f3113
@@ -504,8 +568,8 @@ zabbix_export:
                 The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
               trigger_prototypes:
                 -
                   uuid: 1edf137678504b9d8dced37d9a1d3f5a
@@ -514,6 +578,10 @@ zabbix_export:
                   opdata: 'Current utilization: {ITEM.LASTVALUE1}'
                   priority: WARNING
                   description: 'CPU utilization is too high. The system might be slow to respond.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 28b696fbb7ce4cf4941932ceb04700cb
@@ -558,8 +626,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: e9ab4a4bc78e47a19409d2bfe4d1d5fa
@@ -570,6 +638,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 1e81f6308a2748adbed17064d648b566
                   expression: 'avg(/MikroTik RB2011iLS-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
@@ -584,6 +659,13 @@ zabbix_export:
                       name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
                       expression: 'avg(/MikroTik RB2011iLS-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
                       recovery_expression: 'max(/MikroTik RB2011iLS-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 3a679a3d653d42cabed24e238fa01c38
                   expression: 'avg(/MikroTik RB2011iLS-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
@@ -592,6 +674,13 @@ zabbix_export:
                   name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 6a9998434d8b4a93a7fba87eaf642600
           name: 'Temperature sensor discovery'
@@ -601,8 +690,7 @@ zabbix_export:
           delay: 1h
           description: |
             MIKROTIK-MIB::mtxrHlTemperature
-            Since temperature sensor is not available on all Mikrotik hardware,
-            this is done to avoid unsupported items.
+            Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.
           item_prototypes:
             -
               uuid: 53d76ef4e9224a63bd30e3d1fc89542f
@@ -626,8 +714,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 88fc1612d1b14108a1d90313fa1cb0e7
@@ -638,6 +726,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 048ffb5e510746e6b56daec287db6739
                   expression: 'avg(/MikroTik RB2011iLS-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
@@ -652,6 +747,13 @@ zabbix_export:
                       name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
                       expression: 'avg(/MikroTik RB2011iLS-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
                       recovery_expression: 'max(/MikroTik RB2011iLS-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: fcc70d3662ac49499a0f5bb68a13c007
                   expression: 'avg(/MikroTik RB2011iLS-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
@@ -660,6 +762,13 @@ zabbix_export:
                   name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 53adc733f3c34ddd943e5ccb41d1b536
           name: 'LTE modem discovery'
@@ -694,14 +803,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRP Reference Signal Received Power.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: d9acbd875f514ce8a19638125c096aed
                   expression: 'max(/MikroTik RB2011iLS-IN SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 93254f62b3e74acaa3c5839b9f844363
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
@@ -716,14 +838,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 569c192c940a49f7b180162e4b83be24
                   expression: 'max(/MikroTik RB2011iLS-IN SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 67eb22e623174b06a24460985521d3d4
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
@@ -738,14 +873,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 7b31d412d15140d7be66d4b9963150de
                   expression: 'max(/MikroTik RB2011iLS-IN SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: dda3ef44c9204c46a8affb68aeeec803
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
@@ -760,14 +908,27 @@ zabbix_export:
                 mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 7512216ac6e24d5f88a187621d0d7285
                   expression: 'max(/MikroTik RB2011iLS-IN SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 360063285da04ed29523562086c769c4
@@ -828,8 +989,14 @@ zabbix_export:
                 mtxrWlApAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 437edde63aa74619a3f4531039c1e73d
               name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
@@ -849,8 +1016,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 091618c93d8a405a94d4147d18d985d7
               name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
@@ -870,8 +1043,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: af82a882030b45ca90805a13bf4390f5
               name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
@@ -890,8 +1069,14 @@ zabbix_export:
                     - 15m
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 616f6787b7e8427aa727711c115afbed
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -904,8 +1089,14 @@ zabbix_export:
                 mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
         -
           uuid: 9ab6be8cd3f44b7ba6df32589b844e77
           name: 'CAPsMAN AP channel discovery'
@@ -938,8 +1129,14 @@ zabbix_export:
                 mtxrWlCMAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 0921eb633d6d44f2add1031cbc5ae2fa
               name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
@@ -959,8 +1156,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: a7a9c42aa3054035b9190a38f3456e44
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -973,8 +1176,14 @@ zabbix_export:
                 mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 23b17acfff4246208f744864e5af2108
               name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
@@ -994,8 +1203,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: bcb6d9302db14ee3a7dd120304b7a5a5
@@ -1003,6 +1218,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
                   priority: WARNING
                   description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: fee6ff9551144a1c9888afccc73cddc2
           name: 'Network interfaces discovery'
@@ -1091,8 +1313,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 59ec7c3ac8304d2885623ab64bad205e
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -1111,8 +1339,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 6590c395369244baa3a145197fb929b7
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -1136,8 +1370,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 49ca22d9508740af9de2712bed15d185
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -1160,8 +1400,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: dd61dfacc7dd4fd8afaf6825aedb699a
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -1180,8 +1426,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 976e391051da4a33a1ff3b85b9ff3639
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -1205,8 +1457,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: eaf35c9b8212444ca1736f6fd4e36b0d
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -1231,8 +1489,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: f91919c8c9d049b0ae2d6a4d459f7d98
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -1254,8 +1518,14 @@ zabbix_export:
                 name: 'IF-MIB::ifOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 97aeb18c33b24e29acefa286a52e6815
@@ -1273,6 +1543,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: dcfbfcdc02664c59b73711a01eb00e35
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -1296,8 +1570,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           trigger_prototypes:
             -
               uuid: 3ea926e679704c50b2a8b72bbdbb7136
@@ -1327,6 +1607,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik RB2011iLS-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik RB2011iLS-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik RB2011iLS-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik RB2011iLS-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 544e37fe922d4b6aa28c05becbf6485b
               expression: |
@@ -1347,6 +1631,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik RB2011iLS-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik RB2011iLS-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik RB2011iLS-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik RB2011iLS-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 4f224bcc233c4a378d3af6e4b8ad7df9
               expression: |
@@ -1366,6 +1654,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik RB2011iLS-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik RB2011iLS-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik RB2011iLS-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik RB2011iLS-IN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: 8a0efdf4dfd94a398a09d2df1037802d
@@ -1444,8 +1739,11 @@ zabbix_export:
               description: 'Space utilization in % for Disk-{#SNMPINDEX}'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: ad4d9e4a1a5341fa841eecdd84acf8b8
               name: 'Disk-{#SNMPINDEX}: Total space'
@@ -1472,8 +1770,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: fa6b2e7962e84b53ad0f7909984e6bca
               name: 'Disk-{#SNMPINDEX}: Used space'
@@ -1492,8 +1793,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
           trigger_prototypes:
             -
               uuid: c3e8a5f013f34395afeffc5eabbe01ac
@@ -1509,6 +1813,13 @@ zabbix_export:
                  - The disk free space is less than 5G.
                  - The disk will be full in less than 24 hours.
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
             -
               uuid: 2199168e964c4bd79ad06de3c1226f1d
               expression: |
@@ -1529,6 +1840,13 @@ zabbix_export:
                   expression: |
                     last(/MikroTik RB2011iLS-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
                     ((last(/MikroTik RB2011iLS-IN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB2011iLS-IN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik RB2011iLS-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
           graph_prototypes:
             -
               uuid: baa457270f57426da7d271df998f8c83
@@ -1552,6 +1870,16 @@ zabbix_export:
                   item:
                     host: 'MikroTik RB2011iLS-IN SNMP'
                     key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: mikrotik
+        -
+          tag: target
+          value: rb2011ils-in
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/net/mikrotik/mikrotik_RB260GSP_snmp/README.md b/templates/net/mikrotik/mikrotik_RB260GSP_snmp/README.md
index 8c4b054b1e7..217204ebe92 100644
--- a/templates/net/mikrotik/mikrotik_RB260GSP_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_RB260GSP_snmp/README.md
@@ -71,7 +71,7 @@ There are no template links in this template.
 |Network interfaces discovery |<p>Discovering interfaces from IF-MIB.</p> |SNMP |net.if.discovery<p>**Filter**:</p>AND <p>- {#IFADMINSTATUS} MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.MATCHES}`</p><p>- {#IFADMINSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.NOT_MATCHES}`</p><p>- {#IFOPERSTATUS} MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.MATCHES}`</p><p>- {#IFOPERSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.NOT_MATCHES}`</p><p>- {#IFNAME} MATCHES_REGEX `{$NET.IF.IFNAME.MATCHES}`</p><p>- {#IFNAME} NOT_MATCHES_REGEX `{$NET.IF.IFNAME.NOT_MATCHES}`</p><p>- {#IFDESCR} MATCHES_REGEX `{$NET.IF.IFDESCR.MATCHES}`</p><p>- {#IFDESCR} NOT_MATCHES_REGEX `{$NET.IF.IFDESCR.NOT_MATCHES}`</p><p>- {#IFALIAS} MATCHES_REGEX `{$NET.IF.IFALIAS.MATCHES}`</p><p>- {#IFALIAS} NOT_MATCHES_REGEX `{$NET.IF.IFALIAS.NOT_MATCHES}`</p><p>- {#IFTYPE} MATCHES_REGEX `{$NET.IF.IFTYPE.MATCHES}`</p><p>- {#IFTYPE} NOT_MATCHES_REGEX `{$NET.IF.IFTYPE.NOT_MATCHES}`</p> |
 |Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 |Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
-|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
 
 ## Items collected
 
@@ -137,14 +137,14 @@ There are no template links in this template.
 |Interface {#IFNAME}({#IFALIAS}): Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p><p>3. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik RB260GSP SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik RB260GSP SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik RB260GSP SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))`<p>Recovery expression:</p>`last(/MikroTik RB260GSP SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0` |AVERAGE |<p>Manual close: YES</p> |
 |Interface {#IFNAME}({#IFALIAS}): High bandwidth usage (>{$IF.UTIL.MAX:"{#IFNAME}"}%) |<p>The network interface utilization is close to its estimated maximum bandwidth.</p> |`(avg(/MikroTik RB260GSP SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik RB260GSP SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) or avg(/MikroTik RB260GSP SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik RB260GSP SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])) and last(/MikroTik RB260GSP SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0`<p>Recovery expression:</p>`avg(/MikroTik RB260GSP SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik RB260GSP SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) and avg(/MikroTik RB260GSP SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik RB260GSP SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |Interface {#IFNAME}({#IFALIAS}): High error rate (>{$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) |<p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p> |`min(/MikroTik RB260GSP SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"} or min(/MikroTik RB260GSP SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`max(/MikroTik RB260GSP SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8 and max(/MikroTik RB260GSP SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
-|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik RB260GSP SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik RB260GSP SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik RB260GSP SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik RB260GSP SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik RB260GSP SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik RB260GSP SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik RB260GSP SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik RB260GSP SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik RB260GSP SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2) `<p>Recovery expression:</p>`(change(/MikroTik RB260GSP SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik RB260GSP SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik RB260GSP SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2) ` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik RB260GSP SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik RB260GSP SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik RB260GSP SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik RB260GSP SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik RB260GSP SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik RB260GSP SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik RB260GSP SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik RB260GSP SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik RB260GSP SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2)`<p>Recovery expression:</p>`(change(/MikroTik RB260GSP SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik RB260GSP SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik RB260GSP SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2)` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |{HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/MikroTik RB260GSP SNMP/system.uptime[sysUpTime.0])<10m` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- No SNMP data collection</p> |
 |No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/MikroTik RB260GSP SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |Unavailable by ICMP ping |<p>Last three attempts returned timeout.  Please check device connectivity.</p> |`max(/MikroTik RB260GSP SNMP/icmpping,#3)=0` |HIGH | |
 |High ICMP ping loss |<p>-</p> |`min(/MikroTik RB260GSP SNMP/icmppingloss,5m)>{$ICMP_LOSS_WARN} and min(/MikroTik RB260GSP SNMP/icmppingloss,5m)<100` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |High ICMP ping response time |<p>-</p> |`avg(/MikroTik RB260GSP SNMP/icmppingsec,5m)>{$ICMP_RESPONSE_TIME_WARN}` |WARNING |<p>**Depends on**:</p><p>- High ICMP ping loss</p><p>- Unavailable by ICMP ping</p> |
-|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik RB260GSP SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik RB260GSP SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB260GSP SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik RB260GSP SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
-|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik RB260GSP SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik RB260GSP SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB260GSP SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik RB260GSP SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik RB260GSP SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik RB260GSP SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB260GSP SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik RB260GSP SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik RB260GSP SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik RB260GSP SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB260GSP SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik RB260GSP SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
 |CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik RB260GSP SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik RB260GSP SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
 |CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik RB260GSP SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik RB260GSP SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
 |CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik RB260GSP SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik RB260GSP SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
diff --git a/templates/net/mikrotik/mikrotik_RB260GSP_snmp/template_net_mikrotik_RB260GSP_snmp.yaml b/templates/net/mikrotik/mikrotik_RB260GSP_snmp/template_net_mikrotik_RB260GSP_snmp.yaml
index f435d158d66..b10514cace8 100644
--- a/templates/net/mikrotik/mikrotik_RB260GSP_snmp/template_net_mikrotik_RB260GSP_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_RB260GSP_snmp/template_net_mikrotik_RB260GSP_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:47:30Z'
+  date: '2022-01-26T10:46:09Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -35,8 +35,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 247cdbc159624b33a4b415d3e048c087
@@ -44,6 +47,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 468b063753fd4bca861646312909abf7
           name: 'ICMP loss'
@@ -54,8 +61,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 4d4cde77c8324a88ac0798e2f096be69
@@ -67,6 +77,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik RB260GSP SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: fe030b0a6cb447a1b1c2fe5f96b2bffa
           name: 'ICMP response time'
@@ -77,8 +94,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 0f9f0ffd9322422babb52a5a5058d97e
@@ -93,6 +113,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik RB260GSP SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: cc100edb014b4ff8b119ffe683403396
           name: 'SNMP traps (fallback)'
@@ -105,8 +132,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: e8656127772b4835b2b102d972b29de8
           name: 'System contact details'
@@ -128,8 +155,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: e35b5c62cfa241fdad672ee8b7303044
           name: 'System description'
@@ -152,8 +179,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: df5bf48843cd4981bf719769b3194a3d
           name: 'Firmware version'
@@ -174,8 +201,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 1f05ddb5fc1c4d18a5d9f5755b22a080
@@ -185,6 +212,10 @@ zabbix_export:
               priority: INFO
               description: 'Firmware version has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 50100a89b236431d9ba7e4f2352fa2b9
           name: 'Hardware model name'
@@ -203,8 +234,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
         -
           uuid: 65a753ce87934f75aa719e3e59f76dbd
           name: 'Hardware serial number'
@@ -226,8 +257,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 9bc744f5b70748e68b13933b618f9550
@@ -236,6 +267,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: d5c52de296b04ceab2cfd1a87ccffc6b
           name: 'System location'
@@ -257,8 +292,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: d3e819d5e0dc403fb4b9dafd1ddc59d5
           name: 'System name'
@@ -280,8 +315,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: a5fed81db3c7447c8c62b02974765f57
@@ -290,6 +325,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: 530490cf5862413b8e7896aa8c0cb627
           name: 'System object ID'
@@ -310,8 +352,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: b5a74fe98a7948a9b189953b457b2975
           name: 'Operating system'
@@ -333,8 +375,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: os
           triggers:
             -
               uuid: 72cedbd4d23948c3941d5b2011f5cdab
@@ -347,6 +389,10 @@ zabbix_export:
                 -
                   name: 'System name has changed (new name: {ITEM.VALUE})'
                   expression: 'last(/MikroTik RB260GSP SNMP/system.name,#1)<>last(/MikroTik RB260GSP SNMP/system.name,#2) and length(last(/MikroTik RB260GSP SNMP/system.name))>0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: f0b0b111aac440189f71bb1b2830ded3
           name: Uptime
@@ -367,8 +413,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: a3c432e1d04448d3940f69f8d9633c8f
@@ -381,6 +427,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/MikroTik RB260GSP SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 806938d083e848b4b84b2c222c4f4d2e
           name: 'Total memory'
@@ -407,8 +457,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 0d4cc61a9f8c44f385606bc8394eaeb4
           name: 'Used memory'
@@ -427,8 +477,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 836ba120a51d4c659c034e3a94003c0f
           name: 'Memory utilization'
@@ -441,8 +491,8 @@ zabbix_export:
           description: 'Memory utilization in %'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: 971f8265db9348ce942f4e0adb49bd1a
@@ -450,6 +500,13 @@ zabbix_export:
               name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
               priority: AVERAGE
               description: 'The system is running out of free memory.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 9a70b1387ea14502aadcf05f636e7a5c
           name: 'SNMP agent availability'
@@ -466,8 +523,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: a82f1cafcb424685bb2f562c1c6dce11
@@ -480,6 +540,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik RB260GSP SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: f83ea9e9a0e646f5a9b8c7e1e0290512
@@ -504,8 +568,8 @@ zabbix_export:
                 The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
               trigger_prototypes:
                 -
                   uuid: 636401049a4e46c48e7b89e2b0c8c72b
@@ -514,6 +578,10 @@ zabbix_export:
                   opdata: 'Current utilization: {ITEM.LASTVALUE1}'
                   priority: WARNING
                   description: 'CPU utilization is too high. The system might be slow to respond.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 32c572f1f36545299c21cb9a3b46365f
@@ -558,8 +626,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: fac1eacc650b485faa1f05207a865ed6
@@ -570,6 +638,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: c604329ca3374ed5b29339c10070b9de
                   expression: 'avg(/MikroTik RB260GSP SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
@@ -584,6 +659,13 @@ zabbix_export:
                       name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
                       expression: 'avg(/MikroTik RB260GSP SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
                       recovery_expression: 'max(/MikroTik RB260GSP SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 37927a5941e245d9bce883ce155fefdf
                   expression: 'avg(/MikroTik RB260GSP SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
@@ -592,6 +674,13 @@ zabbix_export:
                   name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: e0d8cd7456724c0690548859ea217994
           name: 'Temperature sensor discovery'
@@ -601,8 +690,7 @@ zabbix_export:
           delay: 1h
           description: |
             MIKROTIK-MIB::mtxrHlTemperature
-            Since temperature sensor is not available on all Mikrotik hardware,
-            this is done to avoid unsupported items.
+            Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.
           item_prototypes:
             -
               uuid: 77bba6eb9e9f4c7dafd8ecb0d895aa4d
@@ -626,8 +714,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 4f2a304aba6e45c7a0186d8b069be904
@@ -638,6 +726,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 7ab0db29abff475d908e9db2e86ee16a
                   expression: 'avg(/MikroTik RB260GSP SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
@@ -652,6 +747,13 @@ zabbix_export:
                       name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
                       expression: 'avg(/MikroTik RB260GSP SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
                       recovery_expression: 'max(/MikroTik RB260GSP SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: ae7e34f53a3d407d86484baffad515fe
                   expression: 'avg(/MikroTik RB260GSP SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
@@ -660,6 +762,13 @@ zabbix_export:
                   name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 4176400783ec41aca75e6edb5a2e7950
           name: 'LTE modem discovery'
@@ -694,14 +803,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRP Reference Signal Received Power.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: a7d31dad39524586ad9cca3c52ab0802
                   expression: 'max(/MikroTik RB260GSP SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 0da46f1b48e34e8d866bdcee4c4f318e
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
@@ -716,14 +838,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: abae11ffeea140debcd8f32c34f10f31
                   expression: 'max(/MikroTik RB260GSP SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 9960c89e7efd40ea8df4da693350156b
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
@@ -738,14 +873,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: f7804db0113d42a49322193872ddc616
                   expression: 'max(/MikroTik RB260GSP SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 8c703fdcb8fa4ce8978034d004c723fa
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
@@ -760,14 +908,27 @@ zabbix_export:
                 mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 73f6c8071582400b952f945388a181c2
                   expression: 'max(/MikroTik RB260GSP SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 00e2b89ffee645e4ac3d95a4219d63ab
@@ -828,8 +989,14 @@ zabbix_export:
                 mtxrWlApAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: e493d9b31000454ab5322d128fc017dd
               name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
@@ -849,8 +1016,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 78e165faa8e84eb5a5b5e33de95667fb
               name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
@@ -870,8 +1043,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 3091e881221f4ac79337ee723e18bdae
               name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
@@ -890,8 +1069,14 @@ zabbix_export:
                     - 15m
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 00ffa0a22f24402ca0b28fcd8deb539a
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -904,8 +1089,14 @@ zabbix_export:
                 mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
         -
           uuid: faa2bf517e6e46aaa8aebdc4571007b7
           name: 'CAPsMAN AP channel discovery'
@@ -938,8 +1129,14 @@ zabbix_export:
                 mtxrWlCMAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: dfe08b76e5794a918047afdeecd30244
               name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
@@ -959,8 +1156,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: fa59c976b98c4074a04183d569cc9c19
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -973,8 +1176,14 @@ zabbix_export:
                 mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 22ec1aa3f660417e9b99f341553ff158
               name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
@@ -994,8 +1203,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: e159cf84958443ec9d148c3e83cf8e41
@@ -1003,6 +1218,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
                   priority: WARNING
                   description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 5450b5a9f856449ba52b6185e4e005cd
           name: 'Network interfaces discovery'
@@ -1091,8 +1313,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: be752ed58d3e4bcbb575f5aa77bc573f
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -1111,8 +1339,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: de703efe12a147ccab5ed87dca174293
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -1136,8 +1370,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 15a9c5f7e9b3403986182e9f63a557f6
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -1160,8 +1400,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: fc09d50cbadb46c499fe153bd9f4b4aa
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -1180,8 +1426,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: fd545abd5b7146dd823d2bd2f1339054
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -1205,8 +1457,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 8beaa10b22194fcda348ae031d0e2284
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -1231,8 +1489,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: bac4bcf127634d06b90c6d2b7c0469a1
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -1254,8 +1518,14 @@ zabbix_export:
                 name: 'IF-MIB::ifOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: f0d3817bc7f243c591078b806f3ae712
@@ -1273,6 +1543,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 96fe507b89234141ad615998fbf581d2
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -1296,8 +1570,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           trigger_prototypes:
             -
               uuid: 6e11e178d1e2418fa94bd2718a6eccaf
@@ -1327,6 +1607,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik RB260GSP SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik RB260GSP SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik RB260GSP SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik RB260GSP SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 54be09c46d2e4c6694fbd4eef4f4e055
               expression: |
@@ -1347,6 +1631,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik RB260GSP SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik RB260GSP SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik RB260GSP SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik RB260GSP SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 3c122a7c5e6348f28f8c04391f73f14b
               expression: |
@@ -1366,6 +1654,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik RB260GSP SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik RB260GSP SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik RB260GSP SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik RB260GSP SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: 6f6c52b8c09140358b7c058d397903d0
@@ -1444,8 +1739,11 @@ zabbix_export:
               description: 'Space utilization in % for Disk-{#SNMPINDEX}'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: c227791696414ebf9167558b1e2933f5
               name: 'Disk-{#SNMPINDEX}: Total space'
@@ -1472,8 +1770,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: dd45e3173ac148caa583f5e39aa12889
               name: 'Disk-{#SNMPINDEX}: Used space'
@@ -1492,8 +1793,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
           trigger_prototypes:
             -
               uuid: c8c7b25b435e4157a22c8f4d6fce9ea5
@@ -1509,6 +1813,13 @@ zabbix_export:
                  - The disk free space is less than 5G.
                  - The disk will be full in less than 24 hours.
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
             -
               uuid: e63fb086de874cfe86e0d03d2d57f157
               expression: |
@@ -1529,6 +1840,13 @@ zabbix_export:
                   expression: |
                     last(/MikroTik RB260GSP SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
                     ((last(/MikroTik RB260GSP SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB260GSP SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik RB260GSP SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
           graph_prototypes:
             -
               uuid: eafa602b8f4a4d6883fcd65555057190
@@ -1552,6 +1870,16 @@ zabbix_export:
                   item:
                     host: 'MikroTik RB260GSP SNMP'
                     key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: mikrotik
+        -
+          tag: target
+          value: rb260gsp
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/net/mikrotik/mikrotik_RB260GS_snmp/README.md b/templates/net/mikrotik/mikrotik_RB260GS_snmp/README.md
index f84097c05a9..6d0b8e3ed3e 100644
--- a/templates/net/mikrotik/mikrotik_RB260GS_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_RB260GS_snmp/README.md
@@ -71,7 +71,7 @@ There are no template links in this template.
 |Network interfaces discovery |<p>Discovering interfaces from IF-MIB.</p> |SNMP |net.if.discovery<p>**Filter**:</p>AND <p>- {#IFADMINSTATUS} MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.MATCHES}`</p><p>- {#IFADMINSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.NOT_MATCHES}`</p><p>- {#IFOPERSTATUS} MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.MATCHES}`</p><p>- {#IFOPERSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.NOT_MATCHES}`</p><p>- {#IFNAME} MATCHES_REGEX `{$NET.IF.IFNAME.MATCHES}`</p><p>- {#IFNAME} NOT_MATCHES_REGEX `{$NET.IF.IFNAME.NOT_MATCHES}`</p><p>- {#IFDESCR} MATCHES_REGEX `{$NET.IF.IFDESCR.MATCHES}`</p><p>- {#IFDESCR} NOT_MATCHES_REGEX `{$NET.IF.IFDESCR.NOT_MATCHES}`</p><p>- {#IFALIAS} MATCHES_REGEX `{$NET.IF.IFALIAS.MATCHES}`</p><p>- {#IFALIAS} NOT_MATCHES_REGEX `{$NET.IF.IFALIAS.NOT_MATCHES}`</p><p>- {#IFTYPE} MATCHES_REGEX `{$NET.IF.IFTYPE.MATCHES}`</p><p>- {#IFTYPE} NOT_MATCHES_REGEX `{$NET.IF.IFTYPE.NOT_MATCHES}`</p> |
 |Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 |Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
-|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
 
 ## Items collected
 
@@ -137,14 +137,14 @@ There are no template links in this template.
 |Interface {#IFNAME}({#IFALIAS}): Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p><p>3. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik RB260GS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik RB260GS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik RB260GS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))`<p>Recovery expression:</p>`last(/MikroTik RB260GS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0` |AVERAGE |<p>Manual close: YES</p> |
 |Interface {#IFNAME}({#IFALIAS}): High bandwidth usage (>{$IF.UTIL.MAX:"{#IFNAME}"}%) |<p>The network interface utilization is close to its estimated maximum bandwidth.</p> |`(avg(/MikroTik RB260GS SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik RB260GS SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) or avg(/MikroTik RB260GS SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik RB260GS SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])) and last(/MikroTik RB260GS SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0`<p>Recovery expression:</p>`avg(/MikroTik RB260GS SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik RB260GS SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) and avg(/MikroTik RB260GS SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik RB260GS SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |Interface {#IFNAME}({#IFALIAS}): High error rate (>{$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) |<p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p> |`min(/MikroTik RB260GS SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"} or min(/MikroTik RB260GS SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`max(/MikroTik RB260GS SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8 and max(/MikroTik RB260GS SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
-|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik RB260GS SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik RB260GS SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik RB260GS SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik RB260GS SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik RB260GS SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik RB260GS SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik RB260GS SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik RB260GS SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik RB260GS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2) `<p>Recovery expression:</p>`(change(/MikroTik RB260GS SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik RB260GS SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik RB260GS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2) ` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik RB260GS SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik RB260GS SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik RB260GS SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik RB260GS SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik RB260GS SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik RB260GS SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik RB260GS SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik RB260GS SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik RB260GS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2)`<p>Recovery expression:</p>`(change(/MikroTik RB260GS SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik RB260GS SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik RB260GS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2)` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |{HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/MikroTik RB260GS SNMP/system.uptime[sysUpTime.0])<10m` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- No SNMP data collection</p> |
 |No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/MikroTik RB260GS SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |Unavailable by ICMP ping |<p>Last three attempts returned timeout.  Please check device connectivity.</p> |`max(/MikroTik RB260GS SNMP/icmpping,#3)=0` |HIGH | |
 |High ICMP ping loss |<p>-</p> |`min(/MikroTik RB260GS SNMP/icmppingloss,5m)>{$ICMP_LOSS_WARN} and min(/MikroTik RB260GS SNMP/icmppingloss,5m)<100` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |High ICMP ping response time |<p>-</p> |`avg(/MikroTik RB260GS SNMP/icmppingsec,5m)>{$ICMP_RESPONSE_TIME_WARN}` |WARNING |<p>**Depends on**:</p><p>- High ICMP ping loss</p><p>- Unavailable by ICMP ping</p> |
-|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik RB260GS SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik RB260GS SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB260GS SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik RB260GS SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
-|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik RB260GS SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik RB260GS SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB260GS SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik RB260GS SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik RB260GS SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik RB260GS SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB260GS SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik RB260GS SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik RB260GS SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik RB260GS SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB260GS SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik RB260GS SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
 |CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik RB260GS SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik RB260GS SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
 |CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik RB260GS SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik RB260GS SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
 |CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik RB260GS SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik RB260GS SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
diff --git a/templates/net/mikrotik/mikrotik_RB260GS_snmp/template_net_mikrotik_RB260GS_snmp.yaml b/templates/net/mikrotik/mikrotik_RB260GS_snmp/template_net_mikrotik_RB260GS_snmp.yaml
index 21ded10243a..30458f39e6d 100644
--- a/templates/net/mikrotik/mikrotik_RB260GS_snmp/template_net_mikrotik_RB260GS_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_RB260GS_snmp/template_net_mikrotik_RB260GS_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:47:35Z'
+  date: '2022-01-26T09:54:18Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -35,8 +35,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 4db071c60daf4a6a836754875b22d27d
@@ -44,6 +47,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: e2ad26afb3674a63a5ffb68ccfa84ccc
           name: 'ICMP loss'
@@ -54,8 +61,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 5ce287958dc743abaa50a18c8ad3f2a5
@@ -67,6 +77,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik RB260GS SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 0338080fdaee47d09df04fd70a56889b
           name: 'ICMP response time'
@@ -77,8 +94,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 314db7fe9ce6403785f737263ee87914
@@ -93,6 +113,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik RB260GS SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 4b22a7465109474db7a86274de0b519e
           name: 'SNMP traps (fallback)'
@@ -105,8 +132,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: 9b93b930cf354451b2613f410db63b55
           name: 'System contact details'
@@ -128,8 +155,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 6b3f14b033914ef58797c15a751fe086
           name: 'System description'
@@ -152,8 +179,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 1f05547dfa4146bd837288c6cfb0b0e4
           name: 'Firmware version'
@@ -174,8 +201,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: a5f7839a9a0d4272ae0312b8954a9313
@@ -185,6 +212,10 @@ zabbix_export:
               priority: INFO
               description: 'Firmware version has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 286376d7fb9e4fa9a608d7494b500f4f
           name: 'Hardware model name'
@@ -203,8 +234,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
         -
           uuid: ad481c4efe304683ac539107a121b10a
           name: 'Hardware serial number'
@@ -226,8 +257,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 672fcd1d34374373b0992d80d46d885c
@@ -236,6 +267,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 37b6610ae0bf4989b1431182dcd239c1
           name: 'System location'
@@ -257,8 +292,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 73459a4cdf8a45a1a480102cfe5119c1
           name: 'System name'
@@ -280,8 +315,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 6f811bec794348e4937cbff22dbf5fb4
@@ -290,6 +325,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: c2a7d5ecda21446bbd55cec32ab3f50e
           name: 'System object ID'
@@ -310,8 +352,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 111bd5c32550427682bb0e683754fda9
           name: 'Operating system'
@@ -333,8 +375,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: os
           triggers:
             -
               uuid: 7538c487e4f14cdcb6fc3a6b415ed559
@@ -347,6 +389,10 @@ zabbix_export:
                 -
                   name: 'System name has changed (new name: {ITEM.VALUE})'
                   expression: 'last(/MikroTik RB260GS SNMP/system.name,#1)<>last(/MikroTik RB260GS SNMP/system.name,#2) and length(last(/MikroTik RB260GS SNMP/system.name))>0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: d379b98f901444368311a7c22c51cbcd
           name: Uptime
@@ -367,8 +413,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 44a2d709f4d0471997697905b8e3b456
@@ -381,6 +427,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/MikroTik RB260GS SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 1b352f84778349c78422b9d4c648d05b
           name: 'Total memory'
@@ -407,8 +457,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: f3f37d9595244448ab98704c49678800
           name: 'Used memory'
@@ -427,8 +477,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 10858c87568841f688e9b0b7e43811dd
           name: 'Memory utilization'
@@ -441,8 +491,8 @@ zabbix_export:
           description: 'Memory utilization in %'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: 6975f0abf1504caebd3a13193da1bdcc
@@ -450,6 +500,13 @@ zabbix_export:
               name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
               priority: AVERAGE
               description: 'The system is running out of free memory.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 6814429f90bb417a9af42b7be081b777
           name: 'SNMP agent availability'
@@ -466,8 +523,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 9a5729d397ad431aa79048b69a65fbd9
@@ -480,6 +540,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik RB260GS SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: 3c377424bbb24740bebe49250a6770f5
@@ -504,8 +568,8 @@ zabbix_export:
                 The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
               trigger_prototypes:
                 -
                   uuid: f6b89443734b4c79920496ff9244f6d3
@@ -514,6 +578,10 @@ zabbix_export:
                   opdata: 'Current utilization: {ITEM.LASTVALUE1}'
                   priority: WARNING
                   description: 'CPU utilization is too high. The system might be slow to respond.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 9fc1b8a3fef146648e8e34ad5be8f5e3
@@ -558,8 +626,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: b9eee5f17d084ba7b6971aaf6165b313
@@ -570,6 +638,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 64193d2ccc1c4813b8585b5d3d81f962
                   expression: 'avg(/MikroTik RB260GS SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
@@ -584,6 +659,13 @@ zabbix_export:
                       name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
                       expression: 'avg(/MikroTik RB260GS SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
                       recovery_expression: 'max(/MikroTik RB260GS SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: be0ff2612a014f2db296b4066c22cfdd
                   expression: 'avg(/MikroTik RB260GS SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
@@ -592,6 +674,13 @@ zabbix_export:
                   name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 12053fcb928a4b788734ea4010de08fd
           name: 'Temperature sensor discovery'
@@ -601,8 +690,7 @@ zabbix_export:
           delay: 1h
           description: |
             MIKROTIK-MIB::mtxrHlTemperature
-            Since temperature sensor is not available on all Mikrotik hardware,
-            this is done to avoid unsupported items.
+            Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.
           item_prototypes:
             -
               uuid: 6fcfd9b1a6324b23a5705a7118874be2
@@ -626,8 +714,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 3035592657fe4a6a89fcacbd05f84573
@@ -638,6 +726,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 5ae663e6743744bba8606334ab17eb60
                   expression: 'avg(/MikroTik RB260GS SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
@@ -652,6 +747,13 @@ zabbix_export:
                       name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
                       expression: 'avg(/MikroTik RB260GS SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
                       recovery_expression: 'max(/MikroTik RB260GS SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 635d0ddc5ba6442bbb51ea451f502662
                   expression: 'avg(/MikroTik RB260GS SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
@@ -660,6 +762,13 @@ zabbix_export:
                   name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 407a0b73cfc041e3a338d9e8fe637fe9
           name: 'LTE modem discovery'
@@ -694,14 +803,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRP Reference Signal Received Power.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 6eb10d964aaf44bb8849f35f39e6b909
                   expression: 'max(/MikroTik RB260GS SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 8f6aea26ce3744298233fa751137b0b0
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
@@ -716,14 +838,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: c8c83d70279b461c95f5c8f4deb59d7e
                   expression: 'max(/MikroTik RB260GS SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 37c41907076142bfb5a8884f959960f0
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
@@ -738,14 +873,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 557d79e0013b4b91a16ce2a0c507256a
                   expression: 'max(/MikroTik RB260GS SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: e019cd1da3644f5592ccdb904f8eda47
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
@@ -760,14 +908,27 @@ zabbix_export:
                 mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: fddeb17ef9dd4876b9ba818d732cbd40
                   expression: 'max(/MikroTik RB260GS SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 7972b1fd0ffc46148f1a8f27bf4ac1b6
@@ -828,8 +989,14 @@ zabbix_export:
                 mtxrWlApAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 3e08aa7a5e9743b8bcc416a0e94c0310
               name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
@@ -849,8 +1016,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: fb4354c77ff94515954a4a4b537ac235
               name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
@@ -870,8 +1043,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 5c90dc649ab14bbfb174af66aa5cfb2b
               name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
@@ -890,8 +1069,14 @@ zabbix_export:
                     - 15m
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 5eae6da3d4684988abad5add9da275fd
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -904,8 +1089,14 @@ zabbix_export:
                 mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
         -
           uuid: cb2ad2c7ab5c4399b70031fd7c31f772
           name: 'CAPsMAN AP channel discovery'
@@ -938,8 +1129,14 @@ zabbix_export:
                 mtxrWlCMAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 88092d9350254ce1ac44524b33f502b8
               name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
@@ -959,8 +1156,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 5cd10bfcae974f26865be0847bd481b1
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -973,8 +1176,14 @@ zabbix_export:
                 mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 05bba59e89ff4812a11393bc88e357ae
               name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
@@ -994,8 +1203,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: cc74f3058c1945a59c95d49e3fdbb47b
@@ -1003,6 +1218,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
                   priority: WARNING
                   description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 442498a0dc4a407caa7fc547d9f4b83c
           name: 'Network interfaces discovery'
@@ -1091,8 +1313,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: a7d6baba939c4d659e040dbc1684a282
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -1111,8 +1339,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 8aa1645a0e904d67b7ad817b2da6bfa0
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -1136,8 +1370,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: c51737e07a6c4a1cb54bba98fc411e03
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -1160,8 +1400,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 7d3ab5988cba43c69df4f64542aca0ec
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -1180,8 +1426,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: d6e87ac1ef4d4d4cbba229c420dfd5d6
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -1205,8 +1457,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: bb37147d244f4d548da1aa607c7f4396
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -1231,8 +1489,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 78b80a419eba483bbf6f6ad12095f53b
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -1254,8 +1518,14 @@ zabbix_export:
                 name: 'IF-MIB::ifOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 1bb803809e6a4b66a4dabbaf7dada2c0
@@ -1273,6 +1543,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: a8cc24b0c22a4cddbc05524288bb8862
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -1296,8 +1570,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           trigger_prototypes:
             -
               uuid: d29da0701e5346ac81450a6002bb53c4
@@ -1327,6 +1607,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik RB260GS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik RB260GS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik RB260GS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik RB260GS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 79709d95fe7a48d3a90b6a502788be89
               expression: |
@@ -1347,6 +1631,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik RB260GS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik RB260GS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik RB260GS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik RB260GS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: b8470cef21e146b4b8ecfde73682d2ee
               expression: |
@@ -1366,6 +1654,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik RB260GS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik RB260GS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik RB260GS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik RB260GS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: 20e634246d814e808e00940e9606607e
@@ -1444,8 +1739,11 @@ zabbix_export:
               description: 'Space utilization in % for Disk-{#SNMPINDEX}'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 7d835648f2f64bf1a1615e9e70822ccd
               name: 'Disk-{#SNMPINDEX}: Total space'
@@ -1472,8 +1770,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: f078344e85614978973618685d022859
               name: 'Disk-{#SNMPINDEX}: Used space'
@@ -1492,8 +1793,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
           trigger_prototypes:
             -
               uuid: 67f66bb09eba4cb2b823fbf96391e0ca
@@ -1509,6 +1813,13 @@ zabbix_export:
                  - The disk free space is less than 5G.
                  - The disk will be full in less than 24 hours.
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
             -
               uuid: f28661579bf04f6eaa1bc06f92f8d8f2
               expression: |
@@ -1529,6 +1840,13 @@ zabbix_export:
                   expression: |
                     last(/MikroTik RB260GS SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
                     ((last(/MikroTik RB260GS SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB260GS SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik RB260GS SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
           graph_prototypes:
             -
               uuid: 2854850c8c14498b9256fd64027455d6
@@ -1552,6 +1870,16 @@ zabbix_export:
                   item:
                     host: 'MikroTik RB260GS SNMP'
                     key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: mikrotik
+        -
+          tag: target
+          value: rb260gs
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/net/mikrotik/mikrotik_RB3011UiAS-RM_snmp/README.md b/templates/net/mikrotik/mikrotik_RB3011UiAS-RM_snmp/README.md
index 9d80e28464d..3bdca13943d 100644
--- a/templates/net/mikrotik/mikrotik_RB3011UiAS-RM_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_RB3011UiAS-RM_snmp/README.md
@@ -71,7 +71,7 @@ There are no template links in this template.
 |Network interfaces discovery |<p>Discovering interfaces from IF-MIB.</p> |SNMP |net.if.discovery<p>**Filter**:</p>AND <p>- {#IFADMINSTATUS} MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.MATCHES}`</p><p>- {#IFADMINSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.NOT_MATCHES}`</p><p>- {#IFOPERSTATUS} MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.MATCHES}`</p><p>- {#IFOPERSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.NOT_MATCHES}`</p><p>- {#IFNAME} MATCHES_REGEX `{$NET.IF.IFNAME.MATCHES}`</p><p>- {#IFNAME} NOT_MATCHES_REGEX `{$NET.IF.IFNAME.NOT_MATCHES}`</p><p>- {#IFDESCR} MATCHES_REGEX `{$NET.IF.IFDESCR.MATCHES}`</p><p>- {#IFDESCR} NOT_MATCHES_REGEX `{$NET.IF.IFDESCR.NOT_MATCHES}`</p><p>- {#IFALIAS} MATCHES_REGEX `{$NET.IF.IFALIAS.MATCHES}`</p><p>- {#IFALIAS} NOT_MATCHES_REGEX `{$NET.IF.IFALIAS.NOT_MATCHES}`</p><p>- {#IFTYPE} MATCHES_REGEX `{$NET.IF.IFTYPE.MATCHES}`</p><p>- {#IFTYPE} NOT_MATCHES_REGEX `{$NET.IF.IFTYPE.NOT_MATCHES}`</p> |
 |Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 |Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
-|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
 
 ## Items collected
 
@@ -137,14 +137,14 @@ There are no template links in this template.
 |Interface {#IFNAME}({#IFALIAS}): Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p><p>3. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik RB3011UiAS-RM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik RB3011UiAS-RM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik RB3011UiAS-RM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))`<p>Recovery expression:</p>`last(/MikroTik RB3011UiAS-RM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0` |AVERAGE |<p>Manual close: YES</p> |
 |Interface {#IFNAME}({#IFALIAS}): High bandwidth usage (>{$IF.UTIL.MAX:"{#IFNAME}"}%) |<p>The network interface utilization is close to its estimated maximum bandwidth.</p> |`(avg(/MikroTik RB3011UiAS-RM SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik RB3011UiAS-RM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) or avg(/MikroTik RB3011UiAS-RM SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik RB3011UiAS-RM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])) and last(/MikroTik RB3011UiAS-RM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0`<p>Recovery expression:</p>`avg(/MikroTik RB3011UiAS-RM SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik RB3011UiAS-RM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) and avg(/MikroTik RB3011UiAS-RM SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik RB3011UiAS-RM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |Interface {#IFNAME}({#IFALIAS}): High error rate (>{$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) |<p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p> |`min(/MikroTik RB3011UiAS-RM SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"} or min(/MikroTik RB3011UiAS-RM SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`max(/MikroTik RB3011UiAS-RM SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8 and max(/MikroTik RB3011UiAS-RM SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
-|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik RB3011UiAS-RM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik RB3011UiAS-RM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik RB3011UiAS-RM SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik RB3011UiAS-RM SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik RB3011UiAS-RM SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik RB3011UiAS-RM SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik RB3011UiAS-RM SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik RB3011UiAS-RM SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik RB3011UiAS-RM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2) `<p>Recovery expression:</p>`(change(/MikroTik RB3011UiAS-RM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik RB3011UiAS-RM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik RB3011UiAS-RM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2) ` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik RB3011UiAS-RM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik RB3011UiAS-RM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik RB3011UiAS-RM SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik RB3011UiAS-RM SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik RB3011UiAS-RM SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik RB3011UiAS-RM SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik RB3011UiAS-RM SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik RB3011UiAS-RM SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik RB3011UiAS-RM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2)`<p>Recovery expression:</p>`(change(/MikroTik RB3011UiAS-RM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik RB3011UiAS-RM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik RB3011UiAS-RM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2)` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |{HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/MikroTik RB3011UiAS-RM SNMP/system.uptime[sysUpTime.0])<10m` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- No SNMP data collection</p> |
 |No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/MikroTik RB3011UiAS-RM SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |Unavailable by ICMP ping |<p>Last three attempts returned timeout.  Please check device connectivity.</p> |`max(/MikroTik RB3011UiAS-RM SNMP/icmpping,#3)=0` |HIGH | |
 |High ICMP ping loss |<p>-</p> |`min(/MikroTik RB3011UiAS-RM SNMP/icmppingloss,5m)>{$ICMP_LOSS_WARN} and min(/MikroTik RB3011UiAS-RM SNMP/icmppingloss,5m)<100` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |High ICMP ping response time |<p>-</p> |`avg(/MikroTik RB3011UiAS-RM SNMP/icmppingsec,5m)>{$ICMP_RESPONSE_TIME_WARN}` |WARNING |<p>**Depends on**:</p><p>- High ICMP ping loss</p><p>- Unavailable by ICMP ping</p> |
-|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik RB3011UiAS-RM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik RB3011UiAS-RM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB3011UiAS-RM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik RB3011UiAS-RM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
-|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik RB3011UiAS-RM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik RB3011UiAS-RM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB3011UiAS-RM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik RB3011UiAS-RM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik RB3011UiAS-RM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik RB3011UiAS-RM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB3011UiAS-RM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik RB3011UiAS-RM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik RB3011UiAS-RM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik RB3011UiAS-RM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB3011UiAS-RM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik RB3011UiAS-RM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
 |CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik RB3011UiAS-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik RB3011UiAS-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
 |CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik RB3011UiAS-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik RB3011UiAS-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
 |CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik RB3011UiAS-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik RB3011UiAS-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
diff --git a/templates/net/mikrotik/mikrotik_RB3011UiAS-RM_snmp/template_net_mikrotik_RB3011UiAS-RM_snmp.yaml b/templates/net/mikrotik/mikrotik_RB3011UiAS-RM_snmp/template_net_mikrotik_RB3011UiAS-RM_snmp.yaml
index aea235c6f74..54311f7a9f4 100644
--- a/templates/net/mikrotik/mikrotik_RB3011UiAS-RM_snmp/template_net_mikrotik_RB3011UiAS-RM_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_RB3011UiAS-RM_snmp/template_net_mikrotik_RB3011UiAS-RM_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:47:40Z'
+  date: '2022-01-26T10:45:13Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -35,8 +35,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 4c7a404a7e7b413bbbac7a21c77b3fcc
@@ -44,6 +47,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: cd14c56b398f4e51bc250dbb266d8792
           name: 'ICMP loss'
@@ -54,8 +61,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: a9c3882f12d94b84a2cbed81db007011
@@ -67,6 +77,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik RB3011UiAS-RM SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 183a44fa82d74603a4673f8a213e221f
           name: 'ICMP response time'
@@ -77,8 +94,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 20cb06fa668d459e80505b23501735a7
@@ -93,6 +113,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik RB3011UiAS-RM SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: b820cdaeb0724fb3b5eb635e7705ee5c
           name: 'SNMP traps (fallback)'
@@ -105,8 +132,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: 69517cfdea8e4602bc7b56f5975e8d64
           name: 'System contact details'
@@ -128,8 +155,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 6323e16160534164a046730cb95f8dd4
           name: 'System description'
@@ -152,8 +179,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 354b56e7cce646c8b143434af11ebd1a
           name: 'Firmware version'
@@ -174,8 +201,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 4a440903276347d9827dcfa3653d496c
@@ -185,6 +212,10 @@ zabbix_export:
               priority: INFO
               description: 'Firmware version has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 3da25a0046ac4f2c9ec35d3ac9db9ae7
           name: 'Hardware model name'
@@ -203,8 +234,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
         -
           uuid: a935a058a7644773b40d0cfbaae218e2
           name: 'Hardware serial number'
@@ -226,8 +257,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 7b48c923659d4569b24692da4037b824
@@ -236,6 +267,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 8ad2b0e46d544272a2a2a79251830ecd
           name: 'System location'
@@ -257,8 +292,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: cd0923c4fed2454f9ba10ae12a237c4a
           name: 'System name'
@@ -280,8 +315,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: bf71167252cf48c99477a03d09523aa0
@@ -290,6 +325,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: 9dbc5959f5c94484ad27fff82ff1e4a2
           name: 'System object ID'
@@ -310,8 +352,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 14e1297549d74f48be28bdfe70746600
           name: 'Operating system'
@@ -333,8 +375,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: os
           triggers:
             -
               uuid: 80b76f59fdfd407ea5c3294736113749
@@ -347,6 +389,10 @@ zabbix_export:
                 -
                   name: 'System name has changed (new name: {ITEM.VALUE})'
                   expression: 'last(/MikroTik RB3011UiAS-RM SNMP/system.name,#1)<>last(/MikroTik RB3011UiAS-RM SNMP/system.name,#2) and length(last(/MikroTik RB3011UiAS-RM SNMP/system.name))>0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 473bcbf0aece42b5bf03ac5d9655060f
           name: Uptime
@@ -367,8 +413,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 3dfea70b489141e1ba7e967a8de964b8
@@ -381,6 +427,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/MikroTik RB3011UiAS-RM SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: b0a11ac957ff4b91b2d032ca2e97fd86
           name: 'Total memory'
@@ -407,8 +457,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 3702de756584423b93730807b797a1db
           name: 'Used memory'
@@ -427,8 +477,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 5e58d0e859a94279b4e52aa4b16d3702
           name: 'Memory utilization'
@@ -441,8 +491,8 @@ zabbix_export:
           description: 'Memory utilization in %'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: d55a4746f70a4d539a9fadd9a335794f
@@ -450,6 +500,13 @@ zabbix_export:
               name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
               priority: AVERAGE
               description: 'The system is running out of free memory.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 471ac0649f454c6ab2d386ef593486a9
           name: 'SNMP agent availability'
@@ -466,8 +523,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 7a790a7c2af34786838280924d2cb252
@@ -480,6 +540,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik RB3011UiAS-RM SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: 261714f543bc43bbbbc2784aee405593
@@ -504,8 +568,8 @@ zabbix_export:
                 The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
               trigger_prototypes:
                 -
                   uuid: e20e628acaae44d58c7f385f98cdb126
@@ -514,6 +578,10 @@ zabbix_export:
                   opdata: 'Current utilization: {ITEM.LASTVALUE1}'
                   priority: WARNING
                   description: 'CPU utilization is too high. The system might be slow to respond.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 2567831d8429484887c61f9606cee3aa
@@ -558,8 +626,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: d009789ee3204089bbd1e60b23fa757f
@@ -570,6 +638,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 51d2ea964a684bfa85e509e549be251b
                   expression: 'avg(/MikroTik RB3011UiAS-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
@@ -584,6 +659,13 @@ zabbix_export:
                       name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
                       expression: 'avg(/MikroTik RB3011UiAS-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
                       recovery_expression: 'max(/MikroTik RB3011UiAS-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 1cc47452c533402596797c5c6ae8351f
                   expression: 'avg(/MikroTik RB3011UiAS-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
@@ -592,6 +674,13 @@ zabbix_export:
                   name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 9d802db2738d4e0cb7bac8cd574b4283
           name: 'Temperature sensor discovery'
@@ -601,8 +690,7 @@ zabbix_export:
           delay: 1h
           description: |
             MIKROTIK-MIB::mtxrHlTemperature
-            Since temperature sensor is not available on all Mikrotik hardware,
-            this is done to avoid unsupported items.
+            Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.
           item_prototypes:
             -
               uuid: 00ec9a3110f54225b1cf7ef17119b63f
@@ -626,8 +714,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 49bf5605212f44e18a0a9f0e4afde82b
@@ -638,6 +726,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: d7d5fa71143e4601b41d24ce85031ed2
                   expression: 'avg(/MikroTik RB3011UiAS-RM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
@@ -652,6 +747,13 @@ zabbix_export:
                       name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
                       expression: 'avg(/MikroTik RB3011UiAS-RM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
                       recovery_expression: 'max(/MikroTik RB3011UiAS-RM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 2478f32c04984bd8a53cb9211953d7c2
                   expression: 'avg(/MikroTik RB3011UiAS-RM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
@@ -660,6 +762,13 @@ zabbix_export:
                   name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 2f495a17418a47bfb48d7df1128eddd2
           name: 'LTE modem discovery'
@@ -694,14 +803,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRP Reference Signal Received Power.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 6dcde689dccb4221bffd0c36f000dcf2
                   expression: 'max(/MikroTik RB3011UiAS-RM SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 20c47d65290648a49f68a723111b6d20
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
@@ -716,14 +838,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: d8d809f110c044bdab269c961b947f0a
                   expression: 'max(/MikroTik RB3011UiAS-RM SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 4f03ff31d0654285828e4a78c960bc5e
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
@@ -738,14 +873,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: a935e2731aac466bb21fd0e3c092cb7c
                   expression: 'max(/MikroTik RB3011UiAS-RM SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 5cc7f564912c4827aedb940f59e574dd
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
@@ -760,14 +908,27 @@ zabbix_export:
                 mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 2193529f37424dc29976bae9681cfff9
                   expression: 'max(/MikroTik RB3011UiAS-RM SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 3faa534c23d641348044d56d871307f0
@@ -828,8 +989,14 @@ zabbix_export:
                 mtxrWlApAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 935ca7fa58e94bc2b4783676f57f1788
               name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
@@ -849,8 +1016,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: b0c6132fffb04ab3a4d392f35d2d418d
               name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
@@ -870,8 +1043,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: c7e6451019bd4780bb2ffa717c98ddfd
               name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
@@ -890,8 +1069,14 @@ zabbix_export:
                     - 15m
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 4783ff6618d74aabab4a998467091b59
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -904,8 +1089,14 @@ zabbix_export:
                 mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
         -
           uuid: 4a884bea9c754839befbf0faf07e39a8
           name: 'CAPsMAN AP channel discovery'
@@ -938,8 +1129,14 @@ zabbix_export:
                 mtxrWlCMAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: a01aec216aff475ab47c0d1ca9ebb6ac
               name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
@@ -959,8 +1156,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 5a6c2c39fd3e444eae67e221721463c0
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -973,8 +1176,14 @@ zabbix_export:
                 mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 859f9073a0b94928816ad037283b5e0b
               name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
@@ -994,8 +1203,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 0f33b00af9164264b0d6fc91831a343e
@@ -1003,6 +1218,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
                   priority: WARNING
                   description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 439bb27734ca4edd91edeca7d97271f6
           name: 'Network interfaces discovery'
@@ -1091,8 +1313,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 0a874ea342fc4339b03eb852558d7fb7
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -1111,8 +1339,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: b846f52186964673ab6addfd6cb89d77
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -1136,8 +1370,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: a0ef0375118b4c6d930041c049949f10
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -1160,8 +1400,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 6c8d6d0caa5a48fba3f6896b69c39688
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -1180,8 +1426,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 52322d25a33542f9bdaab07df875c610
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -1205,8 +1457,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 60577a786d9c4ffab235e9d9dca2b443
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -1231,8 +1489,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: fa2bc982f1384ea7af181876f61ab031
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -1254,8 +1518,14 @@ zabbix_export:
                 name: 'IF-MIB::ifOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 8af0f04b3392466382d73d4986782c24
@@ -1273,6 +1543,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: c2a7039babd34c22a123b7d6473cd6e3
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -1296,8 +1570,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           trigger_prototypes:
             -
               uuid: 19c663970db044c39cc43028e7d0642d
@@ -1327,6 +1607,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik RB3011UiAS-RM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik RB3011UiAS-RM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik RB3011UiAS-RM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik RB3011UiAS-RM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: df9f785e1515408b8b3735a653673100
               expression: |
@@ -1347,6 +1631,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik RB3011UiAS-RM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik RB3011UiAS-RM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik RB3011UiAS-RM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik RB3011UiAS-RM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 5f5b45aa0b4943d191670dcafe035707
               expression: |
@@ -1366,6 +1654,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik RB3011UiAS-RM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik RB3011UiAS-RM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik RB3011UiAS-RM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik RB3011UiAS-RM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: d23b57867776455cb272851a73ea227f
@@ -1444,8 +1739,11 @@ zabbix_export:
               description: 'Space utilization in % for Disk-{#SNMPINDEX}'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 4f634d0afb6542e0b27347ba8555d92b
               name: 'Disk-{#SNMPINDEX}: Total space'
@@ -1472,8 +1770,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 5f55ba87f4084a4693c3c7f8818b5d6b
               name: 'Disk-{#SNMPINDEX}: Used space'
@@ -1492,8 +1793,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
           trigger_prototypes:
             -
               uuid: ccbd9c9dab504a7bab4f403386e5178f
@@ -1509,6 +1813,13 @@ zabbix_export:
                  - The disk free space is less than 5G.
                  - The disk will be full in less than 24 hours.
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
             -
               uuid: 9b4adeaeed41450f839967a3d049b027
               expression: |
@@ -1529,6 +1840,13 @@ zabbix_export:
                   expression: |
                     last(/MikroTik RB3011UiAS-RM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
                     ((last(/MikroTik RB3011UiAS-RM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB3011UiAS-RM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik RB3011UiAS-RM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
           graph_prototypes:
             -
               uuid: 15a9b60d61574e46a0684cf9ec893347
@@ -1552,6 +1870,16 @@ zabbix_export:
                   item:
                     host: 'MikroTik RB3011UiAS-RM SNMP'
                     key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: mikrotik
+        -
+          tag: target
+          value: rb3011uias-rm
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/net/mikrotik/mikrotik_RB4011iGS+RM_snmp/README.md b/templates/net/mikrotik/mikrotik_RB4011iGS+RM_snmp/README.md
index dfa5c3740f0..65e3731f9b2 100644
--- a/templates/net/mikrotik/mikrotik_RB4011iGS+RM_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_RB4011iGS+RM_snmp/README.md
@@ -71,7 +71,7 @@ There are no template links in this template.
 |Network interfaces discovery |<p>Discovering interfaces from IF-MIB.</p> |SNMP |net.if.discovery<p>**Filter**:</p>AND <p>- {#IFADMINSTATUS} MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.MATCHES}`</p><p>- {#IFADMINSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.NOT_MATCHES}`</p><p>- {#IFOPERSTATUS} MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.MATCHES}`</p><p>- {#IFOPERSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.NOT_MATCHES}`</p><p>- {#IFNAME} MATCHES_REGEX `{$NET.IF.IFNAME.MATCHES}`</p><p>- {#IFNAME} NOT_MATCHES_REGEX `{$NET.IF.IFNAME.NOT_MATCHES}`</p><p>- {#IFDESCR} MATCHES_REGEX `{$NET.IF.IFDESCR.MATCHES}`</p><p>- {#IFDESCR} NOT_MATCHES_REGEX `{$NET.IF.IFDESCR.NOT_MATCHES}`</p><p>- {#IFALIAS} MATCHES_REGEX `{$NET.IF.IFALIAS.MATCHES}`</p><p>- {#IFALIAS} NOT_MATCHES_REGEX `{$NET.IF.IFALIAS.NOT_MATCHES}`</p><p>- {#IFTYPE} MATCHES_REGEX `{$NET.IF.IFTYPE.MATCHES}`</p><p>- {#IFTYPE} NOT_MATCHES_REGEX `{$NET.IF.IFTYPE.NOT_MATCHES}`</p> |
 |Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 |Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
-|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
 
 ## Items collected
 
@@ -137,14 +137,14 @@ There are no template links in this template.
 |Interface {#IFNAME}({#IFALIAS}): Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p><p>3. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik RB4011iGSRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik RB4011iGSRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik RB4011iGSRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))`<p>Recovery expression:</p>`last(/MikroTik RB4011iGSRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0` |AVERAGE |<p>Manual close: YES</p> |
 |Interface {#IFNAME}({#IFALIAS}): High bandwidth usage (>{$IF.UTIL.MAX:"{#IFNAME}"}%) |<p>The network interface utilization is close to its estimated maximum bandwidth.</p> |`(avg(/MikroTik RB4011iGSRM SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik RB4011iGSRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) or avg(/MikroTik RB4011iGSRM SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik RB4011iGSRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])) and last(/MikroTik RB4011iGSRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0`<p>Recovery expression:</p>`avg(/MikroTik RB4011iGSRM SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik RB4011iGSRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) and avg(/MikroTik RB4011iGSRM SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik RB4011iGSRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |Interface {#IFNAME}({#IFALIAS}): High error rate (>{$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) |<p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p> |`min(/MikroTik RB4011iGSRM SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"} or min(/MikroTik RB4011iGSRM SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`max(/MikroTik RB4011iGSRM SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8 and max(/MikroTik RB4011iGSRM SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
-|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik RB4011iGSRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik RB4011iGSRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik RB4011iGSRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik RB4011iGSRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik RB4011iGSRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik RB4011iGSRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik RB4011iGSRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik RB4011iGSRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik RB4011iGSRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2) `<p>Recovery expression:</p>`(change(/MikroTik RB4011iGSRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik RB4011iGSRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik RB4011iGSRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2) ` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik RB4011iGSRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik RB4011iGSRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik RB4011iGSRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik RB4011iGSRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik RB4011iGSRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik RB4011iGSRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik RB4011iGSRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik RB4011iGSRM SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik RB4011iGSRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2)`<p>Recovery expression:</p>`(change(/MikroTik RB4011iGSRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik RB4011iGSRM SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik RB4011iGSRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2)` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |{HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/MikroTik RB4011iGSRM SNMP/system.uptime[sysUpTime.0])<10m` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- No SNMP data collection</p> |
 |No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/MikroTik RB4011iGSRM SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |Unavailable by ICMP ping |<p>Last three attempts returned timeout.  Please check device connectivity.</p> |`max(/MikroTik RB4011iGSRM SNMP/icmpping,#3)=0` |HIGH | |
 |High ICMP ping loss |<p>-</p> |`min(/MikroTik RB4011iGSRM SNMP/icmppingloss,5m)>{$ICMP_LOSS_WARN} and min(/MikroTik RB4011iGSRM SNMP/icmppingloss,5m)<100` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |High ICMP ping response time |<p>-</p> |`avg(/MikroTik RB4011iGSRM SNMP/icmppingsec,5m)>{$ICMP_RESPONSE_TIME_WARN}` |WARNING |<p>**Depends on**:</p><p>- High ICMP ping loss</p><p>- Unavailable by ICMP ping</p> |
-|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik RB4011iGSRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik RB4011iGSRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB4011iGSRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik RB4011iGSRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
-|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik RB4011iGSRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik RB4011iGSRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB4011iGSRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik RB4011iGSRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik RB4011iGSRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik RB4011iGSRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB4011iGSRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik RB4011iGSRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik RB4011iGSRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik RB4011iGSRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB4011iGSRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik RB4011iGSRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
 |CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik RB4011iGSRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik RB4011iGSRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
 |CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik RB4011iGSRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik RB4011iGSRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
 |CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik RB4011iGSRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik RB4011iGSRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
diff --git a/templates/net/mikrotik/mikrotik_RB4011iGS+RM_snmp/template_net_mikrotik_RB4011iGS+RM_snmp.yaml b/templates/net/mikrotik/mikrotik_RB4011iGS+RM_snmp/template_net_mikrotik_RB4011iGS+RM_snmp.yaml
index e0feedc036b..bb6b98dd485 100644
--- a/templates/net/mikrotik/mikrotik_RB4011iGS+RM_snmp/template_net_mikrotik_RB4011iGS+RM_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_RB4011iGS+RM_snmp/template_net_mikrotik_RB4011iGS+RM_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:47:45Z'
+  date: '2022-01-26T09:44:01Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -35,8 +35,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 7651bd1c9c3b431eba1db692abe311a1
@@ -44,6 +47,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: a77a1ed1ff254715bc2b3aa4774add63
           name: 'ICMP loss'
@@ -54,8 +61,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 433634cc1ce0426ba8337add07ee07f0
@@ -67,6 +77,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik RB4011iGSRM SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 02eacfbcc4c14ac48aba36c142974c46
           name: 'ICMP response time'
@@ -77,8 +94,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: a114fb9720bd429f8d406bac7b40a6d2
@@ -93,6 +113,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik RB4011iGSRM SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: ad62b571c1c4444881787a040cf03b2b
           name: 'SNMP traps (fallback)'
@@ -105,8 +132,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: db3e28ce72d5488c9d81b4daeaabe9f9
           name: 'System contact details'
@@ -128,8 +155,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 1aa8ba6aacfd4c358600c68c5b22455e
           name: 'System description'
@@ -152,8 +179,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: e98ee47f44a24acab59bf6d10a1f6612
           name: 'Firmware version'
@@ -174,8 +201,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: a61fd73d9dea4257bfbfc3d705475ae5
@@ -185,6 +212,10 @@ zabbix_export:
               priority: INFO
               description: 'Firmware version has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 176f7b3c6e4848c79f0f0f99021c644f
           name: 'Hardware model name'
@@ -203,8 +234,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
         -
           uuid: fffcae15a44d4165af9f293a4dfc3134
           name: 'Hardware serial number'
@@ -226,8 +257,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: c31be8015ce640629af6cd3ed09dc617
@@ -236,6 +267,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 7045e4f4ab0244969d7ab6ada0f2d3cc
           name: 'System location'
@@ -257,8 +292,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 5ee60303a3f44dccb8e2636c61ea882b
           name: 'System name'
@@ -280,8 +315,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 58cd8a4c443e43d595a1afc5d045b67b
@@ -290,6 +325,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: 9757a0d30651457a97860d475e1ce892
           name: 'System object ID'
@@ -310,8 +352,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: a46b0c33e93840e182208a099e6206df
           name: 'Operating system'
@@ -333,8 +375,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: os
           triggers:
             -
               uuid: 991217a368944e34abe41bd465921a47
@@ -347,6 +389,10 @@ zabbix_export:
                 -
                   name: 'System name has changed (new name: {ITEM.VALUE})'
                   expression: 'last(/MikroTik RB4011iGSRM SNMP/system.name,#1)<>last(/MikroTik RB4011iGSRM SNMP/system.name,#2) and length(last(/MikroTik RB4011iGSRM SNMP/system.name))>0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 349e048d1dc04ae49c6e616a4f4499c7
           name: Uptime
@@ -367,8 +413,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 7419d6e22c5d493ba843adf4f4f85529
@@ -381,6 +427,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/MikroTik RB4011iGSRM SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 4255253ed78749d597385af02b95c8fe
           name: 'Total memory'
@@ -407,8 +457,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: fb1cd4666b1d4ee48141c77a7b9f07db
           name: 'Used memory'
@@ -427,8 +477,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 430682c60e8644baa65bcfa66dcd1b37
           name: 'Memory utilization'
@@ -441,8 +491,8 @@ zabbix_export:
           description: 'Memory utilization in %'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: 5b0479439c444be284cac4c699f64b53
@@ -450,6 +500,13 @@ zabbix_export:
               name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
               priority: AVERAGE
               description: 'The system is running out of free memory.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 6fc9f1fc908241ff9484e15802f1e4ae
           name: 'SNMP agent availability'
@@ -466,8 +523,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 463cc0b4e29d4dddba8ddb16b8faa12b
@@ -480,6 +540,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik RB4011iGSRM SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: 70b02231b6874b13a6f4f32808c7d7a9
@@ -504,8 +568,8 @@ zabbix_export:
                 The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
               trigger_prototypes:
                 -
                   uuid: 08f3a59bf7324ff4904737f2c6b94989
@@ -514,6 +578,10 @@ zabbix_export:
                   opdata: 'Current utilization: {ITEM.LASTVALUE1}'
                   priority: WARNING
                   description: 'CPU utilization is too high. The system might be slow to respond.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 7e342bf419d54f9081e0447dbd3d40ae
@@ -558,8 +626,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 1c270c25cfdb4b44b35ad7115105dfbc
@@ -570,6 +638,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 3941319b74e64d8a921714b4748003f1
                   expression: 'avg(/MikroTik RB4011iGSRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
@@ -584,6 +659,13 @@ zabbix_export:
                       name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
                       expression: 'avg(/MikroTik RB4011iGSRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
                       recovery_expression: 'max(/MikroTik RB4011iGSRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 4b669ac2471b442dbfd82e70b0dba586
                   expression: 'avg(/MikroTik RB4011iGSRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
@@ -592,6 +674,13 @@ zabbix_export:
                   name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: a273bbb0f2744f229f08f83002f9ef09
           name: 'Temperature sensor discovery'
@@ -601,8 +690,7 @@ zabbix_export:
           delay: 1h
           description: |
             MIKROTIK-MIB::mtxrHlTemperature
-            Since temperature sensor is not available on all Mikrotik hardware,
-            this is done to avoid unsupported items.
+            Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.
           item_prototypes:
             -
               uuid: b0106d75e8484aea9c4431ff319a35c3
@@ -626,8 +714,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: a3bcec91e98349fa9d53cb96aeb377ac
@@ -638,6 +726,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 9a03df6c9c3141e4845382ea5ae2d609
                   expression: 'avg(/MikroTik RB4011iGSRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
@@ -652,6 +747,13 @@ zabbix_export:
                       name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
                       expression: 'avg(/MikroTik RB4011iGSRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
                       recovery_expression: 'max(/MikroTik RB4011iGSRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: f53807b0daa24b2f9bd3d6ab755008fb
                   expression: 'avg(/MikroTik RB4011iGSRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
@@ -660,6 +762,13 @@ zabbix_export:
                   name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 3de8323ff508430eac61e3f1104d72d5
           name: 'LTE modem discovery'
@@ -694,14 +803,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRP Reference Signal Received Power.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 001e4d76e846438592bd8c7b76025e51
                   expression: 'max(/MikroTik RB4011iGSRM SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 5d1bd43223bf41a699abb04ec1f6bf66
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
@@ -716,14 +838,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: c8adfeee1f4b42b38ba756919d18ffce
                   expression: 'max(/MikroTik RB4011iGSRM SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 840ffc4306d843e6ba23b57fe736de14
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
@@ -738,14 +873,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: c826e712355c4c40a4699346581c1032
                   expression: 'max(/MikroTik RB4011iGSRM SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: ab9d6abcd72b46dc9fadd9bd638084a8
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
@@ -760,14 +908,27 @@ zabbix_export:
                 mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: ab44544163f14c31b2c45fe890b62ea4
                   expression: 'max(/MikroTik RB4011iGSRM SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: c2d5d609a81e41c0b16f1537239761cd
@@ -828,8 +989,14 @@ zabbix_export:
                 mtxrWlApAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 389996b0d06b403da09ea7ad26d2058b
               name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
@@ -849,8 +1016,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 4126c7d4e1bc442ab3d64decbaf5bc2b
               name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
@@ -870,8 +1043,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 8b46ce31662e4784901bb62d8d427db6
               name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
@@ -890,8 +1069,14 @@ zabbix_export:
                     - 15m
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: da476e57bb0545ea9c5586dd359a8016
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -904,8 +1089,14 @@ zabbix_export:
                 mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
         -
           uuid: 9cbb1cad26b745ad9d18f4666a6380f7
           name: 'CAPsMAN AP channel discovery'
@@ -938,8 +1129,14 @@ zabbix_export:
                 mtxrWlCMAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 47ad66f9b9be48a2b28bc1c294bc088e
               name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
@@ -959,8 +1156,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 3dd8fd21a42f493e81d42799c395f25b
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -973,8 +1176,14 @@ zabbix_export:
                 mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 1fe7cef52ef1453a97a7f23292cf7f6c
               name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
@@ -994,8 +1203,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 7830a4b9c5b24762ab083a24c978cf44
@@ -1003,6 +1218,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
                   priority: WARNING
                   description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: a75de8a9798243ee8f0b8629f54e3259
           name: 'Network interfaces discovery'
@@ -1091,8 +1313,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 9a2c81dbd79e46bbb3c48d070420a99f
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -1111,8 +1339,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 4e6f08a3ea114a6292ac778f3e85891d
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -1136,8 +1370,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 4f918f4895f74e17bc60ce81e922a41d
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -1160,8 +1400,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: aab55962d3c34894a1803e4c8fbf54b2
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -1180,8 +1426,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 838819ed65ce4b38a5f5a603aceac7a5
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -1205,8 +1457,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 4550a521700f4184a1abb5c56680d745
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -1231,8 +1489,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: bc1f11185a9740799bf47205d918e90c
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -1254,8 +1518,14 @@ zabbix_export:
                 name: 'IF-MIB::ifOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: b56d0177668c4803b2de395f12c48070
@@ -1273,6 +1543,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 322bbc3e779041f9a2c1d776168c44e4
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -1296,8 +1570,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           trigger_prototypes:
             -
               uuid: 0203940b08b54db982bafbfef0a8ab3c
@@ -1327,6 +1607,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik RB4011iGSRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik RB4011iGSRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik RB4011iGSRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik RB4011iGSRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 883a34a4a82a47f99b63703e3ecd2106
               expression: |
@@ -1347,6 +1631,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik RB4011iGSRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik RB4011iGSRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik RB4011iGSRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik RB4011iGSRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: af6d0bf9ba9a4402bf9ec52b7bfe998f
               expression: |
@@ -1366,6 +1654,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik RB4011iGSRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik RB4011iGSRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik RB4011iGSRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik RB4011iGSRM SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: 73c5e6335b24436f82f141c0c0f4fec5
@@ -1444,8 +1739,11 @@ zabbix_export:
               description: 'Space utilization in % for Disk-{#SNMPINDEX}'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 2fd43d9ea33a480286e331118e10bc11
               name: 'Disk-{#SNMPINDEX}: Total space'
@@ -1472,8 +1770,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: c3d7e0d1fed74855897397a27938b090
               name: 'Disk-{#SNMPINDEX}: Used space'
@@ -1492,8 +1793,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
           trigger_prototypes:
             -
               uuid: 7ec2dad6b1de421d800a086ad45e8fdd
@@ -1509,6 +1813,13 @@ zabbix_export:
                  - The disk free space is less than 5G.
                  - The disk will be full in less than 24 hours.
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
             -
               uuid: e91014be808f40ceba0123f0e59e9975
               expression: |
@@ -1529,6 +1840,13 @@ zabbix_export:
                   expression: |
                     last(/MikroTik RB4011iGSRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
                     ((last(/MikroTik RB4011iGSRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB4011iGSRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik RB4011iGSRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
           graph_prototypes:
             -
               uuid: a552f5e0c0cc44cfaf344d581d522885
@@ -1552,6 +1870,16 @@ zabbix_export:
                   item:
                     host: 'MikroTik RB4011iGSRM SNMP'
                     key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: mikrotik
+        -
+          tag: target
+          value: rb4011igsplusrm
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/net/mikrotik/mikrotik_RB5009UG+S+IN_snmp/README.md b/templates/net/mikrotik/mikrotik_RB5009UG+S+IN_snmp/README.md
index f1dfd78f4b1..b8499fbe382 100644
--- a/templates/net/mikrotik/mikrotik_RB5009UG+S+IN_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_RB5009UG+S+IN_snmp/README.md
@@ -71,7 +71,7 @@ There are no template links in this template.
 |Network interfaces discovery |<p>Discovering interfaces from IF-MIB.</p> |SNMP |net.if.discovery<p>**Filter**:</p>AND <p>- {#IFADMINSTATUS} MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.MATCHES}`</p><p>- {#IFADMINSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.NOT_MATCHES}`</p><p>- {#IFOPERSTATUS} MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.MATCHES}`</p><p>- {#IFOPERSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.NOT_MATCHES}`</p><p>- {#IFNAME} MATCHES_REGEX `{$NET.IF.IFNAME.MATCHES}`</p><p>- {#IFNAME} NOT_MATCHES_REGEX `{$NET.IF.IFNAME.NOT_MATCHES}`</p><p>- {#IFDESCR} MATCHES_REGEX `{$NET.IF.IFDESCR.MATCHES}`</p><p>- {#IFDESCR} NOT_MATCHES_REGEX `{$NET.IF.IFDESCR.NOT_MATCHES}`</p><p>- {#IFALIAS} MATCHES_REGEX `{$NET.IF.IFALIAS.MATCHES}`</p><p>- {#IFALIAS} NOT_MATCHES_REGEX `{$NET.IF.IFALIAS.NOT_MATCHES}`</p><p>- {#IFTYPE} MATCHES_REGEX `{$NET.IF.IFTYPE.MATCHES}`</p><p>- {#IFTYPE} NOT_MATCHES_REGEX `{$NET.IF.IFTYPE.NOT_MATCHES}`</p> |
 |Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 |Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
-|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
 
 ## Items collected
 
@@ -137,14 +137,14 @@ There are no template links in this template.
 |Interface {#IFNAME}({#IFALIAS}): Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p><p>3. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik RB5009UGSIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik RB5009UGSIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik RB5009UGSIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))`<p>Recovery expression:</p>`last(/MikroTik RB5009UGSIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0` |AVERAGE |<p>Manual close: YES</p> |
 |Interface {#IFNAME}({#IFALIAS}): High bandwidth usage (>{$IF.UTIL.MAX:"{#IFNAME}"}%) |<p>The network interface utilization is close to its estimated maximum bandwidth.</p> |`(avg(/MikroTik RB5009UGSIN SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik RB5009UGSIN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) or avg(/MikroTik RB5009UGSIN SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik RB5009UGSIN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])) and last(/MikroTik RB5009UGSIN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0`<p>Recovery expression:</p>`avg(/MikroTik RB5009UGSIN SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik RB5009UGSIN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) and avg(/MikroTik RB5009UGSIN SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik RB5009UGSIN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |Interface {#IFNAME}({#IFALIAS}): High error rate (>{$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) |<p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p> |`min(/MikroTik RB5009UGSIN SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"} or min(/MikroTik RB5009UGSIN SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`max(/MikroTik RB5009UGSIN SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8 and max(/MikroTik RB5009UGSIN SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
-|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik RB5009UGSIN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik RB5009UGSIN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik RB5009UGSIN SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik RB5009UGSIN SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik RB5009UGSIN SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik RB5009UGSIN SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik RB5009UGSIN SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik RB5009UGSIN SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik RB5009UGSIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2) `<p>Recovery expression:</p>`(change(/MikroTik RB5009UGSIN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik RB5009UGSIN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik RB5009UGSIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2) ` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik RB5009UGSIN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik RB5009UGSIN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik RB5009UGSIN SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik RB5009UGSIN SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik RB5009UGSIN SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik RB5009UGSIN SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik RB5009UGSIN SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik RB5009UGSIN SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik RB5009UGSIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2)`<p>Recovery expression:</p>`(change(/MikroTik RB5009UGSIN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik RB5009UGSIN SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik RB5009UGSIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2)` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |{HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/MikroTik RB5009UGSIN SNMP/system.uptime[sysUpTime.0])<10m` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- No SNMP data collection</p> |
 |No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/MikroTik RB5009UGSIN SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |Unavailable by ICMP ping |<p>Last three attempts returned timeout.  Please check device connectivity.</p> |`max(/MikroTik RB5009UGSIN SNMP/icmpping,#3)=0` |HIGH | |
 |High ICMP ping loss |<p>-</p> |`min(/MikroTik RB5009UGSIN SNMP/icmppingloss,5m)>{$ICMP_LOSS_WARN} and min(/MikroTik RB5009UGSIN SNMP/icmppingloss,5m)<100` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |High ICMP ping response time |<p>-</p> |`avg(/MikroTik RB5009UGSIN SNMP/icmppingsec,5m)>{$ICMP_RESPONSE_TIME_WARN}` |WARNING |<p>**Depends on**:</p><p>- High ICMP ping loss</p><p>- Unavailable by ICMP ping</p> |
-|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik RB5009UGSIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik RB5009UGSIN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB5009UGSIN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik RB5009UGSIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
-|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik RB5009UGSIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik RB5009UGSIN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB5009UGSIN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik RB5009UGSIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik RB5009UGSIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik RB5009UGSIN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB5009UGSIN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik RB5009UGSIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik RB5009UGSIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik RB5009UGSIN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB5009UGSIN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik RB5009UGSIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
 |CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik RB5009UGSIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik RB5009UGSIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
 |CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik RB5009UGSIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik RB5009UGSIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
 |CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik RB5009UGSIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik RB5009UGSIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
diff --git a/templates/net/mikrotik/mikrotik_RB5009UG+S+IN_snmp/template_net_mikrotik_RB5009UG+S+IN_snmp.yaml b/templates/net/mikrotik/mikrotik_RB5009UG+S+IN_snmp/template_net_mikrotik_RB5009UG+S+IN_snmp.yaml
index d64d4a42e00..fd9a0eb33c8 100644
--- a/templates/net/mikrotik/mikrotik_RB5009UG+S+IN_snmp/template_net_mikrotik_RB5009UG+S+IN_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_RB5009UG+S+IN_snmp/template_net_mikrotik_RB5009UG+S+IN_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:47:51Z'
+  date: '2022-01-26T10:22:56Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -35,8 +35,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: afd45d5f0f1b48d68af5e58e5b13f7d2
@@ -44,6 +47,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 3341d9f675074db882fac927d722eaa1
           name: 'ICMP loss'
@@ -54,8 +61,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: bea20e4b6a634c3bb4c3c3f2c0ae91ce
@@ -67,6 +77,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik RB5009UGSIN SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: dfaf20182fa7415d84a70157ef7d3a63
           name: 'ICMP response time'
@@ -77,8 +94,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 30e3c09970614f7eb6434aacdc427fcb
@@ -93,6 +113,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik RB5009UGSIN SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 01d49dbd697343eb95913424eb783ca2
           name: 'SNMP traps (fallback)'
@@ -105,8 +132,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: 3d3a73fd1c05477ab6a8bc5bd4a451d9
           name: 'System contact details'
@@ -128,8 +155,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 27c30b2dbe0048ecbd5b1236ac04b542
           name: 'System description'
@@ -152,8 +179,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 2031dfc697c244c59e036a0b166772e2
           name: 'Firmware version'
@@ -174,8 +201,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: d6de889ff3dc4c07a57bb5396a25a760
@@ -185,6 +212,10 @@ zabbix_export:
               priority: INFO
               description: 'Firmware version has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 6b8b9d12f8d449a5be35d89d8c68719d
           name: 'Hardware model name'
@@ -203,8 +234,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
         -
           uuid: 20e6d99fff5943ff85c2beedb0b292f3
           name: 'Hardware serial number'
@@ -226,8 +257,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 6c509b4e298e4df7b4e9cecc064dc8eb
@@ -236,6 +267,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: ba4d97d2010f4d3498fc71e4b10a0941
           name: 'System location'
@@ -257,8 +292,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: f592e2f6cdde465a85c89944de669418
           name: 'System name'
@@ -280,8 +315,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 78efe7ad5d8740f7ae087beb2952f74d
@@ -290,6 +325,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: 9977da08f1374d1c82e92332bbcc199e
           name: 'System object ID'
@@ -310,8 +352,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 2b704d1b595b4fe5aec1f855ff6574ea
           name: 'Operating system'
@@ -333,8 +375,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: os
           triggers:
             -
               uuid: aafa92f02db4429b8ea5c43f1e13ad4e
@@ -347,6 +389,10 @@ zabbix_export:
                 -
                   name: 'System name has changed (new name: {ITEM.VALUE})'
                   expression: 'last(/MikroTik RB5009UGSIN SNMP/system.name,#1)<>last(/MikroTik RB5009UGSIN SNMP/system.name,#2) and length(last(/MikroTik RB5009UGSIN SNMP/system.name))>0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: fadb61328389434c888cb8bfd6e964ed
           name: Uptime
@@ -367,8 +413,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: f4c5126396ce4a07b9f0ef82aea599e3
@@ -381,6 +427,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/MikroTik RB5009UGSIN SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: aa54b9f3cf6746b897c07e7f3eac3c1f
           name: 'Total memory'
@@ -407,8 +457,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: b5a826e18b2941aeb1f3e091928225e0
           name: 'Used memory'
@@ -427,8 +477,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 767414861593473896fb39004ea488d4
           name: 'Memory utilization'
@@ -441,8 +491,8 @@ zabbix_export:
           description: 'Memory utilization in %'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: 570f6f393cf24ee9b0731978bca9d7d7
@@ -450,6 +500,13 @@ zabbix_export:
               name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
               priority: AVERAGE
               description: 'The system is running out of free memory.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: f6a6763b5b344669ab6b605d3d4707f7
           name: 'SNMP agent availability'
@@ -466,8 +523,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 265226f23bfc4bd58cddd2a154c168ac
@@ -480,6 +540,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik RB5009UGSIN SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: b68414c0aaaf439cbf0c1c48bbd7203a
@@ -504,8 +568,8 @@ zabbix_export:
                 The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
               trigger_prototypes:
                 -
                   uuid: 745e204551104bbca3a2db75f55f04cc
@@ -514,6 +578,10 @@ zabbix_export:
                   opdata: 'Current utilization: {ITEM.LASTVALUE1}'
                   priority: WARNING
                   description: 'CPU utilization is too high. The system might be slow to respond.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 36b36fdd03504844b5df446a542abc10
@@ -558,8 +626,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: f7f22555f0524fab8addb969f565b12b
@@ -570,6 +638,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: a291daa1248f4bfca3bdded26cdd3562
                   expression: 'avg(/MikroTik RB5009UGSIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
@@ -584,6 +659,13 @@ zabbix_export:
                       name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
                       expression: 'avg(/MikroTik RB5009UGSIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
                       recovery_expression: 'max(/MikroTik RB5009UGSIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 4952d45ee57747de90b71e7073da13bc
                   expression: 'avg(/MikroTik RB5009UGSIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
@@ -592,6 +674,13 @@ zabbix_export:
                   name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 8e19febc9ea54bdfbe8dd05538f03d41
           name: 'Temperature sensor discovery'
@@ -601,8 +690,7 @@ zabbix_export:
           delay: 1h
           description: |
             MIKROTIK-MIB::mtxrHlTemperature
-            Since temperature sensor is not available on all Mikrotik hardware,
-            this is done to avoid unsupported items.
+            Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.
           item_prototypes:
             -
               uuid: 63a9a283529a47c1921b9e91925783f5
@@ -626,8 +714,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: d6ae3c415fa842339e6f1085296fdca3
@@ -638,6 +726,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 3baba3844f1644e29fa20addb4c483e4
                   expression: 'avg(/MikroTik RB5009UGSIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
@@ -652,6 +747,13 @@ zabbix_export:
                       name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
                       expression: 'avg(/MikroTik RB5009UGSIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
                       recovery_expression: 'max(/MikroTik RB5009UGSIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: f81d3388b38845f1921e30332a487335
                   expression: 'avg(/MikroTik RB5009UGSIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
@@ -660,6 +762,13 @@ zabbix_export:
                   name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 1fe627df6dea431593ca811a29049908
           name: 'LTE modem discovery'
@@ -694,14 +803,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRP Reference Signal Received Power.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 77565b5e0dbb4415b5f24ebe91d6e5b9
                   expression: 'max(/MikroTik RB5009UGSIN SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: cad3593fb06346f7b8e5d293c570dc32
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
@@ -716,14 +838,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 271d7342775141cabcebb53ecb7e9a14
                   expression: 'max(/MikroTik RB5009UGSIN SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: bbd99dc8983d44e2956f81592def392c
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
@@ -738,14 +873,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: bea4466e83fd4733b269d92657e1107e
                   expression: 'max(/MikroTik RB5009UGSIN SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: a7b2478c97854e1b8eab67bb0da603f1
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
@@ -760,14 +908,27 @@ zabbix_export:
                 mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 53ef6c7af6114f5e8f76d15aa82d33d8
                   expression: 'max(/MikroTik RB5009UGSIN SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: e00f330b8e514a87b6d08c298b7d03f6
@@ -828,8 +989,14 @@ zabbix_export:
                 mtxrWlApAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 6a4a5b09f98c48aca9f95166549411cd
               name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
@@ -849,8 +1016,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 803e24bc996e4ad69242c12b62040f19
               name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
@@ -870,8 +1043,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 4c6a4b99a41248a28779e5c3ed5f195f
               name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
@@ -890,8 +1069,14 @@ zabbix_export:
                     - 15m
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 1442e5f206ed4fa99f9a0b711da2e40d
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -904,8 +1089,14 @@ zabbix_export:
                 mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
         -
           uuid: f6efd53d717a49dc9b9e96cc6a670181
           name: 'CAPsMAN AP channel discovery'
@@ -938,8 +1129,14 @@ zabbix_export:
                 mtxrWlCMAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: b0f8d38a88534138a571429d09d2a728
               name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
@@ -959,8 +1156,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: da3f58e212c44b5aa39475a65038595c
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -973,8 +1176,14 @@ zabbix_export:
                 mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: aaf43960f1554a9986d09de5d19238b7
               name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
@@ -994,8 +1203,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 67152198cf984ffeb453d6f149aae38f
@@ -1003,6 +1218,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
                   priority: WARNING
                   description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: e91f8259895343b7924c4d44f71aad82
           name: 'Network interfaces discovery'
@@ -1091,8 +1313,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 4d23dbb885804af4b402edb00fa2b853
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -1111,8 +1339,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 197ab3671e5b4b8f804627691a331d85
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -1136,8 +1370,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 4c0104ac14af4ebca549b82e59dbf135
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -1160,8 +1400,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: dfc294dd052d49a0ba964294ded0f433
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -1180,8 +1426,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: b051145f6cff4725a3e2a1f90414261b
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -1205,8 +1457,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: ff597532ec2b4a81a0344c3bc16214f1
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -1231,8 +1489,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: eaa27aca2b754db99c80b0a5c9f92227
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -1254,8 +1518,14 @@ zabbix_export:
                 name: 'IF-MIB::ifOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 33ce2abc89ee40b2bf88f30b9834ec8c
@@ -1273,6 +1543,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 4ae74d12983d42b7bff4dd5c72e9502a
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -1296,8 +1570,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           trigger_prototypes:
             -
               uuid: 0a611eb7adb546bcab8352199c9fc08b
@@ -1327,6 +1607,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik RB5009UGSIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik RB5009UGSIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik RB5009UGSIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik RB5009UGSIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 464770fa9e3b41399da04f251ff3a215
               expression: |
@@ -1347,6 +1631,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik RB5009UGSIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik RB5009UGSIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik RB5009UGSIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik RB5009UGSIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 4bb5165672484ce0bea109fcef1cf62b
               expression: |
@@ -1366,6 +1654,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik RB5009UGSIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik RB5009UGSIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik RB5009UGSIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik RB5009UGSIN SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: 9133b7a0e09d4f248dfb8b6a0f4dabd5
@@ -1444,8 +1739,11 @@ zabbix_export:
               description: 'Space utilization in % for Disk-{#SNMPINDEX}'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 303a899d2a19448dab031c6265a5ebdd
               name: 'Disk-{#SNMPINDEX}: Total space'
@@ -1472,8 +1770,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: cd0f312fa6044c639abb345c6297ab6b
               name: 'Disk-{#SNMPINDEX}: Used space'
@@ -1492,8 +1793,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
           trigger_prototypes:
             -
               uuid: da49d6b3b96c4c32b1439d13a289a2ef
@@ -1509,6 +1813,13 @@ zabbix_export:
                  - The disk free space is less than 5G.
                  - The disk will be full in less than 24 hours.
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
             -
               uuid: dd9a814580fd47be8982b9ca83217070
               expression: |
@@ -1529,6 +1840,13 @@ zabbix_export:
                   expression: |
                     last(/MikroTik RB5009UGSIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
                     ((last(/MikroTik RB5009UGSIN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB5009UGSIN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik RB5009UGSIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
           graph_prototypes:
             -
               uuid: 2bcf421df683424fa9bff018ec7135b7
@@ -1552,6 +1870,16 @@ zabbix_export:
                   item:
                     host: 'MikroTik RB5009UGSIN SNMP'
                     key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: mikrotik
+        -
+          tag: target
+          value: rb5009ugplussplusin
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/net/mikrotik/mikrotik_hEX_PoE_lite_snmp/README.md b/templates/net/mikrotik/mikrotik_hEX_PoE_lite_snmp/README.md
index 4d26f6a321e..934a1d82c05 100644
--- a/templates/net/mikrotik/mikrotik_hEX_PoE_lite_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_hEX_PoE_lite_snmp/README.md
@@ -71,7 +71,7 @@ There are no template links in this template.
 |Network interfaces discovery |<p>Discovering interfaces from IF-MIB.</p> |SNMP |net.if.discovery<p>**Filter**:</p>AND <p>- {#IFADMINSTATUS} MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.MATCHES}`</p><p>- {#IFADMINSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.NOT_MATCHES}`</p><p>- {#IFOPERSTATUS} MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.MATCHES}`</p><p>- {#IFOPERSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.NOT_MATCHES}`</p><p>- {#IFNAME} MATCHES_REGEX `{$NET.IF.IFNAME.MATCHES}`</p><p>- {#IFNAME} NOT_MATCHES_REGEX `{$NET.IF.IFNAME.NOT_MATCHES}`</p><p>- {#IFDESCR} MATCHES_REGEX `{$NET.IF.IFDESCR.MATCHES}`</p><p>- {#IFDESCR} NOT_MATCHES_REGEX `{$NET.IF.IFDESCR.NOT_MATCHES}`</p><p>- {#IFALIAS} MATCHES_REGEX `{$NET.IF.IFALIAS.MATCHES}`</p><p>- {#IFALIAS} NOT_MATCHES_REGEX `{$NET.IF.IFALIAS.NOT_MATCHES}`</p><p>- {#IFTYPE} MATCHES_REGEX `{$NET.IF.IFTYPE.MATCHES}`</p><p>- {#IFTYPE} NOT_MATCHES_REGEX `{$NET.IF.IFTYPE.NOT_MATCHES}`</p> |
 |Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 |Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
-|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
 
 ## Items collected
 
@@ -137,14 +137,14 @@ There are no template links in this template.
 |Interface {#IFNAME}({#IFALIAS}): Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p><p>3. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik hEX PoE lite SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik hEX PoE lite SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik hEX PoE lite SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))`<p>Recovery expression:</p>`last(/MikroTik hEX PoE lite SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0` |AVERAGE |<p>Manual close: YES</p> |
 |Interface {#IFNAME}({#IFALIAS}): High bandwidth usage (>{$IF.UTIL.MAX:"{#IFNAME}"}%) |<p>The network interface utilization is close to its estimated maximum bandwidth.</p> |`(avg(/MikroTik hEX PoE lite SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik hEX PoE lite SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) or avg(/MikroTik hEX PoE lite SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik hEX PoE lite SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])) and last(/MikroTik hEX PoE lite SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0`<p>Recovery expression:</p>`avg(/MikroTik hEX PoE lite SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik hEX PoE lite SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) and avg(/MikroTik hEX PoE lite SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik hEX PoE lite SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |Interface {#IFNAME}({#IFALIAS}): High error rate (>{$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) |<p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p> |`min(/MikroTik hEX PoE lite SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"} or min(/MikroTik hEX PoE lite SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`max(/MikroTik hEX PoE lite SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8 and max(/MikroTik hEX PoE lite SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
-|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik hEX PoE lite SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik hEX PoE lite SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik hEX PoE lite SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik hEX PoE lite SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik hEX PoE lite SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik hEX PoE lite SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik hEX PoE lite SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik hEX PoE lite SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik hEX PoE lite SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2) `<p>Recovery expression:</p>`(change(/MikroTik hEX PoE lite SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik hEX PoE lite SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik hEX PoE lite SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2) ` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik hEX PoE lite SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik hEX PoE lite SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik hEX PoE lite SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik hEX PoE lite SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik hEX PoE lite SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik hEX PoE lite SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik hEX PoE lite SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik hEX PoE lite SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik hEX PoE lite SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2)`<p>Recovery expression:</p>`(change(/MikroTik hEX PoE lite SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik hEX PoE lite SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik hEX PoE lite SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2)` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |{HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/MikroTik hEX PoE lite SNMP/system.uptime[sysUpTime.0])<10m` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- No SNMP data collection</p> |
 |No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/MikroTik hEX PoE lite SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |Unavailable by ICMP ping |<p>Last three attempts returned timeout.  Please check device connectivity.</p> |`max(/MikroTik hEX PoE lite SNMP/icmpping,#3)=0` |HIGH | |
 |High ICMP ping loss |<p>-</p> |`min(/MikroTik hEX PoE lite SNMP/icmppingloss,5m)>{$ICMP_LOSS_WARN} and min(/MikroTik hEX PoE lite SNMP/icmppingloss,5m)<100` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |High ICMP ping response time |<p>-</p> |`avg(/MikroTik hEX PoE lite SNMP/icmppingsec,5m)>{$ICMP_RESPONSE_TIME_WARN}` |WARNING |<p>**Depends on**:</p><p>- High ICMP ping loss</p><p>- Unavailable by ICMP ping</p> |
-|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik hEX PoE lite SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik hEX PoE lite SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik hEX PoE lite SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik hEX PoE lite SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
-|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik hEX PoE lite SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik hEX PoE lite SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik hEX PoE lite SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik hEX PoE lite SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik hEX PoE lite SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik hEX PoE lite SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik hEX PoE lite SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik hEX PoE lite SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik hEX PoE lite SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik hEX PoE lite SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik hEX PoE lite SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik hEX PoE lite SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
 |CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik hEX PoE lite SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik hEX PoE lite SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
 |CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik hEX PoE lite SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik hEX PoE lite SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
 |CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik hEX PoE lite SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik hEX PoE lite SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
diff --git a/templates/net/mikrotik/mikrotik_hEX_PoE_lite_snmp/template_net_mikrotik_hEX_PoE_lite_snmp.yaml b/templates/net/mikrotik/mikrotik_hEX_PoE_lite_snmp/template_net_mikrotik_hEX_PoE_lite_snmp.yaml
index 45f1ac6598c..614d893c4f6 100644
--- a/templates/net/mikrotik/mikrotik_hEX_PoE_lite_snmp/template_net_mikrotik_hEX_PoE_lite_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_hEX_PoE_lite_snmp/template_net_mikrotik_hEX_PoE_lite_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:46:05Z'
+  date: '2022-01-26T09:52:32Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -35,8 +35,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 9d1eaf8c440842b6867f539d8e4580b9
@@ -44,6 +47,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: dc2b92f5ee3148828d66f17679873755
           name: 'ICMP loss'
@@ -54,8 +61,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: bb1bddbd5b3b4c97a056a3030cb8220c
@@ -67,6 +77,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik hEX PoE lite SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: b0933870b3424664ab150192ca5e790f
           name: 'ICMP response time'
@@ -77,8 +94,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 4de979003a374346a66e18e0dc0ae8b3
@@ -93,6 +113,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik hEX PoE lite SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: d661c8c6e6b847d49d722ce1938efee8
           name: 'SNMP traps (fallback)'
@@ -105,8 +132,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: 02174f3b849a4fe490d79273ad9b4d1d
           name: 'System contact details'
@@ -128,8 +155,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: eba52f0801c74394afce9b85132f4a0a
           name: 'System description'
@@ -152,8 +179,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: f9085ebffffa4e2abca0aa7c0e50599f
           name: 'Firmware version'
@@ -174,8 +201,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 81f162170b3f4cf0a5376f43ba8c826d
@@ -185,6 +212,10 @@ zabbix_export:
               priority: INFO
               description: 'Firmware version has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 3d8a9da605f74a9089b49def0f6a4bff
           name: 'Hardware model name'
@@ -203,8 +234,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
         -
           uuid: e35a6c46c241466a9d96f1017bf3b467
           name: 'Hardware serial number'
@@ -226,8 +257,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: ba2f0b5e00a94aff9db6b436a64b91bd
@@ -236,6 +267,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: ece69e2a6d174678a770c6cc05d20b45
           name: 'System location'
@@ -257,8 +292,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 5577c25fe0ab4decb44fdf31ffd6b345
           name: 'System name'
@@ -280,8 +315,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 0b1965fc09b549f8a0301c3b560f6e04
@@ -290,6 +325,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: 645d1046c0f64a079e97f57f5bb03aad
           name: 'System object ID'
@@ -310,8 +352,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: c25789ed5a2e40b090016c759c5a96cc
           name: 'Operating system'
@@ -333,8 +375,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: os
           triggers:
             -
               uuid: 857cc7715ae243879509d5ba827f0533
@@ -347,6 +389,10 @@ zabbix_export:
                 -
                   name: 'System name has changed (new name: {ITEM.VALUE})'
                   expression: 'last(/MikroTik hEX PoE lite SNMP/system.name,#1)<>last(/MikroTik hEX PoE lite SNMP/system.name,#2) and length(last(/MikroTik hEX PoE lite SNMP/system.name))>0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 44cb15bcd76e4bdba7a5c8f91211226c
           name: Uptime
@@ -367,8 +413,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: f6de5bd6b737473fa0bb8adcd7388f2f
@@ -381,6 +427,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/MikroTik hEX PoE lite SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: c45124bc11da4ebebf0dc1a9cd7c261e
           name: 'Total memory'
@@ -407,8 +457,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 45ec9416e047428b8c535f95985bb61d
           name: 'Used memory'
@@ -427,8 +477,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: d7aa64e64e534b1e9dbd65dd2bdda819
           name: 'Memory utilization'
@@ -441,8 +491,8 @@ zabbix_export:
           description: 'Memory utilization in %'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: f328399a209d4adaa8fed3dc9577539f
@@ -450,6 +500,13 @@ zabbix_export:
               name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
               priority: AVERAGE
               description: 'The system is running out of free memory.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 58e51b1aac7f4433b8f7160d044bc8c4
           name: 'SNMP agent availability'
@@ -466,8 +523,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 7b2ebd40ed1f4e72ac77c9bc31eab800
@@ -480,6 +540,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik hEX PoE lite SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: 2a630c50c8bc4b5d895accbe43af54f8
@@ -504,8 +568,8 @@ zabbix_export:
                 The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
               trigger_prototypes:
                 -
                   uuid: ecb6b125d94643cf80b38078f1d42ad2
@@ -514,6 +578,10 @@ zabbix_export:
                   opdata: 'Current utilization: {ITEM.LASTVALUE1}'
                   priority: WARNING
                   description: 'CPU utilization is too high. The system might be slow to respond.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 150c76d3d44a4025904f4b0b57ff37be
@@ -558,8 +626,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: b7ab6a1e8efd4accaeef15ed26b66308
@@ -570,6 +638,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 5a24a5c02664439da2ee76753e25ec8a
                   expression: 'avg(/MikroTik hEX PoE lite SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
@@ -584,6 +659,13 @@ zabbix_export:
                       name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
                       expression: 'avg(/MikroTik hEX PoE lite SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
                       recovery_expression: 'max(/MikroTik hEX PoE lite SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: c21ad0f3058d4a57a1dc137576217655
                   expression: 'avg(/MikroTik hEX PoE lite SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
@@ -592,6 +674,13 @@ zabbix_export:
                   name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 399c977682b54f21a2de66c620e30f13
           name: 'Temperature sensor discovery'
@@ -601,8 +690,7 @@ zabbix_export:
           delay: 1h
           description: |
             MIKROTIK-MIB::mtxrHlTemperature
-            Since temperature sensor is not available on all Mikrotik hardware,
-            this is done to avoid unsupported items.
+            Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.
           item_prototypes:
             -
               uuid: bbd42a0a59854a0cb8e8661a43308585
@@ -626,8 +714,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: de90614e78854f81822379c9b5ffc74e
@@ -638,6 +726,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 11e619b8b2144751995926ecc71add69
                   expression: 'avg(/MikroTik hEX PoE lite SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
@@ -652,6 +747,13 @@ zabbix_export:
                       name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
                       expression: 'avg(/MikroTik hEX PoE lite SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
                       recovery_expression: 'max(/MikroTik hEX PoE lite SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 931a8a585db94a6eadbaa2cc6ef7c730
                   expression: 'avg(/MikroTik hEX PoE lite SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
@@ -660,6 +762,13 @@ zabbix_export:
                   name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 76bb411f762949169d70dc5f69ce43f7
           name: 'LTE modem discovery'
@@ -694,14 +803,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRP Reference Signal Received Power.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 09762405d2114ec79510f7954dcdae86
                   expression: 'max(/MikroTik hEX PoE lite SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 7424d9ceb77b4a06a935b44f7c1ba568
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
@@ -716,14 +838,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 3f6e42b8dbcb4cd4b47c067fe5b7d1ea
                   expression: 'max(/MikroTik hEX PoE lite SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: f3a86df3351f4dd080031a9c821f5252
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
@@ -738,14 +873,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: e4778ad9d8ee4568b212241439a79e27
                   expression: 'max(/MikroTik hEX PoE lite SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: e551b72d1cd04297a9c9ea0e64e29255
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
@@ -760,14 +908,27 @@ zabbix_export:
                 mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 3eb7aa8563c54b72b7193ef83793acc0
                   expression: 'max(/MikroTik hEX PoE lite SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: aa8108d017b74c4e81bc5bb4c659ff18
@@ -828,8 +989,14 @@ zabbix_export:
                 mtxrWlApAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 4bf8c167c8f743bc8a5f0adf32d546fb
               name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
@@ -849,8 +1016,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: f9953f3ff399439eb71e80f410ebb4a2
               name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
@@ -870,8 +1043,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: be0690e2061e46709c35b4d1645eb4f6
               name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
@@ -890,8 +1069,14 @@ zabbix_export:
                     - 15m
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 27f4310379d14bf7bb6b30eebfabf2cc
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -904,8 +1089,14 @@ zabbix_export:
                 mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
         -
           uuid: 63b0a6b344984f679f06c11089b6bedc
           name: 'CAPsMAN AP channel discovery'
@@ -938,8 +1129,14 @@ zabbix_export:
                 mtxrWlCMAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: dfa45dda12b448109f9cc04003c63812
               name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
@@ -959,8 +1156,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 65fdd09f484a4923bf5a379a9e5d5a8f
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -973,8 +1176,14 @@ zabbix_export:
                 mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: f49f8079f71948858ae1b158b6aa186f
               name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
@@ -994,8 +1203,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: c3737199ab5342829ca6fae6d1de74f9
@@ -1003,6 +1218,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
                   priority: WARNING
                   description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 477f5879c64a43f58a3a769781cdc5bf
           name: 'Network interfaces discovery'
@@ -1091,8 +1313,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: bdf2c149889b48b9a1837d2e9d3d9fee
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -1111,8 +1339,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: ca60ce8dcd674a608e0517d2e647f273
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -1136,8 +1370,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 9cb988645c5d49eb9b598904907d0ab3
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -1160,8 +1400,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 99b8a1cf6c36400b849aa84f4a71f098
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -1180,8 +1426,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 94bd65da101541eb87cf17c49b3fdd88
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -1205,8 +1457,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: b8584ff473de4f20b4ab1e1b0c435251
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -1231,8 +1489,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 55435c135d5341eb89d37185c894c557
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -1254,8 +1518,14 @@ zabbix_export:
                 name: 'IF-MIB::ifOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 101e11f167e64235aa2d5f7d06f43548
@@ -1273,6 +1543,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: caede69c454b46db9a46c7a42b994cf1
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -1296,8 +1570,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           trigger_prototypes:
             -
               uuid: 0a6434fa071a47d4bbf9dfb922580cfa
@@ -1327,6 +1607,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik hEX PoE lite SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik hEX PoE lite SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik hEX PoE lite SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik hEX PoE lite SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: f07cc9964edc4a819717be63759a150d
               expression: |
@@ -1347,6 +1631,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik hEX PoE lite SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik hEX PoE lite SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik hEX PoE lite SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik hEX PoE lite SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 62a5f85871ca4fc3aed8e4cf0423649a
               expression: |
@@ -1366,6 +1654,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik hEX PoE lite SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik hEX PoE lite SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik hEX PoE lite SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik hEX PoE lite SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: e5f8b95c8bbc479ebad65e967591956b
@@ -1444,8 +1739,11 @@ zabbix_export:
               description: 'Space utilization in % for Disk-{#SNMPINDEX}'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 868c3c9fe3c54e3193f3e0b6329828db
               name: 'Disk-{#SNMPINDEX}: Total space'
@@ -1472,8 +1770,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: e75b2f65357c40e487b9b9f3387fcb0a
               name: 'Disk-{#SNMPINDEX}: Used space'
@@ -1492,8 +1793,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
           trigger_prototypes:
             -
               uuid: b911cb33e9044a599d10c06e5b0f90fb
@@ -1509,6 +1813,13 @@ zabbix_export:
                  - The disk free space is less than 5G.
                  - The disk will be full in less than 24 hours.
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
             -
               uuid: eada2d5bde184483bc0496677aff2c3c
               expression: |
@@ -1529,6 +1840,13 @@ zabbix_export:
                   expression: |
                     last(/MikroTik hEX PoE lite SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
                     ((last(/MikroTik hEX PoE lite SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik hEX PoE lite SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik hEX PoE lite SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
           graph_prototypes:
             -
               uuid: edc8dcfebff945e6b3131aa3d12e497c
@@ -1552,6 +1870,16 @@ zabbix_export:
                   item:
                     host: 'MikroTik hEX PoE lite SNMP'
                     key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: hex-poe-lite
+        -
+          tag: target
+          value: mikrotik
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/net/mikrotik/mikrotik_hEX_PoE_snmp/README.md b/templates/net/mikrotik/mikrotik_hEX_PoE_snmp/README.md
index 24915f500e5..9e57eee889f 100644
--- a/templates/net/mikrotik/mikrotik_hEX_PoE_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_hEX_PoE_snmp/README.md
@@ -71,7 +71,7 @@ There are no template links in this template.
 |Network interfaces discovery |<p>Discovering interfaces from IF-MIB.</p> |SNMP |net.if.discovery<p>**Filter**:</p>AND <p>- {#IFADMINSTATUS} MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.MATCHES}`</p><p>- {#IFADMINSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.NOT_MATCHES}`</p><p>- {#IFOPERSTATUS} MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.MATCHES}`</p><p>- {#IFOPERSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.NOT_MATCHES}`</p><p>- {#IFNAME} MATCHES_REGEX `{$NET.IF.IFNAME.MATCHES}`</p><p>- {#IFNAME} NOT_MATCHES_REGEX `{$NET.IF.IFNAME.NOT_MATCHES}`</p><p>- {#IFDESCR} MATCHES_REGEX `{$NET.IF.IFDESCR.MATCHES}`</p><p>- {#IFDESCR} NOT_MATCHES_REGEX `{$NET.IF.IFDESCR.NOT_MATCHES}`</p><p>- {#IFALIAS} MATCHES_REGEX `{$NET.IF.IFALIAS.MATCHES}`</p><p>- {#IFALIAS} NOT_MATCHES_REGEX `{$NET.IF.IFALIAS.NOT_MATCHES}`</p><p>- {#IFTYPE} MATCHES_REGEX `{$NET.IF.IFTYPE.MATCHES}`</p><p>- {#IFTYPE} NOT_MATCHES_REGEX `{$NET.IF.IFTYPE.NOT_MATCHES}`</p> |
 |Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 |Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
-|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
 
 ## Items collected
 
@@ -137,14 +137,14 @@ There are no template links in this template.
 |Interface {#IFNAME}({#IFALIAS}): Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p><p>3. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik hEX PoE SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik hEX PoE SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik hEX PoE SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))`<p>Recovery expression:</p>`last(/MikroTik hEX PoE SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0` |AVERAGE |<p>Manual close: YES</p> |
 |Interface {#IFNAME}({#IFALIAS}): High bandwidth usage (>{$IF.UTIL.MAX:"{#IFNAME}"}%) |<p>The network interface utilization is close to its estimated maximum bandwidth.</p> |`(avg(/MikroTik hEX PoE SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik hEX PoE SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) or avg(/MikroTik hEX PoE SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik hEX PoE SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])) and last(/MikroTik hEX PoE SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0`<p>Recovery expression:</p>`avg(/MikroTik hEX PoE SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik hEX PoE SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) and avg(/MikroTik hEX PoE SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik hEX PoE SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |Interface {#IFNAME}({#IFALIAS}): High error rate (>{$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) |<p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p> |`min(/MikroTik hEX PoE SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"} or min(/MikroTik hEX PoE SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`max(/MikroTik hEX PoE SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8 and max(/MikroTik hEX PoE SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
-|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik hEX PoE SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik hEX PoE SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik hEX PoE SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik hEX PoE SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik hEX PoE SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik hEX PoE SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik hEX PoE SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik hEX PoE SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik hEX PoE SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2) `<p>Recovery expression:</p>`(change(/MikroTik hEX PoE SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik hEX PoE SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik hEX PoE SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2) ` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik hEX PoE SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik hEX PoE SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik hEX PoE SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik hEX PoE SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik hEX PoE SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik hEX PoE SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik hEX PoE SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik hEX PoE SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik hEX PoE SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2)`<p>Recovery expression:</p>`(change(/MikroTik hEX PoE SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik hEX PoE SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik hEX PoE SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2)` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |{HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/MikroTik hEX PoE SNMP/system.uptime[sysUpTime.0])<10m` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- No SNMP data collection</p> |
 |No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/MikroTik hEX PoE SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |Unavailable by ICMP ping |<p>Last three attempts returned timeout.  Please check device connectivity.</p> |`max(/MikroTik hEX PoE SNMP/icmpping,#3)=0` |HIGH | |
 |High ICMP ping loss |<p>-</p> |`min(/MikroTik hEX PoE SNMP/icmppingloss,5m)>{$ICMP_LOSS_WARN} and min(/MikroTik hEX PoE SNMP/icmppingloss,5m)<100` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |High ICMP ping response time |<p>-</p> |`avg(/MikroTik hEX PoE SNMP/icmppingsec,5m)>{$ICMP_RESPONSE_TIME_WARN}` |WARNING |<p>**Depends on**:</p><p>- High ICMP ping loss</p><p>- Unavailable by ICMP ping</p> |
-|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik hEX PoE SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik hEX PoE SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik hEX PoE SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik hEX PoE SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
-|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik hEX PoE SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik hEX PoE SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik hEX PoE SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik hEX PoE SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik hEX PoE SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik hEX PoE SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik hEX PoE SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik hEX PoE SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik hEX PoE SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik hEX PoE SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik hEX PoE SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik hEX PoE SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
 |CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik hEX PoE SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik hEX PoE SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
 |CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik hEX PoE SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik hEX PoE SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
 |CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik hEX PoE SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik hEX PoE SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
diff --git a/templates/net/mikrotik/mikrotik_hEX_PoE_snmp/template_net_mikrotik_hEX_PoE_snmp.yaml b/templates/net/mikrotik/mikrotik_hEX_PoE_snmp/template_net_mikrotik_hEX_PoE_snmp.yaml
index 6ad99e0d200..0b44d6950c5 100644
--- a/templates/net/mikrotik/mikrotik_hEX_PoE_snmp/template_net_mikrotik_hEX_PoE_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_hEX_PoE_snmp/template_net_mikrotik_hEX_PoE_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:46:10Z'
+  date: '2022-01-26T09:48:42Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -35,8 +35,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: c187031a85c340219bf773e53b1eb70b
@@ -44,6 +47,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 71383adcc92c44d3866c0c8592c3e99c
           name: 'ICMP loss'
@@ -54,8 +61,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: c30d9d87e01d4a4fb5f859b9b96a9597
@@ -67,6 +77,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik hEX PoE SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: ed501823d99341b88d17ecd8b0b83fc4
           name: 'ICMP response time'
@@ -77,8 +94,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 71bd6b58f328466fa8855e45f98d9148
@@ -93,6 +113,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik hEX PoE SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 977608b526c843f2aca7dcd9a18d9334
           name: 'SNMP traps (fallback)'
@@ -105,8 +132,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: a1f09e41ce824318be6b2852c82d5ea2
           name: 'System contact details'
@@ -128,8 +155,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 27f4de9554c44842a118ed22da40897f
           name: 'System description'
@@ -152,8 +179,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 3521c975bbb443b1b66ec32ea561745f
           name: 'Firmware version'
@@ -174,8 +201,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: fe1e4e312e5a4ee48fecb03895b51201
@@ -185,6 +212,10 @@ zabbix_export:
               priority: INFO
               description: 'Firmware version has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 6178d9f5c5e947fe8e3fb774cc5a373a
           name: 'Hardware model name'
@@ -203,8 +234,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
         -
           uuid: c449cc37420643ee8493419bde54aac6
           name: 'Hardware serial number'
@@ -226,8 +257,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 250374059d8a45f78107f1f5b9bda7b1
@@ -236,6 +267,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 433dfca6d6fd4b4b903c48a3cf862052
           name: 'System location'
@@ -257,8 +292,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 47326c2cd58242e18397d522df49ad76
           name: 'System name'
@@ -280,8 +315,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 689814337c114068a71c0d510b6ffdee
@@ -290,6 +325,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: e4807c61ed6841eb8b96a0e058343b42
           name: 'System object ID'
@@ -310,8 +352,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 65da6e280942476e842effb8a08e2c6f
           name: 'Operating system'
@@ -333,8 +375,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: os
           triggers:
             -
               uuid: 2615116273594f659184fdc9f2612c91
@@ -347,6 +389,10 @@ zabbix_export:
                 -
                   name: 'System name has changed (new name: {ITEM.VALUE})'
                   expression: 'last(/MikroTik hEX PoE SNMP/system.name,#1)<>last(/MikroTik hEX PoE SNMP/system.name,#2) and length(last(/MikroTik hEX PoE SNMP/system.name))>0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 88c412ccc0944b96be165b4de91e5ee9
           name: Uptime
@@ -367,8 +413,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 6919d6afa065438b976979a4f782414e
@@ -381,6 +427,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/MikroTik hEX PoE SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: b4ce328c64a2471e98a1f608028797d5
           name: 'Total memory'
@@ -407,8 +457,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 9a7746065ea84c8da33740d3552c7073
           name: 'Used memory'
@@ -427,8 +477,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: d294f3fa005b4c90a82fbc3fd5037fb7
           name: 'Memory utilization'
@@ -441,8 +491,8 @@ zabbix_export:
           description: 'Memory utilization in %'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: 851e15f5b81a43b3be5d3eda921c9430
@@ -450,6 +500,13 @@ zabbix_export:
               name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
               priority: AVERAGE
               description: 'The system is running out of free memory.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 18941d2b2b45432f9114b7ff69844ec1
           name: 'SNMP agent availability'
@@ -466,8 +523,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: dbe7f9e93602427e81932c39b4383974
@@ -480,6 +540,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik hEX PoE SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: 9311078329d04ea5a752806a0ee89918
@@ -504,8 +568,8 @@ zabbix_export:
                 The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
               trigger_prototypes:
                 -
                   uuid: 87ea6ae2f5374f68acfbd4d368c8aae8
@@ -514,6 +578,10 @@ zabbix_export:
                   opdata: 'Current utilization: {ITEM.LASTVALUE1}'
                   priority: WARNING
                   description: 'CPU utilization is too high. The system might be slow to respond.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 1646642b07fd4dcaa99e1ad91cf34b52
@@ -558,8 +626,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 89ccd80168694f6cb7742f79ab2f02ae
@@ -570,6 +638,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: a27c393597ac4618846b7c9d906167c7
                   expression: 'avg(/MikroTik hEX PoE SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
@@ -584,6 +659,13 @@ zabbix_export:
                       name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
                       expression: 'avg(/MikroTik hEX PoE SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
                       recovery_expression: 'max(/MikroTik hEX PoE SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 648519d0cc5b4795ab917893a71f1872
                   expression: 'avg(/MikroTik hEX PoE SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
@@ -592,6 +674,13 @@ zabbix_export:
                   name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 361b9a2d66864d14806c8ef41ddf958a
           name: 'Temperature sensor discovery'
@@ -601,8 +690,7 @@ zabbix_export:
           delay: 1h
           description: |
             MIKROTIK-MIB::mtxrHlTemperature
-            Since temperature sensor is not available on all Mikrotik hardware,
-            this is done to avoid unsupported items.
+            Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.
           item_prototypes:
             -
               uuid: edd3813705ad49cf84ee609e51c0b04e
@@ -626,8 +714,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 48244ed562b144c192177e64b06d268c
@@ -638,6 +726,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 1b239ec1f0834b6ebe1ebc974121504b
                   expression: 'avg(/MikroTik hEX PoE SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
@@ -652,6 +747,13 @@ zabbix_export:
                       name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
                       expression: 'avg(/MikroTik hEX PoE SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
                       recovery_expression: 'max(/MikroTik hEX PoE SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: d31b9428aef346d49ec00acd2388f657
                   expression: 'avg(/MikroTik hEX PoE SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
@@ -660,6 +762,13 @@ zabbix_export:
                   name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 2dd64ba5c59643f78d472e2281870390
           name: 'LTE modem discovery'
@@ -694,14 +803,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRP Reference Signal Received Power.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 573a668131014af2bc2989edbcdbf8b8
                   expression: 'max(/MikroTik hEX PoE SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 0a022c73ee604112a46dac1d80312b35
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
@@ -716,14 +838,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 8b6d36e582d34ed7bdec1aaa406d0939
                   expression: 'max(/MikroTik hEX PoE SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: d51b890123044db4bbbbbb2bf8255f11
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
@@ -738,14 +873,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 7e8ac19ee7aa43d7bc849f5a093e846a
                   expression: 'max(/MikroTik hEX PoE SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 6a60892c64f44ba39ac4db3ea3b06a76
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
@@ -760,14 +908,27 @@ zabbix_export:
                 mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 36404ef697ea49329f0572be3940fbd6
                   expression: 'max(/MikroTik hEX PoE SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: d96cc35ffec845a0bfdc742d9c789011
@@ -828,8 +989,14 @@ zabbix_export:
                 mtxrWlApAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 38db6983c1044493ba02a2ca204ed981
               name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
@@ -849,8 +1016,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 58ba2fb7ac314593924d11dfddf96dcc
               name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
@@ -870,8 +1043,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: e6b23b9175eb4a97bce37e07d33891d0
               name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
@@ -890,8 +1069,14 @@ zabbix_export:
                     - 15m
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: b80ecc7de8714f48831cf1c6bb1870b9
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -904,8 +1089,14 @@ zabbix_export:
                 mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
         -
           uuid: ba0e7757c7b645c98b67fda025e7c1d6
           name: 'CAPsMAN AP channel discovery'
@@ -938,8 +1129,14 @@ zabbix_export:
                 mtxrWlCMAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 6be247ddc3a94489b25bee5595e7efea
               name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
@@ -959,8 +1156,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 1ea73c7d20834a168ebb4a5afca21e32
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -973,8 +1176,14 @@ zabbix_export:
                 mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 767c4c5614ff4802b8447079b31bbd42
               name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
@@ -994,8 +1203,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: f75775427c074c83a1002b716733aa7f
@@ -1003,6 +1218,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
                   priority: WARNING
                   description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 69471c3749694f3083a04ff02e396f34
           name: 'Network interfaces discovery'
@@ -1091,8 +1313,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 369c88f8e6fc48498f42feb7480a51b3
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -1111,8 +1339,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: d646ae15a461418aa8e8da230c5782eb
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -1136,8 +1370,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 3e6a5520bc15470da4ac5a4c8a294728
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -1160,8 +1400,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 340ea8c167bf44479c564e46a515fad0
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -1180,8 +1426,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: a63fbf01f29b46c19f6c8af8711e18f4
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -1205,8 +1457,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: a4bf8af96225494886df5fe116af2ada
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -1231,8 +1489,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 31f8c6c9170b490586ff13e88d33ef53
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -1254,8 +1518,14 @@ zabbix_export:
                 name: 'IF-MIB::ifOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 28bc939657054f55a94e3818cba84344
@@ -1273,6 +1543,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 76233c986f8e4e0d9c7262e5a20f3576
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -1296,8 +1570,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           trigger_prototypes:
             -
               uuid: f65d4d21623e4b0cb8a98f088e304de7
@@ -1327,6 +1607,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik hEX PoE SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik hEX PoE SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik hEX PoE SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik hEX PoE SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 98c16c4da816482195fc9a3c43f4cc2b
               expression: |
@@ -1347,6 +1631,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik hEX PoE SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik hEX PoE SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik hEX PoE SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik hEX PoE SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: e24c732a680c4f7fac04eb4fd20e3839
               expression: |
@@ -1366,6 +1654,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik hEX PoE SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik hEX PoE SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik hEX PoE SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik hEX PoE SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: 50f1876239d24cfc93478d4839fa2956
@@ -1444,8 +1739,11 @@ zabbix_export:
               description: 'Space utilization in % for Disk-{#SNMPINDEX}'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 05023f80d98c4234830e56c2c42059f7
               name: 'Disk-{#SNMPINDEX}: Total space'
@@ -1472,8 +1770,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: f6dd161551a0414ca51e4f7c5b1de616
               name: 'Disk-{#SNMPINDEX}: Used space'
@@ -1492,8 +1793,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
           trigger_prototypes:
             -
               uuid: 6d5b2060b6c946c7835867727dec0f87
@@ -1509,6 +1813,13 @@ zabbix_export:
                  - The disk free space is less than 5G.
                  - The disk will be full in less than 24 hours.
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
             -
               uuid: e05e7d6b7b6c45f7974f39a258a754f8
               expression: |
@@ -1529,6 +1840,13 @@ zabbix_export:
                   expression: |
                     last(/MikroTik hEX PoE SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
                     ((last(/MikroTik hEX PoE SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik hEX PoE SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik hEX PoE SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
           graph_prototypes:
             -
               uuid: afe07c8019d5460f9624577328d8c3a6
@@ -1552,6 +1870,16 @@ zabbix_export:
                   item:
                     host: 'MikroTik hEX PoE SNMP'
                     key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: hex-poe
+        -
+          tag: target
+          value: mikrotik
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/net/mikrotik/mikrotik_hEX_S_snmp/README.md b/templates/net/mikrotik/mikrotik_hEX_S_snmp/README.md
index fdb4c89e04f..40377156bbd 100644
--- a/templates/net/mikrotik/mikrotik_hEX_S_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_hEX_S_snmp/README.md
@@ -71,7 +71,7 @@ There are no template links in this template.
 |Network interfaces discovery |<p>Discovering interfaces from IF-MIB.</p> |SNMP |net.if.discovery<p>**Filter**:</p>AND <p>- {#IFADMINSTATUS} MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.MATCHES}`</p><p>- {#IFADMINSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.NOT_MATCHES}`</p><p>- {#IFOPERSTATUS} MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.MATCHES}`</p><p>- {#IFOPERSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.NOT_MATCHES}`</p><p>- {#IFNAME} MATCHES_REGEX `{$NET.IF.IFNAME.MATCHES}`</p><p>- {#IFNAME} NOT_MATCHES_REGEX `{$NET.IF.IFNAME.NOT_MATCHES}`</p><p>- {#IFDESCR} MATCHES_REGEX `{$NET.IF.IFDESCR.MATCHES}`</p><p>- {#IFDESCR} NOT_MATCHES_REGEX `{$NET.IF.IFDESCR.NOT_MATCHES}`</p><p>- {#IFALIAS} MATCHES_REGEX `{$NET.IF.IFALIAS.MATCHES}`</p><p>- {#IFALIAS} NOT_MATCHES_REGEX `{$NET.IF.IFALIAS.NOT_MATCHES}`</p><p>- {#IFTYPE} MATCHES_REGEX `{$NET.IF.IFTYPE.MATCHES}`</p><p>- {#IFTYPE} NOT_MATCHES_REGEX `{$NET.IF.IFTYPE.NOT_MATCHES}`</p> |
 |Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 |Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
-|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
 
 ## Items collected
 
@@ -137,14 +137,14 @@ There are no template links in this template.
 |Interface {#IFNAME}({#IFALIAS}): Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p><p>3. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik hEX S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik hEX S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik hEX S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))`<p>Recovery expression:</p>`last(/MikroTik hEX S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0` |AVERAGE |<p>Manual close: YES</p> |
 |Interface {#IFNAME}({#IFALIAS}): High bandwidth usage (>{$IF.UTIL.MAX:"{#IFNAME}"}%) |<p>The network interface utilization is close to its estimated maximum bandwidth.</p> |`(avg(/MikroTik hEX S SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik hEX S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) or avg(/MikroTik hEX S SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik hEX S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])) and last(/MikroTik hEX S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0`<p>Recovery expression:</p>`avg(/MikroTik hEX S SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik hEX S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) and avg(/MikroTik hEX S SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik hEX S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |Interface {#IFNAME}({#IFALIAS}): High error rate (>{$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) |<p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p> |`min(/MikroTik hEX S SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"} or min(/MikroTik hEX S SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`max(/MikroTik hEX S SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8 and max(/MikroTik hEX S SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
-|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik hEX S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik hEX S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik hEX S SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik hEX S SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik hEX S SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik hEX S SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik hEX S SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik hEX S SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik hEX S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2) `<p>Recovery expression:</p>`(change(/MikroTik hEX S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik hEX S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik hEX S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2) ` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik hEX S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik hEX S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik hEX S SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik hEX S SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik hEX S SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik hEX S SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik hEX S SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik hEX S SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik hEX S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2)`<p>Recovery expression:</p>`(change(/MikroTik hEX S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik hEX S SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik hEX S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2)` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |{HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/MikroTik hEX S SNMP/system.uptime[sysUpTime.0])<10m` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- No SNMP data collection</p> |
 |No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/MikroTik hEX S SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |Unavailable by ICMP ping |<p>Last three attempts returned timeout.  Please check device connectivity.</p> |`max(/MikroTik hEX S SNMP/icmpping,#3)=0` |HIGH | |
 |High ICMP ping loss |<p>-</p> |`min(/MikroTik hEX S SNMP/icmppingloss,5m)>{$ICMP_LOSS_WARN} and min(/MikroTik hEX S SNMP/icmppingloss,5m)<100` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |High ICMP ping response time |<p>-</p> |`avg(/MikroTik hEX S SNMP/icmppingsec,5m)>{$ICMP_RESPONSE_TIME_WARN}` |WARNING |<p>**Depends on**:</p><p>- High ICMP ping loss</p><p>- Unavailable by ICMP ping</p> |
-|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik hEX S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik hEX S SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik hEX S SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik hEX S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
-|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik hEX S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik hEX S SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik hEX S SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik hEX S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik hEX S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik hEX S SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik hEX S SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik hEX S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik hEX S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik hEX S SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik hEX S SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik hEX S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
 |CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik hEX S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik hEX S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
 |CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik hEX S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik hEX S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
 |CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik hEX S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik hEX S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
diff --git a/templates/net/mikrotik/mikrotik_hEX_S_snmp/template_net_mikrotik_hEX_S_snmp.yaml b/templates/net/mikrotik/mikrotik_hEX_S_snmp/template_net_mikrotik_hEX_S_snmp.yaml
index dcef6c0c7a4..6973e018511 100644
--- a/templates/net/mikrotik/mikrotik_hEX_S_snmp/template_net_mikrotik_hEX_S_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_hEX_S_snmp/template_net_mikrotik_hEX_S_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:46:19Z'
+  date: '2022-01-26T09:47:03Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -35,8 +35,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 99b9920681f941c187f81d1c91755891
@@ -44,6 +47,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: c0bffcb2d515415db279b20fcdf3c2ad
           name: 'ICMP loss'
@@ -54,8 +61,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 530db893da94415db5fa5b1f26570bd5
@@ -67,6 +77,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik hEX S SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 9b58686f36c6431f8c5d7f990403a823
           name: 'ICMP response time'
@@ -77,8 +94,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 662e7c6a20bb4038b171f39f88bc5c5a
@@ -93,6 +113,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik hEX S SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 7c5a4f5306ae4fa6bb4f428c68eccc5c
           name: 'SNMP traps (fallback)'
@@ -105,8 +132,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: 6185cb0ed5824d55ab7a3115e34fcd3e
           name: 'System contact details'
@@ -128,8 +155,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 3f9b8a4a60074fd7b08f15db63e95447
           name: 'System description'
@@ -152,8 +179,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: dd3b07cbd6d74fec88e1d371846b48a4
           name: 'Firmware version'
@@ -174,8 +201,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: bdc6d6b5a4be4bba95f1635d8cf165d7
@@ -185,6 +212,10 @@ zabbix_export:
               priority: INFO
               description: 'Firmware version has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: ea51e70e43e24056b25309ce0fa8f9d8
           name: 'Hardware model name'
@@ -203,8 +234,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
         -
           uuid: a577dbe3cfde4294ab93e0ab114c24c7
           name: 'Hardware serial number'
@@ -226,8 +257,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 9bcc039b8f1e4b3c84414d0d62d6c52d
@@ -236,6 +267,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: db89a699f89f45648f7e10476fbb1ba7
           name: 'System location'
@@ -257,8 +292,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 819e7be322cb41728e01c9c91ae925f5
           name: 'System name'
@@ -280,8 +315,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: ed72b3a73f5d498586ddfe57e9ad8638
@@ -290,6 +325,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: 1bde09547e21422ab7e17cdc0503aa53
           name: 'System object ID'
@@ -310,8 +352,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 34a57dc1a4f54f7ea156fa5c7b5f61de
           name: 'Operating system'
@@ -333,8 +375,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: os
           triggers:
             -
               uuid: 21dd8dc14526470493b31ebddf14574c
@@ -347,6 +389,10 @@ zabbix_export:
                 -
                   name: 'System name has changed (new name: {ITEM.VALUE})'
                   expression: 'last(/MikroTik hEX S SNMP/system.name,#1)<>last(/MikroTik hEX S SNMP/system.name,#2) and length(last(/MikroTik hEX S SNMP/system.name))>0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 25aaf430db3d4a19a9b0f7c082e904bc
           name: Uptime
@@ -367,8 +413,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 3b0a33b89325422c90a05950eb7b4ece
@@ -381,6 +427,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/MikroTik hEX S SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 4d8039dcceb344dcb4de5c4895a4e199
           name: 'Total memory'
@@ -407,8 +457,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 664555ffcf5e48039bdcf98bf79247ef
           name: 'Used memory'
@@ -427,8 +477,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 8aa0e7e65d12468e9fdf4e2faebd3450
           name: 'Memory utilization'
@@ -441,8 +491,8 @@ zabbix_export:
           description: 'Memory utilization in %'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: bdd1ff379f214b1896c0e7ee5d6e6e16
@@ -450,6 +500,13 @@ zabbix_export:
               name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
               priority: AVERAGE
               description: 'The system is running out of free memory.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 57f802d3cb784200bb047ccd947d34b0
           name: 'SNMP agent availability'
@@ -466,8 +523,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: e33c3d29eb9f41b49cc6002a5ee14058
@@ -480,6 +540,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik hEX S SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: 455bfeb9d0b14c77a43129d489e3140b
@@ -504,8 +568,8 @@ zabbix_export:
                 The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
               trigger_prototypes:
                 -
                   uuid: ca6c0d5b13a24f6b9e28296818ae1624
@@ -514,6 +578,10 @@ zabbix_export:
                   opdata: 'Current utilization: {ITEM.LASTVALUE1}'
                   priority: WARNING
                   description: 'CPU utilization is too high. The system might be slow to respond.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 37edfa6825394b30b3742eac201a3a58
@@ -558,8 +626,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 21775fd4ca0143838ea2c2c7c16c4b75
@@ -570,6 +638,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 7c75f3db8a8341819bb4455d4a6440e3
                   expression: 'avg(/MikroTik hEX S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
@@ -584,6 +659,13 @@ zabbix_export:
                       name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
                       expression: 'avg(/MikroTik hEX S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
                       recovery_expression: 'max(/MikroTik hEX S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 3247cd9062894b59bb736c3c75bf2f67
                   expression: 'avg(/MikroTik hEX S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
@@ -592,6 +674,13 @@ zabbix_export:
                   name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 7f462b2b67494acc8e968a38ae2949e7
           name: 'Temperature sensor discovery'
@@ -601,8 +690,7 @@ zabbix_export:
           delay: 1h
           description: |
             MIKROTIK-MIB::mtxrHlTemperature
-            Since temperature sensor is not available on all Mikrotik hardware,
-            this is done to avoid unsupported items.
+            Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.
           item_prototypes:
             -
               uuid: 219015883daa4871be424d46c4af4126
@@ -626,8 +714,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: ce2928b0b45a4e74976c4ebb01f769b6
@@ -638,6 +726,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 9401397315604181973ac4a5e0c6a5ba
                   expression: 'avg(/MikroTik hEX S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
@@ -652,6 +747,13 @@ zabbix_export:
                       name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
                       expression: 'avg(/MikroTik hEX S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
                       recovery_expression: 'max(/MikroTik hEX S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 466053cdfce44600bf1ff0ced3c4fce4
                   expression: 'avg(/MikroTik hEX S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
@@ -660,6 +762,13 @@ zabbix_export:
                   name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 9bab04f1de2b4bb59ee2f5116b67829e
           name: 'LTE modem discovery'
@@ -694,14 +803,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRP Reference Signal Received Power.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 9a48a8512ac74bff9c44733842d21693
                   expression: 'max(/MikroTik hEX S SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: b04b0c8358f84225bd33ba0a4494bc91
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
@@ -716,14 +838,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: c5e6899f9dee47d7812366a26e5191d9
                   expression: 'max(/MikroTik hEX S SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 9600e46ee74e48b48d169399b2dda431
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
@@ -738,14 +873,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 207bea70b82e4a6087f104cb1ec1f8a2
                   expression: 'max(/MikroTik hEX S SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 67466da7befe41a9a0a6d84b6c2508d2
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
@@ -760,14 +908,27 @@ zabbix_export:
                 mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 3b7135afe54a4acfbf5d14510f6b22c1
                   expression: 'max(/MikroTik hEX S SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 709b83b504d5409091a71fc4351f06f7
@@ -828,8 +989,14 @@ zabbix_export:
                 mtxrWlApAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: ad811b6b140844e59dd6ac2618e1b9bb
               name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
@@ -849,8 +1016,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 9e3847a985c14de59faf61670478b6bf
               name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
@@ -870,8 +1043,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 51174e5e7d41479fab6b9077ef5d40d9
               name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
@@ -890,8 +1069,14 @@ zabbix_export:
                     - 15m
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: bd2ece0be43f48b1a390d6f44c796f4a
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -904,8 +1089,14 @@ zabbix_export:
                 mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
         -
           uuid: edb9c0ee0f4e4de2819919ddb2a88a99
           name: 'CAPsMAN AP channel discovery'
@@ -938,8 +1129,14 @@ zabbix_export:
                 mtxrWlCMAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: e96e64d9fe5944b4b5bb1324fb2845b0
               name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
@@ -959,8 +1156,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 720d95d0ef294d019fc91b2ed2debb14
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -973,8 +1176,14 @@ zabbix_export:
                 mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 4d8828d7d008441fa7497dbc88d6d065
               name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
@@ -994,8 +1203,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: de36b7b78e8b4bea936347995a0eaeb1
@@ -1003,6 +1218,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
                   priority: WARNING
                   description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: d9f19a854ae14b56a35f87eca75b3b9e
           name: 'Network interfaces discovery'
@@ -1091,8 +1313,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 8e30986c6563461ab42925fe30db21ab
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -1111,8 +1339,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: c38dc98405b14309b3c81df08cccfdea
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -1136,8 +1370,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 396930e89bcc4a1c94df333b75e43799
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -1160,8 +1400,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 8a08acc839f94e22ba0f24d6c469e137
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -1180,8 +1426,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 0a85e89b937842659b588a51b1593e09
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -1205,8 +1457,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 141fc60bd89646a1a3d4dbdff9689037
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -1231,8 +1489,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: c21517a23e5f4042b55a9b9171357525
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -1254,8 +1518,14 @@ zabbix_export:
                 name: 'IF-MIB::ifOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: ef94e6ea0f0547ed9b67073d91a745ec
@@ -1273,6 +1543,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 2117c921d1b747c1953ee0e54619b338
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -1296,8 +1570,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           trigger_prototypes:
             -
               uuid: 8a7a6eb94ea24a819764bdcc5131238d
@@ -1327,6 +1607,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik hEX S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik hEX S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik hEX S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik hEX S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 0d59255268064ca68352411117f5e9cf
               expression: |
@@ -1347,6 +1631,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik hEX S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik hEX S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik hEX S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik hEX S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 062828dbf3964ca9bf6014b15ea13648
               expression: |
@@ -1366,6 +1654,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik hEX S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik hEX S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik hEX S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik hEX S SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: 0b818f0991254d05b2e7434e1a4e3f31
@@ -1444,8 +1739,11 @@ zabbix_export:
               description: 'Space utilization in % for Disk-{#SNMPINDEX}'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: abea1d8e522a48fcb35d3b05b41cd576
               name: 'Disk-{#SNMPINDEX}: Total space'
@@ -1472,8 +1770,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: ed5fce36f7904eb7bf5929b90fd5b535
               name: 'Disk-{#SNMPINDEX}: Used space'
@@ -1492,8 +1793,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
           trigger_prototypes:
             -
               uuid: f303b6ce2be34c8ca0f51e5c73e47715
@@ -1509,6 +1813,13 @@ zabbix_export:
                  - The disk free space is less than 5G.
                  - The disk will be full in less than 24 hours.
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
             -
               uuid: cdef153d2e914c12ba3303c938489359
               expression: |
@@ -1529,6 +1840,13 @@ zabbix_export:
                   expression: |
                     last(/MikroTik hEX S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
                     ((last(/MikroTik hEX S SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik hEX S SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik hEX S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
           graph_prototypes:
             -
               uuid: b5b0436352614bf1ab0f84731dc4f627
@@ -1552,6 +1870,16 @@ zabbix_export:
                   item:
                     host: 'MikroTik hEX S SNMP'
                     key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: hex-s
+        -
+          tag: target
+          value: mikrotik
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/net/mikrotik/mikrotik_hEX_lite_snmp/README.md b/templates/net/mikrotik/mikrotik_hEX_lite_snmp/README.md
index 1eeb48f9bdc..7f60cb12b30 100644
--- a/templates/net/mikrotik/mikrotik_hEX_lite_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_hEX_lite_snmp/README.md
@@ -71,7 +71,7 @@ There are no template links in this template.
 |Network interfaces discovery |<p>Discovering interfaces from IF-MIB.</p> |SNMP |net.if.discovery<p>**Filter**:</p>AND <p>- {#IFADMINSTATUS} MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.MATCHES}`</p><p>- {#IFADMINSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.NOT_MATCHES}`</p><p>- {#IFOPERSTATUS} MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.MATCHES}`</p><p>- {#IFOPERSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.NOT_MATCHES}`</p><p>- {#IFNAME} MATCHES_REGEX `{$NET.IF.IFNAME.MATCHES}`</p><p>- {#IFNAME} NOT_MATCHES_REGEX `{$NET.IF.IFNAME.NOT_MATCHES}`</p><p>- {#IFDESCR} MATCHES_REGEX `{$NET.IF.IFDESCR.MATCHES}`</p><p>- {#IFDESCR} NOT_MATCHES_REGEX `{$NET.IF.IFDESCR.NOT_MATCHES}`</p><p>- {#IFALIAS} MATCHES_REGEX `{$NET.IF.IFALIAS.MATCHES}`</p><p>- {#IFALIAS} NOT_MATCHES_REGEX `{$NET.IF.IFALIAS.NOT_MATCHES}`</p><p>- {#IFTYPE} MATCHES_REGEX `{$NET.IF.IFTYPE.MATCHES}`</p><p>- {#IFTYPE} NOT_MATCHES_REGEX `{$NET.IF.IFTYPE.NOT_MATCHES}`</p> |
 |Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 |Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
-|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
 
 ## Items collected
 
@@ -137,14 +137,14 @@ There are no template links in this template.
 |Interface {#IFNAME}({#IFALIAS}): Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p><p>3. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik hEX lite SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik hEX lite SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik hEX lite SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))`<p>Recovery expression:</p>`last(/MikroTik hEX lite SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0` |AVERAGE |<p>Manual close: YES</p> |
 |Interface {#IFNAME}({#IFALIAS}): High bandwidth usage (>{$IF.UTIL.MAX:"{#IFNAME}"}%) |<p>The network interface utilization is close to its estimated maximum bandwidth.</p> |`(avg(/MikroTik hEX lite SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik hEX lite SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) or avg(/MikroTik hEX lite SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik hEX lite SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])) and last(/MikroTik hEX lite SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0`<p>Recovery expression:</p>`avg(/MikroTik hEX lite SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik hEX lite SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) and avg(/MikroTik hEX lite SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik hEX lite SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |Interface {#IFNAME}({#IFALIAS}): High error rate (>{$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) |<p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p> |`min(/MikroTik hEX lite SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"} or min(/MikroTik hEX lite SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`max(/MikroTik hEX lite SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8 and max(/MikroTik hEX lite SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
-|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik hEX lite SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik hEX lite SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik hEX lite SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik hEX lite SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik hEX lite SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik hEX lite SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik hEX lite SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik hEX lite SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik hEX lite SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2) `<p>Recovery expression:</p>`(change(/MikroTik hEX lite SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik hEX lite SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik hEX lite SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2) ` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik hEX lite SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik hEX lite SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik hEX lite SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik hEX lite SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik hEX lite SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik hEX lite SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik hEX lite SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik hEX lite SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik hEX lite SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2)`<p>Recovery expression:</p>`(change(/MikroTik hEX lite SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik hEX lite SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik hEX lite SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2)` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |{HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/MikroTik hEX lite SNMP/system.uptime[sysUpTime.0])<10m` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- No SNMP data collection</p> |
 |No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/MikroTik hEX lite SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |Unavailable by ICMP ping |<p>Last three attempts returned timeout.  Please check device connectivity.</p> |`max(/MikroTik hEX lite SNMP/icmpping,#3)=0` |HIGH | |
 |High ICMP ping loss |<p>-</p> |`min(/MikroTik hEX lite SNMP/icmppingloss,5m)>{$ICMP_LOSS_WARN} and min(/MikroTik hEX lite SNMP/icmppingloss,5m)<100` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |High ICMP ping response time |<p>-</p> |`avg(/MikroTik hEX lite SNMP/icmppingsec,5m)>{$ICMP_RESPONSE_TIME_WARN}` |WARNING |<p>**Depends on**:</p><p>- High ICMP ping loss</p><p>- Unavailable by ICMP ping</p> |
-|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik hEX lite SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik hEX lite SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik hEX lite SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik hEX lite SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
-|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik hEX lite SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik hEX lite SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik hEX lite SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik hEX lite SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik hEX lite SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik hEX lite SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik hEX lite SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik hEX lite SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik hEX lite SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik hEX lite SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik hEX lite SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik hEX lite SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
 |CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik hEX lite SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik hEX lite SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
 |CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik hEX lite SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik hEX lite SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
 |CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik hEX lite SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik hEX lite SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
diff --git a/templates/net/mikrotik/mikrotik_hEX_lite_snmp/template_net_mikrotik_hEX_lite_snmp.yaml b/templates/net/mikrotik/mikrotik_hEX_lite_snmp/template_net_mikrotik_hEX_lite_snmp.yaml
index d06c97befc9..d175b5b3fa0 100644
--- a/templates/net/mikrotik/mikrotik_hEX_lite_snmp/template_net_mikrotik_hEX_lite_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_hEX_lite_snmp/template_net_mikrotik_hEX_lite_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:46:00Z'
+  date: '2022-01-26T09:44:57Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -35,8 +35,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 78f7c3cb9ad94841b6ef337df5a41914
@@ -44,6 +47,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: b781c132adc34334b27b9e7762c4b7d6
           name: 'ICMP loss'
@@ -54,8 +61,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 899836cd67f74868954af828bcf35521
@@ -67,6 +77,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik hEX lite SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: f1fb3fc2def948559f1db70e4581bbdd
           name: 'ICMP response time'
@@ -77,8 +94,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: f5930e10af6e43d380c97f2522780a8e
@@ -93,6 +113,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik hEX lite SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 324dbec2e7bf49f999411dfb25372701
           name: 'SNMP traps (fallback)'
@@ -105,8 +132,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: 81a3cea5e62e41ecbecbfa1c3bd821e2
           name: 'System contact details'
@@ -128,8 +155,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 8cb003746f8a47a09a21eadb327de4f9
           name: 'System description'
@@ -152,8 +179,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: c15fe701615f41809cdb9440e308339c
           name: 'Firmware version'
@@ -174,8 +201,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 8fb6d0748d5a4e589e397f0523944bc5
@@ -185,6 +212,10 @@ zabbix_export:
               priority: INFO
               description: 'Firmware version has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 10cecca7315d4732badc194787d6e58f
           name: 'Hardware model name'
@@ -203,8 +234,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
         -
           uuid: ab2590092f894a1c97787d5edb470b65
           name: 'Hardware serial number'
@@ -226,8 +257,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: c76bf7b6d13b49a4916a00709ee7c9ba
@@ -236,6 +267,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 3812d629520d45c58ec3603a4eeca72e
           name: 'System location'
@@ -257,8 +292,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: e6f61d8243514cdebac021b5124fce8c
           name: 'System name'
@@ -280,8 +315,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 6aeb9e554ba1411f868668b8f31dca49
@@ -290,6 +325,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: 2736a10a1fc446eb8b9f448e894b14fe
           name: 'System object ID'
@@ -310,8 +352,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 0c40e8e1ccca4418b9bfc22a84c08b4e
           name: 'Operating system'
@@ -333,8 +375,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: os
           triggers:
             -
               uuid: b5cddf34bbe74bb08663b85c83035f57
@@ -347,6 +389,10 @@ zabbix_export:
                 -
                   name: 'System name has changed (new name: {ITEM.VALUE})'
                   expression: 'last(/MikroTik hEX lite SNMP/system.name,#1)<>last(/MikroTik hEX lite SNMP/system.name,#2) and length(last(/MikroTik hEX lite SNMP/system.name))>0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: f7bd0ce4612c46c8a07239b5fe19231a
           name: Uptime
@@ -367,8 +413,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: d893994cfe8145b8bb0cf294b8a49f1f
@@ -381,6 +427,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/MikroTik hEX lite SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 93743e909ba5414294005084cb83fc93
           name: 'Total memory'
@@ -407,8 +457,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 039d0c2fe2224a57b77def7dd4dd2cfd
           name: 'Used memory'
@@ -427,8 +477,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: bdb11b0d08184bd188276b7559286e65
           name: 'Memory utilization'
@@ -441,8 +491,8 @@ zabbix_export:
           description: 'Memory utilization in %'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: 4a08a50891814c0d813c39a4615bffac
@@ -450,6 +500,13 @@ zabbix_export:
               name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
               priority: AVERAGE
               description: 'The system is running out of free memory.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 1d892561e2ca48a3a6d8e2aec6ff7505
           name: 'SNMP agent availability'
@@ -466,8 +523,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: fea996e6b5e14205ad6e41faa9f53263
@@ -480,6 +540,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik hEX lite SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: 9c7a81a8e2654d58acf463a00cce14f5
@@ -504,8 +568,8 @@ zabbix_export:
                 The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
               trigger_prototypes:
                 -
                   uuid: 4910a9cc5fdf4eefa05e1e0f339828c4
@@ -514,6 +578,10 @@ zabbix_export:
                   opdata: 'Current utilization: {ITEM.LASTVALUE1}'
                   priority: WARNING
                   description: 'CPU utilization is too high. The system might be slow to respond.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 2c545076c11b4783b2bd951b38a58618
@@ -558,8 +626,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 0a16b13ef86e4b968690de77d4fdd851
@@ -570,6 +638,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 26ad73c494494a83a6b7eab785efe3ce
                   expression: 'avg(/MikroTik hEX lite SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
@@ -584,6 +659,13 @@ zabbix_export:
                       name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
                       expression: 'avg(/MikroTik hEX lite SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
                       recovery_expression: 'max(/MikroTik hEX lite SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 19c2754a812c48bd87fd250aac01b97b
                   expression: 'avg(/MikroTik hEX lite SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
@@ -592,6 +674,13 @@ zabbix_export:
                   name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 132954d3fced48d9a272be2f748c915d
           name: 'Temperature sensor discovery'
@@ -601,8 +690,7 @@ zabbix_export:
           delay: 1h
           description: |
             MIKROTIK-MIB::mtxrHlTemperature
-            Since temperature sensor is not available on all Mikrotik hardware,
-            this is done to avoid unsupported items.
+            Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.
           item_prototypes:
             -
               uuid: caff962e717e4d2f93d2c67a59316aa6
@@ -626,8 +714,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: fada5a58781c4684b70e7aea77a96040
@@ -638,6 +726,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 87d04ed8af6040f1b2230244b7ffcc18
                   expression: 'avg(/MikroTik hEX lite SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
@@ -652,6 +747,13 @@ zabbix_export:
                       name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
                       expression: 'avg(/MikroTik hEX lite SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
                       recovery_expression: 'max(/MikroTik hEX lite SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: e5ca03c450eb4ccfa4dc94de0d6eeaaf
                   expression: 'avg(/MikroTik hEX lite SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
@@ -660,6 +762,13 @@ zabbix_export:
                   name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 78120670dc214ff5833e8b65c830b9bf
           name: 'LTE modem discovery'
@@ -694,14 +803,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRP Reference Signal Received Power.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: ef64375fbe9b456d895d5fa75b524bc4
                   expression: 'max(/MikroTik hEX lite SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 1da2986f9f9542b58781f141c95a268b
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
@@ -716,14 +838,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: ccc2b5cabd164f2c94268bd8fbb17299
                   expression: 'max(/MikroTik hEX lite SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 889d3fa6f6fb416bb66be28fbe59ea1e
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
@@ -738,14 +873,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 07ac669be6d14c878ed3824adbcaa035
                   expression: 'max(/MikroTik hEX lite SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 4291982f94354c16812ffa4522e74a9b
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
@@ -760,14 +908,27 @@ zabbix_export:
                 mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: e351a08588664f29aab5a784ff3bbc1c
                   expression: 'max(/MikroTik hEX lite SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 3336863bfebf4480aeac28755c770954
@@ -828,8 +989,14 @@ zabbix_export:
                 mtxrWlApAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 01984514830c48d7a8b716700181bd19
               name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
@@ -849,8 +1016,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 40ba0370ec1b4432814c654bc65558fb
               name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
@@ -870,8 +1043,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 9984f8a346b1452d8ccac4e471ff6a18
               name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
@@ -890,8 +1069,14 @@ zabbix_export:
                     - 15m
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 21f387d4d01d47bc98852aee0cbc3e03
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -904,8 +1089,14 @@ zabbix_export:
                 mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
         -
           uuid: c2d5d79d5dc14876ae9951c8813804cb
           name: 'CAPsMAN AP channel discovery'
@@ -938,8 +1129,14 @@ zabbix_export:
                 mtxrWlCMAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 7dd11163c97f4d31b46b7fade589b135
               name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
@@ -959,8 +1156,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 84248b4499ec4b3399905bbb2a7d9e76
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -973,8 +1176,14 @@ zabbix_export:
                 mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 8a7f54f2f8b747bba0de16dd53750679
               name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
@@ -994,8 +1203,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 9361f7dd8cba43e4a237678d00eb26b6
@@ -1003,6 +1218,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
                   priority: WARNING
                   description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 1eede533e5224a8d92c3a2a3d069a00c
           name: 'Network interfaces discovery'
@@ -1091,8 +1313,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 67a0721ca54d47b2b1971fb81ab6a195
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -1111,8 +1339,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 330bc494646c49a1acc43f134e9dea59
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -1136,8 +1370,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: b2bc232de2be40e9b18322bbfe9bd339
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -1160,8 +1400,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 419eb76aa4bd4e6dbf47cbaee0e3b6a5
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -1180,8 +1426,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: d599db57d24745aba77ae60faef325c8
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -1205,8 +1457,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 84970927eb194b00ab4b5aa8093b5709
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -1231,8 +1489,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: cd76e4940cbf4582b3e6f1c7a0ec28fc
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -1254,8 +1518,14 @@ zabbix_export:
                 name: 'IF-MIB::ifOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 89186fdd35cd4300803d8cbfaa86fa71
@@ -1273,6 +1543,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 3c0b9f206c9744d381903da1877e207f
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -1296,8 +1570,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           trigger_prototypes:
             -
               uuid: 775cb415657c4772aa345e886c33af52
@@ -1327,6 +1607,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik hEX lite SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik hEX lite SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik hEX lite SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik hEX lite SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 5ca398d5648b46449d93b13ed69d24ab
               expression: |
@@ -1347,6 +1631,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik hEX lite SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik hEX lite SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik hEX lite SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik hEX lite SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 51cc89abce1c45f4895d904fbf4c7a73
               expression: |
@@ -1366,6 +1654,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik hEX lite SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik hEX lite SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik hEX lite SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik hEX lite SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: 66f5c80600ec4220bf365e5f138948a1
@@ -1444,8 +1739,11 @@ zabbix_export:
               description: 'Space utilization in % for Disk-{#SNMPINDEX}'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 4e63d5682c0147f3a314ab6def8043b7
               name: 'Disk-{#SNMPINDEX}: Total space'
@@ -1472,8 +1770,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 2c8d3e482b6a453e8f46ea59ea75445f
               name: 'Disk-{#SNMPINDEX}: Used space'
@@ -1492,8 +1793,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
           trigger_prototypes:
             -
               uuid: cd0ef8f6c93340a1aadd0559ef302476
@@ -1509,6 +1813,13 @@ zabbix_export:
                  - The disk free space is less than 5G.
                  - The disk will be full in less than 24 hours.
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
             -
               uuid: 0460d9d1f873497ea57430cf067c786e
               expression: |
@@ -1529,6 +1840,13 @@ zabbix_export:
                   expression: |
                     last(/MikroTik hEX lite SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
                     ((last(/MikroTik hEX lite SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik hEX lite SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik hEX lite SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
           graph_prototypes:
             -
               uuid: 277327e948d24186a0723bc0fe4debf4
@@ -1552,6 +1870,16 @@ zabbix_export:
                   item:
                     host: 'MikroTik hEX lite SNMP'
                     key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: hex-lite
+        -
+          tag: target
+          value: mikrotik
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/net/mikrotik/mikrotik_hEX_snmp/README.md b/templates/net/mikrotik/mikrotik_hEX_snmp/README.md
index aec3207a1c2..763b2083be6 100644
--- a/templates/net/mikrotik/mikrotik_hEX_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_hEX_snmp/README.md
@@ -71,7 +71,7 @@ There are no template links in this template.
 |Network interfaces discovery |<p>Discovering interfaces from IF-MIB.</p> |SNMP |net.if.discovery<p>**Filter**:</p>AND <p>- {#IFADMINSTATUS} MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.MATCHES}`</p><p>- {#IFADMINSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.NOT_MATCHES}`</p><p>- {#IFOPERSTATUS} MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.MATCHES}`</p><p>- {#IFOPERSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.NOT_MATCHES}`</p><p>- {#IFNAME} MATCHES_REGEX `{$NET.IF.IFNAME.MATCHES}`</p><p>- {#IFNAME} NOT_MATCHES_REGEX `{$NET.IF.IFNAME.NOT_MATCHES}`</p><p>- {#IFDESCR} MATCHES_REGEX `{$NET.IF.IFDESCR.MATCHES}`</p><p>- {#IFDESCR} NOT_MATCHES_REGEX `{$NET.IF.IFDESCR.NOT_MATCHES}`</p><p>- {#IFALIAS} MATCHES_REGEX `{$NET.IF.IFALIAS.MATCHES}`</p><p>- {#IFALIAS} NOT_MATCHES_REGEX `{$NET.IF.IFALIAS.NOT_MATCHES}`</p><p>- {#IFTYPE} MATCHES_REGEX `{$NET.IF.IFTYPE.MATCHES}`</p><p>- {#IFTYPE} NOT_MATCHES_REGEX `{$NET.IF.IFTYPE.NOT_MATCHES}`</p> |
 |Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 |Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
-|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
 
 ## Items collected
 
@@ -137,14 +137,14 @@ There are no template links in this template.
 |Interface {#IFNAME}({#IFALIAS}): Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p><p>3. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik hEX SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik hEX SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik hEX SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))`<p>Recovery expression:</p>`last(/MikroTik hEX SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0` |AVERAGE |<p>Manual close: YES</p> |
 |Interface {#IFNAME}({#IFALIAS}): High bandwidth usage (>{$IF.UTIL.MAX:"{#IFNAME}"}%) |<p>The network interface utilization is close to its estimated maximum bandwidth.</p> |`(avg(/MikroTik hEX SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik hEX SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) or avg(/MikroTik hEX SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik hEX SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])) and last(/MikroTik hEX SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0`<p>Recovery expression:</p>`avg(/MikroTik hEX SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik hEX SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) and avg(/MikroTik hEX SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik hEX SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |Interface {#IFNAME}({#IFALIAS}): High error rate (>{$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) |<p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p> |`min(/MikroTik hEX SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"} or min(/MikroTik hEX SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`max(/MikroTik hEX SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8 and max(/MikroTik hEX SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
-|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik hEX SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik hEX SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik hEX SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik hEX SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik hEX SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik hEX SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik hEX SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik hEX SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik hEX SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2) `<p>Recovery expression:</p>`(change(/MikroTik hEX SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik hEX SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik hEX SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2) ` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik hEX SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik hEX SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik hEX SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik hEX SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik hEX SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik hEX SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik hEX SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik hEX SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik hEX SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2)`<p>Recovery expression:</p>`(change(/MikroTik hEX SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik hEX SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik hEX SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2)` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |{HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/MikroTik hEX SNMP/system.uptime[sysUpTime.0])<10m` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- No SNMP data collection</p> |
 |No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/MikroTik hEX SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |Unavailable by ICMP ping |<p>Last three attempts returned timeout.  Please check device connectivity.</p> |`max(/MikroTik hEX SNMP/icmpping,#3)=0` |HIGH | |
 |High ICMP ping loss |<p>-</p> |`min(/MikroTik hEX SNMP/icmppingloss,5m)>{$ICMP_LOSS_WARN} and min(/MikroTik hEX SNMP/icmppingloss,5m)<100` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |High ICMP ping response time |<p>-</p> |`avg(/MikroTik hEX SNMP/icmppingsec,5m)>{$ICMP_RESPONSE_TIME_WARN}` |WARNING |<p>**Depends on**:</p><p>- High ICMP ping loss</p><p>- Unavailable by ICMP ping</p> |
-|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik hEX SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik hEX SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik hEX SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik hEX SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
-|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik hEX SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik hEX SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik hEX SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik hEX SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik hEX SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik hEX SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik hEX SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik hEX SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik hEX SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik hEX SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik hEX SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik hEX SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
 |CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik hEX SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik hEX SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
 |CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik hEX SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik hEX SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
 |CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik hEX SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik hEX SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
diff --git a/templates/net/mikrotik/mikrotik_hEX_snmp/template_net_mikrotik_hEX_snmp.yaml b/templates/net/mikrotik/mikrotik_hEX_snmp/template_net_mikrotik_hEX_snmp.yaml
index 1c0f5067f24..8d6b0f57757 100644
--- a/templates/net/mikrotik/mikrotik_hEX_snmp/template_net_mikrotik_hEX_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_hEX_snmp/template_net_mikrotik_hEX_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:46:15Z'
+  date: '2022-01-26T10:45:58Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -35,8 +35,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 2759e7d4eb114d0984aff53e6656e57e
@@ -44,6 +47,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 0b2a45e80039439ca76648ff3eff0515
           name: 'ICMP loss'
@@ -54,8 +61,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 32d2897f2f1d42b0b2d4f40d6332cf48
@@ -67,6 +77,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik hEX SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: bee8dc9f001443c38134e692b933aa89
           name: 'ICMP response time'
@@ -77,8 +94,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 138f10a500aa4b29abf9760c80e22b06
@@ -93,6 +113,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik hEX SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: d44db2b3812246e09860a63d42512382
           name: 'SNMP traps (fallback)'
@@ -105,8 +132,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: 65095df07cf849789fe6d78cbc9e2712
           name: 'System contact details'
@@ -128,8 +155,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: cd8bd2a11d164a9eafc6771bb80eb449
           name: 'System description'
@@ -152,8 +179,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 7154ef6b0f0b4d4a99fdf1d7ec8b2262
           name: 'Firmware version'
@@ -174,8 +201,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 0c58b3a529a541c5813e6d374fb1af38
@@ -185,6 +212,10 @@ zabbix_export:
               priority: INFO
               description: 'Firmware version has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 0e326a00dadf46928949a2270a4e7619
           name: 'Hardware model name'
@@ -203,8 +234,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
         -
           uuid: 17dd769754ca4559b53b191baa8ac571
           name: 'Hardware serial number'
@@ -226,8 +257,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 3a683df3455e4c3b9693f70d7cc2312c
@@ -236,6 +267,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: a6d38cac0dcc4bb085e6d7dc9536407d
           name: 'System location'
@@ -257,8 +292,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 860ffeeac47c434c8890fef9c13f5105
           name: 'System name'
@@ -280,8 +315,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: d6d2aa238d864cc1902b94e44e46b627
@@ -290,6 +325,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: 6d82211969d74fb7b33f1e9d90c83902
           name: 'System object ID'
@@ -310,8 +352,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 7df965b410944b07a5effd80fc3e5514
           name: 'Operating system'
@@ -333,8 +375,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: os
           triggers:
             -
               uuid: 752e3b231fb9428baa28a7dffd90b2a5
@@ -347,6 +389,10 @@ zabbix_export:
                 -
                   name: 'System name has changed (new name: {ITEM.VALUE})'
                   expression: 'last(/MikroTik hEX SNMP/system.name,#1)<>last(/MikroTik hEX SNMP/system.name,#2) and length(last(/MikroTik hEX SNMP/system.name))>0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 2d1af72cb5174acfaaf50992b2aeb25e
           name: Uptime
@@ -367,8 +413,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 40869f938b4f470cad6f5d8996edd088
@@ -381,6 +427,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/MikroTik hEX SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 3698fb3739a8435da6e40f4c2245b78e
           name: 'Total memory'
@@ -407,8 +457,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: b15a14a08a06417a9ca3586754a3c968
           name: 'Used memory'
@@ -427,8 +477,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: ac044f3cfc33483db97ef1daecaafd6e
           name: 'Memory utilization'
@@ -441,8 +491,8 @@ zabbix_export:
           description: 'Memory utilization in %'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: 3887f8ec0f8a4eadb45b3d3388fdd3bf
@@ -450,6 +500,13 @@ zabbix_export:
               name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
               priority: AVERAGE
               description: 'The system is running out of free memory.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: c814df3020694764834105ce89cb5232
           name: 'SNMP agent availability'
@@ -466,8 +523,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 9a95ecc339b34b3a8713d62c68e2b330
@@ -480,6 +540,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik hEX SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: 8bdd4763b58b4bb5ae2cd68f28a7d5aa
@@ -504,8 +568,8 @@ zabbix_export:
                 The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
               trigger_prototypes:
                 -
                   uuid: 2d0e7e1624ef40de9a7ba351917ec339
@@ -514,6 +578,10 @@ zabbix_export:
                   opdata: 'Current utilization: {ITEM.LASTVALUE1}'
                   priority: WARNING
                   description: 'CPU utilization is too high. The system might be slow to respond.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 8dd00c34191d4daab61d4b9b9abe76af
@@ -558,8 +626,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 3b40b247aeb14a6d833a3c67594938ae
@@ -570,6 +638,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: cf13c4a9be634dd09d1f14a9774a0009
                   expression: 'avg(/MikroTik hEX SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
@@ -584,6 +659,13 @@ zabbix_export:
                       name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
                       expression: 'avg(/MikroTik hEX SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
                       recovery_expression: 'max(/MikroTik hEX SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 16f478f052aa47328ac6e23e778d353c
                   expression: 'avg(/MikroTik hEX SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
@@ -592,6 +674,13 @@ zabbix_export:
                   name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 6da7e4227e054a3ca41950f208cd8c01
           name: 'Temperature sensor discovery'
@@ -601,8 +690,7 @@ zabbix_export:
           delay: 1h
           description: |
             MIKROTIK-MIB::mtxrHlTemperature
-            Since temperature sensor is not available on all Mikrotik hardware,
-            this is done to avoid unsupported items.
+            Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.
           item_prototypes:
             -
               uuid: 82aeb0418e3445bd92a6626e75d25b7a
@@ -626,8 +714,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 8b2e3dedb9884c81a8370732a1f3a367
@@ -638,6 +726,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: c5c22051e035432eba2ad5f77da002c0
                   expression: 'avg(/MikroTik hEX SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
@@ -652,6 +747,13 @@ zabbix_export:
                       name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
                       expression: 'avg(/MikroTik hEX SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
                       recovery_expression: 'max(/MikroTik hEX SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 9b49825517f44a7fa37d2d96abd8848b
                   expression: 'avg(/MikroTik hEX SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
@@ -660,6 +762,13 @@ zabbix_export:
                   name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 485845b1ea494e12a042e6e55f8758bb
           name: 'LTE modem discovery'
@@ -694,14 +803,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRP Reference Signal Received Power.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 1491814409194648a9d98bcb18ac77cc
                   expression: 'max(/MikroTik hEX SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 379ec65a6b9f4136950b21a9d90cc547
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
@@ -716,14 +838,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: e7a5fc01703c4474add6aac174ef5b16
                   expression: 'max(/MikroTik hEX SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: f4de2c971a664990a8c6bafc42c089fd
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
@@ -738,14 +873,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: d529f287404945b9a265fefff65768d5
                   expression: 'max(/MikroTik hEX SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: de256c8eb72a457d81fb33f192320037
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
@@ -760,14 +908,27 @@ zabbix_export:
                 mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 2f85f97d29774922b6fecc19379726d8
                   expression: 'max(/MikroTik hEX SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 70a56aeed598461e8d41997d056b83fd
@@ -828,8 +989,14 @@ zabbix_export:
                 mtxrWlApAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 85ae5fc4ef5e404ebd0ffcb14a14d8b7
               name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
@@ -849,8 +1016,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 2412519dbd114cb3b8a16dcb8c11d087
               name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
@@ -870,8 +1043,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 01abec24a89f4112991dfb272512a716
               name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
@@ -890,8 +1069,14 @@ zabbix_export:
                     - 15m
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: de7416fa19824a9abf3223dc2dc77c26
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -904,8 +1089,14 @@ zabbix_export:
                 mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
         -
           uuid: f26774cbab2949f69b634eb8b5821e58
           name: 'CAPsMAN AP channel discovery'
@@ -938,8 +1129,14 @@ zabbix_export:
                 mtxrWlCMAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: e704ea4180ed4e33ba1aee5402e01101
               name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
@@ -959,8 +1156,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: aba46c2b5c614cc7873d2edaeb1d3493
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -973,8 +1176,14 @@ zabbix_export:
                 mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 17a2738e73924bb9928eedd098f3ba7c
               name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
@@ -994,8 +1203,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 92cf3f4cf7a64de58347d2e459321f92
@@ -1003,6 +1218,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
                   priority: WARNING
                   description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 4c29001a422d4c93829f613674c760ab
           name: 'Network interfaces discovery'
@@ -1091,8 +1313,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 32e0d3493c2142389f5dffecb9720551
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -1111,8 +1339,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 45ebaba72cb643c98340640f40129113
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -1136,8 +1370,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 13c44a7c91ed4781aa390cf0fe45224a
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -1160,8 +1400,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: b20fe4196472445e9cbb73152e819f5b
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -1180,8 +1426,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: e55c393989a1461e8a3e05733164a273
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -1205,8 +1457,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 0e5816801ead429688acc6c4e6387c9d
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -1231,8 +1489,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: f8c119662e5a460588e15558e83be9d3
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -1254,8 +1518,14 @@ zabbix_export:
                 name: 'IF-MIB::ifOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: c8fd70162f264509a4bd4898015f522f
@@ -1273,6 +1543,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: c08335ca5dae457b8d0139df59e96057
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -1296,8 +1570,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           trigger_prototypes:
             -
               uuid: 1ebf4ecd3b254ace99f6738cd066035c
@@ -1327,6 +1607,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik hEX SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik hEX SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik hEX SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik hEX SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 01d1b416123541eaad013386e1605241
               expression: |
@@ -1347,6 +1631,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik hEX SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik hEX SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik hEX SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik hEX SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: baa41e89c189448e9d9a5918ef4918be
               expression: |
@@ -1366,6 +1654,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik hEX SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik hEX SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik hEX SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik hEX SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: 29c240aec2bf440c9e69751f16c6aec8
@@ -1444,8 +1739,11 @@ zabbix_export:
               description: 'Space utilization in % for Disk-{#SNMPINDEX}'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 8e9bb2413bd142d194d0563590441797
               name: 'Disk-{#SNMPINDEX}: Total space'
@@ -1472,8 +1770,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 5021e0a0f78b4d6f80965efb0975fe04
               name: 'Disk-{#SNMPINDEX}: Used space'
@@ -1492,8 +1793,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
           trigger_prototypes:
             -
               uuid: 927bf28b0d7f4409ab7b2de288e59b66
@@ -1509,6 +1813,13 @@ zabbix_export:
                  - The disk free space is less than 5G.
                  - The disk will be full in less than 24 hours.
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
             -
               uuid: ca6639ac0950404da35738314aa3b88e
               expression: |
@@ -1529,6 +1840,13 @@ zabbix_export:
                   expression: |
                     last(/MikroTik hEX SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
                     ((last(/MikroTik hEX SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik hEX SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik hEX SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
           graph_prototypes:
             -
               uuid: a7e05919813b4ebb9fc0e4535d342807
@@ -1552,6 +1870,16 @@ zabbix_export:
                   item:
                     host: 'MikroTik hEX SNMP'
                     key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: hex
+        -
+          tag: target
+          value: mikrotik
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/net/mikrotik/mikrotik_netPower_15FR_snmp/README.md b/templates/net/mikrotik/mikrotik_netPower_15FR_snmp/README.md
index a64c70b249e..55b05c4aa21 100644
--- a/templates/net/mikrotik/mikrotik_netPower_15FR_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_netPower_15FR_snmp/README.md
@@ -71,7 +71,7 @@ There are no template links in this template.
 |Network interfaces discovery |<p>Discovering interfaces from IF-MIB.</p> |SNMP |net.if.discovery<p>**Filter**:</p>AND <p>- {#IFADMINSTATUS} MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.MATCHES}`</p><p>- {#IFADMINSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.NOT_MATCHES}`</p><p>- {#IFOPERSTATUS} MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.MATCHES}`</p><p>- {#IFOPERSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.NOT_MATCHES}`</p><p>- {#IFNAME} MATCHES_REGEX `{$NET.IF.IFNAME.MATCHES}`</p><p>- {#IFNAME} NOT_MATCHES_REGEX `{$NET.IF.IFNAME.NOT_MATCHES}`</p><p>- {#IFDESCR} MATCHES_REGEX `{$NET.IF.IFDESCR.MATCHES}`</p><p>- {#IFDESCR} NOT_MATCHES_REGEX `{$NET.IF.IFDESCR.NOT_MATCHES}`</p><p>- {#IFALIAS} MATCHES_REGEX `{$NET.IF.IFALIAS.MATCHES}`</p><p>- {#IFALIAS} NOT_MATCHES_REGEX `{$NET.IF.IFALIAS.NOT_MATCHES}`</p><p>- {#IFTYPE} MATCHES_REGEX `{$NET.IF.IFTYPE.MATCHES}`</p><p>- {#IFTYPE} NOT_MATCHES_REGEX `{$NET.IF.IFTYPE.NOT_MATCHES}`</p> |
 |Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 |Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
-|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
 
 ## Items collected
 
@@ -137,14 +137,14 @@ There are no template links in this template.
 |Interface {#IFNAME}({#IFALIAS}): Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p><p>3. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik netPower 15FR SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik netPower 15FR SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik netPower 15FR SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))`<p>Recovery expression:</p>`last(/MikroTik netPower 15FR SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0` |AVERAGE |<p>Manual close: YES</p> |
 |Interface {#IFNAME}({#IFALIAS}): High bandwidth usage (>{$IF.UTIL.MAX:"{#IFNAME}"}%) |<p>The network interface utilization is close to its estimated maximum bandwidth.</p> |`(avg(/MikroTik netPower 15FR SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik netPower 15FR SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) or avg(/MikroTik netPower 15FR SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik netPower 15FR SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])) and last(/MikroTik netPower 15FR SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0`<p>Recovery expression:</p>`avg(/MikroTik netPower 15FR SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik netPower 15FR SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) and avg(/MikroTik netPower 15FR SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik netPower 15FR SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |Interface {#IFNAME}({#IFALIAS}): High error rate (>{$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) |<p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p> |`min(/MikroTik netPower 15FR SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"} or min(/MikroTik netPower 15FR SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`max(/MikroTik netPower 15FR SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8 and max(/MikroTik netPower 15FR SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
-|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik netPower 15FR SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik netPower 15FR SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik netPower 15FR SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik netPower 15FR SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik netPower 15FR SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik netPower 15FR SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik netPower 15FR SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik netPower 15FR SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik netPower 15FR SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2) `<p>Recovery expression:</p>`(change(/MikroTik netPower 15FR SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik netPower 15FR SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik netPower 15FR SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2) ` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik netPower 15FR SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik netPower 15FR SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik netPower 15FR SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik netPower 15FR SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik netPower 15FR SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik netPower 15FR SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik netPower 15FR SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik netPower 15FR SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik netPower 15FR SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2)`<p>Recovery expression:</p>`(change(/MikroTik netPower 15FR SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik netPower 15FR SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik netPower 15FR SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2)` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |{HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/MikroTik netPower 15FR SNMP/system.uptime[sysUpTime.0])<10m` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- No SNMP data collection</p> |
 |No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/MikroTik netPower 15FR SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |Unavailable by ICMP ping |<p>Last three attempts returned timeout.  Please check device connectivity.</p> |`max(/MikroTik netPower 15FR SNMP/icmpping,#3)=0` |HIGH | |
 |High ICMP ping loss |<p>-</p> |`min(/MikroTik netPower 15FR SNMP/icmppingloss,5m)>{$ICMP_LOSS_WARN} and min(/MikroTik netPower 15FR SNMP/icmppingloss,5m)<100` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |High ICMP ping response time |<p>-</p> |`avg(/MikroTik netPower 15FR SNMP/icmppingsec,5m)>{$ICMP_RESPONSE_TIME_WARN}` |WARNING |<p>**Depends on**:</p><p>- High ICMP ping loss</p><p>- Unavailable by ICMP ping</p> |
-|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik netPower 15FR SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik netPower 15FR SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik netPower 15FR SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik netPower 15FR SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
-|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik netPower 15FR SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik netPower 15FR SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik netPower 15FR SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik netPower 15FR SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik netPower 15FR SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik netPower 15FR SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik netPower 15FR SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik netPower 15FR SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik netPower 15FR SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik netPower 15FR SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik netPower 15FR SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik netPower 15FR SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
 |CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik netPower 15FR SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik netPower 15FR SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
 |CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik netPower 15FR SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik netPower 15FR SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
 |CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik netPower 15FR SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik netPower 15FR SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
diff --git a/templates/net/mikrotik/mikrotik_netPower_15FR_snmp/template_net_mikrotik_netPower_15FR_snmp.yaml b/templates/net/mikrotik/mikrotik_netPower_15FR_snmp/template_net_mikrotik_netPower_15FR_snmp.yaml
index 21bb326f389..402d66ce4c5 100644
--- a/templates/net/mikrotik/mikrotik_netPower_15FR_snmp/template_net_mikrotik_netPower_15FR_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_netPower_15FR_snmp/template_net_mikrotik_netPower_15FR_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:46:24Z'
+  date: '2022-01-26T10:43:46Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -35,8 +35,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 8b77ade2f79b4e3bafc22e7d8766e477
@@ -44,6 +47,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 4f918b392de8452b943c71ef69f17fad
           name: 'ICMP loss'
@@ -54,8 +61,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: cf4a28f174764d20953c4dcbca1576b6
@@ -67,6 +77,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik netPower 15FR SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 7deb2be6b623485fb0e6bbf88a02dbf7
           name: 'ICMP response time'
@@ -77,8 +94,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 5ab1684fe5f34e3faa06192f47562b86
@@ -93,6 +113,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik netPower 15FR SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: ba5410ba09354d87a3f3941d3b45b013
           name: 'SNMP traps (fallback)'
@@ -105,8 +132,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: 84a4224286024f56a09301195b6efa72
           name: 'System contact details'
@@ -128,8 +155,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 2d7c4a734e3b4980b02166caa994d939
           name: 'System description'
@@ -152,8 +179,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: c3a06a34c55c42c89d9158ac8e735564
           name: 'Firmware version'
@@ -174,8 +201,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 86d3bc7830274e24b19f0b7120f9c957
@@ -185,6 +212,10 @@ zabbix_export:
               priority: INFO
               description: 'Firmware version has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 350020213bbd4ca59fad42e8347abd67
           name: 'Hardware model name'
@@ -203,8 +234,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
         -
           uuid: 3540413716f141329c4ffadb402a051d
           name: 'Hardware serial number'
@@ -226,8 +257,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 8964055d1c7445e68b9ba2eb30faf1fc
@@ -236,6 +267,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 225a0364e38845b489a9dc94055790ac
           name: 'System location'
@@ -257,8 +292,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 8fa41471e9b44d138848ab7ecfb7d354
           name: 'System name'
@@ -280,8 +315,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: a67b112302804d90931ea112d7412aa7
@@ -290,6 +325,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: 6320b2b82e3c42f993a053be2ed60a5d
           name: 'System object ID'
@@ -310,8 +352,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: d8413ee1e46846fabbc3f7239d74df02
           name: 'Operating system'
@@ -333,8 +375,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: os
           triggers:
             -
               uuid: ad61f9029ba449aab240fee852d1e49e
@@ -347,6 +389,10 @@ zabbix_export:
                 -
                   name: 'System name has changed (new name: {ITEM.VALUE})'
                   expression: 'last(/MikroTik netPower 15FR SNMP/system.name,#1)<>last(/MikroTik netPower 15FR SNMP/system.name,#2) and length(last(/MikroTik netPower 15FR SNMP/system.name))>0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 3ad913927c424bc9b2ab09365921f41a
           name: Uptime
@@ -367,8 +413,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 6ca7b6f5acfb499b8ffbf5988a95616c
@@ -381,6 +427,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/MikroTik netPower 15FR SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: d80ed64a5916414091a72caf33d650ee
           name: 'Total memory'
@@ -407,8 +457,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: bd680110f05848aaa2754da8d00f60e4
           name: 'Used memory'
@@ -427,8 +477,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 1a8c279dc19c4944804d27e0e6f7b5b3
           name: 'Memory utilization'
@@ -441,8 +491,8 @@ zabbix_export:
           description: 'Memory utilization in %'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: 660db85a472349e7878bcdf41faa4689
@@ -450,6 +500,13 @@ zabbix_export:
               name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
               priority: AVERAGE
               description: 'The system is running out of free memory.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 6ee24adf573947e29e23436f45a47e08
           name: 'SNMP agent availability'
@@ -466,8 +523,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: f0686a8c2a6e42de980d6bca8ce4a0da
@@ -480,6 +540,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik netPower 15FR SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: 41c63da374c3490ca27e7bc3298f269d
@@ -504,8 +568,8 @@ zabbix_export:
                 The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
               trigger_prototypes:
                 -
                   uuid: 6fa6e471c9594ea9a65d54a72a7a7b54
@@ -514,6 +578,10 @@ zabbix_export:
                   opdata: 'Current utilization: {ITEM.LASTVALUE1}'
                   priority: WARNING
                   description: 'CPU utilization is too high. The system might be slow to respond.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 308c726fa1ac419490b645f68bde63de
@@ -558,8 +626,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 46615aebb0e2414b9094e5e25c0a6314
@@ -570,6 +638,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: db07d94668634efca75ab714cc2cf083
                   expression: 'avg(/MikroTik netPower 15FR SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
@@ -584,6 +659,13 @@ zabbix_export:
                       name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
                       expression: 'avg(/MikroTik netPower 15FR SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
                       recovery_expression: 'max(/MikroTik netPower 15FR SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 664ab6cc5ce044af8d6899473ea0a8b1
                   expression: 'avg(/MikroTik netPower 15FR SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
@@ -592,6 +674,13 @@ zabbix_export:
                   name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: fe69d484c5734fc88eb7cb9d8e79288e
           name: 'Temperature sensor discovery'
@@ -601,8 +690,7 @@ zabbix_export:
           delay: 1h
           description: |
             MIKROTIK-MIB::mtxrHlTemperature
-            Since temperature sensor is not available on all Mikrotik hardware,
-            this is done to avoid unsupported items.
+            Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.
           item_prototypes:
             -
               uuid: 511cdf90845747b5bfc43c46c245aec5
@@ -626,8 +714,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: f81db05dfee24aaaa8cc27aca30e7455
@@ -638,6 +726,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: edab3732eb9a41f4b42da927ee8996a7
                   expression: 'avg(/MikroTik netPower 15FR SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
@@ -652,6 +747,13 @@ zabbix_export:
                       name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
                       expression: 'avg(/MikroTik netPower 15FR SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
                       recovery_expression: 'max(/MikroTik netPower 15FR SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 0ef1463290ce45ab83838acb51e9d5ab
                   expression: 'avg(/MikroTik netPower 15FR SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
@@ -660,6 +762,13 @@ zabbix_export:
                   name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 325f04ecd27949d6a5c486850e7d189c
           name: 'LTE modem discovery'
@@ -694,14 +803,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRP Reference Signal Received Power.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 30101628e09d4c67a1d4d7938b7b5674
                   expression: 'max(/MikroTik netPower 15FR SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: f4f48561aad24599886457011a6a4995
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
@@ -716,14 +838,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 179fb6a3947f4a4bad4d914dfbf2727e
                   expression: 'max(/MikroTik netPower 15FR SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: f492fe605f56443d98b136a4d6d81d70
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
@@ -738,14 +873,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: d92f9fa8a9a648ad817295ba5b26c254
                   expression: 'max(/MikroTik netPower 15FR SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 32b98a463dc74c11b4e1695970fca8fc
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
@@ -760,14 +908,27 @@ zabbix_export:
                 mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: df1dc76e73904e35850f1b104dca01ea
                   expression: 'max(/MikroTik netPower 15FR SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 3282106194e14f4e935d10a97d85a536
@@ -828,8 +989,14 @@ zabbix_export:
                 mtxrWlApAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: b723d3bf59c047039fc23568f445aa98
               name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
@@ -849,8 +1016,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 9ba87c338496445dbc1fb2019a07941e
               name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
@@ -870,8 +1043,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 3d1256ace78141cc94a8b36ddcd5578c
               name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
@@ -890,8 +1069,14 @@ zabbix_export:
                     - 15m
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: c9c7f1e0788845398a415a6e649e3818
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -904,8 +1089,14 @@ zabbix_export:
                 mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
         -
           uuid: 802b868d392d4f65bb47178566fc113c
           name: 'CAPsMAN AP channel discovery'
@@ -938,8 +1129,14 @@ zabbix_export:
                 mtxrWlCMAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 26b0c07f668e43718e6fea333f68fc63
               name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
@@ -959,8 +1156,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 8ea5913e43c740b19c28647eef54c3ae
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -973,8 +1176,14 @@ zabbix_export:
                 mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 3ddfb23ff23c44ee9d9690374f82d028
               name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
@@ -994,8 +1203,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: fb10d55898f74edbb7a1541481cbde49
@@ -1003,6 +1218,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
                   priority: WARNING
                   description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 62392f64c22b47d8bb2cf4fcb1c24682
           name: 'Network interfaces discovery'
@@ -1091,8 +1313,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 67bbe49205f6440398bfc5f28df04c3f
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -1111,8 +1339,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 9df47891dc1540f98068c1734a2bab0e
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -1136,8 +1370,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: e8e937775f794e7ca7e78e8e5cc1e555
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -1160,8 +1400,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 88e9b94950084ffcbae95936b9af3c66
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -1180,8 +1426,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 5b3a4925f5c54ae78c46eee45e81588e
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -1205,8 +1457,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: faca9de83a1c4309972af08848b0480d
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -1231,8 +1489,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 9e73b53e463f479fbdaaf17433530cf2
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -1254,8 +1518,14 @@ zabbix_export:
                 name: 'IF-MIB::ifOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 0aac9b47a3f04cc7bea4f118e66d2a2e
@@ -1273,6 +1543,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: b1e65d5043c84e7b9a9185cd0ea36074
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -1296,8 +1570,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           trigger_prototypes:
             -
               uuid: d01d880fa506470a85c4219963c6275d
@@ -1327,6 +1607,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik netPower 15FR SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik netPower 15FR SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik netPower 15FR SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik netPower 15FR SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 65d28a326c624b9da28eb0d0477138fb
               expression: |
@@ -1347,6 +1631,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik netPower 15FR SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik netPower 15FR SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik netPower 15FR SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik netPower 15FR SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 1dcf1776170c44b38acb30d3c20f62a8
               expression: |
@@ -1366,6 +1654,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik netPower 15FR SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik netPower 15FR SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik netPower 15FR SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik netPower 15FR SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: 6744532b53474f93944f103e71a61612
@@ -1444,8 +1739,11 @@ zabbix_export:
               description: 'Space utilization in % for Disk-{#SNMPINDEX}'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: a1838a262c5446d798d1ca6f5b9237c1
               name: 'Disk-{#SNMPINDEX}: Total space'
@@ -1472,8 +1770,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 517b5e46327f48e9b3db685167a77d13
               name: 'Disk-{#SNMPINDEX}: Used space'
@@ -1492,8 +1793,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
           trigger_prototypes:
             -
               uuid: 2ba297940326432dbbc91974ed99d53d
@@ -1509,6 +1813,13 @@ zabbix_export:
                  - The disk free space is less than 5G.
                  - The disk will be full in less than 24 hours.
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
             -
               uuid: e3054ae302bd4c29b81b6f4c58c39021
               expression: |
@@ -1529,6 +1840,13 @@ zabbix_export:
                   expression: |
                     last(/MikroTik netPower 15FR SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
                     ((last(/MikroTik netPower 15FR SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik netPower 15FR SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik netPower 15FR SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
           graph_prototypes:
             -
               uuid: 9d68b0bd14fb432bb730cf1c69098dd7
@@ -1552,6 +1870,16 @@ zabbix_export:
                   item:
                     host: 'MikroTik netPower 15FR SNMP'
                     key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: mikrotik
+        -
+          tag: target
+          value: netpower-15fr
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/net/mikrotik/mikrotik_netPower_16P_snmp/README.md b/templates/net/mikrotik/mikrotik_netPower_16P_snmp/README.md
index c0c05c5a0bc..f6a1b651b00 100644
--- a/templates/net/mikrotik/mikrotik_netPower_16P_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_netPower_16P_snmp/README.md
@@ -71,7 +71,7 @@ There are no template links in this template.
 |Network interfaces discovery |<p>Discovering interfaces from IF-MIB.</p> |SNMP |net.if.discovery<p>**Filter**:</p>AND <p>- {#IFADMINSTATUS} MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.MATCHES}`</p><p>- {#IFADMINSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.NOT_MATCHES}`</p><p>- {#IFOPERSTATUS} MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.MATCHES}`</p><p>- {#IFOPERSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.NOT_MATCHES}`</p><p>- {#IFNAME} MATCHES_REGEX `{$NET.IF.IFNAME.MATCHES}`</p><p>- {#IFNAME} NOT_MATCHES_REGEX `{$NET.IF.IFNAME.NOT_MATCHES}`</p><p>- {#IFDESCR} MATCHES_REGEX `{$NET.IF.IFDESCR.MATCHES}`</p><p>- {#IFDESCR} NOT_MATCHES_REGEX `{$NET.IF.IFDESCR.NOT_MATCHES}`</p><p>- {#IFALIAS} MATCHES_REGEX `{$NET.IF.IFALIAS.MATCHES}`</p><p>- {#IFALIAS} NOT_MATCHES_REGEX `{$NET.IF.IFALIAS.NOT_MATCHES}`</p><p>- {#IFTYPE} MATCHES_REGEX `{$NET.IF.IFTYPE.MATCHES}`</p><p>- {#IFTYPE} NOT_MATCHES_REGEX `{$NET.IF.IFTYPE.NOT_MATCHES}`</p> |
 |Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 |Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
-|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
 
 ## Items collected
 
@@ -137,14 +137,14 @@ There are no template links in this template.
 |Interface {#IFNAME}({#IFALIAS}): Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p><p>3. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik netPower 16P SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik netPower 16P SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik netPower 16P SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))`<p>Recovery expression:</p>`last(/MikroTik netPower 16P SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0` |AVERAGE |<p>Manual close: YES</p> |
 |Interface {#IFNAME}({#IFALIAS}): High bandwidth usage (>{$IF.UTIL.MAX:"{#IFNAME}"}%) |<p>The network interface utilization is close to its estimated maximum bandwidth.</p> |`(avg(/MikroTik netPower 16P SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik netPower 16P SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) or avg(/MikroTik netPower 16P SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik netPower 16P SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])) and last(/MikroTik netPower 16P SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0`<p>Recovery expression:</p>`avg(/MikroTik netPower 16P SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik netPower 16P SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) and avg(/MikroTik netPower 16P SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik netPower 16P SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |Interface {#IFNAME}({#IFALIAS}): High error rate (>{$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) |<p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p> |`min(/MikroTik netPower 16P SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"} or min(/MikroTik netPower 16P SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`max(/MikroTik netPower 16P SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8 and max(/MikroTik netPower 16P SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
-|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik netPower 16P SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik netPower 16P SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik netPower 16P SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik netPower 16P SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik netPower 16P SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik netPower 16P SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik netPower 16P SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik netPower 16P SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik netPower 16P SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2) `<p>Recovery expression:</p>`(change(/MikroTik netPower 16P SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik netPower 16P SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik netPower 16P SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2) ` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik netPower 16P SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik netPower 16P SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik netPower 16P SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik netPower 16P SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik netPower 16P SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik netPower 16P SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik netPower 16P SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik netPower 16P SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik netPower 16P SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2)`<p>Recovery expression:</p>`(change(/MikroTik netPower 16P SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik netPower 16P SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik netPower 16P SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2)` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |{HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/MikroTik netPower 16P SNMP/system.uptime[sysUpTime.0])<10m` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- No SNMP data collection</p> |
 |No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/MikroTik netPower 16P SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |Unavailable by ICMP ping |<p>Last three attempts returned timeout.  Please check device connectivity.</p> |`max(/MikroTik netPower 16P SNMP/icmpping,#3)=0` |HIGH | |
 |High ICMP ping loss |<p>-</p> |`min(/MikroTik netPower 16P SNMP/icmppingloss,5m)>{$ICMP_LOSS_WARN} and min(/MikroTik netPower 16P SNMP/icmppingloss,5m)<100` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |High ICMP ping response time |<p>-</p> |`avg(/MikroTik netPower 16P SNMP/icmppingsec,5m)>{$ICMP_RESPONSE_TIME_WARN}` |WARNING |<p>**Depends on**:</p><p>- High ICMP ping loss</p><p>- Unavailable by ICMP ping</p> |
-|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik netPower 16P SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik netPower 16P SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik netPower 16P SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik netPower 16P SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
-|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik netPower 16P SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik netPower 16P SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik netPower 16P SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik netPower 16P SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik netPower 16P SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik netPower 16P SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik netPower 16P SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik netPower 16P SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik netPower 16P SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik netPower 16P SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik netPower 16P SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik netPower 16P SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
 |CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik netPower 16P SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik netPower 16P SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
 |CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik netPower 16P SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik netPower 16P SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
 |CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik netPower 16P SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik netPower 16P SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
diff --git a/templates/net/mikrotik/mikrotik_netPower_16P_snmp/template_net_mikrotik_netPower_16P_snmp.yaml b/templates/net/mikrotik/mikrotik_netPower_16P_snmp/template_net_mikrotik_netPower_16P_snmp.yaml
index 819c6c89a88..56763d151ff 100644
--- a/templates/net/mikrotik/mikrotik_netPower_16P_snmp/template_net_mikrotik_netPower_16P_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_netPower_16P_snmp/template_net_mikrotik_netPower_16P_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:46:28Z'
+  date: '2022-01-26T09:51:43Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -35,8 +35,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: ad75e791ea804015af4f056851d065e5
@@ -44,6 +47,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 5571d787631e48e782de334341fabb8f
           name: 'ICMP loss'
@@ -54,8 +61,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 53146df6198e4aa8a08ee2f5148b9273
@@ -67,6 +77,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik netPower 16P SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: d39e275bb89745caa0a6b27ac88c58fe
           name: 'ICMP response time'
@@ -77,8 +94,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: d30292aa239f4b08866dd626bea719d4
@@ -93,6 +113,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik netPower 16P SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: c18df4381e984a599904b4fcf19d2f70
           name: 'SNMP traps (fallback)'
@@ -105,8 +132,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: 64eb10d744834f2697951abf073d5149
           name: 'System contact details'
@@ -128,8 +155,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 4d6158d361f943af9dd63ef425e5cf28
           name: 'System description'
@@ -152,8 +179,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 166760a906dd4377a9b548a4809da3fd
           name: 'Firmware version'
@@ -174,8 +201,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 4b2840d437844c54aa8328a2af6ab16a
@@ -185,6 +212,10 @@ zabbix_export:
               priority: INFO
               description: 'Firmware version has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: fd26be143fce4e5bb10c61899b518eb2
           name: 'Hardware model name'
@@ -203,8 +234,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
         -
           uuid: 17f7aa01b647470382387fa9698bb80d
           name: 'Hardware serial number'
@@ -226,8 +257,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 356423e8d963491c84c0ff910a324db9
@@ -236,6 +267,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: c92d6baa96784a30a17e785e6214e3e3
           name: 'System location'
@@ -257,8 +292,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 3b9de782051549bea9f39dd6ceb6b946
           name: 'System name'
@@ -280,8 +315,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 31d043884c104f02aabfc12edc7cca38
@@ -290,6 +325,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: 6455af8d14904fcf892a03989a0b8a37
           name: 'System object ID'
@@ -310,8 +352,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 6f2ceb1729884e39a364207defb39b96
           name: 'Operating system'
@@ -333,8 +375,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: os
           triggers:
             -
               uuid: 381ec628763d43e8a7f287d4bab024ee
@@ -347,6 +389,10 @@ zabbix_export:
                 -
                   name: 'System name has changed (new name: {ITEM.VALUE})'
                   expression: 'last(/MikroTik netPower 16P SNMP/system.name,#1)<>last(/MikroTik netPower 16P SNMP/system.name,#2) and length(last(/MikroTik netPower 16P SNMP/system.name))>0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: ddbd6f5ee0094e5ca2f62aa07fe71fd5
           name: Uptime
@@ -367,8 +413,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: d721994d11d04783af8d3a474de35b1c
@@ -381,6 +427,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/MikroTik netPower 16P SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: efdb24ce66d8410cae4a932160c12bf2
           name: 'Total memory'
@@ -407,8 +457,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 3d359d909fef46ec96fd6f66a7be6d3b
           name: 'Used memory'
@@ -427,8 +477,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: ca6584d0bc71410bb93a7c295e6993b3
           name: 'Memory utilization'
@@ -441,8 +491,8 @@ zabbix_export:
           description: 'Memory utilization in %'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: 35b88fa6b15845e78a3a7211fe2ed0af
@@ -450,6 +500,13 @@ zabbix_export:
               name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
               priority: AVERAGE
               description: 'The system is running out of free memory.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 84fc11c2d18449cb8b903b6a8ac05959
           name: 'SNMP agent availability'
@@ -466,8 +523,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 5a3c6162200746f2b5fc1df3120dcc40
@@ -480,6 +540,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik netPower 16P SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: c8e3efbae6ae49a19192b5df2ee9fea8
@@ -504,8 +568,8 @@ zabbix_export:
                 The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
               trigger_prototypes:
                 -
                   uuid: e40966f36f804bbab518eb0cbc711fca
@@ -514,6 +578,10 @@ zabbix_export:
                   opdata: 'Current utilization: {ITEM.LASTVALUE1}'
                   priority: WARNING
                   description: 'CPU utilization is too high. The system might be slow to respond.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: d8f0a7f28ec647eebdeb1db630e63249
@@ -558,8 +626,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 725caccdc4fe495e93e2cfa438f52674
@@ -570,6 +638,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: ea9e2193843d4a71bd24bead9394685d
                   expression: 'avg(/MikroTik netPower 16P SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
@@ -584,6 +659,13 @@ zabbix_export:
                       name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
                       expression: 'avg(/MikroTik netPower 16P SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
                       recovery_expression: 'max(/MikroTik netPower 16P SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: ac521e5e0c9d416ba0f61563a85a66ff
                   expression: 'avg(/MikroTik netPower 16P SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
@@ -592,6 +674,13 @@ zabbix_export:
                   name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 6db4d343f263423aa2429e64efbef34b
           name: 'Temperature sensor discovery'
@@ -601,8 +690,7 @@ zabbix_export:
           delay: 1h
           description: |
             MIKROTIK-MIB::mtxrHlTemperature
-            Since temperature sensor is not available on all Mikrotik hardware,
-            this is done to avoid unsupported items.
+            Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.
           item_prototypes:
             -
               uuid: 9ea80b6d187a4117aea55f07c782f336
@@ -626,8 +714,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: b5a55e90742148ae91fb30394d79a50a
@@ -638,6 +726,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: f5ccdff135ee46ed81889d2882d54b3a
                   expression: 'avg(/MikroTik netPower 16P SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
@@ -652,6 +747,13 @@ zabbix_export:
                       name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
                       expression: 'avg(/MikroTik netPower 16P SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
                       recovery_expression: 'max(/MikroTik netPower 16P SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: dd21e53afab64548ae180079d705dee5
                   expression: 'avg(/MikroTik netPower 16P SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
@@ -660,6 +762,13 @@ zabbix_export:
                   name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: b26cd292bf634d3e9c7cbf96fae9a9c1
           name: 'LTE modem discovery'
@@ -694,14 +803,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRP Reference Signal Received Power.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 1119a5651b6b469199e6cd8484ea000b
                   expression: 'max(/MikroTik netPower 16P SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: c6fb1da5c6d642579285caf0712e870c
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
@@ -716,14 +838,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 22c7a42c10524dfab69c6e9566a28150
                   expression: 'max(/MikroTik netPower 16P SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 766550d88a2b46ee905b611dd2b740f8
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
@@ -738,14 +873,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 14f69778aac0476290fd2ddff01693fd
                   expression: 'max(/MikroTik netPower 16P SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: a5af3f3c24fa4804b7ce63e7fb377f64
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
@@ -760,14 +908,27 @@ zabbix_export:
                 mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: a6e1255d7904488788f4e5358b4b1a70
                   expression: 'max(/MikroTik netPower 16P SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 955940cc271f48b89a14caebc9cd7adf
@@ -828,8 +989,14 @@ zabbix_export:
                 mtxrWlApAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 7b987144335b4ba58231327e9686bfef
               name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
@@ -849,8 +1016,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: fa450c03ad6f4628915bfe5148d3f159
               name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
@@ -870,8 +1043,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: bba6280d021147ae98ba429ad2c58f80
               name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
@@ -890,8 +1069,14 @@ zabbix_export:
                     - 15m
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: c46c846e04784177b8cfb1efb8678391
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -904,8 +1089,14 @@ zabbix_export:
                 mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
         -
           uuid: a0b2f2d19eda41f78501d076da56be98
           name: 'CAPsMAN AP channel discovery'
@@ -938,8 +1129,14 @@ zabbix_export:
                 mtxrWlCMAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 493ac987474b4d59969765d1ac7e9053
               name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
@@ -959,8 +1156,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: d16e8308541043209d509d8c7f1d502c
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -973,8 +1176,14 @@ zabbix_export:
                 mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: f8da5dbe8a684455b7e384372ede531b
               name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
@@ -994,8 +1203,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: d332b384052e4538869186b6c44ae332
@@ -1003,6 +1218,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
                   priority: WARNING
                   description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 7296321823c4439ba324965a820221a6
           name: 'Network interfaces discovery'
@@ -1091,8 +1313,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: b5a661b631e94afcbe6f1e7e941bd089
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -1111,8 +1339,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 10bedeb24a414598984a8c83730ae718
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -1136,8 +1370,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: b8fd82530c854f54b87e8263dc7be4d8
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -1160,8 +1400,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 8368e3d0f297470f9948681ad83c4a77
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -1180,8 +1426,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 2fb86f95aaf04867b219646000a5b851
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -1205,8 +1457,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: a8d1a185804a49e68c2584373770b33e
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -1231,8 +1489,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 112b5660056246e58af76fef04b44c7f
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -1254,8 +1518,14 @@ zabbix_export:
                 name: 'IF-MIB::ifOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 7337464491af47fdae8202c1e68585ac
@@ -1273,6 +1543,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 577f83588c44447c9c6e79ec334b29f3
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -1296,8 +1570,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           trigger_prototypes:
             -
               uuid: 74b27cf9dbed4239bcbeb3967074fc2f
@@ -1327,6 +1607,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik netPower 16P SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik netPower 16P SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik netPower 16P SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik netPower 16P SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 487e923c839049718746d1875ffb4152
               expression: |
@@ -1347,6 +1631,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik netPower 16P SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik netPower 16P SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik netPower 16P SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik netPower 16P SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: fe9c5bef78df4e0b84920a40d1549e6e
               expression: |
@@ -1366,6 +1654,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik netPower 16P SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik netPower 16P SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik netPower 16P SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik netPower 16P SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: 37f70e8457bc4c8c8578bb63d9243843
@@ -1444,8 +1739,11 @@ zabbix_export:
               description: 'Space utilization in % for Disk-{#SNMPINDEX}'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 45a98099bb5443f192d997c0207503b7
               name: 'Disk-{#SNMPINDEX}: Total space'
@@ -1472,8 +1770,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: c823bfe0913b4316b28079aecac9c5f1
               name: 'Disk-{#SNMPINDEX}: Used space'
@@ -1492,8 +1793,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
           trigger_prototypes:
             -
               uuid: 5f17a45877b44fbab75b614db365db47
@@ -1509,6 +1813,13 @@ zabbix_export:
                  - The disk free space is less than 5G.
                  - The disk will be full in less than 24 hours.
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
             -
               uuid: c5c80f5a24484c05b62d7bb5474f2091
               expression: |
@@ -1529,6 +1840,13 @@ zabbix_export:
                   expression: |
                     last(/MikroTik netPower 16P SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
                     ((last(/MikroTik netPower 16P SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik netPower 16P SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik netPower 16P SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
           graph_prototypes:
             -
               uuid: 37977ee583bd41ba95521c2907457999
@@ -1552,6 +1870,16 @@ zabbix_export:
                   item:
                     host: 'MikroTik netPower 16P SNMP'
                     key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: mikrotik
+        -
+          tag: target
+          value: netpower-16p
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/net/mikrotik/mikrotik_netPower_Lite_7R_snmp/README.md b/templates/net/mikrotik/mikrotik_netPower_Lite_7R_snmp/README.md
index 602b7860e6b..8bc9cf6e2a2 100644
--- a/templates/net/mikrotik/mikrotik_netPower_Lite_7R_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_netPower_Lite_7R_snmp/README.md
@@ -71,7 +71,7 @@ There are no template links in this template.
 |Network interfaces discovery |<p>Discovering interfaces from IF-MIB.</p> |SNMP |net.if.discovery<p>**Filter**:</p>AND <p>- {#IFADMINSTATUS} MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.MATCHES}`</p><p>- {#IFADMINSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.NOT_MATCHES}`</p><p>- {#IFOPERSTATUS} MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.MATCHES}`</p><p>- {#IFOPERSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.NOT_MATCHES}`</p><p>- {#IFNAME} MATCHES_REGEX `{$NET.IF.IFNAME.MATCHES}`</p><p>- {#IFNAME} NOT_MATCHES_REGEX `{$NET.IF.IFNAME.NOT_MATCHES}`</p><p>- {#IFDESCR} MATCHES_REGEX `{$NET.IF.IFDESCR.MATCHES}`</p><p>- {#IFDESCR} NOT_MATCHES_REGEX `{$NET.IF.IFDESCR.NOT_MATCHES}`</p><p>- {#IFALIAS} MATCHES_REGEX `{$NET.IF.IFALIAS.MATCHES}`</p><p>- {#IFALIAS} NOT_MATCHES_REGEX `{$NET.IF.IFALIAS.NOT_MATCHES}`</p><p>- {#IFTYPE} MATCHES_REGEX `{$NET.IF.IFTYPE.MATCHES}`</p><p>- {#IFTYPE} NOT_MATCHES_REGEX `{$NET.IF.IFTYPE.NOT_MATCHES}`</p> |
 |Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 |Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
-|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
 
 ## Items collected
 
@@ -137,14 +137,14 @@ There are no template links in this template.
 |Interface {#IFNAME}({#IFALIAS}): Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p><p>3. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik netPower Lite 7R SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik netPower Lite 7R SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik netPower Lite 7R SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))`<p>Recovery expression:</p>`last(/MikroTik netPower Lite 7R SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0` |AVERAGE |<p>Manual close: YES</p> |
 |Interface {#IFNAME}({#IFALIAS}): High bandwidth usage (>{$IF.UTIL.MAX:"{#IFNAME}"}%) |<p>The network interface utilization is close to its estimated maximum bandwidth.</p> |`(avg(/MikroTik netPower Lite 7R SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik netPower Lite 7R SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) or avg(/MikroTik netPower Lite 7R SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/MikroTik netPower Lite 7R SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])) and last(/MikroTik netPower Lite 7R SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0`<p>Recovery expression:</p>`avg(/MikroTik netPower Lite 7R SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik netPower Lite 7R SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) and avg(/MikroTik netPower Lite 7R SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/MikroTik netPower Lite 7R SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |Interface {#IFNAME}({#IFALIAS}): High error rate (>{$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) |<p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p> |`min(/MikroTik netPower Lite 7R SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"} or min(/MikroTik netPower Lite 7R SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`max(/MikroTik netPower Lite 7R SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8 and max(/MikroTik netPower Lite 7R SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
-|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik netPower Lite 7R SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik netPower Lite 7R SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik netPower Lite 7R SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik netPower Lite 7R SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik netPower Lite 7R SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik netPower Lite 7R SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik netPower Lite 7R SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik netPower Lite 7R SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik netPower Lite 7R SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2) `<p>Recovery expression:</p>`(change(/MikroTik netPower Lite 7R SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik netPower Lite 7R SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik netPower Lite 7R SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2) ` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/MikroTik netPower Lite 7R SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/MikroTik netPower Lite 7R SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/MikroTik netPower Lite 7R SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/MikroTik netPower Lite 7R SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/MikroTik netPower Lite 7R SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/MikroTik netPower Lite 7R SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/MikroTik netPower Lite 7R SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/MikroTik netPower Lite 7R SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/MikroTik netPower Lite 7R SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2)`<p>Recovery expression:</p>`(change(/MikroTik netPower Lite 7R SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/MikroTik netPower Lite 7R SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/MikroTik netPower Lite 7R SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2)` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |{HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/MikroTik netPower Lite 7R SNMP/system.uptime[sysUpTime.0])<10m` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- No SNMP data collection</p> |
 |No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/MikroTik netPower Lite 7R SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |Unavailable by ICMP ping |<p>Last three attempts returned timeout.  Please check device connectivity.</p> |`max(/MikroTik netPower Lite 7R SNMP/icmpping,#3)=0` |HIGH | |
 |High ICMP ping loss |<p>-</p> |`min(/MikroTik netPower Lite 7R SNMP/icmppingloss,5m)>{$ICMP_LOSS_WARN} and min(/MikroTik netPower Lite 7R SNMP/icmppingloss,5m)<100` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |High ICMP ping response time |<p>-</p> |`avg(/MikroTik netPower Lite 7R SNMP/icmppingsec,5m)>{$ICMP_RESPONSE_TIME_WARN}` |WARNING |<p>**Depends on**:</p><p>- High ICMP ping loss</p><p>- Unavailable by ICMP ping</p> |
-|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik netPower Lite 7R SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik netPower Lite 7R SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik netPower Lite 7R SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik netPower Lite 7R SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
-|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik netPower Lite 7R SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik netPower Lite 7R SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik netPower Lite 7R SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik netPower Lite 7R SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik netPower Lite 7R SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik netPower Lite 7R SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik netPower Lite 7R SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik netPower Lite 7R SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik netPower Lite 7R SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik netPower Lite 7R SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik netPower Lite 7R SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik netPower Lite 7R SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
 |CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik netPower Lite 7R SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik netPower Lite 7R SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
 |CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik netPower Lite 7R SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik netPower Lite 7R SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
 |CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik netPower Lite 7R SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik netPower Lite 7R SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
diff --git a/templates/net/mikrotik/mikrotik_netPower_Lite_7R_snmp/template_net_mikrotik_netPower_Lite_7R_snmp.yaml b/templates/net/mikrotik/mikrotik_netPower_Lite_7R_snmp/template_net_mikrotik_netPower_Lite_7R_snmp.yaml
index 819204ea699..261cf8043ab 100644
--- a/templates/net/mikrotik/mikrotik_netPower_Lite_7R_snmp/template_net_mikrotik_netPower_Lite_7R_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_netPower_Lite_7R_snmp/template_net_mikrotik_netPower_Lite_7R_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:46:34Z'
+  date: '2022-01-26T09:53:45Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -35,8 +35,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 9eba3716ff704612a9c498a7b5a72a15
@@ -44,6 +47,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 9ad8e2e7b1ee488f9470836f8cd8f4b6
           name: 'ICMP loss'
@@ -54,8 +61,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: c0069ca77aa140d3ad4559979ad0973d
@@ -67,6 +77,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik netPower Lite 7R SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 9a3155664a4d4f5797733f66939bc506
           name: 'ICMP response time'
@@ -77,8 +94,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 9b01547e80e84f16b017901233e1fddd
@@ -93,6 +113,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik netPower Lite 7R SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 886163a11a0d4dd4922fc4fda700ddcf
           name: 'SNMP traps (fallback)'
@@ -105,8 +132,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: e9f5b25afb7e44918e19df044c71d238
           name: 'System contact details'
@@ -128,8 +155,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 449b88f9f0bb423d89def3227b1d9e38
           name: 'System description'
@@ -152,8 +179,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: bece431938dc48d79221aae1c14bb118
           name: 'Firmware version'
@@ -174,8 +201,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: c9b18f3abf444a849606d278d9db0924
@@ -185,6 +212,10 @@ zabbix_export:
               priority: INFO
               description: 'Firmware version has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: d25a80f7bc97479690fcb07d44462606
           name: 'Hardware model name'
@@ -203,8 +234,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
         -
           uuid: e9b1a9ee39334a7e986ca5fa85baea41
           name: 'Hardware serial number'
@@ -226,8 +257,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 42d7e9c9f03e4b2a8af09b1c54913bba
@@ -236,6 +267,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: f3af39a93b684b99880bfbd50b146ec5
           name: 'System location'
@@ -257,8 +292,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 2258348183a64037bdad1af1a0af29b3
           name: 'System name'
@@ -280,8 +315,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 146922ff45f24d7ea7d3b7b5f0631f77
@@ -290,6 +325,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: 90919bb372954e0eb87fae49ed98ca70
           name: 'System object ID'
@@ -310,8 +352,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 8a2568f84b394419b6f8ede2872dc3f1
           name: 'Operating system'
@@ -333,8 +375,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: os
           triggers:
             -
               uuid: 4400b69762f948f78365b74569ed54af
@@ -347,6 +389,10 @@ zabbix_export:
                 -
                   name: 'System name has changed (new name: {ITEM.VALUE})'
                   expression: 'last(/MikroTik netPower Lite 7R SNMP/system.name,#1)<>last(/MikroTik netPower Lite 7R SNMP/system.name,#2) and length(last(/MikroTik netPower Lite 7R SNMP/system.name))>0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 4116de1f7bcb4902adcc14a449d58b80
           name: Uptime
@@ -367,8 +413,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 06c5437331284cf1ae61668b8fd285b5
@@ -381,6 +427,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/MikroTik netPower Lite 7R SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 2a897066661b413fb7d0f6ae795a8b78
           name: 'Total memory'
@@ -407,8 +457,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 194e39cf188e40ba88b4c1f41b01b0c9
           name: 'Used memory'
@@ -427,8 +477,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 0d8527333e0a4f509b9fe0699577b081
           name: 'Memory utilization'
@@ -441,8 +491,8 @@ zabbix_export:
           description: 'Memory utilization in %'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: 348923e33c3049ea8b27a5d920528300
@@ -450,6 +500,13 @@ zabbix_export:
               name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
               priority: AVERAGE
               description: 'The system is running out of free memory.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 8aa3e5e4cb8440998922015c32994cd2
           name: 'SNMP agent availability'
@@ -466,8 +523,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: d51c0c2689a14b41aed889d67ec596df
@@ -480,6 +540,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/MikroTik netPower Lite 7R SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: 583f23a35ad84a808a6029b7a46b24fc
@@ -504,8 +568,8 @@ zabbix_export:
                 The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
               trigger_prototypes:
                 -
                   uuid: 6c1a7d6fd11541fb93a8e73f8712db83
@@ -514,6 +578,10 @@ zabbix_export:
                   opdata: 'Current utilization: {ITEM.LASTVALUE1}'
                   priority: WARNING
                   description: 'CPU utilization is too high. The system might be slow to respond.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 29d6c58dd153437a9a62c95fdaa0d016
@@ -558,8 +626,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: e51ab41e7ac142afabac3ddbe622fc0b
@@ -570,6 +638,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 8046c8fbb72f4cf3afe0154fc2e41d6d
                   expression: 'avg(/MikroTik netPower Lite 7R SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
@@ -584,6 +659,13 @@ zabbix_export:
                       name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
                       expression: 'avg(/MikroTik netPower Lite 7R SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
                       recovery_expression: 'max(/MikroTik netPower Lite 7R SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 3a4f8decfaf44650bb4066141e36f42a
                   expression: 'avg(/MikroTik netPower Lite 7R SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
@@ -592,6 +674,13 @@ zabbix_export:
                   name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: ebc661ab6f4d48da8294d4199172dc1a
           name: 'Temperature sensor discovery'
@@ -601,8 +690,7 @@ zabbix_export:
           delay: 1h
           description: |
             MIKROTIK-MIB::mtxrHlTemperature
-            Since temperature sensor is not available on all Mikrotik hardware,
-            this is done to avoid unsupported items.
+            Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.
           item_prototypes:
             -
               uuid: f1f656e272c8469b98bda73e0cc6a861
@@ -626,8 +714,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: db6e52bc27714f51bc61e7cc3c3ebad1
@@ -638,6 +726,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 9e1b2270bc144295a7b0edc2ba98c81b
                   expression: 'avg(/MikroTik netPower Lite 7R SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
@@ -652,6 +747,13 @@ zabbix_export:
                       name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
                       expression: 'avg(/MikroTik netPower Lite 7R SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
                       recovery_expression: 'max(/MikroTik netPower Lite 7R SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 27e033be9fd94be2bbc3969e9cb51ac4
                   expression: 'avg(/MikroTik netPower Lite 7R SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
@@ -660,6 +762,13 @@ zabbix_export:
                   name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: e161530a74ca473993b1be2cd03a45a8
           name: 'LTE modem discovery'
@@ -694,14 +803,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRP Reference Signal Received Power.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 0161455f62224813a81ed396716437db
                   expression: 'max(/MikroTik netPower Lite 7R SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 6b7494b2ddac49d9b72e31a1c18fc9e1
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
@@ -716,14 +838,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: c54da31a0d9f4219b8f5a4f47e30fb4e
                   expression: 'max(/MikroTik netPower Lite 7R SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: ce8f8d1d78bd451f962cb25130f829ce
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
@@ -738,14 +873,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 5e1e679028cf499d80484e1fc11e8ba6
                   expression: 'max(/MikroTik netPower Lite 7R SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: ac1f673cad3d4e45a870b09a4d33a1fa
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
@@ -760,14 +908,27 @@ zabbix_export:
                 mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: e1610c79b6704dfc948f77117d928b5d
                   expression: 'max(/MikroTik netPower Lite 7R SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 0d03f46cbb0c44b99e6369bd256a6cfb
@@ -828,8 +989,14 @@ zabbix_export:
                 mtxrWlApAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: fe51564fb48a4434875eb376ec52fd60
               name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
@@ -849,8 +1016,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: a8688972d13f4757b027c4f257193ff8
               name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
@@ -870,8 +1043,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 10dd0b3680c04bde89d521fd8c705887
               name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
@@ -890,8 +1069,14 @@ zabbix_export:
                     - 15m
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 1a6dd112444a4c64a556dda3833fd6d2
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -904,8 +1089,14 @@ zabbix_export:
                 mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
         -
           uuid: de8845213cb14554aa0306b19c997e47
           name: 'CAPsMAN AP channel discovery'
@@ -938,8 +1129,14 @@ zabbix_export:
                 mtxrWlCMAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: b80079f3815c438bb45a76febc53d531
               name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
@@ -959,8 +1156,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 1dc8656481a2470c92e97bef53f17d41
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -973,8 +1176,14 @@ zabbix_export:
                 mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 489322ce283c434684d4f59829c257d2
               name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
@@ -994,8 +1203,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 0c4ff636a9834ee39a16032fd5cd2048
@@ -1003,6 +1218,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
                   priority: WARNING
                   description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 0e526afef3484016aaf73752c4931fa9
           name: 'Network interfaces discovery'
@@ -1091,8 +1313,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 03412734b2614e8a92a9e8b45c6422bd
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -1111,8 +1339,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 48c2f9a47a074a40b20db214de37d830
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -1136,8 +1370,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: ca3d79c0bc594979bbc44fe5c729afd0
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -1160,8 +1400,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: abea3c44fdc2424db5ccf5d388e492f6
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -1180,8 +1426,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 9ff32d3dcc7b4edbbc5f5603fbd4272d
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -1205,8 +1457,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 6ad90d1c5e15433599a516dd88c85ff7
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -1231,8 +1489,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: e9d5d234876e47e9a36779c2e1e247e4
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -1254,8 +1518,14 @@ zabbix_export:
                 name: 'IF-MIB::ifOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 532c7b90f432422398ad782959fb330c
@@ -1273,6 +1543,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 63912ec5f0be48ad966c2a0b0605a9fc
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -1296,8 +1570,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           trigger_prototypes:
             -
               uuid: 91828300121c45d49d9ec4b5e61d872f
@@ -1327,6 +1607,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik netPower Lite 7R SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik netPower Lite 7R SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik netPower Lite 7R SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik netPower Lite 7R SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 8d68e034bf6b4302ad4026fca4fd1e86
               expression: |
@@ -1347,6 +1631,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik netPower Lite 7R SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik netPower Lite 7R SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik netPower Lite 7R SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik netPower Lite 7R SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 0f981e35c326480585104d8ed108bd70
               expression: |
@@ -1366,6 +1654,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/MikroTik netPower Lite 7R SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/MikroTik netPower Lite 7R SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/MikroTik netPower Lite 7R SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/MikroTik netPower Lite 7R SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: e68556274dda430aa646c2c299d26c6a
@@ -1444,8 +1739,11 @@ zabbix_export:
               description: 'Space utilization in % for Disk-{#SNMPINDEX}'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: e308837cc63741b7af3175521c7a66ec
               name: 'Disk-{#SNMPINDEX}: Total space'
@@ -1472,8 +1770,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 36d4268675794bfcba1ca0b2a586770d
               name: 'Disk-{#SNMPINDEX}: Used space'
@@ -1492,8 +1793,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
           trigger_prototypes:
             -
               uuid: 1019a14b0998497daff1707692bc38ac
@@ -1509,6 +1813,13 @@ zabbix_export:
                  - The disk free space is less than 5G.
                  - The disk will be full in less than 24 hours.
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
             -
               uuid: 1c431594950944138617449b126c5d92
               expression: |
@@ -1529,6 +1840,13 @@ zabbix_export:
                   expression: |
                     last(/MikroTik netPower Lite 7R SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
                     ((last(/MikroTik netPower Lite 7R SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik netPower Lite 7R SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik netPower Lite 7R SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
           graph_prototypes:
             -
               uuid: 43b64db05b454192adb237afed0b7b02
@@ -1552,6 +1870,16 @@ zabbix_export:
                   item:
                     host: 'MikroTik netPower Lite 7R SNMP'
                     key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: mikrotik
+        -
+          tag: target
+          value: netpower-lite-7r
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/net/mikrotik/mikrotik_snmp/README.md b/templates/net/mikrotik/mikrotik_snmp/README.md
index 3c872915579..9078bd14f1d 100644
--- a/templates/net/mikrotik/mikrotik_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_snmp/README.md
@@ -66,7 +66,7 @@ There are no template links in this template.
 |Network interfaces discovery |<p>Discovering interfaces from IF-MIB.</p> |SNMP |net.if.discovery<p>**Filter**:</p>AND <p>- {#IFADMINSTATUS} MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.MATCHES}`</p><p>- {#IFADMINSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFADMINSTATUS.NOT_MATCHES}`</p><p>- {#IFOPERSTATUS} MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.MATCHES}`</p><p>- {#IFOPERSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.NOT_MATCHES}`</p><p>- {#IFNAME} MATCHES_REGEX `{$NET.IF.IFNAME.MATCHES}`</p><p>- {#IFNAME} NOT_MATCHES_REGEX `{$NET.IF.IFNAME.NOT_MATCHES}`</p><p>- {#IFDESCR} MATCHES_REGEX `{$NET.IF.IFDESCR.MATCHES}`</p><p>- {#IFDESCR} NOT_MATCHES_REGEX `{$NET.IF.IFDESCR.NOT_MATCHES}`</p><p>- {#IFALIAS} MATCHES_REGEX `{$NET.IF.IFALIAS.MATCHES}`</p><p>- {#IFALIAS} NOT_MATCHES_REGEX `{$NET.IF.IFALIAS.NOT_MATCHES}`</p><p>- {#IFTYPE} MATCHES_REGEX `{$NET.IF.IFTYPE.MATCHES}`</p><p>- {#IFTYPE} NOT_MATCHES_REGEX `{$NET.IF.IFTYPE.NOT_MATCHES}`</p> |
 |Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
 |Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
-|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
 
 ## Items collected
 
@@ -132,14 +132,14 @@ There are no template links in this template.
 |Interface {#IFNAME}({#IFALIAS}): Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p><p>3. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{$IFCONTROL:"{#IFNAME}"}=1 and last(/Mikrotik SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/Mikrotik SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/Mikrotik SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))`<p>Recovery expression:</p>`last(/Mikrotik SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0` |AVERAGE |<p>Manual close: YES</p> |
 |Interface {#IFNAME}({#IFALIAS}): High bandwidth usage (>{$IF.UTIL.MAX:"{#IFNAME}"}%) |<p>The network interface utilization is close to its estimated maximum bandwidth.</p> |`(avg(/Mikrotik SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/Mikrotik SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) or avg(/Mikrotik SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/Mikrotik SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])) and last(/Mikrotik SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0`<p>Recovery expression:</p>`avg(/Mikrotik SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/Mikrotik SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) and avg(/Mikrotik SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/Mikrotik SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |Interface {#IFNAME}({#IFALIAS}): High error rate (>{$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) |<p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p> |`min(/Mikrotik SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"} or min(/Mikrotik SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`max(/Mikrotik SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8 and max(/Mikrotik SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
-|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/Mikrotik SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/Mikrotik SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/Mikrotik SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/Mikrotik SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/Mikrotik SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/Mikrotik SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/Mikrotik SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/Mikrotik SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/Mikrotik SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2) `<p>Recovery expression:</p>`(change(/Mikrotik SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/Mikrotik SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/Mikrotik SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2) ` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/Mikrotik SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/Mikrotik SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/Mikrotik SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/Mikrotik SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/Mikrotik SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/Mikrotik SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/Mikrotik SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/Mikrotik SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/Mikrotik SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2)`<p>Recovery expression:</p>`(change(/Mikrotik SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/Mikrotik SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/Mikrotik SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2)` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |{HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/Mikrotik SNMP/system.uptime[sysUpTime.0])<10m` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- No SNMP data collection</p> |
 |No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/Mikrotik SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |Unavailable by ICMP ping |<p>Last three attempts returned timeout.  Please check device connectivity.</p> |`max(/Mikrotik SNMP/icmpping,#3)=0` |HIGH | |
 |High ICMP ping loss |<p>-</p> |`min(/Mikrotik SNMP/icmppingloss,5m)>{$ICMP_LOSS_WARN} and min(/Mikrotik SNMP/icmppingloss,5m)<100` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |High ICMP ping response time |<p>-</p> |`avg(/Mikrotik SNMP/icmppingsec,5m)>{$ICMP_RESPONSE_TIME_WARN}` |WARNING |<p>**Depends on**:</p><p>- High ICMP ping loss</p><p>- Unavailable by ICMP ping</p> |
-|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/Mikrotik SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/Mikrotik SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/Mikrotik SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/Mikrotik SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
-|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/Mikrotik SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/Mikrotik SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/Mikrotik SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/Mikrotik SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/Mikrotik SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/Mikrotik SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/Mikrotik SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/Mikrotik SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/Mikrotik SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/Mikrotik SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/Mikrotik SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/Mikrotik SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
 |CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/Mikrotik SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/Mikrotik SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
 |CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/Mikrotik SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/Mikrotik SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
 |CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/Mikrotik SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/Mikrotik SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
diff --git a/templates/net/mikrotik/mikrotik_snmp/template_net_mikrotik_snmp.yaml b/templates/net/mikrotik/mikrotik_snmp/template_net_mikrotik_snmp.yaml
index 5741ea37795..02d68fa1054 100644
--- a/templates/net/mikrotik/mikrotik_snmp/template_net_mikrotik_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_snmp/template_net_mikrotik_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:47:56Z'
+  date: '2022-01-26T09:51:53Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -43,8 +43,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: dc51a869c302440ba48d352545782e6e
@@ -52,6 +55,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 81b47dcd39864dd6812344bd0dc34963
           name: 'ICMP loss'
@@ -62,8 +69,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 83fa0a00b298491a967e052ec0c3bafe
@@ -75,6 +85,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/Mikrotik SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 3bb0c6c8aad64f21a11dc58c6be2eeaf
           name: 'ICMP response time'
@@ -85,8 +102,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 7c027442ed3c44a0a26b4f35458a37f9
@@ -101,6 +121,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/Mikrotik SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 540698a8c58d4a659e2c2ecdd5cb76e0
           name: 'SNMP traps (fallback)'
@@ -113,8 +140,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: 9d2b98385edb49979abcde5481560253
           name: 'System contact details'
@@ -136,8 +163,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 763d10f3cf344cd488db9c156c893d18
           name: 'System description'
@@ -160,8 +187,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 260eff3ec4034e33aea9c25962a782be
           name: 'Firmware version'
@@ -182,8 +209,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 62a9cd04a4dc4f5a9b59a01e54fb983f
@@ -193,6 +220,10 @@ zabbix_export:
               priority: INFO
               description: 'Firmware version has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 8d2c5a405ffa42fc81a2c9b914e20874
           name: 'Hardware model name'
@@ -211,8 +242,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
         -
           uuid: 2c5a89f75a8d4e38ad021b3539ce8273
           name: 'Hardware serial number'
@@ -234,8 +265,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 6c1dcb2e8e76405887af69a6a08e53df
@@ -244,6 +275,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 9766fcd2e7b64865a6ef60f3ab27002f
           name: 'System location'
@@ -265,8 +300,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 2d99a01f7c0d4ca38f3bc9a5f8db3ab7
           name: 'System name'
@@ -288,8 +323,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 0172b76bc48d4dcead140c4880499777
@@ -298,6 +333,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: 9d8a27d216f146ae88479e8e6bcbd301
           name: 'System object ID'
@@ -318,8 +360,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 7e3b3e78086742a7b9cda953367a2d83
           name: 'Operating system'
@@ -341,8 +383,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: os
           triggers:
             -
               uuid: 739f60e0862d4fe88cc2a5fe626211a8
@@ -355,6 +397,10 @@ zabbix_export:
                 -
                   name: 'System name has changed (new name: {ITEM.VALUE})'
                   expression: 'last(/Mikrotik SNMP/system.name,#1)<>last(/Mikrotik SNMP/system.name,#2) and length(last(/Mikrotik SNMP/system.name))>0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: ff6fea946fb143e3b8b151eafb403952
           name: Uptime
@@ -375,8 +421,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 53e737a095a840df9abfcfd9c26007bf
@@ -389,6 +435,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/Mikrotik SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 0636e173288d42e68faf62c381a65087
           name: 'Total memory'
@@ -415,8 +465,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 7d4a1591887848028ea8bae81b7d01a7
           name: 'Used memory'
@@ -435,8 +485,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 56017f610bf74f0aaaa92e9183e68ea5
           name: 'Memory utilization'
@@ -449,8 +499,8 @@ zabbix_export:
           description: 'Memory utilization in %'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: e4b4ba5ec80c4d83adbb10739edf4574
@@ -458,6 +508,13 @@ zabbix_export:
               name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
               priority: AVERAGE
               description: 'The system is running out of free memory.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 754f890d63c042f6976a1ad25c317574
           name: 'SNMP agent availability'
@@ -474,8 +531,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 2cc6310f1a824d40903f497f155a7834
@@ -488,6 +548,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/Mikrotik SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: fb2a399dbdb54484a9f58ae2437c32fb
@@ -512,8 +576,8 @@ zabbix_export:
                 The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
               trigger_prototypes:
                 -
                   uuid: 7843aa49df2b4f218bf633bee4f01df6
@@ -522,6 +586,10 @@ zabbix_export:
                   opdata: 'Current utilization: {ITEM.LASTVALUE1}'
                   priority: WARNING
                   description: 'CPU utilization is too high. The system might be slow to respond.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 1e6e64b461dc4010a582d2f39fcfa4f8
@@ -566,8 +634,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: edcc83694dc847f8a8dcb7e192f96404
@@ -578,6 +646,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 1c380934165343a68345c761de9cbdb5
                   expression: 'avg(/Mikrotik SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
@@ -592,6 +667,13 @@ zabbix_export:
                       name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
                       expression: 'avg(/Mikrotik SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
                       recovery_expression: 'max(/Mikrotik SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 47a89879a7db47e9bf598e27f7c084e7
                   expression: 'avg(/Mikrotik SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
@@ -600,6 +682,13 @@ zabbix_export:
                   name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 9c6a401a70ec4dba92bd9e270fe7dc79
           name: 'Temperature sensor discovery'
@@ -609,8 +698,7 @@ zabbix_export:
           delay: 1h
           description: |
             MIKROTIK-MIB::mtxrHlTemperature
-            Since temperature sensor is not available on all Mikrotik hardware,
-            this is done to avoid unsupported items.
+            Since temperature sensor is not available on all Mikrotik hardware, this is done to avoid unsupported items.
           item_prototypes:
             -
               uuid: 2bfb758ca6264401902524b32e04f472
@@ -634,8 +722,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 21afb343688c4c0e8189a7dbc4f441e1
@@ -646,6 +734,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 0ba64ff53885473ca8dcd333a770a7ed
                   expression: 'avg(/Mikrotik SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
@@ -660,6 +755,13 @@ zabbix_export:
                       name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
                       expression: 'avg(/Mikrotik SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
                       recovery_expression: 'max(/Mikrotik SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: cdbfc8fabf9f45fc95dedba327e30a1d
                   expression: 'avg(/Mikrotik SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
@@ -668,6 +770,13 @@ zabbix_export:
                   name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 017797e68eae49afaa864dd57757bbd8
           name: 'LTE modem discovery'
@@ -702,14 +811,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRP Reference Signal Received Power.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: f23c654001384f6e981fd33aeab0af6f
                   expression: 'max(/Mikrotik SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 467f6179fa7d43c2a23333330c1ceac1
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
@@ -724,14 +846,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 57f8757b80914c248a35d0899791a48e
                   expression: 'max(/Mikrotik SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 0994d40dab10493c96c4f79d0cc5e619
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
@@ -746,14 +881,27 @@ zabbix_export:
                 mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: e2c692d5d4ca49b688656a1abe6228e5
                   expression: 'max(/Mikrotik SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 1c5a284353964175b4541c78fea7d07d
               name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
@@ -768,14 +916,27 @@ zabbix_export:
                 mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: e163c4af8ff1451a8728e569c5d3c04c
                   expression: 'max(/Mikrotik SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
                   name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 4f6bc67c40eb441189ec233f926f19ec
@@ -836,8 +997,14 @@ zabbix_export:
                 mtxrWlApAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: a9ca50960dd043038808f3572d1fb281
               name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
@@ -857,8 +1024,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 9f5c294b30d24e5084e8953173bf886e
               name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
@@ -878,8 +1051,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 6140d7fe8011400cb827339f8f6f9cdf
               name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
@@ -898,8 +1077,14 @@ zabbix_export:
                     - 15m
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 45fc6875a91d47debb4e39d93e5b8186
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -912,8 +1097,14 @@ zabbix_export:
                 mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
         -
           uuid: 644433b2a1fa4b38916e2ae4bf74c28d
           name: 'CAPsMAN AP channel discovery'
@@ -946,8 +1137,14 @@ zabbix_export:
                 mtxrWlCMAuthClientCount Number of authentication clients.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 7df773f57c234d219f5a75e11844f5e0
               name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
@@ -967,8 +1164,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: 0db356f16542489586aacdecb029f691
               name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
@@ -981,8 +1184,14 @@ zabbix_export:
                 mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
             -
               uuid: e2212bb46d804d6687a2fe992f867b9d
               name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
@@ -1002,8 +1211,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: e4aedbd5e0c64cf48831bf08192e19bf
@@ -1011,6 +1226,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
                   priority: WARNING
                   description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 39f9ac305fe2497498916dc709b9a097
           name: 'Network interfaces discovery'
@@ -1099,8 +1321,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 32e41ced890a4b349a5167269450efa6
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -1119,8 +1347,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 10806818bfa34f2c94ab9a42720e7e41
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -1144,8 +1378,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: e899752523044d2c830e9cd48ba2cb72
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -1168,8 +1408,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: d3fd9bb2202e441282a6008dbf27cc5b
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -1188,8 +1434,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: af78d9ecefd445c5840bf09e1b3ef438
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -1213,8 +1465,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 16c880544cb741fb90c5ba2823225bb0
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -1239,8 +1497,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 3fd63f1049924a5491b9080702bc5fdb
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -1262,8 +1526,14 @@ zabbix_export:
                 name: 'IF-MIB::ifOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: db74692dd86a428fba64e57751fce1ba
@@ -1281,6 +1551,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 5fb27bdadc9848118bc64a720ff6dea0
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -1304,8 +1578,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           trigger_prototypes:
             -
               uuid: 564e8f3f288a40e9926b75b2711f45d1
@@ -1335,6 +1615,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Mikrotik SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/Mikrotik SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/Mikrotik SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/Mikrotik SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 25cc75fecfd1499ebc65ea434b98cb18
               expression: |
@@ -1355,6 +1639,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Mikrotik SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/Mikrotik SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/Mikrotik SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/Mikrotik SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 4c3aef072fcb47b98f0cdc3b651fae71
               expression: |
@@ -1374,6 +1662,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Mikrotik SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/Mikrotik SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/Mikrotik SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/Mikrotik SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: 6c0e720cb0f24bf4a8cfbebb2759dde9
@@ -1452,8 +1747,11 @@ zabbix_export:
               description: 'Space utilization in % for Disk-{#SNMPINDEX}'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 64747345083e4b38b0e963ccd0b8271b
               name: 'Disk-{#SNMPINDEX}: Total space'
@@ -1480,8 +1778,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 35034472b281453bbfbcf65b5d60dd7e
               name: 'Disk-{#SNMPINDEX}: Used space'
@@ -1500,8 +1801,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: Storage
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
           trigger_prototypes:
             -
               uuid: c866ac0197ee401ab0c5cc6ec0757985
@@ -1517,6 +1821,13 @@ zabbix_export:
                  - The disk free space is less than 5G.
                  - The disk will be full in less than 24 hours.
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
             -
               uuid: 9adb977fde7345d8950265a9127cde57
               expression: |
@@ -1537,6 +1848,13 @@ zabbix_export:
                   expression: |
                     last(/Mikrotik SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
                     ((last(/Mikrotik SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/Mikrotik SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/Mikrotik SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
           graph_prototypes:
             -
               uuid: 82acee070ff1461ba0cdff337184da97
@@ -1560,6 +1878,13 @@ zabbix_export:
                   item:
                     host: 'Mikrotik SNMP'
                     key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: mikrotik
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/net/morningstar/morningstar_prostar_mppt_snmp/README.md b/templates/net/morningstar/morningstar_prostar_mppt_snmp/README.md
index cac0322e924..f51c37df329 100644
--- a/templates/net/morningstar/morningstar_prostar_mppt_snmp/README.md
+++ b/templates/net/morningstar/morningstar_prostar_mppt_snmp/README.md
@@ -70,7 +70,7 @@ There are no template links in this template.
 |Temperature |Temperature: Ambient |<p>MIB: PROSTAR-MPPT</p><p>Ambient Temperature</p><p> Description:Ambient Temperature</p><p> Scaling Factor:1.0</p><p> Units:deg C</p><p> Range:[-128, 127]</p><p> Modbus address:0x001C</p> |SNMP |temp.ambient[ambientTemperature.0] |
 |Temperature |Temperature: Battery |<p>MIB: PROSTAR-MPPT</p><p>Battery Temperature</p><p>  Description:Battery Temperature</p><p>  Scaling Factor:1.0</p><p>  Units:deg C</p><p>  Range:[-128, 127]</p><p>  Modbus address:0x001B</p> |SNMP |temp.battery[batteryTemperature.0] |
 |Temperature |Temperature: Heatsink |<p>MIB: PROSTAR-MPPT</p><p>Heatsink Temperature</p><p> Description:Heatsink Temperature</p><p> Scaling Factor:1.0</p><p> Units:deg C</p><p> Range:[-128, 127]</p><p> Modbus address:0x001A</p> |SNMP |temp.heatsink[heatsinkTemperature.0] |
-|Zabbix_raw_items |Battery: Battery Voltage discovery |<p>MIB: PROSTAR-MPPT</p> |SNMP |battery.voltage.discovery[batteryTerminalVoltage.0] |
+|Zabbix raw items |Battery: Battery Voltage discovery |<p>MIB: PROSTAR-MPPT</p> |SNMP |battery.voltage.discovery[batteryTerminalVoltage.0] |
 
 ## Triggers
 
diff --git a/templates/net/morningstar/morningstar_prostar_mppt_snmp/template_net_morningstar_prostar_mppt_snmp.yaml b/templates/net/morningstar/morningstar_prostar_mppt_snmp/template_net_morningstar_prostar_mppt_snmp.yaml
index baaa05b5749..8dcdfc9d7a9 100644
--- a/templates/net/morningstar/morningstar_prostar_mppt_snmp/template_net_morningstar_prostar_mppt_snmp.yaml
+++ b/templates/net/morningstar/morningstar_prostar_mppt_snmp/template_net_morningstar_prostar_mppt_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-17T06:31:59Z'
+  date: '2022-01-26T09:49:10Z'
   groups:
     -
       uuid: 57b7ae836ca64446ba2c296389c009b7
@@ -14,7 +14,7 @@ zabbix_export:
         MIBs used:
         PROSTAR-MPPT
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Modules
@@ -38,8 +38,8 @@ zabbix_export:
              Modbus address:0x003E
           tags:
             -
-              tag: Application
-              value: Array
+              tag: component
+              value: array
         -
           uuid: 7714c76013e341f8b6753cc5a50a960f
           name: 'Array: Sweep Vmp'
@@ -59,8 +59,8 @@ zabbix_export:
               Modbus address:0x003D
           tags:
             -
-              tag: Application
-              value: Array
+              tag: component
+              value: array
         -
           uuid: 379ab969ad784968a1090ff98f5801ff
           name: 'Array: Sweep Voc'
@@ -80,8 +80,8 @@ zabbix_export:
              Modbus address:0x003F
           tags:
             -
-              tag: Application
-              value: Array
+              tag: component
+              value: array
         -
           uuid: 41a1118e1be3417daa79faace733d861
           name: 'Array: Voltage'
@@ -101,8 +101,8 @@ zabbix_export:
               Modbus address:0x0013
           tags:
             -
-              tag: Application
-              value: Array
+              tag: component
+              value: array
         -
           uuid: fe5c3b724e894573acdaf522a2213adb
           name: 'Battery: Battery Voltage discovery'
@@ -116,8 +116,14 @@ zabbix_export:
           description: 'MIB: PROSTAR-MPPT'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: battery
+            -
+              tag: component
+              value: discovery
+            -
+              tag: component
+              value: raw
         -
           uuid: ed1d54fce0904b7c9d0895a094f55108
           name: 'Battery: Charge Current'
@@ -137,8 +143,8 @@ zabbix_export:
               Modbus address:0x0010
           tags:
             -
-              tag: Application
-              value: Battery
+              tag: component
+              value: battery
         -
           uuid: 1b1b61995c0d4d89a7f9ad4e14c3541f
           name: 'Battery: Charge State'
@@ -173,8 +179,8 @@ zabbix_export:
                 - 1h
           tags:
             -
-              tag: Application
-              value: Battery
+              tag: component
+              value: battery
           triggers:
             -
               uuid: fe4863fdd4d64e1c977328bd3d0f687f
@@ -182,6 +188,10 @@ zabbix_export:
               name: 'Battery: Device charge in critical state'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 4d064e4877474d72b85c9cdfb7b09dad
               expression: 'last(/Morningstar ProStar MPPT SNMP/charge.state[chargeState.0])={$CHARGE.STATE.WARN}'
@@ -192,6 +202,10 @@ zabbix_export:
                 -
                   name: 'Battery: Device charge in critical state'
                   expression: 'last(/Morningstar ProStar MPPT SNMP/charge.state[chargeState.0])={$CHARGE.STATE.CRIT}'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 009eb72ff6674da49d1dd85a6f9459cf
           name: 'Counter: Charge Amp-hours'
@@ -216,8 +230,8 @@ zabbix_export:
                 - '0.1'
           tags:
             -
-              tag: Application
-              value: Counter
+              tag: component
+              value: counter
         -
           uuid: 4a53a2211a1249d59369ad65762ffe47
           name: 'Counter: Charge KW-hours'
@@ -237,8 +251,8 @@ zabbix_export:
             Modbus address:0x002A
           tags:
             -
-              tag: Application
-              value: Counter
+              tag: component
+              value: counter
         -
           uuid: c72ef851c2d240c9835c1703cec49fd6
           name: 'Counter: Load Amp-hours'
@@ -262,8 +276,8 @@ zabbix_export:
                 - '0.1'
           tags:
             -
-              tag: Application
-              value: Counter
+              tag: component
+              value: counter
         -
           uuid: 29a7d76472fb4025bc78fbeab273e955
           name: 'Load: Current'
@@ -283,8 +297,8 @@ zabbix_export:
              Modbus address:0x0016
           tags:
             -
-              tag: Application
-              value: Load
+              tag: component
+              value: load
         -
           uuid: ae927b5cba5b43f5a2136fd3ee71b63d
           name: 'Load: State'
@@ -317,8 +331,8 @@ zabbix_export:
                 - 1h
           tags:
             -
-              tag: Application
-              value: Load
+              tag: component
+              value: load
           triggers:
             -
               uuid: a88025c5e5a748e3a6dfa01685ba075b
@@ -326,6 +340,10 @@ zabbix_export:
               name: 'Load: Device load in critical state'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 9ab107b39b874fed83d09e7c1964a699
               expression: 'last(/Morningstar ProStar MPPT SNMP/load.state[loadState.0])={$LOAD.STATE.WARN:"lvdWarning"}  or last(/Morningstar ProStar MPPT SNMP/load.state[loadState.0])={$LOAD.STATE.WARN:"override"}'
@@ -336,6 +354,10 @@ zabbix_export:
                 -
                   name: 'Load: Device load in critical state'
                   expression: 'last(/Morningstar ProStar MPPT SNMP/load.state[loadState.0])={$LOAD.STATE.CRIT:"lvd"} or last(/Morningstar ProStar MPPT SNMP/load.state[loadState.0])={$LOAD.STATE.CRIT:"fault"}'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 47894752dd1d41f1aa882387acf6dc3a
           name: 'Load: Voltage'
@@ -355,8 +377,8 @@ zabbix_export:
              Modbus address:0x0014
           tags:
             -
-              tag: Application
-              value: Load
+              tag: component
+              value: load
         -
           uuid: d44cb5d7db31402dae79275a9148817d
           name: 'Status: Alarms'
@@ -421,8 +443,8 @@ zabbix_export:
                   return result.length ? result.join('\n') : 'No alarms';
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: status
           triggers:
             -
               uuid: a2d0ab5150dd4bad8b5ec4f2c6aa13f8
@@ -430,150 +452,250 @@ zabbix_export:
               name: 'Status: Device has "arrayCurrentOffset" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: cc6a15f16fd8470a9dcd9a9e01cba61c
               expression: 'count(/Morningstar ProStar MPPT SNMP/status.alarms[alarms.0],#3,"like","batterySenseDisconnected")=2'
               name: 'Status: Device has "batterySenseDisconnected" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 55d4726d9b9047c79cf690353d950797
               expression: 'count(/Morningstar ProStar MPPT SNMP/status.alarms[alarms.0],#3,"like","batterySenseOutOfRange")=2'
               name: 'Status: Device has "batterySenseOutOfRange" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 7f015198395042219666cde4458d407c
               expression: 'count(/Morningstar ProStar MPPT SNMP/status.alarms[alarms.0],#3,"like","controllerReset")=2'
               name: 'Status: Device has "controllerReset" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 48339339e5a7465fbc67266998c9a8fe
               expression: 'count(/Morningstar ProStar MPPT SNMP/status.alarms[alarms.0],#3,"like","currentLimit")=2'
               name: 'Status: Device has "currentLimit" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: c88074037099498c896bb4793e04fea3
               expression: 'count(/Morningstar ProStar MPPT SNMP/status.alarms[alarms.0],#3,"like","currentMeasurementError")=2'
               name: 'Status: Device has "currentMeasurementError" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: cecd8ee17e5143ffb46495e927750c82
               expression: 'count(/Morningstar ProStar MPPT SNMP/status.alarms[alarms.0],#3,"like","eepromAccessFailure")=2'
               name: 'Status: Device has "eepromAccessFailure" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 4affa15e1c1c42459ea8dd6820d1c008
               expression: 'count(/Morningstar ProStar MPPT SNMP/status.alarms[alarms.0],#3,"like","fp10SupplyOutOfRange")=2'
               name: 'Status: Device has "fp10SupplyOutOfRange" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 41e4225072a3468696cfb534c65b9736
               expression: 'count(/Morningstar ProStar MPPT SNMP/status.alarms[alarms.0],#3,"like","heatsinkTempLimit")=2'
               name: 'Status: Device has "heatsinkTempLimit" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 5d269997a57d44ceb545e751e8e2d919
               expression: 'count(/Morningstar ProStar MPPT SNMP/status.alarms[alarms.0],#3,"like","heatsinkTempSensorOpen")=2'
               name: 'Status: Device has "heatsinkTempSensorOpen" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: a8342a4e2fff40a7b830086dec303fd9
               expression: 'count(/Morningstar ProStar MPPT SNMP/status.alarms[alarms.0],#3,"like","heatsinkTempSensorShorted")=2'
               name: 'Status: Device has "heatsinkTempSensorShorted" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 32e5b7ae81ce4ebea9b05ff7ab411e5a
               expression: 'count(/Morningstar ProStar MPPT SNMP/status.alarms[alarms.0],#3,"like","hightInputVoltageLimit")=2'
               name: 'Status: Device has "hightInputVoltageLimit" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: c10d27c1d9d54b8981a639e7bf0dfc02
               expression: 'count(/Morningstar ProStar MPPT SNMP/status.alarms[alarms.0],#3,"like","inductorTempLimit")=2'
               name: 'Status: Device has "inductorTempLimit" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 9f80959684b34b6498a1634097cd0d22
               expression: 'count(/Morningstar ProStar MPPT SNMP/status.alarms[alarms.0],#3,"like","inductorTempSensorOpen")=2'
               name: 'Status: Device has "inductorTempSensorOpen" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: cc735ddcc98e4c099bb770e2b2a171b5
               expression: 'count(/Morningstar ProStar MPPT SNMP/status.alarms[alarms.0],#3,"like","inductorTempSensorShorted")=2'
               name: 'Status: Device has "inductorTempSensorShorted" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 217935cd6c7547bc95f5af51b3e643d4
               expression: 'count(/Morningstar ProStar MPPT SNMP/status.alarms[alarms.0],#3,"like","loadCurrentOffset")=2'
               name: 'Status: Device has "loadCurrentOffset" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: cb05261f120240bf944b304ffc4979e6
               expression: 'count(/Morningstar ProStar MPPT SNMP/status.alarms[alarms.0],#3,"like","loadLvd")=2'
               name: 'Status: Device has "loadLvd" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 1ed1de932e084ce5ba03747bdd8ca4e5
               expression: 'count(/Morningstar ProStar MPPT SNMP/status.alarms[alarms.0],#3,"like","logTimeout")=2'
               name: 'Status: Device has "logTimeout" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 8824f80f1ef245508d6d0d660e3cabf1
               expression: 'count(/Morningstar ProStar MPPT SNMP/status.alarms[alarms.0],#3,"like","mosfetOpen")=2'
               name: 'Status: Device has "mosfetOpen" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 59569aaebf32403c9fd310f6b26845b0
               expression: 'count(/Morningstar ProStar MPPT SNMP/status.alarms[alarms.0],#3,"like","p12SupplyOutOfRange")=2'
               name: 'Status: Device has "p12SupplyOutOfRange" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 4775d3a7b843455eb404661c070be092
               expression: 'count(/Morningstar ProStar MPPT SNMP/status.alarms[alarms.0],#3,"like","p33SupplyOutOfRange")=2'
               name: 'Status: Device has "p33SupplyOutOfRange" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 2015d2b876564ad79699a23fc6b60f07
               expression: 'count(/Morningstar ProStar MPPT SNMP/status.alarms[alarms.0],#3,"like","rtsDisconnected")=2'
               name: 'Status: Device has "rtsDisconnected" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: cce1eb2bee094a3b9a993ec2d60d182b
               expression: 'count(/Morningstar ProStar MPPT SNMP/status.alarms[alarms.0],#3,"like","rtsShorted")=2'
               name: 'Status: Device has "rtsShorted" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 7a07b757660a4c9a879ac03a94832720
               expression: 'count(/Morningstar ProStar MPPT SNMP/status.alarms[alarms.0],#3,"like","tb5v")=2'
               name: 'Status: Device has "tb5v" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 39205fc6d2cd4888994cccb016b4b2f8
               expression: 'count(/Morningstar ProStar MPPT SNMP/status.alarms[alarms.0],#3,"like","uncalibrated")=2'
               name: 'Status: Device has "uncalibrated" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 8fbb5c650fa040c892a1d10a17fbbf14
           name: 'Status: Array Faults'
@@ -623,8 +745,8 @@ zabbix_export:
                   return result.length ? result.join('\n') : 'No faults';
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: status
           triggers:
             -
               uuid: 8322f8ca8e2e462a8799dc399f17ba27
@@ -632,72 +754,120 @@ zabbix_export:
               name: 'Status: Device has "arrayHvd" array faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 6a138cd2af754bb3a22173e8da28b254
               expression: 'count(/Morningstar ProStar MPPT SNMP/status.array_faults[arrayFaults.0],#3,"like","batteryHvd")=2'
               name: 'Status: Device has "batteryHvd" array faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 8e42cf21ec10409da840021bfd26f74c
               expression: 'count(/Morningstar ProStar MPPT SNMP/status.array_faults[arrayFaults.0],#3,"like","batteryLowVoltageDisconnect")=2'
               name: 'Status: Device has "batteryLowVoltageDisconnect" array faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: d1112d9828064a879d56626ac6339dbf
               expression: 'count(/Morningstar ProStar MPPT SNMP/status.array_faults[arrayFaults.0],#3,"like","customSettingsEdit")=2'
               name: 'Status: Device has "customSettingsEdit" array faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 75a67f17a33e41eea34585fade6319ef
               expression: 'count(/Morningstar ProStar MPPT SNMP/status.array_faults[arrayFaults.0],#3,"like","dipSwitchChanged")=2'
               name: 'Status: Device has "dipSwitchChanged" array faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 4502112383524f0499ea13e6f83ce789
               expression: 'count(/Morningstar ProStar MPPT SNMP/status.array_faults[arrayFaults.0],#3,"like","localTempSensorDamaged")=2'
               name: 'Status: Device has "localTempSensorDamaged" array faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: f1489dc1f8574895bd233b14ce080748
               expression: 'count(/Morningstar ProStar MPPT SNMP/status.array_faults[arrayFaults.0],#3,"like","mosfetSShorted")=2'
               name: 'Status: Device has "mosfetSShorted" array faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 4ea903d3e8644ddaa5309eaa9715b894
               expression: 'count(/Morningstar ProStar MPPT SNMP/status.array_faults[arrayFaults.0],#3,"like","overcurrent")=2'
               name: 'Status: Device has "overcurrent" array faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: e12a29ec16ea423cb69ca4ce460f201b
               expression: 'count(/Morningstar ProStar MPPT SNMP/status.array_faults[arrayFaults.0],#3,"like","rtsNoLongerValid")=2'
               name: 'Status: Device has "rtsNoLongerValid" array faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 3ec4307bb2c444fc8eca27f9b7a136e2
               expression: 'count(/Morningstar ProStar MPPT SNMP/status.array_faults[arrayFaults.0],#3,"like","rtsShorted")=2'
               name: 'Status: Device has "rtsShorted" array faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 915c00d98e144ee7a9a2d50d0bd474c0
               expression: 'count(/Morningstar ProStar MPPT SNMP/status.array_faults[arrayFaults.0],#3,"like","slaveTimeout")=2'
               name: 'Status: Device has "slaveTimeout" array faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 9aac314eef594a8d86fd4b88308428e5
               expression: 'count(/Morningstar ProStar MPPT SNMP/status.array_faults[arrayFaults.0],#3,"like","software")=2'
               name: 'Status: Device has "software" array faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: fb4d2147a8224b599ad908eca1b019e4
           name: 'Status: Load Faults'
@@ -743,8 +913,8 @@ zabbix_export:
                   return result.length ? result.join('\n') : 'No faults';
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: status
           triggers:
             -
               uuid: 93750f768ba94f1bb9302fc17c76faeb
@@ -752,48 +922,80 @@ zabbix_export:
               name: 'Status: Device has "customSettingsEdit" load faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 456e2c36369f4519b2c80bcfe1acb4b0
               expression: 'count(/Morningstar ProStar MPPT SNMP/status.load_faults[loadFaults.0],#3,"like","dipSwitchChanged")=2'
               name: 'Status: Device has "dipSwitchChanged" load faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 359df17c40684187b7ae92c8aa0c9624
               expression: 'count(/Morningstar ProStar MPPT SNMP/status.load_faults[loadFaults.0],#3,"like","externalShortCircuit")=2'
               name: 'Status: Device has "externalShortCircuit" load faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 6dadf09064304f4381ad9ed0436e562a
               expression: 'count(/Morningstar ProStar MPPT SNMP/status.load_faults[loadFaults.0],#3,"like","highTempDisconnect")=2'
               name: 'Status: Device has "highTempDisconnect" load faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: bc41145ae8074290913a47cc3fd11e1e
               expression: 'count(/Morningstar ProStar MPPT SNMP/status.load_faults[loadFaults.0],#3,"like","loadHvd")=2'
               name: 'Status: Device has "loadHvd" load faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 8c8a7021928e4bf78b6309574e298876
               expression: 'count(/Morningstar ProStar MPPT SNMP/status.load_faults[loadFaults.0],#3,"like","mosfetShorted")=2'
               name: 'Status: Device has "mosfetShorted" load faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: b7d3f05837bd4d788d14f1aaf18b0482
               expression: 'count(/Morningstar ProStar MPPT SNMP/status.load_faults[loadFaults.0],#3,"like","overcurrent")=2'
               name: 'Status: Device has "overcurrent" load faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 801728740c1948b1a751469e6443daab
               expression: 'count(/Morningstar ProStar MPPT SNMP/status.load_faults[loadFaults.0],#3,"like","software")=2'
               name: 'Status: Device has "software" load faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 526ee94df484462a9264e57d92954e64
           name: 'Status: Uptime'
@@ -810,8 +1012,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: status
           triggers:
             -
               uuid: ca65a39c019046c29a522a6ca93ceb75
@@ -820,6 +1022,10 @@ zabbix_export:
               priority: INFO
               description: 'Uptime is less than 10 minutes'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 59cbcaaee8304b38a1144b3abf40bd9d
               expression: 'nodata(/Morningstar ProStar MPPT SNMP/status.uptime,5m)=1'
@@ -827,6 +1033,10 @@ zabbix_export:
               priority: WARNING
               description: 'Zabbix has not received data for items for the last 5 minutes'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 20ce95acdff6486684461f10579a73b4
           name: 'Battery: Target Voltage'
@@ -851,8 +1061,8 @@ zabbix_export:
                 - 1h
           tags:
             -
-              tag: Application
-              value: Battery
+              tag: component
+              value: battery
         -
           uuid: 9a87cdcf65184059be334e986bcf801d
           name: 'Temperature: Ambient'
@@ -872,8 +1082,8 @@ zabbix_export:
              Modbus address:0x001C
           tags:
             -
-              tag: Application
-              value: Temperature
+              tag: component
+              value: temperature
         -
           uuid: 1a8e79f49e86429abc80dd29598299ee
           name: 'Temperature: Battery'
@@ -893,8 +1103,8 @@ zabbix_export:
               Modbus address:0x001B
           tags:
             -
-              tag: Application
-              value: Temperature
+              tag: component
+              value: temperature
           triggers:
             -
               uuid: c74e1d3be1c24bde986bbce068db4bb8
@@ -902,12 +1112,20 @@ zabbix_export:
               name: 'Temperature: Critically high battery temperature (over {$BATTERY.TEMP.MAX.CRIT}C for 5m)'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 0c2180ae5deb41adb503e37bf91c34e2
               expression: 'max(/Morningstar ProStar MPPT SNMP/temp.battery[batteryTemperature.0],5m)<{$BATTERY.TEMP.MIN.CRIT}'
               name: 'Temperature: Critically low battery temperature (below {$BATTERY.TEMP.MIN.WARN}C for 5m)'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 1ab91d781c734f1eb2b9552f6dee9370
               expression: 'min(/Morningstar ProStar MPPT SNMP/temp.battery[batteryTemperature.0],5m)>{$BATTERY.TEMP.MAX.WARN}'
@@ -918,6 +1136,10 @@ zabbix_export:
                 -
                   name: 'Temperature: Critically high battery temperature (over {$BATTERY.TEMP.MAX.CRIT}C for 5m)'
                   expression: 'min(/Morningstar ProStar MPPT SNMP/temp.battery[batteryTemperature.0],5m)>{$BATTERY.TEMP.MAX.CRIT}'
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 6ec855dc6a5c42a79f1f40e14655418a
               expression: 'max(/Morningstar ProStar MPPT SNMP/temp.battery[batteryTemperature.0],5m)<{$BATTERY.TEMP.MIN.WARN}'
@@ -928,6 +1150,10 @@ zabbix_export:
                 -
                   name: 'Temperature: Critically low battery temperature (below {$BATTERY.TEMP.MIN.WARN}C for 5m)'
                   expression: 'max(/Morningstar ProStar MPPT SNMP/temp.battery[batteryTemperature.0],5m)<{$BATTERY.TEMP.MIN.CRIT}'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 7d0cf28c0d334154971738df11775d1f
           name: 'Temperature: Heatsink'
@@ -947,8 +1173,8 @@ zabbix_export:
              Modbus address:0x001A
           tags:
             -
-              tag: Application
-              value: Temperature
+              tag: component
+              value: temperature
       discovery_rules:
         -
           uuid: 1a21c30663c74c23b60e6ad72e228681
@@ -977,8 +1203,8 @@ zabbix_export:
                 Modbus address:0x0012
               tags:
                 -
-                  tag: Application
-                  value: Battery
+                  tag: component
+                  value: battery
               trigger_prototypes:
                 -
                   uuid: 402f73ca5b8d412689a7e715223e890d
@@ -986,12 +1212,20 @@ zabbix_export:
                   name: 'Battery: Critically high battery voltage (over {#VOLTAGE.MAX.CRIT}V for 5m)'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
                 -
                   uuid: 753a0d25832d434186f586f895124f31
                   expression: 'max(/Morningstar ProStar MPPT SNMP/battery.voltage[batteryTerminalVoltage.0{#SINGLETON}],5m)<{#VOLTAGE.MIN.CRIT}'
                   name: 'Battery: Critically low battery voltage (below {#VOLTAGE.MIN.CRIT}V for 5m)'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
                 -
                   uuid: 66e1fdfbfa5740dfa8945626f7f8be78
                   expression: 'min(/Morningstar ProStar MPPT SNMP/battery.voltage[batteryTerminalVoltage.0{#SINGLETON}],5m)>{#VOLTAGE.MAX.WARN}'
@@ -1002,6 +1236,10 @@ zabbix_export:
                     -
                       name: 'Battery: Critically high battery voltage (over {#VOLTAGE.MAX.CRIT}V for 5m)'
                       expression: 'min(/Morningstar ProStar MPPT SNMP/battery.voltage[batteryTerminalVoltage.0{#SINGLETON}],5m)>{#VOLTAGE.MAX.CRIT}'
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
                 -
                   uuid: c9f3d03ce06641eb9b184f511a3a0341
                   expression: 'max(/Morningstar ProStar MPPT SNMP/battery.voltage[batteryTerminalVoltage.0{#SINGLETON}],5m)<{#VOLTAGE.MIN.WARN}'
@@ -1012,6 +1250,10 @@ zabbix_export:
                     -
                       name: 'Battery: Critically low battery voltage (below {#VOLTAGE.MIN.CRIT}V for 5m)'
                       expression: 'max(/Morningstar ProStar MPPT SNMP/battery.voltage[batteryTerminalVoltage.0{#SINGLETON}],5m)<{#VOLTAGE.MIN.CRIT}'
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
           graph_prototypes:
             -
               uuid: 480e4c11060a4e34851b48bf7b9c5bb1
@@ -1058,6 +1300,13 @@ zabbix_export:
                   }
                   
                   return JSON.stringify(result);
+      tags:
+        -
+          tag: class
+          value: power
+        -
+          tag: target
+          value: morningstar
       macros:
         -
           macro: '{$BATTERY.TEMP.MAX.CRIT}'
diff --git a/templates/net/morningstar/morningstar_prostar_pwm_snmp/README.md b/templates/net/morningstar/morningstar_prostar_pwm_snmp/README.md
index a3f7f261c01..4011e956ed0 100644
--- a/templates/net/morningstar/morningstar_prostar_pwm_snmp/README.md
+++ b/templates/net/morningstar/morningstar_prostar_pwm_snmp/README.md
@@ -67,7 +67,7 @@ There are no template links in this template.
 |Temperature |Temperature: Ambient |<p>MIB: PROSTAR-PWM</p><p>Description:Ambient Temperature</p><p>Scaling Factor:1.0</p><p>Units:deg C</p><p>Range:[-128, 127]</p><p>Modbus address:0x001C</p> |SNMP |temp.ambient[ambientTemperature.0] |
 |Temperature |Temperature: Battery |<p>MIB: PROSTAR-PWM</p><p>Description:Battery Temperature</p><p>Scaling Factor:1.0</p><p>Units:deg C</p><p>Range:[-128, 127]</p><p>Modbus address:0x001B</p> |SNMP |temp.battery[batteryTemperature.0] |
 |Temperature |Temperature: Heatsink |<p>MIB: PROSTAR-PWM</p><p>Description:Heatsink Temperature</p><p>Scaling Factor:1.0</p><p>Units:deg C</p><p>Range:[-128, 127]</p><p>Modbus address:0x001A</p> |SNMP |temp.heatsink[heatsinkTemperature.0] |
-|Zabbix_raw_items |Battery: Battery Voltage discovery |<p>MIB: PROSTAR-PWM</p> |SNMP |battery.voltage.discovery[batteryTerminalVoltage.0] |
+|Zabbix raw items |Battery: Battery Voltage discovery |<p>MIB: PROSTAR-PWM</p> |SNMP |battery.voltage.discovery[batteryTerminalVoltage.0] |
 
 ## Triggers
 
diff --git a/templates/net/morningstar/morningstar_prostar_pwm_snmp/template_net_morningstar_prostar_pwm_snmp.yaml b/templates/net/morningstar/morningstar_prostar_pwm_snmp/template_net_morningstar_prostar_pwm_snmp.yaml
index 7dee3a295c2..8866f789984 100644
--- a/templates/net/morningstar/morningstar_prostar_pwm_snmp/template_net_morningstar_prostar_pwm_snmp.yaml
+++ b/templates/net/morningstar/morningstar_prostar_pwm_snmp/template_net_morningstar_prostar_pwm_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-17T06:32:04Z'
+  date: '2022-01-26T09:52:22Z'
   groups:
     -
       uuid: 57b7ae836ca64446ba2c296389c009b7
@@ -14,7 +14,7 @@ zabbix_export:
         MIBs used:
         PROSTAR-PWM
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Modules
@@ -37,8 +37,8 @@ zabbix_export:
             Modbus address:0x0013
           tags:
             -
-              tag: Application
-              value: Array
+              tag: component
+              value: array
         -
           uuid: a80ad3ace9b14446bc5fd5d6aaa5af87
           name: 'Battery: Battery Voltage discovery'
@@ -52,8 +52,14 @@ zabbix_export:
           description: 'MIB: PROSTAR-PWM'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: battery
+            -
+              tag: component
+              value: discovery
+            -
+              tag: component
+              value: raw
         -
           uuid: 148008b117c94155ba81600e3050ab25
           name: 'Battery: Charge Current'
@@ -72,8 +78,8 @@ zabbix_export:
             Modbus address:0x0011
           tags:
             -
-              tag: Application
-              value: Battery
+              tag: component
+              value: battery
         -
           uuid: a7ae2d3b911e4bb5a7eeb770470245a5
           name: 'Battery: Charge State'
@@ -105,8 +111,8 @@ zabbix_export:
                 - 1h
           tags:
             -
-              tag: Application
-              value: Battery
+              tag: component
+              value: battery
           triggers:
             -
               uuid: f12fc2c1a7a142a287304c18bafa1181
@@ -114,6 +120,10 @@ zabbix_export:
               name: 'Battery: Device charge in critical state'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: adf8cf02aa1e42fa84e1f11ddae4df01
               expression: 'last(/Morningstar ProStar PWM SNMP/charge.state[chargeState.0])={$CHARGE.STATE.WARN}'
@@ -124,6 +134,10 @@ zabbix_export:
                 -
                   name: 'Battery: Device charge in critical state'
                   expression: 'last(/Morningstar ProStar PWM SNMP/charge.state[chargeState.0])={$CHARGE.STATE.CRIT}'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 8acd2e7944694a828cf9b739b75513d9
           name: 'Counter: Charge Amp-hours'
@@ -147,8 +161,8 @@ zabbix_export:
                 - '0.1'
           tags:
             -
-              tag: Application
-              value: Counter
+              tag: component
+              value: counter
         -
           uuid: 0e7124df3f2b4298b1a13576d0b2d5e7
           name: 'Counter: Charge KW-hours'
@@ -167,8 +181,8 @@ zabbix_export:
             Modbus address:0x002A
           tags:
             -
-              tag: Application
-              value: Counter
+              tag: component
+              value: counter
         -
           uuid: 104a7db1c27d40b3bbee506f7f922393
           name: 'Counter: Load Amp-hours'
@@ -192,8 +206,8 @@ zabbix_export:
                 - '0.1'
           tags:
             -
-              tag: Application
-              value: Counter
+              tag: component
+              value: counter
         -
           uuid: dcade8607cf142a2b88333f9880448fc
           name: 'Load: Current'
@@ -212,8 +226,8 @@ zabbix_export:
             Modbus address:0x0016
           tags:
             -
-              tag: Application
-              value: Load
+              tag: component
+              value: load
         -
           uuid: 14b3ca3869374f54a467e5e9017f918a
           name: 'Load: State'
@@ -245,8 +259,8 @@ zabbix_export:
                 - 1h
           tags:
             -
-              tag: Application
-              value: Load
+              tag: component
+              value: load
           triggers:
             -
               uuid: 7a8bf4420b6b48ab8a5bc999eecae760
@@ -254,6 +268,10 @@ zabbix_export:
               name: 'Load: Device load in critical state'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 5152f9cd4ee34be485f3cb0a0f60afd5
               expression: 'last(/Morningstar ProStar PWM SNMP/load.state[loadState.0])={$LOAD.STATE.WARN:"lvdWarning"}  or last(/Morningstar ProStar PWM SNMP/load.state[loadState.0])={$LOAD.STATE.WARN:"override"}'
@@ -264,6 +282,10 @@ zabbix_export:
                 -
                   name: 'Load: Device load in critical state'
                   expression: 'last(/Morningstar ProStar PWM SNMP/load.state[loadState.0])={$LOAD.STATE.CRIT:"lvd"} or last(/Morningstar ProStar PWM SNMP/load.state[loadState.0])={$LOAD.STATE.CRIT:"fault"}'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: cccc0976a62b47b1a558d521704c125d
           name: 'Load: Voltage'
@@ -282,8 +304,8 @@ zabbix_export:
             Modbus address:0x0014
           tags:
             -
-              tag: Application
-              value: Load
+              tag: component
+              value: load
         -
           uuid: 7c1c1e03425c4b4bb176cf45458b916a
           name: 'Status: Alarms'
@@ -344,8 +366,8 @@ zabbix_export:
                   return result.length ? result.join('\n') : 'No alarms';
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: status
           triggers:
             -
               uuid: 67fd46f034c3486e9af3cabfc5dc8056
@@ -353,42 +375,70 @@ zabbix_export:
               name: 'Status: Device has "arrayCurrentOffset" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 31cc0b05b83045de80a7d07f26545010
               expression: 'count(/Morningstar ProStar PWM SNMP/status.alarms[alarms.0],#3,"like","batterySenseDisconnected")=2'
               name: 'Status: Device has "batterySenseDisconnected" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 9e498d21bc7f4ca1937f1628f4b1ea55
               expression: 'count(/Morningstar ProStar PWM SNMP/status.alarms[alarms.0],#3,"like","batterySenseOutOfRange")=2'
               name: 'Status: Device has "batterySenseOutOfRange" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 8a09c7609f9a45cea5b217757a7d2e5e
               expression: 'count(/Morningstar ProStar PWM SNMP/status.alarms[alarms.0],#3,"like","batteryTempOutOfRange")=2'
               name: 'Status: Device has "batteryTempOutOfRange" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: b173b8ca12f8464aae6476009b4c89e8
               expression: 'count(/Morningstar ProStar PWM SNMP/status.alarms[alarms.0],#3,"like","controllerReset")=2'
               name: 'Status: Device has "controllerReset" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: cdbac88810ff49caa35771e661d8b312
               expression: 'count(/Morningstar ProStar PWM SNMP/status.alarms[alarms.0],#3,"like","currentLimit")=2'
               name: 'Status: Device has "currentLimit" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 7758388df28d4540ba393f4423fef00a
               expression: 'count(/Morningstar ProStar PWM SNMP/status.alarms[alarms.0],#3,"like","currentMeasurementError")=2'
               name: 'Status: Device has "currentMeasurementError" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: a56fef1f61c44ba884ec448b0d306c1d
               expression: 'count(/Morningstar ProStar PWM SNMP/status.alarms[alarms.0],#3,"like","eepromAccessFailure")=2'
@@ -401,84 +451,140 @@ zabbix_export:
               name: 'Status: Device has "fp10SupplyOutOfRange" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: c252c82aff2a4ac680965115cb2fab64
               expression: 'count(/Morningstar ProStar PWM SNMP/status.alarms[alarms.0],#3,"like","heatsinkTempLimit")=2'
               name: 'Status: Device has "heatsinkTempLimit" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 5b93a0a09a62481d8096ec743c2ceaff
               expression: 'count(/Morningstar ProStar PWM SNMP/status.alarms[alarms.0],#3,"like","heatsinkTempSensorOpen")=2'
               name: 'Status: Device has "heatsinkTempSensorOpen" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: f28e5143a238470ba93c1345c814f87d
               expression: 'count(/Morningstar ProStar PWM SNMP/status.alarms[alarms.0],#3,"like","heatsinkTempSensorShorted")=2'
               name: 'Status: Device has "heatsinkTempSensorShorted" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 75c84ef378984fca854b34a8ef79668c
               expression: 'count(/Morningstar ProStar PWM SNMP/status.alarms[alarms.0],#3,"like","hightInputVoltageLimit")=2'
               name: 'Status: Device has "hightInputVoltageLimit" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 5c1551f7e2be40e0b8b50ed263f8e293
               expression: 'count(/Morningstar ProStar PWM SNMP/status.alarms[alarms.0],#3,"like","loadCurrentOffset")=2'
               name: 'Status: Device has "loadCurrentOffset" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 665117c5b9b64ea09a1d661e9c40fc43
               expression: 'count(/Morningstar ProStar PWM SNMP/status.alarms[alarms.0],#3,"like","loadLvd")=2'
               name: 'Status: Device has "loadLvd" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: b89c002c859c419ea748b43d575e9e27
               expression: 'count(/Morningstar ProStar PWM SNMP/status.alarms[alarms.0],#3,"like","logTimeout")=2'
               name: 'Status: Device has "logTimeout" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 17f51e7b248b4e63934e8b529b85b2ef
               expression: 'count(/Morningstar ProStar PWM SNMP/status.alarms[alarms.0],#3,"like","mosfetOpen")=2'
               name: 'Status: Device has "mosfetOpen" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 75e23772250741d0b1fc1ddff2a72ef6
               expression: 'count(/Morningstar ProStar PWM SNMP/status.alarms[alarms.0],#3,"like","p12SupplyOutOfRange")=2'
               name: 'Status: Device has "p12SupplyOutOfRange" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: fc374c9ac9fa4f979fbff9f7c7d83565
               expression: 'count(/Morningstar ProStar PWM SNMP/status.alarms[alarms.0],#3,"like","p33SupplyOutOfRange")=2'
               name: 'Status: Device has "p33SupplyOutOfRange" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: fbec2a1fdbe54d8da352471acf67bad1
               expression: 'count(/Morningstar ProStar PWM SNMP/status.alarms[alarms.0],#3,"like","rtsDisconnected")=2'
               name: 'Status: Device has "rtsDisconnected" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 915da6e7b1cd410da9a6c68e3b4abd85
               expression: 'count(/Morningstar ProStar PWM SNMP/status.alarms[alarms.0],#3,"like","rtsShorted")=2'
               name: 'Status: Device has "rtsShorted" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: e8bf2213a5444e2c9923b6f093d43f75
               expression: 'count(/Morningstar ProStar PWM SNMP/status.alarms[alarms.0],#3,"like","uncalibrated")=2'
               name: 'Status: Device has "uncalibrated" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 2517d96e51c14372a0336c9a6ed5d078
           name: 'Status: Array Faults'
@@ -529,8 +635,8 @@ zabbix_export:
                   return result.length ? result.join('\n') : 'No faults';
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: status
           triggers:
             -
               uuid: b2ff69793e124031a79a668b03678fac
@@ -538,78 +644,130 @@ zabbix_export:
               name: 'Status: Device has "arrayHvd" array faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: a4ca36ccaa9d45ceb79303afef1c49f0
               expression: 'count(/Morningstar ProStar PWM SNMP/status.array_faults[arrayFaults.0],#3,"like","batteryHvd")=2'
               name: 'Status: Device has "batteryHvd" array faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: f4d1120afb13456b9d45f8795dbc30b7
               expression: 'count(/Morningstar ProStar PWM SNMP/status.array_faults[arrayFaults.0],#3,"like","batteryLowVoltageDisconnect")=2'
               name: 'Status: Device has "batteryLowVoltageDisconnect" array faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 9e5f2c575945458ea8a39f33cb23b833
               expression: 'count(/Morningstar ProStar PWM SNMP/status.array_faults[arrayFaults.0],#3,"like","customSettingsEdit")=2'
               name: 'Status: Device has "customSettingsEdit" array faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: fd904f4469324784ac2c469e64069f94
               expression: 'count(/Morningstar ProStar PWM SNMP/status.array_faults[arrayFaults.0],#3,"like","dipSwitchChanged")=2'
               name: 'Status: Device has "dipSwitchChanged" array faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 62076ce0967049c8bde39f71afcb85d9
               expression: 'count(/Morningstar ProStar PWM SNMP/status.array_faults[arrayFaults.0],#3,"like","localTempSensorDamaged")=2'
               name: 'Status: Device has "localTempSensorDamaged" array faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: ea8487afe1c14bc08f3d9fd7f75d208f
               expression: 'count(/Morningstar ProStar PWM SNMP/status.array_faults[arrayFaults.0],#3,"like","mosfetSShorted")=2'
               name: 'Status: Device has "mosfetSShorted" array faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: b0bb139541ae493bafc40dac9074d898
               expression: 'count(/Morningstar ProStar PWM SNMP/status.array_faults[arrayFaults.0],#3,"like","overcurrent")=2'
               name: 'Status: Device has "overcurrent" array faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 8af94d7ff1a84e18b10122b0e3743d45
               expression: 'count(/Morningstar ProStar PWM SNMP/status.array_faults[arrayFaults.0],#3,"like","p3Fault")=2'
               name: 'Status: Device has "p3Fault" array faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: b41cb2e05acb40f59efa50a25f66cd62
               expression: 'count(/Morningstar ProStar PWM SNMP/status.array_faults[arrayFaults.0],#3,"like","rtsNoLongerValid")=2'
               name: 'Status: Device has "rtsNoLongerValid" array faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: d99c3f126c7e480cb4fcc705349eb61d
               expression: 'count(/Morningstar ProStar PWM SNMP/status.array_faults[arrayFaults.0],#3,"like","rtsShorted")=2'
               name: 'Status: Device has "rtsShorted" array faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 711b28f19cb74c0faeef73263ca1fb8f
               expression: 'count(/Morningstar ProStar PWM SNMP/status.array_faults[arrayFaults.0],#3,"like","slaveTimeout")=2'
               name: 'Status: Device has "slaveTimeout" array faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: e4a261d750d546c7b5d5067dd9a0ec25
               expression: 'count(/Morningstar ProStar PWM SNMP/status.array_faults[arrayFaults.0],#3,"like","software")=2'
               name: 'Status: Device has "software" array faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 1cd47d04af104cb9ab1cd7dc745a6aea
           name: 'Status: Load Faults'
@@ -656,8 +814,8 @@ zabbix_export:
                   return result.length ? result.join('\n') : 'No faults';
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: status
           triggers:
             -
               uuid: 99ab5f0d3014459a8cd7d137d3a1f688
@@ -665,54 +823,90 @@ zabbix_export:
               name: 'Status: Device has "customSettingsEdit" load faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 77752192092f4f1caceef19c3c164b72
               expression: 'count(/Morningstar ProStar PWM SNMP/status.load_faults[loadFaults.0],#3,"like","dipSwitchChanged")=2'
               name: 'Status: Device has "dipSwitchChanged" load faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: d2e55501d89844aeb47f7887a11754a9
               expression: 'count(/Morningstar ProStar PWM SNMP/status.load_faults[loadFaults.0],#3,"like","externalShortCircuit")=2'
               name: 'Status: Device has "externalShortCircuit" load faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: a6548502cfc4406098ba3129af8efcb5
               expression: 'count(/Morningstar ProStar PWM SNMP/status.load_faults[loadFaults.0],#3,"like","highTempDisconnect")=2'
               name: 'Status: Device has "highTempDisconnect" load faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 6e8f0127bc7b42dea9d867ab174f458c
               expression: 'count(/Morningstar ProStar PWM SNMP/status.load_faults[loadFaults.0],#3,"like","loadHvd")=2'
               name: 'Status: Device has "loadHvd" load faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 2a303d4712e244a9b051fb1b0247fac5
               expression: 'count(/Morningstar ProStar PWM SNMP/status.load_faults[loadFaults.0],#3,"like","mosfetShorted")=2'
               name: 'Status: Device has "mosfetShorted" load faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 5720e2e15e5f42099fd7de361f62c99a
               expression: 'count(/Morningstar ProStar PWM SNMP/status.load_faults[loadFaults.0],#3,"like","overcurrent")=2'
               name: 'Status: Device has "overcurrent" load faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 2f522d50a8124ed2a8af4d7b6417c31c
               expression: 'count(/Morningstar ProStar PWM SNMP/status.load_faults[loadFaults.0],#3,"like","p3Fault")=2'
               name: 'Status: Device has "p3Fault" load faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: e75abe852b9c4e1d91a1f8f83622ef64
               expression: 'count(/Morningstar ProStar PWM SNMP/status.load_faults[loadFaults.0],#3,"like","software")=2'
               name: 'Status: Device has "software" load faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 42f6a75d923d4262b37d85c4f7d1d322
           name: 'Status: Uptime'
@@ -729,8 +923,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: status
           triggers:
             -
               uuid: dea364bf454746bca6be38d7e0759d06
@@ -739,6 +933,10 @@ zabbix_export:
               priority: INFO
               description: 'Uptime is less than 10 minutes'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 16c1444a745a47e59fd22bd1a64baef3
               expression: 'nodata(/Morningstar ProStar PWM SNMP/status.uptime,5m)=1'
@@ -746,6 +944,10 @@ zabbix_export:
               priority: WARNING
               description: 'Zabbix has not received data for items for the last 5 minutes'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: f4b7bfb000754a17b4719863d3755519
           name: 'Battery: Target Voltage'
@@ -769,8 +971,8 @@ zabbix_export:
                 - 1h
           tags:
             -
-              tag: Application
-              value: Battery
+              tag: component
+              value: battery
         -
           uuid: 13d3479a7b5940b5a53d5f13bea9e2d1
           name: 'Temperature: Ambient'
@@ -789,8 +991,8 @@ zabbix_export:
             Modbus address:0x001C
           tags:
             -
-              tag: Application
-              value: Temperature
+              tag: component
+              value: temperature
         -
           uuid: 39763f7fccd94aefb720a34871c0962b
           name: 'Temperature: Battery'
@@ -809,8 +1011,8 @@ zabbix_export:
             Modbus address:0x001B
           tags:
             -
-              tag: Application
-              value: Temperature
+              tag: component
+              value: temperature
           triggers:
             -
               uuid: 46eb3a0e80294a4db8324d56337ed712
@@ -818,12 +1020,20 @@ zabbix_export:
               name: 'Temperature: Critically high battery temperature (over {$BATTERY.TEMP.MAX.CRIT}C for 5m)'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: c3f3ba5b2cab4481bb62fa8527554e96
               expression: 'max(/Morningstar ProStar PWM SNMP/temp.battery[batteryTemperature.0],5m)<{$BATTERY.TEMP.MIN.CRIT}'
               name: 'Temperature: Critically low battery temperature (below {$BATTERY.TEMP.MIN.WARN}C for 5m)'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 80aaf1de029b4d6eadce9f2a946f6dde
               expression: 'min(/Morningstar ProStar PWM SNMP/temp.battery[batteryTemperature.0],5m)>{$BATTERY.TEMP.MAX.WARN}'
@@ -834,6 +1044,10 @@ zabbix_export:
                 -
                   name: 'Temperature: Critically high battery temperature (over {$BATTERY.TEMP.MAX.CRIT}C for 5m)'
                   expression: 'min(/Morningstar ProStar PWM SNMP/temp.battery[batteryTemperature.0],5m)>{$BATTERY.TEMP.MAX.CRIT}'
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: cf1db336ea124f9a9fd6eb367f93f0e8
               expression: 'max(/Morningstar ProStar PWM SNMP/temp.battery[batteryTemperature.0],5m)<{$BATTERY.TEMP.MIN.WARN}'
@@ -844,6 +1058,10 @@ zabbix_export:
                 -
                   name: 'Temperature: Critically low battery temperature (below {$BATTERY.TEMP.MIN.WARN}C for 5m)'
                   expression: 'max(/Morningstar ProStar PWM SNMP/temp.battery[batteryTemperature.0],5m)<{$BATTERY.TEMP.MIN.CRIT}'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 1d13bd3ea24a4fcab3cd5b7586e6033a
           name: 'Temperature: Heatsink'
@@ -862,8 +1080,8 @@ zabbix_export:
             Modbus address:0x001A
           tags:
             -
-              tag: Application
-              value: Temperature
+              tag: component
+              value: temperature
       discovery_rules:
         -
           uuid: 17148797def9484ba26b0afdcc44bfd5
@@ -888,8 +1106,8 @@ zabbix_export:
                 Modbus address:0x0021
               tags:
                 -
-                  tag: Application
-                  value: Battery
+                  tag: component
+                  value: battery
               trigger_prototypes:
                 -
                   uuid: e89cf2b8066840c2876642f0d8db1edd
@@ -897,12 +1115,20 @@ zabbix_export:
                   name: 'Battery: Critically high battery voltage (over {#VOLTAGE.MAX.CRIT}V for 5m)'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
                 -
                   uuid: 8356aba9afb242b09902873a5f0e1d47
                   expression: 'max(/Morningstar ProStar PWM SNMP/battery.voltage[batteryTerminalVoltage.0{#SINGLETON}],5m)<{#VOLTAGE.MIN.CRIT}'
                   name: 'Battery: Critically low battery voltage (below {#VOLTAGE.MIN.CRIT}V for 5m)'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
                 -
                   uuid: 77f130af976c43edb8c823de5cbd57b2
                   expression: 'min(/Morningstar ProStar PWM SNMP/battery.voltage[batteryTerminalVoltage.0{#SINGLETON}],5m)>{#VOLTAGE.MAX.WARN}'
@@ -913,6 +1139,10 @@ zabbix_export:
                     -
                       name: 'Battery: Critically high battery voltage (over {#VOLTAGE.MAX.CRIT}V for 5m)'
                       expression: 'min(/Morningstar ProStar PWM SNMP/battery.voltage[batteryTerminalVoltage.0{#SINGLETON}],5m)>{#VOLTAGE.MAX.CRIT}'
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
                 -
                   uuid: 6c288c8b28db4f8e95c8ad2aa8b838ef
                   expression: 'max(/Morningstar ProStar PWM SNMP/battery.voltage[batteryTerminalVoltage.0{#SINGLETON}],5m)<{#VOLTAGE.MIN.WARN}'
@@ -923,6 +1153,10 @@ zabbix_export:
                     -
                       name: 'Battery: Critically low battery voltage (below {#VOLTAGE.MIN.CRIT}V for 5m)'
                       expression: 'max(/Morningstar ProStar PWM SNMP/battery.voltage[batteryTerminalVoltage.0{#SINGLETON}],5m)<{#VOLTAGE.MIN.CRIT}'
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
           graph_prototypes:
             -
               uuid: 8ecd4f88627a4dadb132fdbb6d911b6b
@@ -969,6 +1203,13 @@ zabbix_export:
                   }
                   
                   return JSON.stringify(result);
+      tags:
+        -
+          tag: class
+          value: power
+        -
+          tag: target
+          value: morningstar
       macros:
         -
           macro: '{$BATTERY.TEMP.MAX.CRIT}'
diff --git a/templates/net/morningstar/morningstar_sunsaver_mppt_snmp/README.md b/templates/net/morningstar/morningstar_sunsaver_mppt_snmp/README.md
index e8d76dc3c8b..6586797d03c 100644
--- a/templates/net/morningstar/morningstar_sunsaver_mppt_snmp/README.md
+++ b/templates/net/morningstar/morningstar_sunsaver_mppt_snmp/README.md
@@ -70,7 +70,7 @@ There are no template links in this template.
 |Temperature |Temperature: Ambient |<p>MIB: SUNSAVER-MPPT</p><p>Description:Ambient Temperature</p><p>Scaling Factor:1.0</p><p>Units:deg C</p><p>Range:[-128, 127]</p><p>Modbus address:0x000F</p> |SNMP |temp.ambient[ambientTemperature.0] |
 |Temperature |Temperature: Battery |<p>MIB: SUNSAVER-MPPT</p><p>Description:Heatsink Temperature</p><p>Scaling Factor:1.0</p><p>Units:deg C</p><p>Range:[-128, 127]</p><p>Modbus address:0x000D</p> |SNMP |temp.battery[batteryTemperature.0] |
 |Temperature |Temperature: Heatsink |<p>MIB: SUNSAVER-MPPT</p><p>Description:Battery Temperature</p><p>Scaling Factor:1.0</p><p>Units:deg C</p><p>Range:[-128, 127]</p><p>Modbus address:0x000E</p> |SNMP |temp.heatsink[heatsinkTemperature.0] |
-|Zabbix_raw_items |Battery: Battery Voltage discovery |<p>MIB: SUNSAVER-MPPT</p> |SNMP |battery.voltage.discovery[batteryVoltage.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.003051757813`</p> |
+|Zabbix raw items |Battery: Battery Voltage discovery |<p>MIB: SUNSAVER-MPPT</p> |SNMP |battery.voltage.discovery[batteryVoltage.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.003051757813`</p> |
 
 ## Triggers
 
diff --git a/templates/net/morningstar/morningstar_sunsaver_mppt_snmp/template_net_morningstar_sunsaver_mppt_snmp.yaml b/templates/net/morningstar/morningstar_sunsaver_mppt_snmp/template_net_morningstar_sunsaver_mppt_snmp.yaml
index 02f648954a1..3b0235ea8a7 100644
--- a/templates/net/morningstar/morningstar_sunsaver_mppt_snmp/template_net_morningstar_sunsaver_mppt_snmp.yaml
+++ b/templates/net/morningstar/morningstar_sunsaver_mppt_snmp/template_net_morningstar_sunsaver_mppt_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-17T06:32:09Z'
+  date: '2022-01-26T09:44:16Z'
   groups:
     -
       uuid: 57b7ae836ca64446ba2c296389c009b7
@@ -14,7 +14,7 @@ zabbix_export:
         MIBs used:
         SUNSAVER-MPPT
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Modules
@@ -47,8 +47,8 @@ zabbix_export:
                 - \1\2
           tags:
             -
-              tag: Application
-              value: Array
+              tag: component
+              value: array
         -
           uuid: 0842746ca41c44128a575113307259e2
           name: 'Array: Sweep Vmp'
@@ -77,8 +77,8 @@ zabbix_export:
                 - \1\2
           tags:
             -
-              tag: Application
-              value: Array
+              tag: component
+              value: array
         -
           uuid: 0e3371208513416ab1b9afdf2c3b2c08
           name: 'Array: Sweep Voc'
@@ -107,8 +107,8 @@ zabbix_export:
                 - \1\2
           tags:
             -
-              tag: Application
-              value: Array
+              tag: component
+              value: array
         -
           uuid: da1f347b28dd4fbeb123f228adefb0ed
           name: 'Array: Voltage'
@@ -137,8 +137,8 @@ zabbix_export:
                 - \1\2
           tags:
             -
-              tag: Application
-              value: Array
+              tag: component
+              value: array
         -
           uuid: f8803a1390b745f08673d4ea998548a9
           name: 'Battery: Battery Voltage discovery'
@@ -157,8 +157,14 @@ zabbix_export:
                 - '0.003051757813'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: battery
+            -
+              tag: component
+              value: discovery
+            -
+              tag: component
+              value: raw
         -
           uuid: a36313ef0933403788a42de8a62b4838
           name: 'Battery: Charge Current'
@@ -187,8 +193,8 @@ zabbix_export:
                 - \1\2
           tags:
             -
-              tag: Application
-              value: Battery
+              tag: component
+              value: battery
         -
           uuid: 4da765c8e26540c190ea07be08b87abc
           name: 'Battery: Charge State'
@@ -220,8 +226,8 @@ zabbix_export:
                 - 1h
           tags:
             -
-              tag: Application
-              value: Battery
+              tag: component
+              value: battery
           triggers:
             -
               uuid: 0362139c66f4464db8c022b9ffce5502
@@ -229,6 +235,10 @@ zabbix_export:
               name: 'Battery: Device charge in critical state'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: d5439cee53b148ecb4186286c4e93ada
               expression: 'last(/Morningstar SunSaver MPPT SNMP/charge.state[chargeState.0])={$CHARGE.STATE.WARN}'
@@ -239,6 +249,10 @@ zabbix_export:
                 -
                   name: 'Battery: Device charge in critical state'
                   expression: 'last(/Morningstar SunSaver MPPT SNMP/charge.state[chargeState.0])={$CHARGE.STATE.CRIT}'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 149545b9154044e3af27b4e9ad809c0e
           name: 'Counter: Charge Amp-hours'
@@ -262,8 +276,8 @@ zabbix_export:
                 - '0.1'
           tags:
             -
-              tag: Application
-              value: Counter
+              tag: component
+              value: counter
         -
           uuid: f6d0f89c747b4418ad34c32b5ac9a5b9
           name: 'Counter: Charge KW-hours'
@@ -275,8 +289,8 @@ zabbix_export:
           description: 'MIB: SUNSAVER-MPPT'
           tags:
             -
-              tag: Application
-              value: Counter
+              tag: component
+              value: counter
         -
           uuid: 28e679eace174d289ca5ccf90f3b9150
           name: 'Counter: Load Amp-hours'
@@ -300,8 +314,8 @@ zabbix_export:
                 - '0.1'
           tags:
             -
-              tag: Application
-              value: Counter
+              tag: component
+              value: counter
         -
           uuid: 6491ee507d9a4c099852d33e57df48a9
           name: 'Load: Current'
@@ -330,8 +344,8 @@ zabbix_export:
                 - \1\2
           tags:
             -
-              tag: Application
-              value: Load
+              tag: component
+              value: load
         -
           uuid: c5dfef2deee445ec88e2d63dbfbbaf68
           name: 'Load: State'
@@ -363,8 +377,8 @@ zabbix_export:
                 - 1h
           tags:
             -
-              tag: Application
-              value: Load
+              tag: component
+              value: load
           triggers:
             -
               uuid: bbd3a89b012a40daa646ec7113d43e43
@@ -372,6 +386,10 @@ zabbix_export:
               name: 'Load: Device load in critical state'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 8f6967c1b577431c995a3c13f8cdb1c1
               expression: 'last(/Morningstar SunSaver MPPT SNMP/load.state[loadState.0])={$LOAD.STATE.WARN:"lvdWarning"}  or last(/Morningstar SunSaver MPPT SNMP/load.state[loadState.0])={$LOAD.STATE.WARN:"override"}'
@@ -382,6 +400,10 @@ zabbix_export:
                 -
                   name: 'Load: Device load in critical state'
                   expression: 'last(/Morningstar SunSaver MPPT SNMP/load.state[loadState.0])={$LOAD.STATE.CRIT:"lvd"} or last(/Morningstar SunSaver MPPT SNMP/load.state[loadState.0])={$LOAD.STATE.CRIT:"fault"}'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: a9ca69fcedbb4524a8eb4b92b975008e
           name: 'Load: Voltage'
@@ -410,8 +432,8 @@ zabbix_export:
                 - \1\2
           tags:
             -
-              tag: Application
-              value: Load
+              tag: component
+              value: load
         -
           uuid: 91f2c1893b594e808032eb0140247d7a
           name: 'Status: Alarms'
@@ -467,8 +489,8 @@ zabbix_export:
                   return result.length ? result.join('\n') : 'No alarms';
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: status
           triggers:
             -
               uuid: 86220f6cc9164490b6d80be4a249e749
@@ -476,78 +498,130 @@ zabbix_export:
               name: 'Status: Device has "currentLimit" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 69016ea6a1204435b3ddb8de6b8944dc
               expression: 'count(/Morningstar SunSaver MPPT SNMP/status.alarms[alarms.0],#3,"like","currentOffset")=2'
               name: 'Status: Device has "currentOffset" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 2c02465ea74e4c63ab783d235c8f1a30
               expression: 'count(/Morningstar SunSaver MPPT SNMP/status.alarms[alarms.0],#3,"like","heatsinkTempSensorOpen")=2'
               name: 'Status: Device has "heatsinkTempSensorOpen" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 1aa289c68f0b4b44a043281e6df9e462
               expression: 'count(/Morningstar SunSaver MPPT SNMP/status.alarms[alarms.0],#3,"like","heatsinkTempSensorShorted")=2'
               name: 'Status: Device has "heatsinkTempSensorShorted" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 6d0ce7d6e2cc407ba0f4d989bdd9a141
               expression: 'count(/Morningstar SunSaver MPPT SNMP/status.alarms[alarms.0],#3,"like","highVaCurrentLimit")=2'
               name: 'Status: Device has "highVaCurrentLimit" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 718a3426363040e1ab82864635444056
               expression: 'count(/Morningstar SunSaver MPPT SNMP/status.alarms[alarms.0],#3,"like","mosfetSOpen")=2'
               name: 'Status: Device has "mosfetSOpen" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 4eb4df0b4cf04a198190312cdb33538f
               expression: 'count(/Morningstar SunSaver MPPT SNMP/status.alarms[alarms.0],#3,"like","p12VoltageReferenceOff")=2'
               name: 'Status: Device has "p12VoltageReferenceOff" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: e2ac890bb16d4e0798b0410f33c8a860
               expression: 'count(/Morningstar SunSaver MPPT SNMP/status.alarms[alarms.0],#3,"like","rtsDisconnected")=2'
               name: 'Status: Device has "rtsDisconnected" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 3b02b27bd4674ae3b820730cee8e611a
               expression: 'count(/Morningstar SunSaver MPPT SNMP/status.alarms[alarms.0],#3,"like","rtsMiswire")=2'
               name: 'Status: Device has "rtsMiswire" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: d253c037d5974ee38e888162687b96ef
               expression: 'count(/Morningstar SunSaver MPPT SNMP/status.alarms[alarms.0],#3,"like","rtsShorted")=2'
               name: 'Status: Device has "rtsShorted" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 1bea0c0e01314dbaa1cfdfa5a0625755
               expression: 'count(/Morningstar SunSaver MPPT SNMP/status.alarms[alarms.0],#3,"like","sspptHot")=2'
               name: 'Status: Device has "sspptHot" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: d28d0e51500a45859ccb6969d9b5493f
               expression: 'count(/Morningstar SunSaver MPPT SNMP/status.alarms[alarms.0],#3,"like","systemMiswire")=2'
               name: 'Status: Device has "systemMiswire" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 427f75a98d4440a38e40522bccec03bb
               expression: 'count(/Morningstar SunSaver MPPT SNMP/status.alarms[alarms.0],#3,"like","uncalibrated")=2'
               name: 'Status: Device has "uncalibrated" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: f44756455697466cb905aa6ae4d0220d
           name: 'Status: Array Faults'
@@ -594,8 +668,8 @@ zabbix_export:
                   return result.length ? result.join('\n') : 'No faults';
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: status
           triggers:
             -
               uuid: 2d8b0bdeb95c49d68771af384d985311
@@ -603,54 +677,90 @@ zabbix_export:
               name: 'Status: Device has "arrayHvd" array faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 2e07c5d51691462ca0961d77ea974bd5
               expression: 'count(/Morningstar SunSaver MPPT SNMP/status.array_faults[arrayFaults.0],#3,"like","batteryHvd")=2'
               name: 'Status: Device has "batteryHvd" array faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 65d2cd1ff93f45db9d7f572ee0a8f568
               expression: 'count(/Morningstar SunSaver MPPT SNMP/status.array_faults[arrayFaults.0],#3,"like","customSettingsEdit")=2'
               name: 'Status: Device has "customSettingsEdit" array faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: fe217d10399044d7b1008f0010691e1e
               expression: 'count(/Morningstar SunSaver MPPT SNMP/status.array_faults[arrayFaults.0],#3,"like","localTempSensorDamaged")=2'
               name: 'Status: Device has "localTempSensorDamaged" array faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: fa62f9e4f0f84e278938ba18785a1b5f
               expression: 'count(/Morningstar SunSaver MPPT SNMP/status.array_faults[arrayFaults.0],#3,"like","mosfetSShorted")=2'
               name: 'Status: Device has "mosfetSShorted" array faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 6f450621a12e46369745b2a0fed018ac
               expression: 'count(/Morningstar SunSaver MPPT SNMP/status.array_faults[arrayFaults.0],#3,"like","overcurrent")=2'
               name: 'Status: Device has "overcurrent" array faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 7ea38daa41a94ab3a9c1efc34276b17b
               expression: 'count(/Morningstar SunSaver MPPT SNMP/status.array_faults[arrayFaults.0],#3,"like","rtsNoLongerValid")=2'
               name: 'Status: Device has "rtsNoLongerValid" array faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 91edc885c3f140cc85bb6085f06e6820
               expression: 'count(/Morningstar SunSaver MPPT SNMP/status.array_faults[arrayFaults.0],#3,"like","rtsShorted")=2'
               name: 'Status: Device has "rtsShorted" array faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: cae74543a0da478d80b9302a2431fe4b
               expression: 'count(/Morningstar SunSaver MPPT SNMP/status.array_faults[arrayFaults.0],#3,"like","softwareFault")=2'
               name: 'Status: Device has "softwareFault" array faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 24762b0c264745548150a4bd5913156f
           name: 'Status: Load Faults'
@@ -696,8 +806,8 @@ zabbix_export:
                   return result.length ? result.join('\n') : 'No faults';
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: status
           triggers:
             -
               uuid: d086fbb093344723a4bb5fe928e984ff
@@ -705,48 +815,80 @@ zabbix_export:
               name: 'Status: Device has "customSettingsEdit" load faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 5743ed062a954330928092fb8574002a
               expression: 'count(/Morningstar SunSaver MPPT SNMP/status.load_faults[loadFaults.0],#3,"like","externalShortCircuit")=2'
               name: 'Status: Device has "externalShortCircuit" load faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 354a1512bca5468585a489dd14fc793d
               expression: 'count(/Morningstar SunSaver MPPT SNMP/status.load_faults[loadFaults.0],#3,"like","highTempDisconnect")=2'
               name: 'Status: Device has "highTempDisconnect" load faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 3640e470580846ac9e1651cba186d0a3
               expression: 'count(/Morningstar SunSaver MPPT SNMP/status.load_faults[loadFaults.0],#3,"like","loadHvd")=2'
               name: 'Status: Device has "loadHvd" load faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: d3911d64792e4b88b31cb51a405a1a2e
               expression: 'count(/Morningstar SunSaver MPPT SNMP/status.load_faults[loadFaults.0],#3,"like","mosfetShorted")=2'
               name: 'Status: Device has "mosfetShorted" load faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: d1bfa4177c0844ec9fc2bc7270c09338
               expression: 'count(/Morningstar SunSaver MPPT SNMP/status.load_faults[loadFaults.0],#3,"like","overcurrent")=2'
               name: 'Status: Device has "overcurrent" load faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: baaba919b58546f08cdcd1e2791feb27
               expression: 'count(/Morningstar SunSaver MPPT SNMP/status.load_faults[loadFaults.0],#3,"like","software")=2'
               name: 'Status: Device has "software" load faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 41e47074c983421a83b1e500d4591188
               expression: 'count(/Morningstar SunSaver MPPT SNMP/status.load_faults[loadFaults.0],#3,"like","unknownLoadFault")=2'
               name: 'Status: Device has "unknownLoadFault" load faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 63512390f2a04885bf8d0e19653a72b1
           name: 'Status: Uptime'
@@ -763,8 +905,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: status
           triggers:
             -
               uuid: fd5dcb256d4547da9c432c1b9c01b0ae
@@ -773,6 +915,10 @@ zabbix_export:
               priority: INFO
               description: 'Uptime is less than 10 minutes'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 72e6e08faed647a98a027bd25b6a7106
               expression: 'nodata(/Morningstar SunSaver MPPT SNMP/status.uptime,5m)=1'
@@ -780,6 +926,10 @@ zabbix_export:
               priority: WARNING
               description: 'Zabbix has not received data for items for the last 5 minutes'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 52afa576b83b49e69ec8d379fbc42965
           name: 'Battery: Target Voltage'
@@ -808,8 +958,8 @@ zabbix_export:
                 - \1\2
           tags:
             -
-              tag: Application
-              value: Battery
+              tag: component
+              value: battery
         -
           uuid: 430cf6fcb9b74943a8ca7f1d9d06fa56
           name: 'Temperature: Ambient'
@@ -828,8 +978,8 @@ zabbix_export:
             Modbus address:0x000F
           tags:
             -
-              tag: Application
-              value: Temperature
+              tag: component
+              value: temperature
         -
           uuid: 157faa85ae244950b4a114b95bad6d50
           name: 'Temperature: Battery'
@@ -848,8 +998,8 @@ zabbix_export:
             Modbus address:0x000D
           tags:
             -
-              tag: Application
-              value: Temperature
+              tag: component
+              value: temperature
           triggers:
             -
               uuid: cc121c44be05440a82d3344c530456e5
@@ -857,12 +1007,20 @@ zabbix_export:
               name: 'Temperature: Critically high battery temperature (over {$BATTERY.TEMP.MAX.CRIT}C for 5m)'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 9e0d552b93ae402d98c327420c99d160
               expression: 'max(/Morningstar SunSaver MPPT SNMP/temp.battery[batteryTemperature.0],5m)<{$BATTERY.TEMP.MIN.CRIT}'
               name: 'Temperature: Critically low battery temperature (below {$BATTERY.TEMP.MIN.WARN}C for 5m)'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 95b600e280b94949b41422eb60def010
               expression: 'min(/Morningstar SunSaver MPPT SNMP/temp.battery[batteryTemperature.0],5m)>{$BATTERY.TEMP.MAX.WARN}'
@@ -873,6 +1031,10 @@ zabbix_export:
                 -
                   name: 'Temperature: Critically high battery temperature (over {$BATTERY.TEMP.MAX.CRIT}C for 5m)'
                   expression: 'min(/Morningstar SunSaver MPPT SNMP/temp.battery[batteryTemperature.0],5m)>{$BATTERY.TEMP.MAX.CRIT}'
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: e351922a0a8c4c53972d9477d47af528
               expression: 'max(/Morningstar SunSaver MPPT SNMP/temp.battery[batteryTemperature.0],5m)<{$BATTERY.TEMP.MIN.WARN}'
@@ -883,6 +1045,10 @@ zabbix_export:
                 -
                   name: 'Temperature: Critically low battery temperature (below {$BATTERY.TEMP.MIN.WARN}C for 5m)'
                   expression: 'max(/Morningstar SunSaver MPPT SNMP/temp.battery[batteryTemperature.0],5m)<{$BATTERY.TEMP.MIN.CRIT}'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 5f238fe557a7412cad5f3864e407284e
           name: 'Temperature: Heatsink'
@@ -901,8 +1067,8 @@ zabbix_export:
             Modbus address:0x000E
           tags:
             -
-              tag: Application
-              value: Temperature
+              tag: component
+              value: temperature
       discovery_rules:
         -
           uuid: 81b324d81e6549d59cbf14163181fb48
@@ -937,8 +1103,8 @@ zabbix_export:
                     - \1\2
               tags:
                 -
-                  tag: Application
-                  value: Battery
+                  tag: component
+                  value: battery
               trigger_prototypes:
                 -
                   uuid: bf4ad2cee8cf41baafa3d81df5fbe4d3
@@ -946,12 +1112,20 @@ zabbix_export:
                   name: 'Battery: Critically high battery voltage (over {#VOLTAGE.MAX.CRIT}V for 5m)'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
                 -
                   uuid: 2aedfef9b8764881a4768e6b32793820
                   expression: 'max(/Morningstar SunSaver MPPT SNMP/battery.voltage[batteryVoltage.0{#SINGLETON}],5m)<{#VOLTAGE.MIN.CRIT}'
                   name: 'Battery: Critically low battery voltage (below {#VOLTAGE.MIN.CRIT}V for 5m)'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
                 -
                   uuid: bec4c7a6a1ab44a4adc8e4286b9a41d9
                   expression: 'min(/Morningstar SunSaver MPPT SNMP/battery.voltage[batteryVoltage.0{#SINGLETON}],5m)>{#VOLTAGE.MAX.WARN}'
@@ -962,6 +1136,10 @@ zabbix_export:
                     -
                       name: 'Battery: Critically high battery voltage (over {#VOLTAGE.MAX.CRIT}V for 5m)'
                       expression: 'min(/Morningstar SunSaver MPPT SNMP/battery.voltage[batteryVoltage.0{#SINGLETON}],5m)>{#VOLTAGE.MAX.CRIT}'
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
                 -
                   uuid: c06425d8a0a24b5f80fd0591be61b3f0
                   expression: 'max(/Morningstar SunSaver MPPT SNMP/battery.voltage[batteryVoltage.0{#SINGLETON}],5m)<{#VOLTAGE.MIN.WARN}'
@@ -972,6 +1150,10 @@ zabbix_export:
                     -
                       name: 'Battery: Critically low battery voltage (below {#VOLTAGE.MIN.CRIT}V for 5m)'
                       expression: 'max(/Morningstar SunSaver MPPT SNMP/battery.voltage[batteryVoltage.0{#SINGLETON}],5m)<{#VOLTAGE.MIN.CRIT}'
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
           graph_prototypes:
             -
               uuid: b3520796c85a45df954633bc5f87d80b
@@ -1018,6 +1200,13 @@ zabbix_export:
                   }
                   
                   return JSON.stringify(result);
+      tags:
+        -
+          tag: class
+          value: power
+        -
+          tag: target
+          value: morningstar
       macros:
         -
           macro: '{$BATTERY.TEMP.MAX.CRIT}'
diff --git a/templates/net/morningstar/morningstar_suresine_snmp/README.md b/templates/net/morningstar/morningstar_suresine_snmp/README.md
index 1ba8862a15c..fcd161404be 100644
--- a/templates/net/morningstar/morningstar_suresine_snmp/README.md
+++ b/templates/net/morningstar/morningstar_suresine_snmp/README.md
@@ -56,7 +56,7 @@ There are no template links in this template.
 |Status |Status: Faults |<p>MIB: SURESINE</p><p>Description:Faults</p><p>Modbus address:0x0007</p> |SNMP |status.faults[faults.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
 |Status |Status: Alarms |<p>MIB: SURESINE</p><p>Description:Faults</p><p>Modbus address:0x0007</p> |SNMP |status.alarms[alarms.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
 |Temperature |Temperature: Heatsink |<p>MIB: SURESINE</p><p>Description:Heatsink Temperature</p><p>Scaling Factor:1</p><p>Units:C</p><p>Range:[-128, 127]</p><p>Modbus address:0x0006</p> |SNMP |temp.heatsink[heatsinkTemperature.0] |
-|Zabbix_raw_items |Battery: Battery Voltage discovery |<p>MIB: SURESINE</p> |SNMP |battery.voltage.discovery[batteryVoltageSlow.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `2.581787109375E-4`</p><p>- REGEX: `^(\d+)(\.\d{1,2})? \1\2`</p> |
+|Zabbix raw items |Battery: Battery Voltage discovery |<p>MIB: SURESINE</p> |SNMP |battery.voltage.discovery[batteryVoltageSlow.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `2.581787109375E-4`</p><p>- REGEX: `^(\d+)(\.\d{1,2})? \1\2`</p> |
 
 ## Triggers
 
diff --git a/templates/net/morningstar/morningstar_suresine_snmp/template_net_morningstar_suresine_snmp.yaml b/templates/net/morningstar/morningstar_suresine_snmp/template_net_morningstar_suresine_snmp.yaml
index 371e0035290..18f64357e62 100644
--- a/templates/net/morningstar/morningstar_suresine_snmp/template_net_morningstar_suresine_snmp.yaml
+++ b/templates/net/morningstar/morningstar_suresine_snmp/template_net_morningstar_suresine_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-17T06:32:13Z'
+  date: '2022-01-26T10:44:52Z'
   groups:
     -
       uuid: 57b7ae836ca64446ba2c296389c009b7
@@ -14,7 +14,7 @@ zabbix_export:
         MIBs used:
         SURESINE
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Modules
@@ -42,8 +42,14 @@ zabbix_export:
                 - \1\2
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: battery
+            -
+              tag: component
+              value: discovery
+            -
+              tag: component
+              value: raw
         -
           uuid: 0cbf90bdfbc44bc9939167625c20aaed
           name: 'Load: A/C Current'
@@ -71,8 +77,8 @@ zabbix_export:
                 - \1\2
           tags:
             -
-              tag: Application
-              value: Load
+              tag: component
+              value: load
         -
           uuid: 193eeecf87c24527b5ba4b0df2b66cfc
           name: 'Load: State'
@@ -104,8 +110,8 @@ zabbix_export:
                 - 1h
           tags:
             -
-              tag: Application
-              value: Load
+              tag: component
+              value: load
           triggers:
             -
               uuid: 83a1cad652b445a69541208f81b12c23
@@ -113,6 +119,10 @@ zabbix_export:
               name: 'Load: Device load in critical state'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: bed6bfb29f5d4a3e89b9028b45bfb8b8
               expression: 'last(/Morningstar SureSine SNMP/load.state[loadState.0])={$LOAD.STATE.WARN:"lvdWarning"}  or last(/Morningstar SureSine SNMP/load.state[loadState.0])={$LOAD.STATE.WARN:"override"}'
@@ -123,6 +133,10 @@ zabbix_export:
                 -
                   name: 'Load: Device load in critical state'
                   expression: 'last(/Morningstar SureSine SNMP/load.state[loadState.0])={$LOAD.STATE.CRIT:"lvd"} or last(/Morningstar SureSine SNMP/load.state[loadState.0])={$LOAD.STATE.CRIT:"fault"}'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: d15815c3d6024a83ac03425e23d798cd
           name: 'Status: Alarms'
@@ -164,8 +178,8 @@ zabbix_export:
                   return result.length ? result.join('\n') : 'No alarms';
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: status
           triggers:
             -
               uuid: 6181b0f6c4cf4febaa86039dae994f30
@@ -173,24 +187,40 @@ zabbix_export:
               name: 'Status: Device has "heatsinkTempSensorOpen" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: ebe250d8faf543429bd5732114f05fd4
               expression: 'count(/Morningstar SureSine SNMP/status.alarms[alarms.0],#3,"like","heatsinkTempSensorShort")=2'
               name: 'Status: Device has "heatsinkTempSensorShort" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: ff3ee8e7bd074037a99a56f02dfaff72
               expression: 'count(/Morningstar SureSine SNMP/status.alarms[alarms.0],#3,"like","suresineHot")=2'
               name: 'Status: Device has "suresineHot" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 64c7437f53f74578a85b358f73529322
               expression: 'count(/Morningstar SureSine SNMP/status.alarms[alarms.0],#3,"like","unknownAlarm")=2'
               name: 'Status: Device has "unknownAlarm" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: d92ff915ccda482db946118238ea2ef3
           name: 'Status: Faults'
@@ -236,8 +266,8 @@ zabbix_export:
                   return result.length ? result.join('\n') : 'No faults';
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: status
           triggers:
             -
               uuid: 438d1fb319234de9aaa74fa565e6c661
@@ -245,48 +275,80 @@ zabbix_export:
               name: 'Status: Device has "customSettingsEdit" faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 174685e8f89f4e21b7275db6be7623b2
               expression: 'count(/Morningstar SureSine SNMP/status.faults[faults.0],#3,"like","dipSwitchChanged")=2'
               name: 'Status: Device has "dipSwitchChanged" faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 283d5eb818744b25b4275509b0492bfd
               expression: 'count(/Morningstar SureSine SNMP/status.faults[faults.0],#3,"like","highVoltageDisconnect")=2'
               name: 'Status: Device has "highVoltageDisconnect" faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: a271f6d0e1504e46966da689b91cf1f7
               expression: 'count(/Morningstar SureSine SNMP/status.faults[faults.0],#3,"like","overcurrent")=2'
               name: 'Status: Device has "overcurrent" faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 88df087dcb434c5d9980d249f077a661
               expression: 'count(/Morningstar SureSine SNMP/status.faults[faults.0],#3,"like","reset")=2'
               name: 'Status: Device has "reset" faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 9fa2ec74f9b34f0082d9173f57e1edf6
               expression: 'count(/Morningstar SureSine SNMP/status.faults[faults.0],#3,"like","software")=2'
               name: 'Status: Device has "software" faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 970e89c852c34a219ad0c1fce357e97a
               expression: 'count(/Morningstar SureSine SNMP/status.faults[faults.0],#3,"like","suresineHot")=2'
               name: 'Status: Device has "suresineHot" faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: fe023e11a544470cb09db1585d7f1e83
               expression: 'count(/Morningstar SureSine SNMP/status.faults[faults.0],#3,"like","unknownFault")=2'
               name: 'Status: Device has "unknownFault" faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: cb4a5c3033f84baa8260a8199265e5a9
           name: 'Status: Uptime'
@@ -303,8 +365,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: status
           triggers:
             -
               uuid: f9404001de4c4c1d8438e0b560977398
@@ -313,6 +375,10 @@ zabbix_export:
               priority: INFO
               description: 'Uptime is less than 10 minutes'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: db5506294fd945659eae945014332a62
               expression: 'nodata(/Morningstar SureSine SNMP/status.uptime,5m)=1'
@@ -320,6 +386,10 @@ zabbix_export:
               priority: WARNING
               description: 'Zabbix has not received data for items for the last 5 minutes'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: c6119c74beeb4ab69854d52f2eaa969d
           name: 'Temperature: Heatsink'
@@ -338,8 +408,8 @@ zabbix_export:
             Modbus address:0x0006
           tags:
             -
-              tag: Application
-              value: Temperature
+              tag: component
+              value: temperature
       discovery_rules:
         -
           uuid: c43e02a5d94343e2b54cba50b3388826
@@ -377,8 +447,8 @@ zabbix_export:
                     - \1\2
               tags:
                 -
-                  tag: Application
-                  value: Battery
+                  tag: component
+                  value: battery
               trigger_prototypes:
                 -
                   uuid: 4b27f6ecdc674803a883a8a60e3ddce2
@@ -386,12 +456,20 @@ zabbix_export:
                   name: 'Battery: Critically high battery voltage (over {#VOLTAGE.MAX.CRIT}V for 5m)'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
                 -
                   uuid: dfbcd455a92d423fbb841f2d6b6293a8
                   expression: 'max(/Morningstar SureSine SNMP/battery.voltage[batteryVoltageSlow.0{#SINGLETON}],5m)<{#VOLTAGE.MIN.CRIT}'
                   name: 'Battery: Critically low battery voltage (below {#VOLTAGE.MIN.CRIT}V for 5m)'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
                 -
                   uuid: e0173479978841ec8607430cf2fb356e
                   expression: 'min(/Morningstar SureSine SNMP/battery.voltage[batteryVoltageSlow.0{#SINGLETON}],5m)>{#VOLTAGE.MAX.WARN}'
@@ -402,6 +480,10 @@ zabbix_export:
                     -
                       name: 'Battery: Critically high battery voltage (over {#VOLTAGE.MAX.CRIT}V for 5m)'
                       expression: 'min(/Morningstar SureSine SNMP/battery.voltage[batteryVoltageSlow.0{#SINGLETON}],5m)>{#VOLTAGE.MAX.CRIT}'
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
                 -
                   uuid: 75a433d7ec28440f947a4aaed3aed33d
                   expression: 'max(/Morningstar SureSine SNMP/battery.voltage[batteryVoltageSlow.0{#SINGLETON}],5m)<{#VOLTAGE.MIN.WARN}'
@@ -412,6 +494,10 @@ zabbix_export:
                     -
                       name: 'Battery: Critically low battery voltage (below {#VOLTAGE.MIN.CRIT}V for 5m)'
                       expression: 'max(/Morningstar SureSine SNMP/battery.voltage[batteryVoltageSlow.0{#SINGLETON}],5m)<{#VOLTAGE.MIN.CRIT}'
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
           graph_prototypes:
             -
               uuid: 6cdc54f509c045b0880af6f7f901b6ab
@@ -451,6 +537,13 @@ zabbix_export:
                   }
                   
                   return JSON.stringify(result);
+      tags:
+        -
+          tag: class
+          value: power
+        -
+          tag: target
+          value: morningstar
       macros:
         -
           macro: '{$BATTERY.TEMP.MAX.CRIT}'
diff --git a/templates/net/morningstar/morningstar_tristar_mppt_600V_snmp/README.md b/templates/net/morningstar/morningstar_tristar_mppt_600V_snmp/README.md
index 32e985aa597..89c2a106a40 100644
--- a/templates/net/morningstar/morningstar_tristar_mppt_600V_snmp/README.md
+++ b/templates/net/morningstar/morningstar_tristar_mppt_600V_snmp/README.md
@@ -66,7 +66,7 @@ There are no template links in this template.
 |Status |Status: Alarms |<p>MIB: TRISTAR-MPPT</p><p>Description:Alarms</p><p>Modbus addresses:H=0x002e L=0x002f</p> |SNMP |status.alarms[alarms.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
 |Temperature |Temperature: Battery |<p>MIB: TRISTAR-MPPT</p><p>Description:Batt. Temp</p><p>Scaling Factor:1.0</p><p>Units:C</p><p>Range:[-40, 80]</p><p>Modbus address:0x0025</p> |SNMP |temp.battery[batteryTemperature.0] |
 |Temperature |Temperature: Heatsink |<p>MIB: TRISTAR-MPPT</p><p>Description:HS Temp</p><p>Scaling Factor:1.0</p><p>Units:C</p><p>Range:[-40, 80]</p><p>Modbus address:0x0023</p> |SNMP |temp.heatsink[heatsinkTemperature.0] |
-|Zabbix_raw_items |Battery: Battery Voltage discovery |<p>MIB: TRISTAR-MPPT</p><p>Description:Battery voltage</p><p>Scaling Factor:1.0</p><p>Units:V</p><p>Range:[-10, 80]</p><p>Modbus address:0x0018</p> |SNMP |battery.voltage.discovery[batteryVoltage.0] |
+|Zabbix raw items |Battery: Battery Voltage discovery |<p>MIB: TRISTAR-MPPT</p><p>Description:Battery voltage</p><p>Scaling Factor:1.0</p><p>Units:V</p><p>Range:[-10, 80]</p><p>Modbus address:0x0018</p> |SNMP |battery.voltage.discovery[batteryVoltage.0] |
 
 ## Triggers
 
diff --git a/templates/net/morningstar/morningstar_tristar_mppt_600V_snmp/template_net_morningstar_tristar_mppt_600V_snmp.yaml b/templates/net/morningstar/morningstar_tristar_mppt_600V_snmp/template_net_morningstar_tristar_mppt_600V_snmp.yaml
index 3b0a39e8143..96320b587f5 100644
--- a/templates/net/morningstar/morningstar_tristar_mppt_600V_snmp/template_net_morningstar_tristar_mppt_600V_snmp.yaml
+++ b/templates/net/morningstar/morningstar_tristar_mppt_600V_snmp/template_net_morningstar_tristar_mppt_600V_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-17T06:32:19Z'
+  date: '2022-01-26T09:50:44Z'
   groups:
     -
       uuid: 57b7ae836ca64446ba2c296389c009b7
@@ -14,7 +14,7 @@ zabbix_export:
         MIBs used:
         TRISTAR-MPPT
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Modules
@@ -37,8 +37,8 @@ zabbix_export:
             Modbus address:0x001d
           tags:
             -
-              tag: Application
-              value: Array
+              tag: component
+              value: array
         -
           uuid: 9750ce4073d9467fa18f0e35f990c081
           name: 'Array: Sweep Pmax'
@@ -57,8 +57,8 @@ zabbix_export:
             Modbus address:0x003c
           tags:
             -
-              tag: Application
-              value: Array
+              tag: component
+              value: array
         -
           uuid: de36a1087b2d4ade8369c620c794c881
           name: 'Array: Sweep Vmp'
@@ -77,8 +77,8 @@ zabbix_export:
             Modbus address:0x003d
           tags:
             -
-              tag: Application
-              value: Array
+              tag: component
+              value: array
         -
           uuid: a8f4819131fe4247aef9b1cd819b47d9
           name: 'Array: Sweep Voc'
@@ -97,8 +97,8 @@ zabbix_export:
             Modbus address:0x003e
           tags:
             -
-              tag: Application
-              value: Array
+              tag: component
+              value: array
         -
           uuid: e13c3135ce8649ea9c88d4f9eb56219e
           name: 'Array: Voltage'
@@ -117,8 +117,8 @@ zabbix_export:
             Modbus address:0x001b
           tags:
             -
-              tag: Application
-              value: Array
+              tag: component
+              value: array
         -
           uuid: 058dc403d9b541978aebcb2944ecf75f
           name: 'Battery: Battery Voltage discovery'
@@ -138,8 +138,14 @@ zabbix_export:
             Modbus address:0x0018
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: battery
+            -
+              tag: component
+              value: discovery
+            -
+              tag: component
+              value: raw
         -
           uuid: 5e42ba3c9a764b9690feb04d4bf7df45
           name: 'Battery: Charge Current'
@@ -158,8 +164,8 @@ zabbix_export:
             Modbus address:0x001c
           tags:
             -
-              tag: Application
-              value: Battery
+              tag: component
+              value: battery
         -
           uuid: 6e168ff947324068aad1fc16d577369d
           name: 'Battery: Output Power'
@@ -178,8 +184,8 @@ zabbix_export:
             Modbus address:0x003a
           tags:
             -
-              tag: Application
-              value: Battery
+              tag: component
+              value: battery
         -
           uuid: aa20a89288c444a492910cb1a7f19499
           name: 'Battery: Charge State'
@@ -213,8 +219,8 @@ zabbix_export:
                 - 1h
           tags:
             -
-              tag: Application
-              value: Battery
+              tag: component
+              value: battery
           triggers:
             -
               uuid: ed2b56b78fce47f88b679774640706b5
@@ -222,6 +228,10 @@ zabbix_export:
               name: 'Battery: Device charge in critical state'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 6f21bda91cc640809f0f4faf04ba86f4
               expression: 'last(/Morningstar TriStar MPPT 600V SNMP/charge.state[chargeState.0])={$CHARGE.STATE.WARN}'
@@ -232,6 +242,10 @@ zabbix_export:
                 -
                   name: 'Battery: Device charge in critical state'
                   expression: 'last(/Morningstar TriStar MPPT 600V SNMP/charge.state[chargeState.0])={$CHARGE.STATE.CRIT}'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 3d67ceefb2c443d38051e2d22aca45ce
           name: 'Counter: Charge Amp-hours'
@@ -250,8 +264,8 @@ zabbix_export:
             Modbus addresses:H=0x0034 L=0x0035
           tags:
             -
-              tag: Application
-              value: Counter
+              tag: component
+              value: counter
         -
           uuid: 1a7ff2c884784eb4817956e0ecd5b718
           name: 'Counter: Charge KW-hours'
@@ -270,8 +284,8 @@ zabbix_export:
             Modbus address:0x0038
           tags:
             -
-              tag: Application
-              value: Counter
+              tag: component
+              value: counter
         -
           uuid: a2b5a78fe649480ea0cc580b5fa30bde
           name: 'Status: Alarms'
@@ -341,8 +355,8 @@ zabbix_export:
                   return result.length ? result.join('\n') : 'No alarms';
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: status
           triggers:
             -
               uuid: 62d1ffe8417c4ef9b746d17185d8853b
@@ -350,174 +364,290 @@ zabbix_export:
               name: 'Status: Device has "alarm21Internal" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 367d91fa49c241e795a2b497739c6f01
               expression: 'count(/Morningstar TriStar MPPT 600V SNMP/status.alarms[alarms.0],#3,"like","arrayCurrentOffset")=2'
               name: 'Status: Device has "arrayCurrentOffset" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 1c1baf4eea9e416a98bcf3e12d7ae01f
               expression: 'count(/Morningstar TriStar MPPT 600V SNMP/status.alarms[alarms.0],#3,"like","batterySense")=2'
               name: 'Status: Device has "batterySense" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: b627e79de7b446d69ee245b07f755405
               expression: 'count(/Morningstar TriStar MPPT 600V SNMP/status.alarms[alarms.0],#3,"like","batterySenseDisconnected")=2'
               name: 'Status: Device has "batterySenseDisconnected" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 73aba1af987843d98542105f2b41c5bd
               expression: 'count(/Morningstar TriStar MPPT 600V SNMP/status.alarms[alarms.0],#3,"like","controllerWasReset")=2'
               name: 'Status: Device has "controllerWasReset" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: aae5a3441b9e4394a39e7a8c5ce29e0c
               expression: 'count(/Morningstar TriStar MPPT 600V SNMP/status.alarms[alarms.0],#3,"like","currentLimit")=2'
               name: 'Status: Device has "currentLimit" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: f8e42483b1534ed586252db0c8880aa6
               expression: 'count(/Morningstar TriStar MPPT 600V SNMP/status.alarms[alarms.0],#3,"like","currentOffset")=2'
               name: 'Status: Device has "currentOffset" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: bd32be9b60334cc1b80d2de129f0f1a2
               expression: 'count(/Morningstar TriStar MPPT 600V SNMP/status.alarms[alarms.0],#3,"like","derateLimit")=2'
               name: 'Status: Device has "derateLimit" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: e0886663f4df4ff0965fac33951d4ffc
               expression: 'count(/Morningstar TriStar MPPT 600V SNMP/status.alarms[alarms.0],#3,"like","ee-i2cRetryLimit")=2'
               name: 'Status: Device has "ee-i2cRetryLimit" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: abfeb2c3c566401b9f30cd28765aacff
               expression: 'count(/Morningstar TriStar MPPT 600V SNMP/status.alarms[alarms.0],#3,"like","ethernetAlarm")=2'
               name: 'Status: Device has "ethernetAlarm" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: a0ffdbf5695d4945960df6ea7defa071
               expression: 'count(/Morningstar TriStar MPPT 600V SNMP/status.alarms[alarms.0],#3,"like","extflashFault")=2'
               name: 'Status: Device has "extflashFault" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: f92ce5a55f0a4a65beca0abb748b7c04
               expression: 'count(/Morningstar TriStar MPPT 600V SNMP/status.alarms[alarms.0],#3,"like","fp12VoltageOutOfRange")=2'
               name: 'Status: Device has "fp12VoltageOutOfRange" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 5bdcd298878a4baf97aab8df338e1123
               expression: 'count(/Morningstar TriStar MPPT 600V SNMP/status.alarms[alarms.0],#3,"like","heatsinkTempSensorOpen")=2'
               name: 'Status: Device has "heatsinkTempSensorOpen" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 9fe220d99b524db8bbfe5b511ee91fa7
               expression: 'count(/Morningstar TriStar MPPT 600V SNMP/status.alarms[alarms.0],#3,"like","heatsinkTempSensorShorted")=2'
               name: 'Status: Device has "heatsinkTempSensorShorted" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: dc8d3f71c60643b7a6a25a9d7452ce60
               expression: 'count(/Morningstar TriStar MPPT 600V SNMP/status.alarms[alarms.0],#3,"like","highArrayVCurrentLimit")=2'
               name: 'Status: Device has "highArrayVCurrentLimit" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: d279f44217b046c789c865b8b44c9342
               expression: 'count(/Morningstar TriStar MPPT 600V SNMP/status.alarms[alarms.0],#3,"like","highTemperatureCurrentLimit")=2'
               name: 'Status: Device has "highTemperatureCurrentLimit" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: b48d1c04e95c4b89a7240fc2a611a499
               expression: 'count(/Morningstar TriStar MPPT 600V SNMP/status.alarms[alarms.0],#3,"like","highVoltageDisconnect")=2'
               name: 'Status: Device has "highVoltageDisconnect" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 767be108224d43a99ac2568166c9cd33
               expression: 'count(/Morningstar TriStar MPPT 600V SNMP/status.alarms[alarms.0],#3,"like","lvd")=2'
               name: 'Status: Device has "lvd" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 107b8a4a63c146fa908f5b7ccc716258
               expression: 'count(/Morningstar TriStar MPPT 600V SNMP/status.alarms[alarms.0],#3,"like","maxAdcValueReached")=2'
               name: 'Status: Device has "maxAdcValueReached" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 5792c3702ab94123891e02ee4c05339f
               expression: 'count(/Morningstar TriStar MPPT 600V SNMP/status.alarms[alarms.0],#3,"like","mosfetSOpen")=2'
               name: 'Status: Device has "mosfetSOpen" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: a115f88a282e41179b569633234f04e2
               expression: 'count(/Morningstar TriStar MPPT 600V SNMP/status.alarms[alarms.0],#3,"like","p3VoltageOutOfRange")=2'
               name: 'Status: Device has "p3VoltageOutOfRange" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 8a3906ceae5547ca8f9c916ca46e7be8
               expression: 'count(/Morningstar TriStar MPPT 600V SNMP/status.alarms[alarms.0],#3,"like","p12VoltageOutOfRange")=2'
               name: 'Status: Device has "p12VoltageOutOfRange" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 49d3fb027a88462aa7f67442a507c051
               expression: 'count(/Morningstar TriStar MPPT 600V SNMP/status.alarms[alarms.0],#3,"like","rtsDisconnected")=2'
               name: 'Status: Device has "rtsDisconnected" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 650cf2d3c06f4c55ac90b1dd23ca25d1
               expression: 'count(/Morningstar TriStar MPPT 600V SNMP/status.alarms[alarms.0],#3,"like","rtsMiswire")=2'
               name: 'Status: Device has "rtsMiswire" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 48bb77b135c84d6a9e3792d8385f16da
               expression: 'count(/Morningstar TriStar MPPT 600V SNMP/status.alarms[alarms.0],#3,"like","rtsShorted")=2'
               name: 'Status: Device has "rtsShorted" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 7e363c7cc8ce4104a9c6269c9e94ac26
               expression: 'count(/Morningstar TriStar MPPT 600V SNMP/status.alarms[alarms.0],#3,"like","slaveControlFault")=2'
               name: 'Status: Device has "slaveControlFault" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: e1235a2201a542bb9ac67345c70641e3
               expression: 'count(/Morningstar TriStar MPPT 600V SNMP/status.alarms[alarms.0],#3,"like","software")=2'
               name: 'Status: Device has "software" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: cb5b84c99bcf45459bdc955c8604264b
               expression: 'count(/Morningstar TriStar MPPT 600V SNMP/status.alarms[alarms.0],#3,"like","systemMiswire")=2'
               name: 'Status: Device has "systemMiswire" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 72ce41657c1848d897255ad3de77d942
               expression: 'count(/Morningstar TriStar MPPT 600V SNMP/status.alarms[alarms.0],#3,"like","uncalibrated")=2'
               name: 'Status: Device has "uncalibrated" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 81efe20cce1b4b26a6eda83e86fbd49c
           name: 'Status: Faults'
@@ -584,8 +714,8 @@ zabbix_export:
                   return result.length ? result.join('\n') : 'No faults';
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: status
           triggers:
             -
               uuid: 747a56182a6f4336b720a95b0609013c
@@ -593,168 +723,280 @@ zabbix_export:
               name: 'Status: Device has "arrayHvd" faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: e9d7a51b64444e27b28b13ebf38a11c3
               expression: 'count(/Morningstar TriStar MPPT 600V SNMP/status.faults[faults.0],#3,"like","batteryHvd")=2'
               name: 'Status: Device has "batteryHvd" faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: b898ac485d094f1cb65020ad5459641b
               expression: 'count(/Morningstar TriStar MPPT 600V SNMP/status.faults[faults.0],#3,"like","batteryLvd")=2'
               name: 'Status: Device has "batteryLvd" faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 806e83938072453ab66895044907c02d
               expression: 'count(/Morningstar TriStar MPPT 600V SNMP/status.faults[faults.0],#3,"like","blockbusBoot")=2'
               name: 'Status: Device has "blockbusBoot" faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: f20f87cd6ce3414182cd2088a947ef24
               expression: 'count(/Morningstar TriStar MPPT 600V SNMP/status.faults[faults.0],#3,"like","chargeSlaveControlTimeout")=2'
               name: 'Status: Device has "chargeSlaveControlTimeout" faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: f4478548ad17400c9cddbf8b27720952
               expression: 'count(/Morningstar TriStar MPPT 600V SNMP/status.faults[faults.0],#3,"like","controllerWasReset")=2'
               name: 'Status: Device has "controllerWasReset" faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 6c9a64ff6f61457daf826e831f51b048
               expression: 'count(/Morningstar TriStar MPPT 600V SNMP/status.faults[faults.0],#3,"like","currentSensorReferenceOutOfRange")=2'
               name: 'Status: Device has "currentSensorReferenceOutOfRange" faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 74d39d01841f454e8f72457104a42cb7
               expression: 'count(/Morningstar TriStar MPPT 600V SNMP/status.faults[faults.0],#3,"like","customSettingsEdit")=2'
               name: 'Status: Device has "customSettingsEdit" faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 12d55fb0398c4fbb87ca948f2e692a38
               expression: 'count(/Morningstar TriStar MPPT 600V SNMP/status.faults[faults.0],#3,"like","dipSwitchChange")=2'
               name: 'Status: Device has "dipSwitchChange" faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 25e71e9c3ad945ed9f48945cac45bb56
               expression: 'count(/Morningstar TriStar MPPT 600V SNMP/status.faults[faults.0],#3,"like","eepromRetryLimit")=2'
               name: 'Status: Device has "eepromRetryLimit" faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: f6fafa09a41a428c87d5ef303071a7f7
               expression: 'count(/Morningstar TriStar MPPT 600V SNMP/status.faults[faults.0],#3,"like","fault16Software")=2'
               name: 'Status: Device has "fault16Software" faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 8f079e7606d14dc2ab6313fdae80bafc
               expression: 'count(/Morningstar TriStar MPPT 600V SNMP/status.faults[faults.0],#3,"like","fault17Software")=2'
               name: 'Status: Device has "fault17Software" faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: c388f647dd48445d8b8e3eee02ea38fc
               expression: 'count(/Morningstar TriStar MPPT 600V SNMP/status.faults[faults.0],#3,"like","fault18Software")=2'
               name: 'Status: Device has "fault18Software" faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 1466954e09704b3092772f0996f692f4
               expression: 'count(/Morningstar TriStar MPPT 600V SNMP/status.faults[faults.0],#3,"like","fault19Software")=2'
               name: 'Status: Device has "fault19Software" faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 86595bafc3054fd99343f24bbfdc44e3
               expression: 'count(/Morningstar TriStar MPPT 600V SNMP/status.faults[faults.0],#3,"like","fault20Software")=2'
               name: 'Status: Device has "fault20Software" faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: d269607e330243fe93e2f85c36d38114
               expression: 'count(/Morningstar TriStar MPPT 600V SNMP/status.faults[faults.0],#3,"like","fault21Software")=2'
               name: 'Status: Device has "fault21Software" faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 68d6b95b6b9e42ada5a212a913d1ae43
               expression: 'count(/Morningstar TriStar MPPT 600V SNMP/status.faults[faults.0],#3,"like","fetShort")=2'
               name: 'Status: Device has "fetShort" faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: dcb1c2bcc704405c8baae825124e3958
               expression: 'count(/Morningstar TriStar MPPT 600V SNMP/status.faults[faults.0],#3,"like","fpgaVersion")=2'
               name: 'Status: Device has "fpgaVersion" faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 351af5c43f984930b4ebdb8690c52e7d
               expression: 'count(/Morningstar TriStar MPPT 600V SNMP/status.faults[faults.0],#3,"like","hscomm")=2'
               name: 'Status: Device has "hscomm" faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: b32067a9b80c4836af4120f9f8e21bbd
               expression: 'count(/Morningstar TriStar MPPT 600V SNMP/status.faults[faults.0],#3,"like","hscommMaster")=2'
               name: 'Status: Device has "hscommMaster" faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: bb61ea6f03c94556bf4f333bc050206f
               expression: 'count(/Morningstar TriStar MPPT 600V SNMP/status.faults[faults.0],#3,"like","ia-refSlaveModeTimeout")=2'
               name: 'Status: Device has "ia-refSlaveModeTimeout" faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 843654df3185400e854c8c1f0229c32c
               expression: 'count(/Morningstar TriStar MPPT 600V SNMP/status.faults[faults.0],#3,"like","overcurrent")=2'
               name: 'Status: Device has "overcurrent" faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 642f03d6eda346aca835e75088b7067b
               expression: 'count(/Morningstar TriStar MPPT 600V SNMP/status.faults[faults.0],#3,"like","powerboardCommunicationFault")=2'
               name: 'Status: Device has "powerboardCommunicationFault" faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 4d8f0244f8d047bc8730ffc2f02a976d
               expression: 'count(/Morningstar TriStar MPPT 600V SNMP/status.faults[faults.0],#3,"like","rs232SerialToMeterBridge")=2'
               name: 'Status: Device has "rs232SerialToMeterBridge" faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 6c125b8f681b47a99f7535292bd0507c
               expression: 'count(/Morningstar TriStar MPPT 600V SNMP/status.faults[faults.0],#3,"like","rtsDisconnected")=2'
               name: 'Status: Device has "rtsDisconnected" faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: abad398631f34dac8094e4bcd14e3613
               expression: 'count(/Morningstar TriStar MPPT 600V SNMP/status.faults[faults.0],#3,"like","rtsShorted")=2'
               name: 'Status: Device has "rtsShorted" faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 6824d221feb042da860248a4b418105c
               expression: 'count(/Morningstar TriStar MPPT 600V SNMP/status.faults[faults.0],#3,"like","slave")=2'
               name: 'Status: Device has "slave" faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 56adf438e90f410497246b27b6da49f4
               expression: 'count(/Morningstar TriStar MPPT 600V SNMP/status.faults[faults.0],#3,"like","softwareFault")=2'
               name: 'Status: Device has "softwareFault" faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: e6a4dd0a61c8479985a1179842d22766
           name: 'Status: Uptime'
@@ -771,8 +1013,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: status
           triggers:
             -
               uuid: 5393dee9b39d438a8c1553a0be0fb0f2
@@ -781,6 +1023,10 @@ zabbix_export:
               priority: INFO
               description: 'Uptime is less than 10 minutes'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: c4f0ea9e18884bc0b546933871017098
               expression: 'nodata(/Morningstar TriStar MPPT 600V SNMP/status.uptime,5m)=1'
@@ -788,6 +1034,10 @@ zabbix_export:
               priority: WARNING
               description: 'Zabbix has not received data for items for the last 5 minutes'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 738f2e6d143a4e6db3ecf2736ca843cb
           name: 'Battery: Target Voltage'
@@ -811,8 +1061,8 @@ zabbix_export:
                 - 1h
           tags:
             -
-              tag: Application
-              value: Battery
+              tag: component
+              value: battery
         -
           uuid: 4f3fdc6382704fb584fbe11264a0e5c2
           name: 'Temperature: Battery'
@@ -831,8 +1081,8 @@ zabbix_export:
             Modbus address:0x0025
           tags:
             -
-              tag: Application
-              value: Temperature
+              tag: component
+              value: temperature
           triggers:
             -
               uuid: bc117de353304889980c7836603abb0d
@@ -840,12 +1090,20 @@ zabbix_export:
               name: 'Temperature: Critically high battery temperature (over {$BATTERY.TEMP.MAX.CRIT}C for 5m)'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 25a8f16d632940c3a2c994a9f2a76851
               expression: 'max(/Morningstar TriStar MPPT 600V SNMP/temp.battery[batteryTemperature.0],5m)<{$BATTERY.TEMP.MIN.CRIT}'
               name: 'Temperature: Critically low battery temperature (below {$BATTERY.TEMP.MIN.WARN}C for 5m)'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: db1152c815c84d208be0db3dac63acb4
               expression: 'min(/Morningstar TriStar MPPT 600V SNMP/temp.battery[batteryTemperature.0],5m)>{$BATTERY.TEMP.MAX.WARN}'
@@ -856,6 +1114,10 @@ zabbix_export:
                 -
                   name: 'Temperature: Critically high battery temperature (over {$BATTERY.TEMP.MAX.CRIT}C for 5m)'
                   expression: 'min(/Morningstar TriStar MPPT 600V SNMP/temp.battery[batteryTemperature.0],5m)>{$BATTERY.TEMP.MAX.CRIT}'
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 9c331fb9a30b4867a3e16acd7e9f8983
               expression: 'max(/Morningstar TriStar MPPT 600V SNMP/temp.battery[batteryTemperature.0],5m)<{$BATTERY.TEMP.MIN.WARN}'
@@ -866,6 +1128,10 @@ zabbix_export:
                 -
                   name: 'Temperature: Critically low battery temperature (below {$BATTERY.TEMP.MIN.WARN}C for 5m)'
                   expression: 'max(/Morningstar TriStar MPPT 600V SNMP/temp.battery[batteryTemperature.0],5m)<{$BATTERY.TEMP.MIN.CRIT}'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: d3abc18d718540039adcfcb4a74bea43
           name: 'Temperature: Heatsink'
@@ -884,8 +1150,8 @@ zabbix_export:
             Modbus address:0x0023
           tags:
             -
-              tag: Application
-              value: Temperature
+              tag: component
+              value: temperature
       discovery_rules:
         -
           uuid: 7ba9493b38174751b448419b0b03312e
@@ -913,8 +1179,8 @@ zabbix_export:
                 Modbus address:0x0018
               tags:
                 -
-                  tag: Application
-                  value: Battery
+                  tag: component
+                  value: battery
               trigger_prototypes:
                 -
                   uuid: f326b9eb93fe4267bf9f4a07bb578eca
@@ -922,12 +1188,20 @@ zabbix_export:
                   name: 'Battery: Critically high battery voltage (over {#VOLTAGE.MAX.CRIT}V for 5m)'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
                 -
                   uuid: 07fb5dd68c954da3982392dfcb2de0b8
                   expression: 'max(/Morningstar TriStar MPPT 600V SNMP/battery.voltage[batteryVoltage.0{#SINGLETON}],5m)<{#VOLTAGE.MIN.CRIT}'
                   name: 'Battery: Critically low battery voltage (below {#VOLTAGE.MIN.CRIT}V for 5m)'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
                 -
                   uuid: aca6ef49842d4b3ba543fcf470473a96
                   expression: 'min(/Morningstar TriStar MPPT 600V SNMP/battery.voltage[batteryVoltage.0{#SINGLETON}],5m)>{#VOLTAGE.MAX.WARN}'
@@ -938,6 +1212,10 @@ zabbix_export:
                     -
                       name: 'Battery: Critically high battery voltage (over {#VOLTAGE.MAX.CRIT}V for 5m)'
                       expression: 'min(/Morningstar TriStar MPPT 600V SNMP/battery.voltage[batteryVoltage.0{#SINGLETON}],5m)>{#VOLTAGE.MAX.CRIT}'
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
                 -
                   uuid: b8673c0802a244d0850730e3fdf5a6dc
                   expression: 'max(/Morningstar TriStar MPPT 600V SNMP/battery.voltage[batteryVoltage.0{#SINGLETON}],5m)<{#VOLTAGE.MIN.WARN}'
@@ -948,6 +1226,10 @@ zabbix_export:
                     -
                       name: 'Battery: Critically low battery voltage (below {#VOLTAGE.MIN.CRIT}V for 5m)'
                       expression: 'max(/Morningstar TriStar MPPT 600V SNMP/battery.voltage[batteryVoltage.0{#SINGLETON}],5m)<{#VOLTAGE.MIN.CRIT}'
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
           graph_prototypes:
             -
               uuid: 592990e094e842f68463ab542878d5a9
@@ -987,6 +1269,13 @@ zabbix_export:
                   }
                   
                   return JSON.stringify(result);
+      tags:
+        -
+          tag: class
+          value: power
+        -
+          tag: target
+          value: morningstar
       macros:
         -
           macro: '{$BATTERY.TEMP.MAX.CRIT}'
diff --git a/templates/net/morningstar/morningstar_tristar_mppt_snmp/README.md b/templates/net/morningstar/morningstar_tristar_mppt_snmp/README.md
index 7af00476ca2..1c9c8dd6f7c 100644
--- a/templates/net/morningstar/morningstar_tristar_mppt_snmp/README.md
+++ b/templates/net/morningstar/morningstar_tristar_mppt_snmp/README.md
@@ -66,7 +66,7 @@ There are no template links in this template.
 |Status |Status: Alarms |<p>MIB: TRISTAR-MPPT</p><p>Description:Faults</p><p>Modbus address:0x002c</p> |SNMP |status.alarms[alarms.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
 |Temperature |Temperature: Battery |<p>MIB: TRISTAR-MPPT</p><p>Description:Batt. Temp</p><p>Scaling Factor:1.0</p><p>Units:C</p><p>Range:[-40, 80]</p><p>Modbus address:0x0025</p> |SNMP |temp.battery[batteryTemperature.0] |
 |Temperature |Temperature: Heatsink |<p>MIB: TRISTAR-MPPT</p><p>Description:HS Temp</p><p>Scaling Factor:1.0</p><p>Units:C</p><p>Range:[-40, 80]</p><p>Modbus address:0x0023</p> |SNMP |temp.heatsink[heatsinkTemperature.0] |
-|Zabbix_raw_items |Battery: Battery Voltage discovery |<p>MIB: TRISTAR-MPPT</p> |SNMP |battery.voltage.discovery[batteryVoltage.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.005493164063`</p> |
+|Zabbix raw items |Battery: Battery Voltage discovery |<p>MIB: TRISTAR-MPPT</p> |SNMP |battery.voltage.discovery[batteryVoltage.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.005493164063`</p> |
 
 ## Triggers
 
diff --git a/templates/net/morningstar/morningstar_tristar_mppt_snmp/template_net_morningstar_tristar_mppt_snmp.yaml b/templates/net/morningstar/morningstar_tristar_mppt_snmp/template_net_morningstar_tristar_mppt_snmp.yaml
index c0b1b08de1c..0da2b1e28e2 100644
--- a/templates/net/morningstar/morningstar_tristar_mppt_snmp/template_net_morningstar_tristar_mppt_snmp.yaml
+++ b/templates/net/morningstar/morningstar_tristar_mppt_snmp/template_net_morningstar_tristar_mppt_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-17T06:32:24Z'
+  date: '2022-01-26T09:45:22Z'
   groups:
     -
       uuid: 57b7ae836ca64446ba2c296389c009b7
@@ -14,7 +14,7 @@ zabbix_export:
         MIBs used:
         TRISTAR-MPPT
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Modules
@@ -47,8 +47,8 @@ zabbix_export:
                 - \1\2
           tags:
             -
-              tag: Application
-              value: Array
+              tag: component
+              value: array
         -
           uuid: 53c1cccd0262422eb18bb6745adb2369
           name: 'Array: Sweep Pmax'
@@ -77,8 +77,8 @@ zabbix_export:
                 - \1\2
           tags:
             -
-              tag: Application
-              value: Array
+              tag: component
+              value: array
         -
           uuid: 2f0bbf8b6d53457283069aaf8e0386ae
           name: 'Array: Sweep Vmp'
@@ -107,8 +107,8 @@ zabbix_export:
                 - \1\2
           tags:
             -
-              tag: Application
-              value: Array
+              tag: component
+              value: array
         -
           uuid: ced0f7c4abb6409399a9e05797841497
           name: 'Array: Sweep Voc'
@@ -137,8 +137,8 @@ zabbix_export:
                 - \1\2
           tags:
             -
-              tag: Application
-              value: Array
+              tag: component
+              value: array
         -
           uuid: 419b9faf88284121a8806c60c8a4550d
           name: 'Array: Voltage'
@@ -167,8 +167,8 @@ zabbix_export:
                 - \1\2
           tags:
             -
-              tag: Application
-              value: Array
+              tag: component
+              value: array
         -
           uuid: f40795d2c28b4f53ac50399ca6e6f8d6
           name: 'Battery: Battery Voltage discovery'
@@ -187,8 +187,14 @@ zabbix_export:
                 - '0.005493164063'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: battery
+            -
+              tag: component
+              value: discovery
+            -
+              tag: component
+              value: raw
         -
           uuid: e1646c9847064d53913d9c57d1b59de7
           name: 'Battery: Charge Current'
@@ -217,8 +223,8 @@ zabbix_export:
                 - \1\2
           tags:
             -
-              tag: Application
-              value: Battery
+              tag: component
+              value: battery
         -
           uuid: e70284aa07924a61add98dc516f0429e
           name: 'Battery: Output Power'
@@ -247,8 +253,8 @@ zabbix_export:
                 - \1\2
           tags:
             -
-              tag: Application
-              value: Battery
+              tag: component
+              value: battery
         -
           uuid: 7ad0e0153d6342a5bdd1576b2ad815e3
           name: 'Battery: Charge State'
@@ -281,8 +287,8 @@ zabbix_export:
                 - 1h
           tags:
             -
-              tag: Application
-              value: Battery
+              tag: component
+              value: battery
           triggers:
             -
               uuid: 6c6371d2476246789d23404e068e5179
@@ -290,6 +296,10 @@ zabbix_export:
               name: 'Battery: Device charge in critical state'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 65bdeac02fed4febae857f571319bf37
               expression: 'last(/Morningstar TriStar MPPT SNMP/charge.state[chargeState.0])={$CHARGE.STATE.WARN}'
@@ -300,6 +310,10 @@ zabbix_export:
                 -
                   name: 'Battery: Device charge in critical state'
                   expression: 'last(/Morningstar TriStar MPPT SNMP/charge.state[chargeState.0])={$CHARGE.STATE.CRIT}'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 48db3379939b4698b8f30ff7118a9a95
           name: 'Counter: Charge Amp-hours'
@@ -323,8 +337,8 @@ zabbix_export:
                 - '0.1'
           tags:
             -
-              tag: Application
-              value: Counter
+              tag: component
+              value: counter
         -
           uuid: f14eb25c426141d1875d5828b5c62c30
           name: 'Counter: Charge KW-hours'
@@ -342,8 +356,8 @@ zabbix_export:
             Modbus address:0x0038
           tags:
             -
-              tag: Application
-              value: Counter
+              tag: component
+              value: counter
         -
           uuid: 5c96236f9623495289b94bd4d63e6faf
           name: 'Status: Alarms'
@@ -401,8 +415,8 @@ zabbix_export:
                   return result.length ? result.join('\n') : 'No alarms';
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: status
           triggers:
             -
               uuid: b073c972bb64463aaee85c6129fad319
@@ -410,108 +424,180 @@ zabbix_export:
               name: 'Status: Device has "batterySense" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 80a2d0a457024c22b39f0fcd45992e1e
               expression: 'count(/Morningstar TriStar MPPT SNMP/status.alarms[alarms.0],#3,"like","batterySenseDisconnected")=2'
               name: 'Status: Device has "batterySenseDisconnected" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: bac1cc54818245f9baa8dc07ddc0f850
               expression: 'count(/Morningstar TriStar MPPT SNMP/status.alarms[alarms.0],#3,"like","controllerWasReset")=2'
               name: 'Status: Device has "controllerWasReset" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 86c2dfb7b0984eaab02f47c58337f468
               expression: 'count(/Morningstar TriStar MPPT SNMP/status.alarms[alarms.0],#3,"like","currentLimit")=2'
               name: 'Status: Device has "currentLimit" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: dd000390277a4e848a3236501817addf
               expression: 'count(/Morningstar TriStar MPPT SNMP/status.alarms[alarms.0],#3,"like","currentOffset")=2'
               name: 'Status: Device has "currentOffset" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 650ecb9c06464937a3f797e73a3d756d
               expression: 'count(/Morningstar TriStar MPPT SNMP/status.alarms[alarms.0],#3,"like","heatsinkTempSensorOpen")=2'
               name: 'Status: Device has "heatsinkTempSensorOpen" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 5999a4b6c49a4dabb6350d826b01e646
               expression: 'count(/Morningstar TriStar MPPT SNMP/status.alarms[alarms.0],#3,"like","heatsinkTempSensorShorted")=2'
               name: 'Status: Device has "heatsinkTempSensorShorted" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 7331337c7ffb4933bca3982614657912
               expression: 'count(/Morningstar TriStar MPPT SNMP/status.alarms[alarms.0],#3,"like","highArrayVCurrentLimit")=2'
               name: 'Status: Device has "highArrayVCurrentLimit" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 82a2e0adba7444c6945666fcb9430808
               expression: 'count(/Morningstar TriStar MPPT SNMP/status.alarms[alarms.0],#3,"like","highTemperatureCurrentLimit")=2'
               name: 'Status: Device has "highTemperatureCurrentLimit" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: b1f6d22d205e449a811da905e679800f
               expression: 'count(/Morningstar TriStar MPPT SNMP/status.alarms[alarms.0],#3,"like","highVoltageDisconnect")=2'
               name: 'Status: Device has "highVoltageDisconnect" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: e3ce50b9b696486f945ee5a4c1a7a753
               expression: 'count(/Morningstar TriStar MPPT SNMP/status.alarms[alarms.0],#3,"like","maxAdcValueReached")=2'
               name: 'Status: Device has "maxAdcValueReached" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 1536cf07556b4cddb62186030a4321ca
               expression: 'count(/Morningstar TriStar MPPT SNMP/status.alarms[alarms.0],#3,"like","mosfetSOpen")=2'
               name: 'Status: Device has "mosfetSOpen" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 136621f032544ea8af5e86a14ec03cb6
               expression: 'count(/Morningstar TriStar MPPT SNMP/status.alarms[alarms.0],#3,"like","p12VoltageReferenceOff")=2'
               name: 'Status: Device has "p12VoltageReferenceOff" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 62ecaaf59a984b2999d13540c5220470
               expression: 'count(/Morningstar TriStar MPPT SNMP/status.alarms[alarms.0],#3,"like","rtsDisconnected")=2'
               name: 'Status: Device has "rtsDisconnected" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 12037d207b3f413198594877cc7a3862
               expression: 'count(/Morningstar TriStar MPPT SNMP/status.alarms[alarms.0],#3,"like","rtsMiswire")=2'
               name: 'Status: Device has "rtsMiswire" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 330f9dfe6ea34b17bcf4cac2c908d78c
               expression: 'count(/Morningstar TriStar MPPT SNMP/status.alarms[alarms.0],#3,"like","rtsShorted")=2'
               name: 'Status: Device has "rtsShorted" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: fba13770ff67433489ec95d62b65d4b5
               expression: 'count(/Morningstar TriStar MPPT SNMP/status.alarms[alarms.0],#3,"like","systemMiswire")=2'
               name: 'Status: Device has "systemMiswire" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: de6208b4474f4743ad99444fd7eb135d
               expression: 'count(/Morningstar TriStar MPPT SNMP/status.alarms[alarms.0],#3,"like","uncalibrated")=2'
               name: 'Status: Device has "uncalibrated" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 64a01cde330e437499a719237f68fda2
           name: 'Status: Faults'
@@ -561,8 +647,8 @@ zabbix_export:
                   return result.length ? result.join('\n') : 'No faults';
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: status
           triggers:
             -
               uuid: 2a1b5a65311144d69c03255336f9f15f
@@ -570,66 +656,110 @@ zabbix_export:
               name: 'Status: Device has "arrayHvd" faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: f837f0839967493bb0e38b21000f5e9a
               expression: 'count(/Morningstar TriStar MPPT SNMP/status.faults[faults.0],#3,"like","batteryHvd")=2'
               name: 'Status: Device has "batteryHvd" faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 05b70b4be5554dd5ac2c65af04d79986
               expression: 'count(/Morningstar TriStar MPPT SNMP/status.faults[faults.0],#3,"like","customSettingsEdit")=2'
               name: 'Status: Device has "customSettingsEdit" faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 24ecb8842ea84a82b4d05a4e85150c55
               expression: 'count(/Morningstar TriStar MPPT SNMP/status.faults[faults.0],#3,"like","dipSwitchChange")=2'
               name: 'Status: Device has "dipSwitchChange" faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 008d82bc793b49afa6cd37d038c837fe
               expression: 'count(/Morningstar TriStar MPPT SNMP/status.faults[faults.0],#3,"like","eepromRetryLimit")=2'
               name: 'Status: Device has "eepromRetryLimit" faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 71dbbf441c234dcfbf014fc043bf5d3a
               expression: 'count(/Morningstar TriStar MPPT SNMP/status.faults[faults.0],#3,"like","fetShort")=2'
               name: 'Status: Device has "fetShort" faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: c100ec68ddaf40e6964ba2598141daa7
               expression: 'count(/Morningstar TriStar MPPT SNMP/status.faults[faults.0],#3,"like","overcurrent")=2'
               name: 'Status: Device has "overcurrent" faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 435df7ebe3e047ffada64dcf7e69148a
               expression: 'count(/Morningstar TriStar MPPT SNMP/status.faults[faults.0],#3,"like","rtsDisconnected")=2'
               name: 'Status: Device has "rtsDisconnected" faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 88443c84eaa0415db976e7a5d6c1dec4
               expression: 'count(/Morningstar TriStar MPPT SNMP/status.faults[faults.0],#3,"like","rtsShorted")=2'
               name: 'Status: Device has "rtsShorted" faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: b19111ec08094dbca30a804011b02ed2
               expression: 'count(/Morningstar TriStar MPPT SNMP/status.faults[faults.0],#3,"like","slaveControlTimeout")=2'
               name: 'Status: Device has "slaveControlTimeout" faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 0d90cab800ad4bbcbf880c157a7a9dae
               expression: 'count(/Morningstar TriStar MPPT SNMP/status.faults[faults.0],#3,"like","softwareFault")=2'
               name: 'Status: Device has "softwareFault" faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 5f1e79c9987648c8abb325a507209a07
           name: 'Status: Uptime'
@@ -646,8 +776,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: status
           triggers:
             -
               uuid: aab5be196ac64dc69883c3109fcd094f
@@ -656,6 +786,10 @@ zabbix_export:
               priority: INFO
               description: 'Uptime is less than 10 minutes'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: db9317cb9a6645d2bd8f4760f7579c17
               expression: 'nodata(/Morningstar TriStar MPPT SNMP/status.uptime,5m)=1'
@@ -663,6 +797,10 @@ zabbix_export:
               priority: WARNING
               description: 'Zabbix has not received data for items for the last 5 minutes'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: c46896a6169142b59fc7f534f1981993
           name: 'Battery: Target Voltage'
@@ -691,8 +829,8 @@ zabbix_export:
                 - \1\2
           tags:
             -
-              tag: Application
-              value: Battery
+              tag: component
+              value: battery
         -
           uuid: 9aee4500f32a4016be4f137c948b3d67
           name: 'Temperature: Battery'
@@ -711,8 +849,8 @@ zabbix_export:
             Modbus address:0x0025
           tags:
             -
-              tag: Application
-              value: Temperature
+              tag: component
+              value: temperature
           triggers:
             -
               uuid: 5ec1c2e4786048fc889a37a12a2f4ad6
@@ -720,12 +858,20 @@ zabbix_export:
               name: 'Temperature: Critically high battery temperature (over {$BATTERY.TEMP.MAX.CRIT}C for 5m)'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 84c059ff133f4f4d8145615c0a98eb50
               expression: 'max(/Morningstar TriStar MPPT SNMP/temp.battery[batteryTemperature.0],5m)<{$BATTERY.TEMP.MIN.CRIT}'
               name: 'Temperature: Critically low battery temperature (below {$BATTERY.TEMP.MIN.WARN}C for 5m)'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 11d2b988cfec425c9ffb082e9c78490d
               expression: 'min(/Morningstar TriStar MPPT SNMP/temp.battery[batteryTemperature.0],5m)>{$BATTERY.TEMP.MAX.WARN}'
@@ -736,6 +882,10 @@ zabbix_export:
                 -
                   name: 'Temperature: Critically high battery temperature (over {$BATTERY.TEMP.MAX.CRIT}C for 5m)'
                   expression: 'min(/Morningstar TriStar MPPT SNMP/temp.battery[batteryTemperature.0],5m)>{$BATTERY.TEMP.MAX.CRIT}'
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 46122992e8a04c7bb7a8c8037a2da74a
               expression: 'max(/Morningstar TriStar MPPT SNMP/temp.battery[batteryTemperature.0],5m)<{$BATTERY.TEMP.MIN.WARN}'
@@ -746,6 +896,10 @@ zabbix_export:
                 -
                   name: 'Temperature: Critically low battery temperature (below {$BATTERY.TEMP.MIN.WARN}C for 5m)'
                   expression: 'max(/Morningstar TriStar MPPT SNMP/temp.battery[batteryTemperature.0],5m)<{$BATTERY.TEMP.MIN.CRIT}'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: ffed57b626254db6bcc0df6de51d39fa
           name: 'Temperature: Heatsink'
@@ -764,8 +918,8 @@ zabbix_export:
             Modbus address:0x0023
           tags:
             -
-              tag: Application
-              value: Temperature
+              tag: component
+              value: temperature
       discovery_rules:
         -
           uuid: 5c8910a7991240a9b586d0d87ef00d5d
@@ -803,8 +957,8 @@ zabbix_export:
                     - \1\2
               tags:
                 -
-                  tag: Application
-                  value: Battery
+                  tag: component
+                  value: battery
               trigger_prototypes:
                 -
                   uuid: cf9bb1b6e84d4b03b38f13c1c1d4905c
@@ -812,12 +966,20 @@ zabbix_export:
                   name: 'Battery: Critically high battery voltage (over {#VOLTAGE.MAX.CRIT}V for 5m)'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
                 -
                   uuid: d977ded736704d748ca49595f3658b89
                   expression: 'max(/Morningstar TriStar MPPT SNMP/battery.voltage[batteryVoltage.0{#SINGLETON}],5m)<{#VOLTAGE.MIN.CRIT}'
                   name: 'Battery: Critically low battery voltage (below {#VOLTAGE.MIN.CRIT}V for 5m)'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
                 -
                   uuid: 00deb7608b3e4444bd4833f5b8ae5875
                   expression: 'min(/Morningstar TriStar MPPT SNMP/battery.voltage[batteryVoltage.0{#SINGLETON}],5m)>{#VOLTAGE.MAX.WARN}'
@@ -828,6 +990,10 @@ zabbix_export:
                     -
                       name: 'Battery: Critically high battery voltage (over {#VOLTAGE.MAX.CRIT}V for 5m)'
                       expression: 'min(/Morningstar TriStar MPPT SNMP/battery.voltage[batteryVoltage.0{#SINGLETON}],5m)>{#VOLTAGE.MAX.CRIT}'
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
                 -
                   uuid: 2877138cdfb0448a9a83eb807b5da24a
                   expression: 'max(/Morningstar TriStar MPPT SNMP/battery.voltage[batteryVoltage.0{#SINGLETON}],5m)<{#VOLTAGE.MIN.WARN}'
@@ -838,6 +1004,10 @@ zabbix_export:
                     -
                       name: 'Battery: Critically low battery voltage (below {#VOLTAGE.MIN.CRIT}V for 5m)'
                       expression: 'max(/Morningstar TriStar MPPT SNMP/battery.voltage[batteryVoltage.0{#SINGLETON}],5m)<{#VOLTAGE.MIN.CRIT}'
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
           graph_prototypes:
             -
               uuid: f95cafe8c2a744908e3a290b0b2f6252
@@ -877,6 +1047,13 @@ zabbix_export:
                   }
                   
                   return JSON.stringify(result);
+      tags:
+        -
+          tag: class
+          value: power
+        -
+          tag: target
+          value: morningstar
       macros:
         -
           macro: '{$BATTERY.TEMP.MAX.CRIT}'
diff --git a/templates/net/morningstar/morningstar_tristar_pwm_snmp/README.md b/templates/net/morningstar/morningstar_tristar_pwm_snmp/README.md
index 488e2163c24..593e44dce1f 100644
--- a/templates/net/morningstar/morningstar_tristar_pwm_snmp/README.md
+++ b/templates/net/morningstar/morningstar_tristar_pwm_snmp/README.md
@@ -44,11 +44,11 @@ There are no template links in this template.
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
 |Battery voltage discovery |<p>Discovery for battery voltage triggers</p> |DEPENDENT |battery.voltage.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
+|Charge + Diversion mode discovery |<p>Discovery for device in charge and diversion modes</p> |DEPENDENT |controlmode.charge_diversion.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
 |Charge mode discovery |<p>Discovery for device in charge mode</p> |DEPENDENT |controlmode.charge.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `return JSON.stringify(parseInt(value) === 0 ? [{'{#SINGLETON}': ''}] : []);`</p> |
-|Load mode discovery |<p>Discovery for device in load mode</p> |DEPENDENT |controlmode.load.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `return JSON.stringify(parseInt(value) === 1 ? [{'{#SINGLETON}': ''}] : []);`</p> |
 |Diversion mode discovery |<p>Discovery for device in diversion mode</p> |DEPENDENT |controlmode.diversion.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `return JSON.stringify(parseInt(value) === 2 ? [{'{#SINGLETON}': ''}] : []);`</p> |
-|Charge + Diversion mode discovery |<p>Discovery for device in charge and diversion modes</p> |DEPENDENT |controlmode.charge_diversion.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
 |Load + Diversion mode discovery |<p>Discovery for device in load and diversion modes</p> |DEPENDENT |controlmode.load_diversion.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
+|Load mode discovery |<p>Discovery for device in load mode</p> |DEPENDENT |controlmode.load.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `return JSON.stringify(parseInt(value) === 1 ? [{'{#SINGLETON}': ''}] : []);`</p> |
 
 ## Items collected
 
@@ -71,7 +71,7 @@ There are no template links in this template.
 |Status |Status: Alarms |<p>MIB: TRISTAR</p><p>Description:Alarms</p><p>Modbus addresses:H=0x001D L=0x0017</p> |SNMP |status.alarms[alarms.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
 |Temperature |Temperature: Battery |<p>MIB: TRISTAR</p><p>Description:Battery Temperature</p><p>Scaling Factor:1.0</p><p>Units:deg C</p><p>Range:[-40, 120]</p><p>Modbus address:0x000F</p> |SNMP |temp.battery[batteryTemperature.0] |
 |Temperature |Temperature: Heatsink |<p>MIB: TRISTAR</p><p>Description:Heatsink Temperature</p><p>Scaling Factor:1.0</p><p>Units:deg C</p><p>Range:[-40, 120]</p><p>Modbus address:0x000E</p> |SNMP |temp.heatsink[heatsinkTemperature.0] |
-|Zabbix_raw_items |Battery: Battery Voltage discovery |<p>MIB: TRISTAR</p><p>Description:Battery voltage</p><p>Scaling Factor:0.002950042724609375</p><p>Units:V</p><p>Range:[0.0, 80.0]</p><p>Modbus address:0x0008</p> |SNMP |battery.voltage.discovery[batteryVoltage.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.002950042725`</p> |
+|Zabbix raw items |Battery: Battery Voltage discovery |<p>MIB: TRISTAR</p><p>Description:Battery voltage</p><p>Scaling Factor:0.002950042724609375</p><p>Units:V</p><p>Range:[0.0, 80.0]</p><p>Modbus address:0x0008</p> |SNMP |battery.voltage.discovery[batteryVoltage.0]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.002950042725`</p> |
 
 ## Triggers
 
diff --git a/templates/net/morningstar/morningstar_tristar_pwm_snmp/template_net_morningstar_tristar_pwm_snmp.yaml b/templates/net/morningstar/morningstar_tristar_pwm_snmp/template_net_morningstar_tristar_pwm_snmp.yaml
index e0e0b56c4b7..b879ec5760a 100644
--- a/templates/net/morningstar/morningstar_tristar_pwm_snmp/template_net_morningstar_tristar_pwm_snmp.yaml
+++ b/templates/net/morningstar/morningstar_tristar_pwm_snmp/template_net_morningstar_tristar_pwm_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-17T06:32:28Z'
+  date: '2022-01-26T09:55:00Z'
   groups:
     -
       uuid: 57b7ae836ca64446ba2c296389c009b7
@@ -14,7 +14,7 @@ zabbix_export:
         MIBs used:
         TRISTAR
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Modules
@@ -43,8 +43,14 @@ zabbix_export:
                 - '0.002950042725'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: battery
+            -
+              tag: component
+              value: discovery
+            -
+              tag: component
+              value: raw
         -
           uuid: 0c57da022cf8497e88f788cee1b3a0a6
           name: 'Status: Control Mode'
@@ -66,8 +72,8 @@ zabbix_export:
             name: 'TriStar PWM control mode'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: status
         -
           uuid: 25a576060f6948e59a855462b04c7276
           name: 'Counter: Amp-hours'
@@ -91,8 +97,8 @@ zabbix_export:
                 - '0.1'
           tags:
             -
-              tag: Application
-              value: Counter
+              tag: component
+              value: counter
         -
           uuid: d2351af0b6244044949eba67a7f7b39c
           name: 'Counter: KW-hours'
@@ -121,8 +127,8 @@ zabbix_export:
                 - \1\2
           tags:
             -
-              tag: Application
-              value: Counter
+              tag: component
+              value: counter
         -
           uuid: 03c3397ac32b47499002b13e0735ec9b
           name: 'Status: Alarms'
@@ -178,8 +184,8 @@ zabbix_export:
                   return result.length ? result.join('\n') : 'No alarms';
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: status
           triggers:
             -
               uuid: 121d47c6bbdd45bca261df2e01ea41c6
@@ -187,102 +193,170 @@ zabbix_export:
               name: 'Status: Device has "batterySense" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: fd2d9290144143d39bb5a3cf0a2d261f
               expression: 'count(/Morningstar TriStar PWM SNMP/status.alarms[alarms.0],#3,"like","batterySenseDisconnected")=2'
               name: 'Status: Device has "batterySenseDisconnected" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 83d5b8d52acd4e21ac6d3a9cf05dcd04
               expression: 'count(/Morningstar TriStar PWM SNMP/status.alarms[alarms.0],#3,"like","currentLimit")=2'
               name: 'Status: Device has "currentLimit" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: d9529a4372d848038e6ee561d62e9f22
               expression: 'count(/Morningstar TriStar PWM SNMP/status.alarms[alarms.0],#3,"like","currentOffset")=2'
               name: 'Status: Device has "currentOffset" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 5f3983acc1cc417e860c1305b11c15ea
               expression: 'count(/Morningstar TriStar PWM SNMP/status.alarms[alarms.0],#3,"like","diversionLoadNearMax")=2'
               name: 'Status: Device has "diversionLoadNearMax" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 878e04df7e7b416bb0d2213b5dbb80e6
               expression: 'count(/Morningstar TriStar PWM SNMP/status.alarms[alarms.0],#3,"like","heatsinkTempSensorOpen")=2'
               name: 'Status: Device has "heatsinkTempSensorOpen" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: c642ed9496ce4322809c7142d32929a5
               expression: 'count(/Morningstar TriStar PWM SNMP/status.alarms[alarms.0],#3,"like","heatsinkTempSensorShorted")=2'
               name: 'Status: Device has "heatsinkTempSensorShorted" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 532421fe17bf4732a01a6990e34e649a
               expression: 'count(/Morningstar TriStar PWM SNMP/status.alarms[alarms.0],#3,"like","highVoltageDisconnect")=2'
               name: 'Status: Device has "highVoltageDisconnect" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: ae90e8034baf4b21906d56d18bfa4da8
               expression: 'count(/Morningstar TriStar PWM SNMP/status.alarms[alarms.0],#3,"like","loadDisconnectState")=2'
               name: 'Status: Device has "loadDisconnectState" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 8d8b721c6dee40499b29bee44b21589a
               expression: 'count(/Morningstar TriStar PWM SNMP/status.alarms[alarms.0],#3,"like","mosfetSOpen")=2'
               name: 'Status: Device has "mosfetSOpen" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 8cda8e5773de4583b9baa6a6e542e32c
               expression: 'count(/Morningstar TriStar PWM SNMP/status.alarms[alarms.0],#3,"like","p12VoltageReferenceOff")=2'
               name: 'Status: Device has "p12VoltageReferenceOff" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 1b6192b8ca364c229b35ba6de89ad56b
               expression: 'count(/Morningstar TriStar PWM SNMP/status.alarms[alarms.0],#3,"like","rtsDisconnected")=2'
               name: 'Status: Device has "rtsDisconnected" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 176de77a142d45a3ac39ea42989e209c
               expression: 'count(/Morningstar TriStar PWM SNMP/status.alarms[alarms.0],#3,"like","rtsMiswire")=2'
               name: 'Status: Device has "rtsMiswire" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: f63029eabc8e498ea7e6336d312ac169
               expression: 'count(/Morningstar TriStar PWM SNMP/status.alarms[alarms.0],#3,"like","rtsShorted")=2'
               name: 'Status: Device has "rtsShorted" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 480b69c1febf45a2971788c2f967c45d
               expression: 'count(/Morningstar TriStar PWM SNMP/status.alarms[alarms.0],#3,"like","systemMiswire")=2'
               name: 'Status: Device has "systemMiswire" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 4a287e4086c4458aaa3dc48bbb8ee219
               expression: 'count(/Morningstar TriStar PWM SNMP/status.alarms[alarms.0],#3,"like","tristarHot")=2'
               name: 'Status: Device has "tristarHot" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: de665482d2574730a3a839948dd730ea
               expression: 'count(/Morningstar TriStar PWM SNMP/status.alarms[alarms.0],#3,"like","uncalibrated")=2'
               name: 'Status: Device has "uncalibrated" alarm flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 9d0f4444f98c4ec082d35559e8fe9ac5
           name: 'Status: Faults'
@@ -335,8 +409,8 @@ zabbix_export:
                   return result.length ? result.join('\n') : 'No faults';
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: status
           triggers:
             -
               uuid: 514b041aebdd4ddb8ab2d1222c0ef295
@@ -344,72 +418,120 @@ zabbix_export:
               name: 'Status: Device has "customSettingsEdit" faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 1a40ce8b87f04ab1b4f30387e9ce2d9d
               expression: 'count(/Morningstar TriStar PWM SNMP/status.faults[faults.0],#3,"like","dipSwitchChange")=2'
               name: 'Status: Device has "dipSwitchChange" faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 49b120c3933c43b1b7f5c77f7b359997
               expression: 'count(/Morningstar TriStar PWM SNMP/status.faults[faults.0],#3,"like","externalShort")=2'
               name: 'Status: Device has "externalShort" faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: f063b9f717c44ab988db7ac95bfca68f
               expression: 'count(/Morningstar TriStar PWM SNMP/status.faults[faults.0],#3,"like","highVoltageDisconnect")=2'
               name: 'Status: Device has "highVoltageDisconnect" faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 468716d748f1470cb764ce1af922164d
               expression: 'count(/Morningstar TriStar PWM SNMP/status.faults[faults.0],#3,"like","mosfetSShorted")=2'
               name: 'Status: Device has "mosfetSShorted" faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: b6f65dfca421490eafff48991cdf1e3b
               expression: 'count(/Morningstar TriStar PWM SNMP/status.faults[faults.0],#3,"like","overcurrent")=2'
               name: 'Status: Device has "overcurrent" faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 73561a5765694633b1dc0ef1b1f60fd4
               expression: 'count(/Morningstar TriStar PWM SNMP/status.faults[faults.0],#3,"like","reset")=2'
               name: 'Status: Device has "reset" faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: d14c7d928f57448390c2b4c588a28c65
               expression: 'count(/Morningstar TriStar PWM SNMP/status.faults[faults.0],#3,"like","rtsDisconnected")=2'
               name: 'Status: Device has "rtsDisconnected" faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: d94067598c234968b4929404067eff86
               expression: 'count(/Morningstar TriStar PWM SNMP/status.faults[faults.0],#3,"like","rtsShorted")=2'
               name: 'Status: Device has "rtsShorted" faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 886b18bee7cd4f8eb454973e2d2ae59f
               expression: 'count(/Morningstar TriStar PWM SNMP/status.faults[faults.0],#3,"like","softwareFault")=2'
               name: 'Status: Device has "softwareFault" faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 2e520cdafaaa4eefad5ebea71819c3a6
               expression: 'count(/Morningstar TriStar PWM SNMP/status.faults[faults.0],#3,"like","systemMiswire")=2'
               name: 'Status: Device has "systemMiswire" faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 041be44e639d4d1eadb15230a678e278
               expression: 'count(/Morningstar TriStar PWM SNMP/status.faults[faults.0],#3,"like","tristarHot")=2'
               name: 'Status: Device has "tristarHot" faults flag'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 642eec19ba5d450186590e9f5bba36db
           name: 'Status: Uptime'
@@ -426,8 +548,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: status
           triggers:
             -
               uuid: f0549419f015448497cd7d15a2bf96fa
@@ -436,6 +558,10 @@ zabbix_export:
               priority: INFO
               description: 'Uptime is less than 10 minutes'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 64aa2a79fe854def8e179a4d27790417
               expression: 'nodata(/Morningstar TriStar PWM SNMP/status.uptime,5m)=1'
@@ -443,6 +569,10 @@ zabbix_export:
               priority: WARNING
               description: 'Zabbix has not received data for items for the last 5 minutes'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: bc729e23973b4d9d97d694d884431e0b
           name: 'Temperature: Battery'
@@ -461,8 +591,8 @@ zabbix_export:
             Modbus address:0x000F
           tags:
             -
-              tag: Application
-              value: Temperature
+              tag: component
+              value: temperature
           triggers:
             -
               uuid: e759b90e2bf44bbb8e5efe5b9e458e40
@@ -470,12 +600,20 @@ zabbix_export:
               name: 'Temperature: Critically high battery temperature (over {$BATTERY.TEMP.MAX.CRIT}C for 5m)'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: e57f335f657d45768509f139d31dcdae
               expression: 'max(/Morningstar TriStar PWM SNMP/temp.battery[batteryTemperature.0],5m)<{$BATTERY.TEMP.MIN.CRIT}'
               name: 'Temperature: Critically low battery temperature (below {$BATTERY.TEMP.MIN.WARN}C for 5m)'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 7d1444dba9334e91ad425a6f2ff9fef9
               expression: 'min(/Morningstar TriStar PWM SNMP/temp.battery[batteryTemperature.0],5m)>{$BATTERY.TEMP.MAX.WARN}'
@@ -486,6 +624,10 @@ zabbix_export:
                 -
                   name: 'Temperature: Critically high battery temperature (over {$BATTERY.TEMP.MAX.CRIT}C for 5m)'
                   expression: 'min(/Morningstar TriStar PWM SNMP/temp.battery[batteryTemperature.0],5m)>{$BATTERY.TEMP.MAX.CRIT}'
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 14fe4a22b28c4d08a24da51a54e36e81
               expression: 'max(/Morningstar TriStar PWM SNMP/temp.battery[batteryTemperature.0],5m)<{$BATTERY.TEMP.MIN.WARN}'
@@ -496,6 +638,10 @@ zabbix_export:
                 -
                   name: 'Temperature: Critically low battery temperature (below {$BATTERY.TEMP.MIN.WARN}C for 5m)'
                   expression: 'max(/Morningstar TriStar PWM SNMP/temp.battery[batteryTemperature.0],5m)<{$BATTERY.TEMP.MIN.CRIT}'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: a9a009058e99419dbb6cbef5b7797388
           name: 'Temperature: Heatsink'
@@ -514,8 +660,8 @@ zabbix_export:
             Modbus address:0x000E
           tags:
             -
-              tag: Application
-              value: Temperature
+              tag: component
+              value: temperature
       discovery_rules:
         -
           uuid: 0e06c296579f4b6aa40d69ebb62742b4
@@ -553,8 +699,8 @@ zabbix_export:
                     - \1\2
               tags:
                 -
-                  tag: Application
-                  value: Battery
+                  tag: component
+                  value: battery
               trigger_prototypes:
                 -
                   uuid: 156ec13d673b4a8aa02a87b1794cb722
@@ -562,12 +708,20 @@ zabbix_export:
                   name: 'Battery: Critically high battery voltage (over {#VOLTAGE.MAX.CRIT}V for 5m)'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
                 -
                   uuid: 5e4400321f4f45b39397c68a4ba54d8e
                   expression: 'max(/Morningstar TriStar PWM SNMP/battery.voltage[batteryVoltage.0{#SINGLETON}],5m)<{#VOLTAGE.MIN.CRIT}'
                   name: 'Battery: Critically low battery voltage (below {#VOLTAGE.MIN.CRIT}V for 5m)'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
                 -
                   uuid: fa6502a4a0214f7f933e982182d21d6b
                   expression: 'min(/Morningstar TriStar PWM SNMP/battery.voltage[batteryVoltage.0{#SINGLETON}],5m)>{#VOLTAGE.MAX.WARN}'
@@ -578,6 +732,10 @@ zabbix_export:
                     -
                       name: 'Battery: Critically high battery voltage (over {#VOLTAGE.MAX.CRIT}V for 5m)'
                       expression: 'min(/Morningstar TriStar PWM SNMP/battery.voltage[batteryVoltage.0{#SINGLETON}],5m)>{#VOLTAGE.MAX.CRIT}'
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
                 -
                   uuid: a5275748f4c742ea8ab9efd266901e95
                   expression: 'max(/Morningstar TriStar PWM SNMP/battery.voltage[batteryVoltage.0{#SINGLETON}],5m)<{#VOLTAGE.MIN.WARN}'
@@ -588,6 +746,10 @@ zabbix_export:
                     -
                       name: 'Battery: Critically low battery voltage (below {#VOLTAGE.MIN.CRIT}V for 5m)'
                       expression: 'max(/Morningstar TriStar PWM SNMP/battery.voltage[batteryVoltage.0{#SINGLETON}],5m)<{#VOLTAGE.MIN.CRIT}'
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
           graph_prototypes:
             -
               uuid: bbdea967f4f34a299dd8d9bee43f2841
@@ -664,8 +826,8 @@ zabbix_export:
                     - \1\2
               tags:
                 -
-                  tag: Application
-                  value: Array
+                  tag: component
+                  value: array
             -
               uuid: b5d74de2e96440a5a00a4a4dffffbb26
               name: 'Battery: Charge Current{#SINGLETON}'
@@ -694,8 +856,8 @@ zabbix_export:
                     - \1\2
               tags:
                 -
-                  tag: Application
-                  value: Battery
+                  tag: component
+                  value: battery
           graph_prototypes:
             -
               uuid: 9886a05be4a74a82a208e3a5950f022d
@@ -754,8 +916,8 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: Battery
+                  tag: component
+                  value: battery
               trigger_prototypes:
                 -
                   uuid: da21473ce79c42269cc24d3e470b7d07
@@ -763,6 +925,10 @@ zabbix_export:
                   name: 'Battery: Device charge in critical state'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: 79a592050bc64c018cfa5c7b779fba02
                   expression: 'last(/Morningstar TriStar PWM SNMP/charge.state[controlState.0{#SINGLETON}])={$CHARGE.STATE.WARN}'
@@ -773,6 +939,10 @@ zabbix_export:
                     -
                       name: 'Battery: Device charge in critical state'
                       expression: 'last(/Morningstar TriStar PWM SNMP/charge.state[controlState.0{#SINGLETON}])={$CHARGE.STATE.CRIT}'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: edd7d01d2523481293f3ac9e8f3c0a00
               name: 'Battery: Target Voltage{#SINGLETON}'
@@ -801,8 +971,8 @@ zabbix_export:
                     - \1\2
               tags:
                 -
-                  tag: Application
-                  value: Battery
+                  tag: component
+                  value: battery
           master_item:
             key: 'control.mode[controlMode.0]'
           preprocessing:
@@ -848,8 +1018,8 @@ zabbix_export:
                     - \1\2
               tags:
                 -
-                  tag: Application
-                  value: Load
+                  tag: component
+                  value: load
           master_item:
             key: 'control.mode[controlMode.0]'
           preprocessing:
@@ -897,8 +1067,8 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: Load
+                  tag: component
+                  value: load
               trigger_prototypes:
                 -
                   uuid: 9035e0a92d384a3c844b8a4d4ebd1eb9
@@ -906,6 +1076,10 @@ zabbix_export:
                   name: 'Load: Device load in critical state'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: a2d13f97c4bd46bfab8e74a2f2a7df2e
                   expression: 'last(/Morningstar TriStar PWM SNMP/load.state[loadState.0{#SINGLETON}])={$LOAD.STATE.WARN:"lvdWarning"}  or last(/Morningstar TriStar PWM SNMP/load.state[loadState.0{#SINGLETON}])={$LOAD.STATE.WARN:"override"}'
@@ -916,6 +1090,10 @@ zabbix_export:
                     -
                       name: 'Load: Device load in critical state'
                       expression: 'last(/Morningstar TriStar PWM SNMP/load.state[loadState.0{#SINGLETON}])={$LOAD.STATE.CRIT:"lvd"} or last(/Morningstar TriStar PWM SNMP/load.state[loadState.0{#SINGLETON}])={$LOAD.STATE.CRIT:"fault"}'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
           master_item:
             key: 'control.mode[controlMode.0]'
           preprocessing:
@@ -960,8 +1138,8 @@ zabbix_export:
                     - \1\2
               tags:
                 -
-                  tag: Application
-                  value: Load
+                  tag: component
+                  value: load
             -
               uuid: f87ddb7d31d748c8917030ede731f37a
               name: 'Load: Voltage{#SINGLETON}'
@@ -990,8 +1168,8 @@ zabbix_export:
                     - \1\2
               tags:
                 -
-                  tag: Application
-                  value: Load
+                  tag: component
+                  value: load
           graph_prototypes:
             -
               uuid: 91ee10b435144218ab3dfac8f6bf7bdd
@@ -1022,6 +1200,13 @@ zabbix_export:
                 - |
                   var mode = parseInt(value);
                   return JSON.stringify((mode === 1 || mode === 2) ? [{'{#SINGLETON}': ''}] : []);
+      tags:
+        -
+          tag: class
+          value: power
+        -
+          tag: target
+          value: morningstar
       macros:
         -
           macro: '{$BATTERY.TEMP.MAX.CRIT}'
diff --git a/templates/net/netgear_snmp/template_net_netgear_snmp.yaml b/templates/net/netgear_snmp/template_net_netgear_snmp.yaml
index 401ed39712a..42f284e9588 100644
--- a/templates/net/netgear_snmp/template_net_netgear_snmp.yaml
+++ b/templates/net/netgear_snmp/template_net_netgear_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:48:32Z'
+  date: '2022-01-26T10:43:34Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -34,8 +34,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 424d07aafe9f4e8c8f647db6a43363d0
@@ -43,6 +46,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 4c2b7fe079ba45f6b150d9aeda4b8ab1
           name: 'ICMP loss'
@@ -53,8 +60,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 9d2efd0614ba4e16b3479ed515d3a9a2
@@ -66,6 +76,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/Netgear Fastpath SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: f6d11b8498e04df9bcf392aee2aacde3
           name: 'ICMP response time'
@@ -76,8 +93,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 99888c77fc084d43b742a1f156d87832
@@ -92,6 +112,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/Netgear Fastpath SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 6f2e3553d7874f81b184b1b25a3d9ac6
           name: 'SNMP traps (fallback)'
@@ -104,8 +131,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: 44a19d5435e8476dafa2e52b481b9c75
           name: 'System contact details'
@@ -127,8 +154,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: e8ffc912f0ee47cca513861fcecfddb0
           name: 'CPU utilization'
@@ -149,8 +176,8 @@ zabbix_export:
                 - \1
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
           triggers:
             -
               uuid: 1e47f984c5514205aad2be5db1157fd2
@@ -159,6 +186,10 @@ zabbix_export:
               opdata: 'Current utilization: {ITEM.LASTVALUE1}'
               priority: WARNING
               description: 'CPU utilization is too high. The system might be slow to respond.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 59c81fd37e334a0ba60b1256d3730624
           name: 'System description'
@@ -181,8 +212,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 2470e113b1174c70a1265bf4c4252b5f
           name: 'Hardware model name'
@@ -202,8 +233,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
         -
           uuid: 697f863cf86544d4a366e8827976ed50
           name: 'Hardware serial number'
@@ -225,8 +256,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: eba057a7ef5743ecb2c037476c97fc38
@@ -235,6 +266,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: eeeceba5d9dd43de856ada8b5460f3d5
           name: 'System location'
@@ -256,8 +291,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 53b0dbb74854494eb834804a1f0afbe7
           name: 'System name'
@@ -279,8 +314,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 61e82ab169374a51a1ebd876cc7813a8
@@ -289,6 +324,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: 8d5bfc785de5459c967659306d66b7e5
           name: 'System object ID'
@@ -309,8 +351,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 5bd8c956163d4201a7e896abde28044b
           name: 'Operating system'
@@ -332,8 +374,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: os
           triggers:
             -
               uuid: bf0a6ff122a14f4c9baa640d27c8f982
@@ -346,6 +388,10 @@ zabbix_export:
                 -
                   name: 'System name has changed (new name: {ITEM.VALUE})'
                   expression: 'last(/Netgear Fastpath SNMP/system.name,#1)<>last(/Netgear Fastpath SNMP/system.name,#2) and length(last(/Netgear Fastpath SNMP/system.name))>0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 6538a853fd47460585dbc2b4853ea65b
           name: Uptime
@@ -366,8 +412,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: d68e4595fd4c4e5a9307b268cfe06b3e
@@ -380,6 +426,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/Netgear Fastpath SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: f94ffd4d6eb84ae88cdf5033df65f249
           name: 'Available memory'
@@ -393,8 +443,8 @@ zabbix_export:
             The total memory freed for utilization.
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 98037eeab349478c8c393b163ec5193e
           name: 'Total memory'
@@ -408,8 +458,8 @@ zabbix_export:
             The total Memory allocated for the tasks
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 86ef153d78b5466cac76a32f81d8b958
           name: 'Memory utilization'
@@ -422,8 +472,8 @@ zabbix_export:
           description: 'Memory utilization in %'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: 21c1a017dcc14148a9020207a6fd7488
@@ -431,6 +481,13 @@ zabbix_export:
               name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
               priority: AVERAGE
               description: 'The system is running out of free memory.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 755ae00add264d2ba735b45f7dc5ca23
           name: 'SNMP agent availability'
@@ -447,8 +504,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: cc91cb171901433bbb35752127e54ad0
@@ -461,6 +521,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/Netgear Fastpath SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: 8fb96a540bab4deba00626237797cb62
@@ -487,8 +551,8 @@ zabbix_export:
                 name: 'FASTPATH-BOXSERVICES-PRIVATE-MIB::boxServicesFanItemState'
               tags:
                 -
-                  tag: Application
-                  value: Fans
+                  tag: component
+                  value: fan
               trigger_prototypes:
                 -
                   uuid: ce48c2b0a07d4528b95668c853b6b4e0
@@ -497,6 +561,13 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the fan unit'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: d37bcb60aa354c55b363e33c5ec3af9d
           name: 'Network interfaces discovery'
@@ -585,8 +656,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 50f169f55fb949aebf4233b702f2edb9
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -605,8 +682,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 055c64e171144b119b2e0b2c427e1c77
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -630,8 +713,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 036b6e8533044a0a8c5101f0dbc38c2f
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -654,8 +743,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 6ec1a97308a74aea8b68a1854d6692eb
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -674,8 +769,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 36d9193337164198a0fcb76bc3d9adcf
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -699,8 +800,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: f5f25ce6e6604f0b9b2d685d664c7469
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -725,8 +832,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 96d56a8cb6024d5d9841b7ac817e5aab
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -748,8 +861,14 @@ zabbix_export:
                 name: 'IF-MIB::ifOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 8e06e74957de4467bb127e6f16cdd84c
@@ -767,6 +886,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 2baed21110ca4e50af898442668bdd8b
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -790,8 +913,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           trigger_prototypes:
             -
               uuid: 443260352dec4467b6eafdd4c6a8ba9c
@@ -821,6 +950,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Netgear Fastpath SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/Netgear Fastpath SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/Netgear Fastpath SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/Netgear Fastpath SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 8b33b079505846558c6ee4f0afb05c5d
               expression: |
@@ -841,6 +974,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Netgear Fastpath SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/Netgear Fastpath SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/Netgear Fastpath SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/Netgear Fastpath SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: bfc9aaa24f17487184a8b88d4bf310a5
               expression: |
@@ -860,6 +997,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Netgear Fastpath SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/Netgear Fastpath SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/Netgear Fastpath SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/Netgear Fastpath SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: 7edcc1da1c1343a094028153e8f74fdb
@@ -931,8 +1075,8 @@ zabbix_export:
                 name: 'FASTPATH-BOXSERVICES-PRIVATE-MIB::boxServicesPowSupplyItemState'
               tags:
                 -
-                  tag: Application
-                  value: 'Power supply'
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: 78d4bcad8d7d4694ad492b37003fa0b0
@@ -941,6 +1085,13 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the power supply unit for errors'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: c63b577cb8544b54a40a4d86bc926ada
           name: 'Temperature Discovery'
@@ -966,8 +1117,8 @@ zabbix_export:
                 name: 'FASTPATH-BOXSERVICES-PRIVATE-MIB::boxServicesTempSensorState'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
             -
               uuid: 488762ecfb1549d294886681a6ec34f6
               name: '#{#SNMPVALUE}: Temperature'
@@ -982,8 +1133,8 @@ zabbix_export:
                 The temperature value reported by sensor
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 222b4523c61144d1a91bb1b5cbd63caf
@@ -993,6 +1144,13 @@ zabbix_export:
                   name: '#{#SNMPVALUE}: Temperature is too low: <{$TEMP_CRIT_LOW:""}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
           trigger_prototypes:
             -
               uuid: bead54e2d2f34d45bafb41600e84ac2d
@@ -1006,6 +1164,13 @@ zabbix_export:
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
               description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: f3444dbde8344a1782449ec4260972d1
               expression: |
@@ -1026,6 +1191,23 @@ zabbix_export:
                     or
                     last(/Netgear Fastpath SNMP/sensor.temp.status[boxServicesTempSensorState.{#SNMPINDEX}])={$TEMP_CRIT_STATUS}
                   recovery_expression: 'max(/Netgear Fastpath SNMP/sensor.temp.value[boxServicesTempSensorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:""}-3'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: fastpath
+        -
+          tag: target
+          value: netgear
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/net/qtech_snmp/template_net_qtech_snmp.yaml b/templates/net/qtech_snmp/template_net_qtech_snmp.yaml
index cbfcf8257ae..d04f2f2d5b4 100644
--- a/templates/net/qtech_snmp/template_net_qtech_snmp.yaml
+++ b/templates/net/qtech_snmp/template_net_qtech_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:48:37Z'
+  date: '2022-01-26T10:44:08Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -35,8 +35,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: fd05f449cbc64dcba10029c246594568
@@ -44,6 +47,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 8f355d66881c47b5be8097dbd1f950d1
           name: 'ICMP loss'
@@ -54,8 +61,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 4b2e2d168a0b4da3b5999263f52f3c36
@@ -67,6 +77,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/QTech QSW SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 6138402da32a40259bb26f217be2df59
           name: 'ICMP response time'
@@ -77,8 +94,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 18f41db36192463eabaa3797034e578a
@@ -93,6 +113,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/QTech QSW SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: ddb9ac31893d4b1d882b0e500d2d6ad7
           name: Temperature
@@ -107,8 +134,8 @@ zabbix_export:
             Temperature readings of testpoint: __RESOURCE__
           tags:
             -
-              tag: Application
-              value: Temperature
+              tag: component
+              value: temperature
           triggers:
             -
               uuid: 8ca8b9dfed0e4af898d9182150bb1ad0
@@ -119,6 +146,13 @@ zabbix_export:
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
               description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: b9122f253bf440ccb413d577790e46a0
               expression: 'avg(/QTech QSW SNMP/sensor.temp.value[switchTemperature.0],5m)>{$TEMP_WARN:""}'
@@ -133,6 +167,13 @@ zabbix_export:
                   name: 'Temperature is above critical threshold: >{$TEMP_CRIT:""}'
                   expression: 'avg(/QTech QSW SNMP/sensor.temp.value[switchTemperature.0],5m)>{$TEMP_CRIT:""}'
                   recovery_expression: 'max(/QTech QSW SNMP/sensor.temp.value[switchTemperature.0],5m)<{$TEMP_CRIT:""}-3'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: d7607e97e2f549caaefa184c9fee8220
               expression: 'avg(/QTech QSW SNMP/sensor.temp.value[switchTemperature.0],5m)<{$TEMP_CRIT_LOW:""}'
@@ -141,6 +182,13 @@ zabbix_export:
               name: 'Temperature is too low: <{$TEMP_CRIT_LOW:""}'
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 568c2b550b944dd084ec4e4486e7ec72
           name: 'SNMP traps (fallback)'
@@ -153,8 +201,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: b821576134ff4185a3e11b35763b7d1d
           name: 'System contact details'
@@ -176,8 +224,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: daab52a7d91b431b8ec579200e53a0c4
           name: 'CPU utilization'
@@ -192,8 +240,8 @@ zabbix_export:
             CPU utilization in %
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
           triggers:
             -
               uuid: 57bf78318ded4574bde08adfafe94454
@@ -202,6 +250,10 @@ zabbix_export:
               opdata: 'Current utilization: {ITEM.LASTVALUE1}'
               priority: WARNING
               description: 'CPU utilization is too high. The system might be slow to respond.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 3701b10845d449a3b1a5d67a7d743ca4
           name: 'System description'
@@ -224,8 +276,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: e7dda2d7f577404dbe8e5beba7609617
           name: 'Firmware version'
@@ -244,8 +296,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: e4682afd0cc547eea9605452b7df79f4
@@ -255,6 +307,10 @@ zabbix_export:
               priority: INFO
               description: 'Firmware version has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 5ff90f06a84a43ac937d3798b360bbd9
           name: 'Hardware model name'
@@ -274,8 +330,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
         -
           uuid: 684868048c1645aea9d8ad94514bd4c6
           name: 'Hardware serial number'
@@ -295,8 +351,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 83db3bd248994482a92ba86e5d3ae5ab
@@ -305,6 +361,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: a842a44da43a4d2c906d0c642eb11411
           name: 'Hardware version(revision)'
@@ -323,8 +383,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
         -
           uuid: de9a507ae83247398a4708fff2889862
           name: 'System location'
@@ -346,8 +406,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: aa2a90f772154d0e9354d496afae9939
           name: 'System name'
@@ -369,8 +429,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 27fa16e646224f88ad3b35ce7a71a18a
@@ -379,6 +439,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: 237a5f0537a549b3a63ed7f81d0b6122
           name: 'System object ID'
@@ -399,8 +466,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: ea6000232033495babf9157a67b89bcc
           name: 'Operating system'
@@ -420,8 +487,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: os
           triggers:
             -
               uuid: 6431f9a46fcb4a42ab3e04c8289bd07d
@@ -434,6 +501,10 @@ zabbix_export:
                 -
                   name: 'System name has changed (new name: {ITEM.VALUE})'
                   expression: 'last(/QTech QSW SNMP/system.name,#1)<>last(/QTech QSW SNMP/system.name,#2) and length(last(/QTech QSW SNMP/system.name))>0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 0123f7f4eab541a786130af4fbb2a534
           name: Uptime
@@ -454,8 +525,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 44d6c66a6a1641f8816031c0d5bf4040
@@ -468,6 +539,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/QTech QSW SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 609971d1876444659f779ef28ed81ce7
           name: 'Total memory'
@@ -481,8 +556,8 @@ zabbix_export:
             Total memory in Bytes
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 8821718704db4ab4a8af8fbeb61dde93
           name: 'Used memory'
@@ -496,8 +571,8 @@ zabbix_export:
             Used memory in Bytes
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: f2271ace8bd040618f10ec651a634cbc
           name: 'Memory utilization'
@@ -510,8 +585,8 @@ zabbix_export:
           description: 'Memory utilization in %'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: 082a768e190d4e8e97e0857cd3412ea1
@@ -519,6 +594,13 @@ zabbix_export:
               name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
               priority: AVERAGE
               description: 'The system is running out of free memory.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 3e44eea15b2a4b2c994fb3372c538466
           name: 'SNMP agent availability'
@@ -535,8 +617,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 7a7c0c7501ca484491394fe82c75b401
@@ -549,6 +634,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/QTech QSW SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: 58e5512df6204f7b9b7156055cfa35d4
@@ -572,8 +661,8 @@ zabbix_export:
                 name: 'QTECH-MIB::sysFanStatus'
               tags:
                 -
-                  tag: Application
-                  value: Fans
+                  tag: component
+                  value: fan
               trigger_prototypes:
                 -
                   uuid: 9961328558a74e45a3154559ed582e41
@@ -582,6 +671,13 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the fan unit'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 868afe31f18b401f9af17050f7b4f797
           name: 'Network interfaces discovery'
@@ -670,8 +766,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 7834edab485241e1bf065c0b314fcfc7
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -690,8 +792,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: f6d6b81658db4ba1b4edc2bf245816ce
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -715,8 +823,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 1d1e8f319cf84bc4813e07b4d1637e83
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -739,8 +853,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 69fddbf678284814ba8ec7f68314be5c
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -759,8 +879,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: dfc2d7184bd84c6592072857fc2abc48
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -784,8 +910,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 1aade0dd9063467e9fd1841b84e710f5
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -810,8 +942,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 37fffae80d9243d0863909fdae8683a2
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -833,8 +971,14 @@ zabbix_export:
                 name: 'IF-MIB::ifOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: efa56904fcf54fa5bbd0ba21381dc415
@@ -852,6 +996,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 950d69eedab445a09d53f002a499d25c
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -875,8 +1023,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           trigger_prototypes:
             -
               uuid: cb39728aac4940dda2b3a307d12be813
@@ -906,6 +1060,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/QTech QSW SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/QTech QSW SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/QTech QSW SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/QTech QSW SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 303873dbb6224b4abc2f678100a72eda
               expression: |
@@ -926,6 +1084,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/QTech QSW SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/QTech QSW SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/QTech QSW SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/QTech QSW SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 0e0544466c6845349078ca2a72d2cf6c
               expression: |
@@ -945,6 +1107,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/QTech QSW SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/QTech QSW SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/QTech QSW SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/QTech QSW SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: 986751c7fdb14537a5b525a0829f3b63
@@ -1048,8 +1217,14 @@ zabbix_export:
                 name: 'EtherLike-MIB::dot3StatsDuplexStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 8688cff304604fd7b015e92ef9f98647
@@ -1058,6 +1233,10 @@ zabbix_export:
                   priority: WARNING
                   description: 'Please check autonegotiation settings and cabling'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           preprocessing:
             -
               type: JAVASCRIPT
@@ -1098,8 +1277,8 @@ zabbix_export:
                 name: 'QTECH-MIB::sysPowerStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Power supply'
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: d047cf0b9e9f4e169e4a62c60358178d
@@ -1108,6 +1287,23 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the power supply unit for errors'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: qsw
+        -
+          tag: target
+          value: qtech
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/net/tplink_snmp/template_net_tplink_snmp.yaml b/templates/net/tplink_snmp/template_net_tplink_snmp.yaml
index e80b5b73972..1a94e931361 100644
--- a/templates/net/tplink_snmp/template_net_tplink_snmp.yaml
+++ b/templates/net/tplink_snmp/template_net_tplink_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:48:41Z'
+  date: '2022-01-26T09:51:03Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -44,8 +44,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 5b86c558f99d4ff5a8abca830df6e86e
@@ -53,6 +56,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 71567de591174a64aafd48aebae0b4f4
           name: 'ICMP loss'
@@ -63,8 +70,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 421d12d2c2a0405ba31c869c4d481b70
@@ -76,6 +86,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/TP-LINK SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: dde3ad74c18847f4a91bee29b20a6364
           name: 'ICMP response time'
@@ -86,8 +103,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 4d1df00b9476483fa77e6064708abf58
@@ -102,6 +122,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/TP-LINK SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 707bcd801726449d9a7d3de0fa650c0a
           name: 'SNMP traps (fallback)'
@@ -114,8 +141,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: 2b293fd8a3e346f9be437ae539dca3c3
           name: 'System contact details'
@@ -137,8 +164,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 4727c07daa0c413aa4bbc293198f9cde
           name: 'System description'
@@ -161,8 +188,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 1d20905fda0442b8b7b0eefcf473afd9
           name: 'Firmware version'
@@ -183,8 +210,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: ee797ebfc568468d8a3e9a8b388afb6d
@@ -194,6 +221,10 @@ zabbix_export:
               priority: INFO
               description: 'Firmware version has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: a571370a974c43deb9b5bb531d4dc4ce
           name: 'Hardware model name'
@@ -215,8 +246,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
         -
           uuid: d2cc080e7e7f49a19bb27737c749ba36
           name: 'Hardware serial number'
@@ -238,8 +269,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 57a906ac8f994ebaa2543a5eb4949db7
@@ -248,6 +279,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 20690cbfeb924ec79f67200da3e0577c
           name: 'Hardware version(revision)'
@@ -268,8 +303,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
         -
           uuid: 3cfe39b7d7f9401190de46aa86a04686
           name: 'System location'
@@ -291,8 +326,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 72bc86c14222404cad76bc04836d11eb
           name: 'System name'
@@ -314,8 +349,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 367bce2d38fe4ecbbe23c34bc7ec6226
@@ -324,6 +359,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: 78034b7a1d964b199f6a12c43821c27e
           name: 'System object ID'
@@ -344,8 +386,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: cb63d68e6d0143049534225d1d69da12
           name: Uptime
@@ -366,8 +408,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 63b45803131d4391abfa313a222339e5
@@ -380,6 +422,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/TP-LINK SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: b6cd5b22d8014aa18fdb7735d77cc84c
           name: 'SNMP agent availability'
@@ -396,8 +442,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 7b533ce3df8c4405a04f90dd1e850a32
@@ -410,6 +459,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/TP-LINK SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: 5325de505855448a8c785066374ba201
@@ -435,8 +488,8 @@ zabbix_export:
                 Reference: http://www.tp-link.com/faq-1330.html
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
               trigger_prototypes:
                 -
                   uuid: 667a09c4f1c04a1a84c7c79adb9cbc70
@@ -445,6 +498,10 @@ zabbix_export:
                   opdata: 'Current utilization: {ITEM.LASTVALUE1}'
                   priority: WARNING
                   description: 'CPU utilization is too high. The system might be slow to respond.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 6ec1580dfdcb46ec933cf2e4ef3122da
@@ -482,8 +539,8 @@ zabbix_export:
                 Reference: http://www.tp-link.com/faq-1330.html
               tags:
                 -
-                  tag: Application
-                  value: Memory
+                  tag: component
+                  value: memory
               trigger_prototypes:
                 -
                   uuid: 3bd3af786eb34b5e9a05f3113fce8007
@@ -491,6 +548,13 @@ zabbix_export:
                   name: '#{#SNMPVALUE}: High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
                   priority: AVERAGE
                   description: 'The system is running out of free memory.'
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 7c0b7c99942e41348c2dc3350f2323cc
@@ -583,8 +647,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFDESCR}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 738de59c4df9435d8076751a33098685
               name: 'Interface {#IFDESCR}: Inbound packets with errors'
@@ -603,8 +673,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFDESCR}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: a9393bc9e68c4c27b01320f776c037cb
               name: 'Interface {#IFDESCR}: Bits received'
@@ -628,8 +704,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFDESCR}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 86798974d9f143bf81e5fa40ac792835
               name: 'Interface {#IFDESCR}: Outbound packets discarded'
@@ -652,8 +734,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFDESCR}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: aa20e57e43bd4252b232e9f18ab73391
               name: 'Interface {#IFDESCR}: Outbound packets with errors'
@@ -672,8 +760,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFDESCR}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 694efd29271f4109a3008cd3404c2d54
               name: 'Interface {#IFDESCR}: Bits sent'
@@ -697,8 +791,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFDESCR}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: b06b4597959c44d6b998b506257e0f7f
               name: 'Interface {#IFDESCR}: Speed'
@@ -719,8 +819,14 @@ zabbix_export:
                 For a sub-layer which has no concept of bandwidth, this object should be zero.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFDESCR}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 25c78dd4d9ff466980d06912c8ca79db
               name: 'Interface {#IFDESCR}: Operational status'
@@ -742,8 +848,14 @@ zabbix_export:
                 name: 'IF-MIB::ifOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFDESCR}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: ce16733da6d24beb9cea97d61368e21b
@@ -761,6 +873,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 7d5f2f31ef3f49809e1011fed5347942
               name: 'Interface {#IFDESCR}: Interface type'
@@ -784,8 +900,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFDESCR}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           trigger_prototypes:
             -
               uuid: ebcdfd6d8c974c06810375d98e7d76c7
@@ -815,6 +937,10 @@ zabbix_export:
                   name: 'Interface {#IFDESCR}: Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/TP-LINK SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/TP-LINK SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/TP-LINK SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/TP-LINK SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: ae472f99d7ab480c947293f09c4b9dbb
               expression: |
@@ -835,6 +961,10 @@ zabbix_export:
                   name: 'Interface {#IFDESCR}: Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/TP-LINK SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/TP-LINK SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/TP-LINK SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/TP-LINK SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: ec28cbfaaf6245a194fe001555d05e5c
               expression: |
@@ -854,6 +984,10 @@ zabbix_export:
                   name: 'Interface {#IFDESCR}: Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/TP-LINK SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/TP-LINK SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/TP-LINK SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/TP-LINK SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: bd2e806179a24ca6bd4b2a8d13810061
@@ -900,6 +1034,13 @@ zabbix_export:
                   item:
                     host: 'TP-LINK SNMP'
                     key: 'net.if.in.discards[ifInDiscards.{#SNMPINDEX}]'
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: tp-link
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/net/ubiquiti_airos_snmp/template_net_ubiquiti_airos_snmp.yaml b/templates/net/ubiquiti_airos_snmp/template_net_ubiquiti_airos_snmp.yaml
index c4df088b204..1378aece519 100644
--- a/templates/net/ubiquiti_airos_snmp/template_net_ubiquiti_airos_snmp.yaml
+++ b/templates/net/ubiquiti_airos_snmp/template_net_ubiquiti_airos_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:48:45Z'
+  date: '2022-01-26T09:55:11Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -52,8 +52,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 2a6711992f354095b056b628be78022c
@@ -61,6 +64,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 11297d0102734139aa4fa81eefad9839
           name: 'ICMP loss'
@@ -71,8 +78,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 8e66ba0787b54af2897dd348e5453f10
@@ -84,6 +94,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/Ubiquiti AirOS SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: d8416e68bab94a568b8fbc67927ae739
           name: 'ICMP response time'
@@ -94,8 +111,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 4ae253aa403a42ad8cd4721e2ffdfbca
@@ -110,6 +130,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/Ubiquiti AirOS SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 11edabc72e4a4d69a0dc9c36458fbfbc
           name: 'SNMP traps (fallback)'
@@ -122,8 +149,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: 362b533375e544d9804eba534e5f4935
           name: 'System contact details'
@@ -145,8 +172,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 1aaf7d729983431cb28351e7ba0c8235
           name: 'CPU utilization'
@@ -161,8 +188,8 @@ zabbix_export:
             5 minute load average of processor load.
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
           triggers:
             -
               uuid: 0a779320c2ba4494b8c55aef969e7c9d
@@ -171,6 +198,10 @@ zabbix_export:
               opdata: 'Current utilization: {ITEM.LASTVALUE1}'
               priority: WARNING
               description: 'CPU utilization is too high. The system might be slow to respond.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: a05d416bcdde44929f091c4cde2e6537
           name: 'System description'
@@ -193,8 +224,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 9e8ab4b180f24b64bcddfc1606d616d0
           name: 'Firmware version'
@@ -215,8 +246,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: ab4a91cf3c2a4305a59727558c00a1f8
@@ -226,6 +257,10 @@ zabbix_export:
               priority: INFO
               description: 'Firmware version has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: e770de183b1e4ffc9348750520719b41
           name: 'Hardware model name'
@@ -247,8 +282,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
         -
           uuid: eabbdf5343fb42bfa3e5f13bc51ad66d
           name: 'System location'
@@ -270,8 +305,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 5994fe565b1d437f8e9f1d0d8ec83104
           name: 'System name'
@@ -293,8 +328,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 15523bce03a24cd6a4818ab655d1d2ad
@@ -303,6 +338,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: 2fbfe02459724f089b5bcd31ff6245d9
           name: 'System object ID'
@@ -323,8 +365,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: de270e3ac6874ca59a236a040d82c099
           name: Uptime
@@ -345,8 +387,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 2d9ed5a3b714461bbcdc4c530f955e5b
@@ -359,6 +401,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/Ubiquiti AirOS SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 6393f8a84fd4417abdccd8bd867aac7e
           name: 'Memory (buffers)'
@@ -377,8 +423,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 224c8d32f0d649b3b94b77e960934f15
           name: 'Memory (cached)'
@@ -397,8 +443,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 401b95eff89743cba6942606ac051b01
           name: 'Free memory'
@@ -415,8 +461,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: eefa6d2e8560407f82bbb8783bb399ad
           name: 'Total memory'
@@ -435,8 +481,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 29df9ffb192d4434a88ac6a413b9569d
           name: 'Memory utilization'
@@ -449,8 +495,8 @@ zabbix_export:
           description: 'Memory utilization in %'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: 30c0c80ae6df45bb96c434016e394bba
@@ -458,6 +504,13 @@ zabbix_export:
               name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
               priority: AVERAGE
               description: 'The system is running out of free memory.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 0aad82f9addd45efa20253da000ec699
           name: 'SNMP agent availability'
@@ -474,8 +527,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 7735f20ab7fd40b8b34cead6cb306b30
@@ -488,6 +544,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/Ubiquiti AirOS SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: 441118e6712e4f6bae4c9cab7be8d0a2
@@ -568,8 +628,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFDESCR}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: cec2d0f88b494cb8b49a8e234108cbbb
               name: 'Interface {#IFDESCR}: Inbound packets with errors'
@@ -588,8 +654,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFDESCR}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 0610c78c5be54df29ef6833758331896
               name: 'Interface {#IFDESCR}: Bits received'
@@ -613,8 +685,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFDESCR}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 9a129fa67db34b4fa6af29e4c0936f09
               name: 'Interface {#IFDESCR}: Outbound packets discarded'
@@ -637,8 +715,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFDESCR}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 016c8fc0a0524df3b5fa9a7d6a28fb94
               name: 'Interface {#IFDESCR}: Outbound packets with errors'
@@ -657,8 +741,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFDESCR}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 84be5259caec44cfb5963e8d31c27e71
               name: 'Interface {#IFDESCR}: Bits sent'
@@ -682,8 +772,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFDESCR}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 570b2d64c79748ac9c8350fa68933de5
               name: 'Interface {#IFDESCR}: Speed'
@@ -704,8 +800,14 @@ zabbix_export:
                 For a sub-layer which has no concept of bandwidth, this object should be zero.
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFDESCR}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: ec9624acd1d940e49f6cb996551ec66b
               name: 'Interface {#IFDESCR}: Operational status'
@@ -727,8 +829,14 @@ zabbix_export:
                 name: 'IF-MIB::ifOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFDESCR}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: c360a22671ea4dcda48fc49ec7847c2d
@@ -746,6 +854,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 435d93d378d646c388ddccb22bb43dc9
               name: 'Interface {#IFDESCR}: Interface type'
@@ -769,8 +881,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFDESCR}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           trigger_prototypes:
             -
               uuid: 9ccbb6859cd7422684e1946c1e321b3c
@@ -800,6 +918,10 @@ zabbix_export:
                   name: 'Interface {#IFDESCR}: Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Ubiquiti AirOS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/Ubiquiti AirOS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/Ubiquiti AirOS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/Ubiquiti AirOS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 80e37d44eddf49c89b39dacc8c88ac07
               expression: |
@@ -820,6 +942,10 @@ zabbix_export:
                   name: 'Interface {#IFDESCR}: Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Ubiquiti AirOS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/Ubiquiti AirOS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/Ubiquiti AirOS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/Ubiquiti AirOS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 3d7c8f98d0c447038c630f4e2ad81c06
               expression: |
@@ -839,6 +965,10 @@ zabbix_export:
                   name: 'Interface {#IFDESCR}: Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Ubiquiti AirOS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/Ubiquiti AirOS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/Ubiquiti AirOS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/Ubiquiti AirOS SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: 756cecebd5e04ffc8f535fa20412734d
@@ -885,6 +1015,16 @@ zabbix_export:
                   item:
                     host: 'Ubiquiti AirOS SNMP'
                     key: 'net.if.in.discards[ifInDiscards.{#SNMPINDEX}]'
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: airos
+        -
+          tag: target
+          value: ubiquiti
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/net/velocloud_http/template_net_velocloud_http.yaml b/templates/net/velocloud_http/template_net_velocloud_http.yaml
index 2faf2a5666b..50ee130c115 100644
--- a/templates/net/velocloud_http/template_net_velocloud_http.yaml
+++ b/templates/net/velocloud_http/template_net_velocloud_http.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-17T06:33:51Z'
+  date: '2022-01-26T09:58:15Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -15,7 +15,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: 'Templates/Network devices'
@@ -159,14 +159,8 @@ zabbix_export:
               value: '{$VELOCLOUD.URL}'
           tags:
             -
-              tag: data
+              tag: component
               value: raw
-            -
-              tag: target
-              value: velocloud
-            -
-              tag: transport
-              value: script
         -
           uuid: 9df4ba5324d94d0fb54d3231311016a6
           name: 'Velocloud: Clear data'
@@ -187,17 +181,8 @@ zabbix_export:
             key: velocloud.get
           tags:
             -
-              tag: resource
+              tag: component
               value: orchestrator
-            -
-              tag: target
-              value: velocloud
-            -
-              tag: transport
-              value: dependent
-            -
-              tag: type
-              value: text
         -
           uuid: 8a54309d8abc4fc7816b168329243de4
           name: 'Velocloud: Get data collection errors'
@@ -221,17 +206,8 @@ zabbix_export:
             key: velocloud.get
           tags:
             -
-              tag: resource
-              value: errors
-            -
-              tag: target
-              value: velocloud
-            -
-              tag: transport
-              value: dependent
-            -
-              tag: type
-              value: text
+              tag: component
+              value: application
           triggers:
             -
               uuid: a0623655a2fa4f60962ad560b8bb5a13
@@ -239,6 +215,10 @@ zabbix_export:
               name: 'Velocloud: There are errors in aggregate script item'
               priority: WARNING
               description: 'There are errors in aggregate script item.'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 3f589e2191c5419fb89cc33639595ae9
           name: 'Velocloud: Orchestrator API version'
@@ -258,17 +238,8 @@ zabbix_export:
             key: velocloud.get.clear_metrics
           tags:
             -
-              tag: resource
+              tag: component
               value: orchestrator
-            -
-              tag: target
-              value: velocloud
-            -
-              tag: transport
-              value: dependent
-            -
-              tag: type
-              value: text
           triggers:
             -
               uuid: 5a95d9c614e74c2c8b6181fc8dff2226
@@ -277,6 +248,10 @@ zabbix_export:
               priority: AVERAGE
               description: 'Zabbix has not received data for items for the last 30 minutes.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: ab24d8fc4c2a4130bca1b4b6d4f311ae
           name: 'Velocloud: Orchestrator build'
@@ -300,17 +275,8 @@ zabbix_export:
             key: velocloud.get.clear_metrics
           tags:
             -
-              tag: resource
+              tag: component
               value: orchestrator
-            -
-              tag: target
-              value: velocloud
-            -
-              tag: transport
-              value: dependent
-            -
-              tag: type
-              value: text
           triggers:
             -
               uuid: 37c16b3cbd8b4680ab85a1fea819611f
@@ -319,6 +285,10 @@ zabbix_export:
               priority: INFO
               description: 'Velocloud Orchestrator build has been changed.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 1f60b61051494ab495de4dfe2cd83450
           name: 'Velocloud: Orchestrator version'
@@ -342,17 +312,8 @@ zabbix_export:
             key: velocloud.get.clear_metrics
           tags:
             -
-              tag: resource
+              tag: component
               value: orchestrator
-            -
-              tag: target
-              value: velocloud
-            -
-              tag: transport
-              value: dependent
-            -
-              tag: type
-              value: text
           triggers:
             -
               uuid: a1d8e4d61a804c8fb11b33f590f0885c
@@ -361,6 +322,10 @@ zabbix_export:
               priority: INFO
               description: 'Velocloud Orchestrator version has been changed.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 1206789df5b44af7ba1c5416662344dd
           name: 'Velocloud: System properties'
@@ -388,17 +353,8 @@ zabbix_export:
           request_method: POST
           tags:
             -
-              tag: resource
-              value: orchestrator
-            -
-              tag: target
-              value: velocloud
-            -
-              tag: transport
-              value: dependent
-            -
-              tag: type
-              value: text
+              tag: component
+              value: application
           triggers:
             -
               uuid: 58541dfe798843fa822276e84a32b919
@@ -407,6 +363,10 @@ zabbix_export:
               priority: INFO
               description: 'System properties have changed.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
       discovery_rules:
         -
           uuid: 522ba6551cc64094b60a136d07c9921d
@@ -466,23 +426,14 @@ zabbix_export:
                   tag: city
                   value: '{#CITY}'
                 -
+                  tag: component
+                  value: edge
+                -
                   tag: name
                   value: '{#NAME}'
                 -
-                  tag: resource
-                  value: edge
-                -
                   tag: state
                   value: '{#STATE}'
-                -
-                  tag: target
-                  value: velocloud
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: State
             -
               uuid: cecb2a3698704c4c89ef12eb3bb39222
               name: 'Edge [{#NAME}]: Description'
@@ -509,23 +460,14 @@ zabbix_export:
                   tag: city
                   value: '{#CITY}'
                 -
+                  tag: component
+                  value: edge
+                -
                   tag: name
                   value: '{#NAME}'
                 -
-                  tag: resource
-                  value: edge
-                -
                   tag: state
                   value: '{#STATE}'
-                -
-                  tag: target
-                  value: velocloud
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: text
             -
               uuid: 490afb422d0f457595343d49536470b7
               name: 'Edge [{#NAME}]: HA state'
@@ -568,23 +510,14 @@ zabbix_export:
                   tag: city
                   value: '{#CITY}'
                 -
+                  tag: component
+                  value: edge
+                -
                   tag: name
                   value: '{#NAME}'
                 -
-                  tag: resource
-                  value: edge
-                -
                   tag: state
                   value: '{#STATE}'
-                -
-                  tag: target
-                  value: velocloud
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: State
               trigger_prototypes:
                 -
                   uuid: 075d35e3ed074b9daf01864b111945c7
@@ -592,6 +525,10 @@ zabbix_export:
                   name: 'Edge [{#NAME}]: HA state is in "FAILED" state'
                   priority: WARNING
                   description: 'High availability state is "FAILED".'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: fdb55947147249109da453009d6bd443
               name: 'Edge [{#NAME}]: Model number'
@@ -618,23 +555,14 @@ zabbix_export:
                   tag: city
                   value: '{#CITY}'
                 -
+                  tag: component
+                  value: edge
+                -
                   tag: name
                   value: '{#NAME}'
                 -
-                  tag: resource
-                  value: edge
-                -
                   tag: state
                   value: '{#STATE}'
-                -
-                  tag: target
-                  value: velocloud
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: text
             -
               uuid: 0af44b485ae54de49a0385923c897bee
               name: 'Edge [{#NAME}]: Service uptime'
@@ -662,23 +590,14 @@ zabbix_export:
                   tag: city
                   value: '{#CITY}'
                 -
+                  tag: component
+                  value: edge
+                -
                   tag: name
                   value: '{#NAME}'
                 -
-                  tag: resource
-                  value: edge
-                -
                   tag: state
                   value: '{#STATE}'
-                -
-                  tag: target
-                  value: velocloud
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: counter
             -
               uuid: e12fe7584fbd40268e7c16ed044aa4db
               name: 'Edge [{#NAME}]: Software version'
@@ -705,23 +624,14 @@ zabbix_export:
                   tag: city
                   value: '{#CITY}'
                 -
+                  tag: component
+                  value: edge
+                -
                   tag: name
                   value: '{#NAME}'
                 -
-                  tag: resource
-                  value: edge
-                -
                   tag: state
                   value: '{#STATE}'
-                -
-                  tag: target
-                  value: velocloud
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: text
             -
               uuid: 74b49eac72574daab1b727045be118ca
               name: 'Edge [{#NAME}]: State'
@@ -762,23 +672,14 @@ zabbix_export:
                   tag: city
                   value: '{#CITY}'
                 -
+                  tag: component
+                  value: edge
+                -
                   tag: name
                   value: '{#NAME}'
                 -
-                  tag: resource
-                  value: edge
-                -
                   tag: state
                   value: '{#STATE}'
-                -
-                  tag: target
-                  value: velocloud
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: State
               trigger_prototypes:
                 -
                   uuid: 962d2d0c6f124424b2e5a7aca89d293f
@@ -786,6 +687,10 @@ zabbix_export:
                   name: 'Edge [{#NAME}]: Edge is in "OFFLINE" state'
                   priority: WARNING
                   description: 'Edge state is "OFFLINE".'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: a86c1fa26d4d4481bdfb099338c27989
               name: 'Edge [{#NAME}]: System uptime'
@@ -813,23 +718,14 @@ zabbix_export:
                   tag: city
                   value: '{#CITY}'
                 -
+                  tag: component
+                  value: edge
+                -
                   tag: name
                   value: '{#NAME}'
                 -
-                  tag: resource
-                  value: edge
-                -
                   tag: state
                   value: '{#STATE}'
-                -
-                  tag: target
-                  value: velocloud
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: counter
               trigger_prototypes:
                 -
                   uuid: 156d96052fd54606828cc53484794bb2
@@ -837,6 +733,10 @@ zabbix_export:
                   name: 'Edge [{#NAME}]: Edge has been restarted (uptime < 10m)'
                   priority: WARNING
                   description: 'Edge was restarted.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
           master_item:
             key: velocloud.get.clear_metrics
           lld_macro_paths:
@@ -901,23 +801,14 @@ zabbix_export:
                   tag: city
                   value: '{#CITY}'
                 -
+                  tag: component
+                  value: gateway
+                -
                   tag: name
                   value: '{#NAME}'
                 -
-                  tag: resource
-                  value: gateway
-                -
                   tag: state
                   value: '{#STATE}'
-                -
-                  tag: target
-                  value: velocloud
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: gauge
               trigger_prototypes:
                 -
                   uuid: f0d7bdb2ac3540258ab6a276b43a382c
@@ -926,6 +817,10 @@ zabbix_export:
                   priority: WARNING
                   description: 'The number of connected edges is changed.'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 5e588efb83be4dc2bc29eaa0a6630718
               name: 'Gateway [{#NAME}]: Description'
@@ -952,23 +847,14 @@ zabbix_export:
                   tag: city
                   value: '{#CITY}'
                 -
+                  tag: component
+                  value: gateway
+                -
                   tag: name
                   value: '{#NAME}'
                 -
-                  tag: resource
-                  value: gateway
-                -
                   tag: state
                   value: '{#STATE}'
-                -
-                  tag: target
-                  value: velocloud
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: text
             -
               uuid: 7f2a0a68386744cb84fab35df8c55a07
               name: 'Gateway [{#NAME}]: IP address'
@@ -995,23 +881,14 @@ zabbix_export:
                   tag: city
                   value: '{#CITY}'
                 -
+                  tag: component
+                  value: gateway
+                -
                   tag: name
                   value: '{#NAME}'
                 -
-                  tag: resource
-                  value: gateway
-                -
                   tag: state
                   value: '{#STATE}'
-                -
-                  tag: target
-                  value: velocloud
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: text
             -
               uuid: b304460854f0485189f88df12483b5ac
               name: 'Gateway [{#NAME}]: Service uptime'
@@ -1039,23 +916,14 @@ zabbix_export:
                   tag: city
                   value: '{#CITY}'
                 -
+                  tag: component
+                  value: gateway
+                -
                   tag: name
                   value: '{#NAME}'
                 -
-                  tag: resource
-                  value: gateway
-                -
                   tag: state
                   value: '{#STATE}'
-                -
-                  tag: target
-                  value: velocloud
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: counter
             -
               uuid: 91784583eda943a7ace430413450391c
               name: 'Gateway [{#NAME}]: State'
@@ -1082,23 +950,14 @@ zabbix_export:
                   tag: city
                   value: '{#CITY}'
                 -
+                  tag: component
+                  value: gateway
+                -
                   tag: name
                   value: '{#NAME}'
                 -
-                  tag: resource
-                  value: gateway
-                -
                   tag: state
                   value: '{#STATE}'
-                -
-                  tag: target
-                  value: velocloud
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: State
             -
               uuid: d902600ef51640ffaaa4384ce505bcc2
               name: 'Gateway [{#NAME}]: System uptime'
@@ -1126,23 +985,14 @@ zabbix_export:
                   tag: city
                   value: '{#CITY}'
                 -
+                  tag: component
+                  value: gateway
+                -
                   tag: name
                   value: '{#NAME}'
                 -
-                  tag: resource
-                  value: gateway
-                -
                   tag: state
                   value: '{#STATE}'
-                -
-                  tag: target
-                  value: velocloud
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: counter
               trigger_prototypes:
                 -
                   uuid: e51ea2da27284067bd3ec8fa4faffdde
@@ -1150,6 +1000,10 @@ zabbix_export:
                   name: 'Gateway [{#NAME}]: Gateway has been restarted (uptime < 10m)'
                   priority: WARNING
                   description: 'Gateway was restarted.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 66c8fe8095724fb38966b05ef5d77a37
               name: 'Gateway [{#NAME}]: Utilization CPU'
@@ -1172,23 +1026,17 @@ zabbix_export:
                   tag: city
                   value: '{#CITY}'
                 -
-                  tag: name
-                  value: '{#NAME}'
+                  tag: component
+                  value: cpu
                 -
-                  tag: resource
+                  tag: component
                   value: gateway
                 -
+                  tag: name
+                  value: '{#NAME}'
+                -
                   tag: state
                   value: '{#STATE}'
-                -
-                  tag: target
-                  value: velocloud
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: gauge
             -
               uuid: b510c38771464024a66dc20ce9d75505
               name: 'Gateway [{#NAME}]: Utilization load'
@@ -1211,23 +1059,14 @@ zabbix_export:
                   tag: city
                   value: '{#CITY}'
                 -
+                  tag: component
+                  value: gateway
+                -
                   tag: name
                   value: '{#NAME}'
                 -
-                  tag: resource
-                  value: gateway
-                -
                   tag: state
                   value: '{#STATE}'
-                -
-                  tag: target
-                  value: velocloud
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: gauge
             -
               uuid: ad83565ae40f480dacd56e63bd475ddc
               name: 'Gateway [{#NAME}]: Utilization memory'
@@ -1250,23 +1089,17 @@ zabbix_export:
                   tag: city
                   value: '{#CITY}'
                 -
+                  tag: component
+                  value: gateway
+                -
+                  tag: component
+                  value: memory
+                -
                   tag: name
                   value: '{#NAME}'
                 -
-                  tag: resource
-                  value: gateway
-                -
                   tag: state
                   value: '{#STATE}'
-                -
-                  tag: target
-                  value: velocloud
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: gauge
             -
               uuid: b10c51350f604a8195e9c0176ca2de85
               name: 'Gateway [{#NAME}]: Utilization overall'
@@ -1289,23 +1122,14 @@ zabbix_export:
                   tag: city
                   value: '{#CITY}'
                 -
+                  tag: component
+                  value: gateway
+                -
                   tag: name
                   value: '{#NAME}'
                 -
-                  tag: resource
-                  value: gateway
-                -
                   tag: state
                   value: '{#STATE}'
-                -
-                  tag: target
-                  value: velocloud
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: gauge
           graph_prototypes:
             -
               uuid: d8d9b176f439436ba6fe69ec8bc6409e
@@ -1396,26 +1220,23 @@ zabbix_export:
                 key: velocloud.get.clear_metrics
               tags:
                 -
+                  tag: component
+                  value: link
+                -
                   tag: edge
                   value: '{#EDGE}'
                 -
                   tag: enterprise
                   value: '{#ENTERPRISE}'
                 -
-                  tag: name
-                  value: '{#NAME}'
-                -
-                  tag: resource
-                  value: link
-                -
-                  tag: target
-                  value: velocloud
+                  tag: interface
+                  value: '{#IF}'
                 -
-                  tag: transport
-                  value: dependent
+                  tag: ip
+                  value: '{#IP}'
                 -
-                  tag: type
-                  value: gauge
+                  tag: name
+                  value: '{#NAME}'
             -
               uuid: 897c9055d51a4e75ba7bae1160c7303e
               name: 'Link [{#NAME}]:[{#IP}]: Best loss tx, %'
@@ -1434,26 +1255,23 @@ zabbix_export:
                 key: velocloud.get.clear_metrics
               tags:
                 -
+                  tag: component
+                  value: link
+                -
                   tag: edge
                   value: '{#EDGE}'
                 -
                   tag: enterprise
                   value: '{#ENTERPRISE}'
                 -
-                  tag: name
-                  value: '{#NAME}'
-                -
-                  tag: resource
-                  value: link
+                  tag: interface
+                  value: '{#IF}'
                 -
-                  tag: target
-                  value: velocloud
+                  tag: ip
+                  value: '{#IP}'
                 -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: gauge
+                  tag: name
+                  value: '{#NAME}'
             -
               uuid: 5602191f2e0f4cb2b2340a4cfc77cfc7
               name: 'Link [{#NAME}]:[{#IP}]: Bytes in'
@@ -1472,26 +1290,23 @@ zabbix_export:
                 key: velocloud.get.clear_metrics
               tags:
                 -
+                  tag: component
+                  value: link
+                -
                   tag: edge
                   value: '{#EDGE}'
                 -
                   tag: enterprise
                   value: '{#ENTERPRISE}'
                 -
-                  tag: name
-                  value: '{#NAME}'
+                  tag: interface
+                  value: '{#IF}'
                 -
-                  tag: resource
-                  value: link
-                -
-                  tag: target
-                  value: velocloud
-                -
-                  tag: transport
-                  value: dependent
+                  tag: ip
+                  value: '{#IP}'
                 -
-                  tag: type
-                  value: gauge
+                  tag: name
+                  value: '{#NAME}'
             -
               uuid: 758b71f1692c46a8bb0611566b00031b
               name: 'Link [{#NAME}]:[{#IP}]: Bytes out'
@@ -1510,26 +1325,23 @@ zabbix_export:
                 key: velocloud.get.clear_metrics
               tags:
                 -
+                  tag: component
+                  value: link
+                -
                   tag: edge
                   value: '{#EDGE}'
                 -
                   tag: enterprise
                   value: '{#ENTERPRISE}'
                 -
-                  tag: name
-                  value: '{#NAME}'
-                -
-                  tag: resource
-                  value: link
-                -
-                  tag: target
-                  value: velocloud
+                  tag: interface
+                  value: '{#IF}'
                 -
-                  tag: transport
-                  value: dependent
+                  tag: ip
+                  value: '{#IP}'
                 -
-                  tag: type
-                  value: gauge
+                  tag: name
+                  value: '{#NAME}'
             -
               uuid: 3320d368036b460091b3f20e3c5cebd9
               name: 'Link [{#NAME}]:[{#IP}]: Last active'
@@ -1552,26 +1364,23 @@ zabbix_export:
                 key: velocloud.get.clear_metrics
               tags:
                 -
+                  tag: component
+                  value: link
+                -
                   tag: edge
                   value: '{#EDGE}'
                 -
                   tag: enterprise
                   value: '{#ENTERPRISE}'
                 -
-                  tag: name
-                  value: '{#NAME}'
-                -
-                  tag: resource
-                  value: link
+                  tag: interface
+                  value: '{#IF}'
                 -
-                  tag: target
-                  value: velocloud
+                  tag: ip
+                  value: '{#IP}'
                 -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: counter
+                  tag: name
+                  value: '{#NAME}'
             -
               uuid: cf66e401adc6432e8052baf0128d6877
               name: 'Link [{#NAME}]:[{#IP}]: Packets in'
@@ -1590,26 +1399,23 @@ zabbix_export:
                 key: velocloud.get.clear_metrics
               tags:
                 -
+                  tag: component
+                  value: link
+                -
                   tag: edge
                   value: '{#EDGE}'
                 -
                   tag: enterprise
                   value: '{#ENTERPRISE}'
                 -
-                  tag: name
-                  value: '{#NAME}'
-                -
-                  tag: resource
-                  value: link
-                -
-                  tag: target
-                  value: velocloud
+                  tag: interface
+                  value: '{#IF}'
                 -
-                  tag: transport
-                  value: dependent
+                  tag: ip
+                  value: '{#IP}'
                 -
-                  tag: type
-                  value: gauge
+                  tag: name
+                  value: '{#NAME}'
             -
               uuid: 152d25185f3e4e8b80ffea7d8ba25775
               name: 'Link [{#NAME}]:[{#IP}]: Packets out'
@@ -1628,26 +1434,23 @@ zabbix_export:
                 key: velocloud.get.clear_metrics
               tags:
                 -
+                  tag: component
+                  value: link
+                -
                   tag: edge
                   value: '{#EDGE}'
                 -
                   tag: enterprise
                   value: '{#ENTERPRISE}'
                 -
-                  tag: name
-                  value: '{#NAME}'
-                -
-                  tag: resource
-                  value: link
+                  tag: interface
+                  value: '{#IF}'
                 -
-                  tag: target
-                  value: velocloud
+                  tag: ip
+                  value: '{#IP}'
                 -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: gauge
+                  tag: name
+                  value: '{#NAME}'
             -
               uuid: b1d5964d030841e28a8b9e80c8152e7a
               name: 'Link [{#NAME}]:[{#IP}]: State'
@@ -1685,26 +1488,23 @@ zabbix_export:
                 key: velocloud.get.clear_metrics
               tags:
                 -
+                  tag: component
+                  value: link
+                -
                   tag: edge
                   value: '{#EDGE}'
                 -
                   tag: enterprise
                   value: '{#ENTERPRISE}'
                 -
-                  tag: name
-                  value: '{#NAME}'
+                  tag: interface
+                  value: '{#IF}'
                 -
-                  tag: resource
-                  value: link
-                -
-                  tag: target
-                  value: velocloud
-                -
-                  tag: transport
-                  value: dependent
+                  tag: ip
+                  value: '{#IP}'
                 -
-                  tag: type
-                  value: text
+                  tag: name
+                  value: '{#NAME}'
               trigger_prototypes:
                 -
                   uuid: abceaab09aea4cb482dc4b554502429b
@@ -1712,6 +1512,10 @@ zabbix_export:
                   name: 'Link [{#NAME}]:[{#IP}]: Link state is not "STABLE"'
                   priority: WARNING
                   description: 'Link state is not "STABLE".'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 43deb16e85644937a182b01eadb875d0
               name: 'Link [{#NAME}]:[{#IP}]: Total bytes'
@@ -1730,26 +1534,23 @@ zabbix_export:
                 key: velocloud.get.clear_metrics
               tags:
                 -
+                  tag: component
+                  value: link
+                -
                   tag: edge
                   value: '{#EDGE}'
                 -
                   tag: enterprise
                   value: '{#ENTERPRISE}'
                 -
-                  tag: name
-                  value: '{#NAME}'
+                  tag: interface
+                  value: '{#IF}'
                 -
-                  tag: resource
-                  value: link
+                  tag: ip
+                  value: '{#IP}'
                 -
-                  tag: target
-                  value: velocloud
-                -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: gauge
+                  tag: name
+                  value: '{#NAME}'
             -
               uuid: 622408bd703040339d1b4bdebed3280e
               name: 'Link [{#NAME}]:[{#IP}]: Total packets'
@@ -1768,26 +1569,23 @@ zabbix_export:
                 key: velocloud.get.clear_metrics
               tags:
                 -
+                  tag: component
+                  value: link
+                -
                   tag: edge
                   value: '{#EDGE}'
                 -
                   tag: enterprise
                   value: '{#ENTERPRISE}'
                 -
-                  tag: name
-                  value: '{#NAME}'
-                -
-                  tag: resource
-                  value: link
+                  tag: interface
+                  value: '{#IF}'
                 -
-                  tag: target
-                  value: velocloud
+                  tag: ip
+                  value: '{#IP}'
                 -
-                  tag: transport
-                  value: dependent
-                -
-                  tag: type
-                  value: gauge
+                  tag: name
+                  value: '{#NAME}'
           graph_prototypes:
             -
               uuid: d117ffc6c5f245099209ca3a471cc63f
@@ -1902,20 +1700,17 @@ zabbix_export:
                 key: velocloud.get.clear_metrics
               tags:
                 -
-                  tag: name
-                  value: '{#NAME}'
-                -
-                  tag: resource
-                  value: sdwanpath
+                  tag: component
+                  value: sdwan-path
                 -
-                  tag: target
-                  value: velocloud
+                  tag: destination
+                  value: '{#DESTINATION}'
                 -
-                  tag: transport
-                  value: dependent
+                  tag: name
+                  value: '{#NAME}'
                 -
-                  tag: type
-                  value: gauge
+                  tag: source
+                  value: '{#SOURCE}'
             -
               uuid: 2fa176affa6b46ffae3682ea7cb96866
               name: 'Path [{#NAME}]:[{#SOURCE} => {#DESTINATION}]: Bytes out'
@@ -1934,20 +1729,17 @@ zabbix_export:
                 key: velocloud.get.clear_metrics
               tags:
                 -
-                  tag: name
-                  value: '{#NAME}'
-                -
-                  tag: resource
-                  value: sdwanpath
+                  tag: component
+                  value: sdwan-path
                 -
-                  tag: target
-                  value: velocloud
+                  tag: destination
+                  value: '{#DESTINATION}'
                 -
-                  tag: transport
-                  value: dependent
+                  tag: name
+                  value: '{#NAME}'
                 -
-                  tag: type
-                  value: gauge
+                  tag: source
+                  value: '{#SOURCE}'
             -
               uuid: cf8f3d0c61994e49b493d79160da27bf
               name: 'Path [{#NAME}]:[{#SOURCE} => {#DESTINATION}]: Packets in'
@@ -1966,20 +1758,17 @@ zabbix_export:
                 key: velocloud.get.clear_metrics
               tags:
                 -
-                  tag: name
-                  value: '{#NAME}'
-                -
-                  tag: resource
-                  value: sdwanpath
+                  tag: component
+                  value: sdwan-path
                 -
-                  tag: target
-                  value: velocloud
+                  tag: destination
+                  value: '{#DESTINATION}'
                 -
-                  tag: transport
-                  value: dependent
+                  tag: name
+                  value: '{#NAME}'
                 -
-                  tag: type
-                  value: gauge
+                  tag: source
+                  value: '{#SOURCE}'
             -
               uuid: 49fc4e85c5a5415793fc89f2c3cdec8f
               name: 'Path [{#NAME}]:[{#SOURCE} => {#DESTINATION}]: Packets out'
@@ -1998,20 +1787,17 @@ zabbix_export:
                 key: velocloud.get.clear_metrics
               tags:
                 -
-                  tag: name
-                  value: '{#NAME}'
-                -
-                  tag: resource
-                  value: sdwanpath
+                  tag: component
+                  value: sdwan-path
                 -
-                  tag: target
-                  value: velocloud
+                  tag: destination
+                  value: '{#DESTINATION}'
                 -
-                  tag: transport
-                  value: dependent
+                  tag: name
+                  value: '{#NAME}'
                 -
-                  tag: type
-                  value: gauge
+                  tag: source
+                  value: '{#SOURCE}'
             -
               uuid: 98a0c2c3a3be47e9bd32cf719069cad2
               name: 'Path [{#NAME}]:[{#SOURCE} => {#DESTINATION}]: Packet Loss in'
@@ -2031,20 +1817,17 @@ zabbix_export:
                 key: velocloud.get.clear_metrics
               tags:
                 -
-                  tag: name
-                  value: '{#NAME}'
-                -
-                  tag: resource
-                  value: sdwanpath
+                  tag: component
+                  value: sdwan-path
                 -
-                  tag: target
-                  value: velocloud
+                  tag: destination
+                  value: '{#DESTINATION}'
                 -
-                  tag: transport
-                  value: dependent
+                  tag: name
+                  value: '{#NAME}'
                 -
-                  tag: type
-                  value: gauge
+                  tag: source
+                  value: '{#SOURCE}'
             -
               uuid: 0f2ef8113a3644feae7b827675362485
               name: 'Path [{#NAME}]:[{#SOURCE} => {#DESTINATION}]: Packet Loss out'
@@ -2064,20 +1847,17 @@ zabbix_export:
                 key: velocloud.get.clear_metrics
               tags:
                 -
-                  tag: name
-                  value: '{#NAME}'
+                  tag: component
+                  value: sdwan-path
                 -
-                  tag: resource
-                  value: sdwanpath
+                  tag: destination
+                  value: '{#DESTINATION}'
                 -
-                  tag: target
-                  value: velocloud
-                -
-                  tag: transport
-                  value: dependent
+                  tag: name
+                  value: '{#NAME}'
                 -
-                  tag: type
-                  value: gauge
+                  tag: source
+                  value: '{#SOURCE}'
             -
               uuid: 3a7ed14c13874c3088f28253a25a0c10
               name: 'Path [{#NAME}]:[{#SOURCE} => {#DESTINATION}]: Bytes total'
@@ -2096,20 +1876,17 @@ zabbix_export:
                 key: velocloud.get.clear_metrics
               tags:
                 -
-                  tag: name
-                  value: '{#NAME}'
-                -
-                  tag: resource
-                  value: sdwanpath
+                  tag: component
+                  value: sdwan-path
                 -
-                  tag: target
-                  value: velocloud
+                  tag: destination
+                  value: '{#DESTINATION}'
                 -
-                  tag: transport
-                  value: dependent
+                  tag: name
+                  value: '{#NAME}'
                 -
-                  tag: type
-                  value: gauge
+                  tag: source
+                  value: '{#SOURCE}'
             -
               uuid: 1f7bbdd7c1e24429878538b3b6bbddc4
               name: 'Path [{#NAME}]:[{#SOURCE} => {#DESTINATION}]: Total packets'
@@ -2128,20 +1905,17 @@ zabbix_export:
                 key: velocloud.get.clear_metrics
               tags:
                 -
-                  tag: name
-                  value: '{#NAME}'
-                -
-                  tag: resource
-                  value: sdwanpath
+                  tag: component
+                  value: sdwan-path
                 -
-                  tag: target
-                  value: velocloud
+                  tag: destination
+                  value: '{#DESTINATION}'
                 -
-                  tag: transport
-                  value: dependent
+                  tag: name
+                  value: '{#NAME}'
                 -
-                  tag: type
-                  value: gauge
+                  tag: source
+                  value: '{#SOURCE}'
           master_item:
             key: velocloud.get.clear_metrics
           lld_macro_paths:
@@ -2188,23 +1962,17 @@ zabbix_export:
                 key: velocloud.get.clear_metrics
               tags:
                 -
+                  tag: component
+                  value: sdwan-peer
+                -
                   tag: edge
                   value: '{#EDGE}'
                 -
                   tag: name
                   value: '{#NAME}'
                 -
-                  tag: resource
-                  value: sdwanpeer
-                -
-                  tag: target
-                  value: velocloud
-                -
-                  tag: transport
-                  value: dependent
-                -
                   tag: type
-                  value: gauge
+                  value: '{#TYPE}'
             -
               uuid: 08fb5b9cf8464e4382224515ba75953d
               name: 'SDWAN Peer [{#NAME}]:[{#TYPE}]: Description'
@@ -2228,23 +1996,17 @@ zabbix_export:
                 key: velocloud.get.clear_metrics
               tags:
                 -
+                  tag: component
+                  value: sdwan-peer
+                -
                   tag: edge
                   value: '{#EDGE}'
                 -
                   tag: name
                   value: '{#NAME}'
                 -
-                  tag: resource
-                  value: sdwanpeer
-                -
-                  tag: target
-                  value: velocloud
-                -
-                  tag: transport
-                  value: dependent
-                -
                   tag: type
-                  value: text
+                  value: '{#TYPE}'
             -
               uuid: ece78f083d55413ab82a33f03c0204ef
               name: 'SDWAN Peer [{#NAME}]:[{#TYPE}]: Stable path'
@@ -2262,23 +2024,17 @@ zabbix_export:
                 key: velocloud.get.clear_metrics
               tags:
                 -
+                  tag: component
+                  value: sdwan-peer
+                -
                   tag: edge
                   value: '{#EDGE}'
                 -
                   tag: name
                   value: '{#NAME}'
                 -
-                  tag: resource
-                  value: sdwanpeer
-                -
-                  tag: target
-                  value: velocloud
-                -
-                  tag: transport
-                  value: dependent
-                -
                   tag: type
-                  value: gauge
+                  value: '{#TYPE}'
             -
               uuid: 3884e4bf4e8a46508c04a6cd06ae1513
               name: 'SDWAN Peer [{#NAME}]:[{#TYPE}]: Standby path'
@@ -2296,23 +2052,17 @@ zabbix_export:
                 key: velocloud.get.clear_metrics
               tags:
                 -
+                  tag: component
+                  value: sdwan-peer
+                -
                   tag: edge
                   value: '{#EDGE}'
                 -
                   tag: name
                   value: '{#NAME}'
                 -
-                  tag: resource
-                  value: sdwanpeer
-                -
-                  tag: target
-                  value: velocloud
-                -
-                  tag: transport
-                  value: dependent
-                -
                   tag: type
-                  value: gauge
+                  value: '{#TYPE}'
             -
               uuid: 39389b7b594e4b5da678ff985da0ba2a
               name: 'SDWAN Peer [{#NAME}]:[{#TYPE}]: Total path'
@@ -2330,23 +2080,17 @@ zabbix_export:
                 key: velocloud.get.clear_metrics
               tags:
                 -
+                  tag: component
+                  value: sdwan-peer
+                -
                   tag: edge
                   value: '{#EDGE}'
                 -
                   tag: name
                   value: '{#NAME}'
                 -
-                  tag: resource
-                  value: sdwanpeer
-                -
-                  tag: target
-                  value: velocloud
-                -
-                  tag: transport
-                  value: dependent
-                -
                   tag: type
-                  value: gauge
+                  value: '{#TYPE}'
             -
               uuid: 474e118fa98340f68c73f4ddc5f54f5e
               name: 'SDWAN Peer [{#NAME}]:[{#TYPE}]: Unknown path'
@@ -2364,23 +2108,17 @@ zabbix_export:
                 key: velocloud.get.clear_metrics
               tags:
                 -
+                  tag: component
+                  value: sdwan-peer
+                -
                   tag: edge
                   value: '{#EDGE}'
                 -
                   tag: name
                   value: '{#NAME}'
                 -
-                  tag: resource
-                  value: sdwanpeer
-                -
-                  tag: target
-                  value: velocloud
-                -
-                  tag: transport
-                  value: dependent
-                -
                   tag: type
-                  value: gauge
+                  value: '{#TYPE}'
             -
               uuid: 4e93b5e2f88747b093aba97d94d433f2
               name: 'SDWAN Peer [{#NAME}]:[{#TYPE}]: Unstable path'
@@ -2398,23 +2136,17 @@ zabbix_export:
                 key: velocloud.get.clear_metrics
               tags:
                 -
+                  tag: component
+                  value: sdwan-peer
+                -
                   tag: edge
                   value: '{#EDGE}'
                 -
                   tag: name
                   value: '{#NAME}'
                 -
-                  tag: resource
-                  value: sdwanpeer
-                -
-                  tag: target
-                  value: velocloud
-                -
-                  tag: transport
-                  value: dependent
-                -
                   tag: type
-                  value: gauge
+                  value: '{#TYPE}'
           graph_prototypes:
             -
               uuid: 36438b5369794ea8a9147ec7675bc1a6
@@ -2476,6 +2208,13 @@ zabbix_export:
               type: DISCARD_UNCHANGED_HEARTBEAT
               parameters:
                 - 1h
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: vmware-sd-wan-velocloud
       macros:
         -
           macro: '{$VELOCLOUD.LLD.EDGES.FILTER.MATCHES}'
diff --git a/templates/net/zyxel_snmp/zyxel_aam1212-51_snmp/README.md b/templates/net/zyxel_snmp/zyxel_aam1212-51_snmp/README.md
index 8e844f846d6..496d7bd3c6f 100644
--- a/templates/net/zyxel_snmp/zyxel_aam1212-51_snmp/README.md
+++ b/templates/net/zyxel_snmp/zyxel_aam1212-51_snmp/README.md
@@ -39,10 +39,10 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
+|ADSL interface discovery |<p>-</p> |SNMP |zyxel.aam1212.net.adsl.discovery<p>**Filter**:</p>AND <p>- {#ZYXEL.IF.LINKSTATUS} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKSTATUS.MATCHES}`</p><p>- {#ZYXEL.IF.LINKSTATUS} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKSTATUS.NOT_MATCHES}`</p><p>- {#ZYXEL.IF.NAME} MATCHES_REGEX `adsl`</p><p>**Overrides:**</p><p>Don't create triggers for matching interface<br> - {#ZYXEL.IF.NAME} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}`<br>  - TRIGGER_PROTOTYPE REGEXP `.*` - NO_DISCOVER</p> |
+|Ethernet interface discovery |<p>-</p> |SNMP |zyxel.aam1212.net.if.discovery<p>**Filter**:</p>AND <p>- {#ZYXEL.IF.LINKSTATUS} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKSTATUS.MATCHES}`</p><p>- {#ZYXEL.IF.LINKSTATUS} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKSTATUS.NOT_MATCHES}`</p><p>- {#ZYXEL.IF.NAME} MATCHES_REGEX `enet`</p><p>**Overrides:**</p><p>Don't create triggers for matching interface<br> - {#ZYXEL.IF.NAME} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}`<br>  - TRIGGER_PROTOTYPE REGEXP `.*` - NO_DISCOVER</p> |
 |Temperature discovery |<p>An entry in tempTable.</p> |SNMP |zyxel.aam1212.temp.discovery |
 |Voltage discovery |<p>An entry in voltageTable.</p> |SNMP |zyxel.aam1212.volt.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
-|Ethernet interface discovery |<p>-</p> |SNMP |zyxel.aam1212.net.if.discovery<p>**Filter**:</p>AND <p>- {#ZYXEL.IF.LINKSTATUS} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKSTATUS.MATCHES}`</p><p>- {#ZYXEL.IF.LINKSTATUS} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKSTATUS.NOT_MATCHES}`</p><p>- {#ZYXEL.IF.NAME} MATCHES_REGEX `enet`</p><p>**Overrides:**</p><p>Don't create triggers for matching interface<br> - {#ZYXEL.IF.NAME} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}`<br>  - TRIGGER_PROTOTYPE REGEXP `.*` - NO_DISCOVER</p> |
-|ADSL interface discovery |<p>-</p> |SNMP |zyxel.aam1212.net.adsl.discovery<p>**Filter**:</p>AND <p>- {#ZYXEL.IF.LINKSTATUS} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKSTATUS.MATCHES}`</p><p>- {#ZYXEL.IF.LINKSTATUS} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKSTATUS.NOT_MATCHES}`</p><p>- {#ZYXEL.IF.NAME} MATCHES_REGEX `adsl`</p><p>**Overrides:**</p><p>Don't create triggers for matching interface<br> - {#ZYXEL.IF.NAME} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}`<br>  - TRIGGER_PROTOTYPE REGEXP `.*` - NO_DISCOVER</p> |
 
 ## Items collected
 
@@ -55,23 +55,23 @@ There are no template links in this template.
 |Inventory |ZYXEL AAM1212-51 / IES-612: MAC address |<p>MIB: IF-MIB</p><p>The interface's address at the protocol layer</p><p>immediately `below' the network layer in the</p><p>protocol stack.  For interfaces which do not have</p><p>such an address (e.g., a serial line), this object</p><p>should contain an octet string of zero length.</p> |SNMP |zyxel.aam1212.mac<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Inventory |ZYXEL AAM1212-51 / IES-612: ZyNOS F/W Version |<p>MIB: ZYXEL-IESCOMMON-MIB</p> |SNMP |zyxel.aam1212.fwversion<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Inventory |ZYXEL AAM1212-51 / IES-612: Hardware serial number |<p>MIB: ZYXEL-IESCOMMON-MIB</p><p>Serial number</p> |SNMP |zyxel.aam1212.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL AAM1212-51 / IES-612: Port {#ZYXEL.IF.NAME}: Interface name |<p>MIB: IF-MIB</p><p>A textual string containing information about the interface</p> |SNMP |zyxel.aam1212.net.if.name[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL AAM1212-51 / IES-612: Port {#ZYXEL.IF.NAME}: Operational status |<p>MIB: IF-MIB</p><p>The current operational state of the interface.</p><p>The testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.aam1212.net.if.operstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL AAM1212-51 / IES-612: Port {#ZYXEL.IF.NAME}: Administrative status |<p>MIB: IF-MIB</p><p>The desired state of the interface.  The</p><p>testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.aam1212.net.if.adminstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL AAM1212-51 / IES-612: Port {#ZYXEL.IF.NAME}: Incoming traffic |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface,</p><p>including framing characters.</p> |SNMP |zyxel.aam1212.net.if.in.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL AAM1212-51 / IES-612: Port {#ZYXEL.IF.NAME}: Outgoing traffic |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the</p><p>interface, including framing characters.  This object is a</p><p>64-bit version of ifOutOctets.</p> |SNMP |zyxel.aam1212.net.if.out.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL AAM1212-51 / IES-612: Port {#SNMPINDEX}: Interface name |<p>MIB: IF-MIB</p><p>A textual string containing information about the interface</p> |SNMP |zyxel.aam1212.net.adsl.name[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL AAM1212-51 / IES-612: Port {#SNMPINDEX}: Operational status |<p>MIB: IF-MIB</p><p>The current operational state of the interface.</p><p>The testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.aam1212.net.adsl.operstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL AAM1212-51 / IES-612: Port {#SNMPINDEX}: Administrative status |<p>MIB: IF-MIB</p><p>The desired state of the interface.  The</p><p>testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.aam1212.net.adsl.adminstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL AAM1212-51 / IES-612: Port {#SNMPINDEX}: Incoming traffic |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface,</p><p>including framing characters.</p> |SNMP |zyxel.aam1212.net.adsl.in.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL AAM1212-51 / IES-612: Port {#SNMPINDEX}: Outgoing traffic |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the</p><p>interface, including framing characters.  This object is a</p><p>64-bit version of ifOutOctets.</p> |SNMP |zyxel.aam1212.net.adsl.out.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL AAM1212-51 / IES-612: Port {#SNMPINDEX}: ATUC noise margin |<p>MIB: ADSL-LINE-MIB</p><p>Noise Margin as seen by this ATU with respect to its</p><p>received signal in tenth dB.</p><p>The Info Atuc fields show data acquired from the ATUC (ADSL Termination Unit – Central), in this case ZYXEL AAM1212-51 / IES-612, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.aam1212.net.adsl.atuc.snrmgn[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL AAM1212-51 / IES-612: Port {#SNMPINDEX}: ATUC attenuation |<p>MIB: ADSL-LINE-MIB</p><p>Measured difference in the total power transmitted by</p><p>the peer ATU and the total power received by this ATU.</p><p>The Info Atuc fields show data acquired from the ATUC (ADSL Termination Unit – Central), in this case ZYXEL AAM1212-51 / IES-612, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.aam1212.net.adsl.atuc.atn[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL AAM1212-51 / IES-612: Port {#SNMPINDEX}: ATUC output power |<p>MIB: ADSL-LINE-MIB</p><p>Measured total output power transmitted by this ATU.</p><p>The Info Atuc fields show data acquired from the ATUC (ADSL Termination Unit – Central), in this case ZYXEL AAM1212-51 / IES-612, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.aam1212.net.adsl.atuc.outpwr[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL AAM1212-51 / IES-612: Port {#SNMPINDEX}: ATUR noise margin |<p>MIB: ADSL-LINE-MIB</p><p>Noise Margin as seen by this ATU with respect to its</p><p>received signal in tenth dB.</p><p>The Info Atur fields show data acquired from the ATUR (ADSL Termination Unit – Remote), in this case the subscriber's ADSL modem or router, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.aam1212.net.adsl.atur.snrmgn[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL AAM1212-51 / IES-612: Port {#SNMPINDEX}: ATUR attenuation |<p>MIB: ADSL-LINE-MIB</p><p>Measured difference in the total power transmitted by</p><p>the peer ATU and the total power received by this ATU.</p><p>The Info Atur fields show data acquired from the ATUR (ADSL Termination Unit – Remote), in this case the subscriber's ADSL modem or router, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.aam1212.net.adsl.atur.atn[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL AAM1212-51 / IES-612: Port {#SNMPINDEX}: ATUR output power |<p>MIB: ADSL-LINE-MIB</p><p>Measured total output power transmitted by this ATU.</p><p>The Info Atur fields show data acquired from the ATUR (ADSL Termination Unit – Remote), in this case the subscriber's ADSL modem or router, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.aam1212.net.adsl.atur.outpwr[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Power_supply |ZYXEL AAM1212-51 / IES-612: Nominal "{#ZYXEL.VOLT.NOMINAL}" |<p>MIB: ZYXEL-IESCOMMON-MIB</p><p>The current voltage reading.</p> |SNMP |zyxel.aam1212.volt[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL AAM1212-51 / IES-612: Port {#ZYXEL.IF.NAME}: Interface name |<p>MIB: IF-MIB</p><p>A textual string containing information about the interface</p> |SNMP |zyxel.aam1212.net.if.name[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL AAM1212-51 / IES-612: Port {#ZYXEL.IF.NAME}: Operational status |<p>MIB: IF-MIB</p><p>The current operational state of the interface.</p><p>The testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.aam1212.net.if.operstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL AAM1212-51 / IES-612: Port {#ZYXEL.IF.NAME}: Administrative status |<p>MIB: IF-MIB</p><p>The desired state of the interface.  The</p><p>testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.aam1212.net.if.adminstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL AAM1212-51 / IES-612: Port {#ZYXEL.IF.NAME}: Incoming traffic |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface,</p><p>including framing characters.</p> |SNMP |zyxel.aam1212.net.if.in.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL AAM1212-51 / IES-612: Port {#ZYXEL.IF.NAME}: Outgoing traffic |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the</p><p>interface, including framing characters.  This object is a</p><p>64-bit version of ifOutOctets.</p> |SNMP |zyxel.aam1212.net.if.out.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL AAM1212-51 / IES-612: Port {#SNMPINDEX}: Interface name |<p>MIB: IF-MIB</p><p>A textual string containing information about the interface</p> |SNMP |zyxel.aam1212.net.adsl.name[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL AAM1212-51 / IES-612: Port {#SNMPINDEX}: Operational status |<p>MIB: IF-MIB</p><p>The current operational state of the interface.</p><p>The testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.aam1212.net.adsl.operstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL AAM1212-51 / IES-612: Port {#SNMPINDEX}: Administrative status |<p>MIB: IF-MIB</p><p>The desired state of the interface.  The</p><p>testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.aam1212.net.adsl.adminstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL AAM1212-51 / IES-612: Port {#SNMPINDEX}: Incoming traffic |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface,</p><p>including framing characters.</p> |SNMP |zyxel.aam1212.net.adsl.in.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL AAM1212-51 / IES-612: Port {#SNMPINDEX}: Outgoing traffic |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the</p><p>interface, including framing characters.  This object is a</p><p>64-bit version of ifOutOctets.</p> |SNMP |zyxel.aam1212.net.adsl.out.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL AAM1212-51 / IES-612: Port {#SNMPINDEX}: ATUC noise margin |<p>MIB: ADSL-LINE-MIB</p><p>Noise Margin as seen by this ATU with respect to its</p><p>received signal in tenth dB.</p><p>The Info Atuc fields show data acquired from the ATUC (ADSL Termination Unit – Central), in this case ZYXEL AAM1212-51 / IES-612, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.aam1212.net.adsl.atuc.snrmgn[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL AAM1212-51 / IES-612: Port {#SNMPINDEX}: ATUC attenuation |<p>MIB: ADSL-LINE-MIB</p><p>Measured difference in the total power transmitted by</p><p>the peer ATU and the total power received by this ATU.</p><p>The Info Atuc fields show data acquired from the ATUC (ADSL Termination Unit – Central), in this case ZYXEL AAM1212-51 / IES-612, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.aam1212.net.adsl.atuc.atn[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL AAM1212-51 / IES-612: Port {#SNMPINDEX}: ATUC output power |<p>MIB: ADSL-LINE-MIB</p><p>Measured total output power transmitted by this ATU.</p><p>The Info Atuc fields show data acquired from the ATUC (ADSL Termination Unit – Central), in this case ZYXEL AAM1212-51 / IES-612, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.aam1212.net.adsl.atuc.outpwr[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL AAM1212-51 / IES-612: Port {#SNMPINDEX}: ATUR noise margin |<p>MIB: ADSL-LINE-MIB</p><p>Noise Margin as seen by this ATU with respect to its</p><p>received signal in tenth dB.</p><p>The Info Atur fields show data acquired from the ATUR (ADSL Termination Unit – Remote), in this case the subscriber's ADSL modem or router, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.aam1212.net.adsl.atur.snrmgn[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL AAM1212-51 / IES-612: Port {#SNMPINDEX}: ATUR attenuation |<p>MIB: ADSL-LINE-MIB</p><p>Measured difference in the total power transmitted by</p><p>the peer ATU and the total power received by this ATU.</p><p>The Info Atur fields show data acquired from the ATUR (ADSL Termination Unit – Remote), in this case the subscriber's ADSL modem or router, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.aam1212.net.adsl.atur.atn[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL AAM1212-51 / IES-612: Port {#SNMPINDEX}: ATUR output power |<p>MIB: ADSL-LINE-MIB</p><p>Measured total output power transmitted by this ATU.</p><p>The Info Atur fields show data acquired from the ATUR (ADSL Termination Unit – Remote), in this case the subscriber's ADSL modem or router, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.aam1212.net.adsl.atur.outpwr[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Power supply |ZYXEL AAM1212-51 / IES-612: Nominal "{#ZYXEL.VOLT.NOMINAL}" |<p>MIB: ZYXEL-IESCOMMON-MIB</p><p>The current voltage reading.</p> |SNMP |zyxel.aam1212.volt[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Status |ZYXEL AAM1212-51 / IES-612: SNMP agent availability |<p>-</p> |INTERNAL |zabbix[host,snmp,available]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Status |ZYXEL AAM1212-51 / IES-612: Uptime |<p>MIB: RFC1213-MIB</p><p>The time (in hundredths of a second) since the</p><p>network management portion of the system was last</p><p>re-initialized.</p> |SNMP |zyxel.aam1212.uptime<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.01`</p> |
 |Status |ZYXEL AAM1212-51 / IES-612: Alarm status |<p>MIB: ZYXEL-IESCOMMON-MIB</p><p>This variable indicates the alarm status of the module.</p><p>It is a bit map represented a sum, therefore, it can represent</p><p>multiple defects simultaneously. The moduleNoDefect should be set</p><p>if and only if no other flag is set.</p><p>The various bit positions are:</p><p>1   moduleNoDefect</p><p>2   moduleOverHeat</p><p>3   moduleFanRpmLow</p><p>4   moduleVoltageLow</p><p>5   moduleThermalSensorFailure</p><p>6   modulePullOut</p><p>7   powerDC48VAFailure</p><p>8   powerDC48VBFailure</p><p>9   extAlarmInputTrigger</p><p>10   moduleDown</p><p>11   mscSwitchOverOK</p><p>12   networkTopologyChange</p><p>13   macSpoof</p><p>14   cpuHigh</p><p>15   memoryUsageHigh</p><p>16   packetBufferUsageHigh</p><p>17   loopguardOccurence</p> |SNMP |zyxel.aam1212.slot.alarm<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
@@ -100,7 +100,7 @@ There are no template links in this template.
 
 Please report any issues with the template at https://support.zabbix.com
 
-You can also provide a feedback, discuss the template or ask for help with it at [ZABBIX forums](https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/422668-discussion-thread-for-official-zabbix-templates-for-zyxel).
+You can also provide feedback, discuss the template or ask for help with it at [ZABBIX forums](https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/422668-discussion-thread-for-official-zabbix-templates-for-zyxel).
 
 ## Known Issues
 
diff --git a/templates/net/zyxel_snmp/zyxel_aam1212-51_snmp/template_net_zyxel_aam1212-51_snmp.yaml b/templates/net/zyxel_snmp/zyxel_aam1212-51_snmp/template_net_zyxel_aam1212-51_snmp.yaml
index 9b8a3b11870..05595b8f23a 100644
--- a/templates/net/zyxel_snmp/zyxel_aam1212-51_snmp/template_net_zyxel_aam1212-51_snmp.yaml
+++ b/templates/net/zyxel_snmp/zyxel_aam1212-51_snmp/template_net_zyxel_aam1212-51_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-17T06:33:55Z'
+  date: '2022-01-26T09:52:02Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -27,7 +27,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/422668-discussion-thread-for-official-zabbix-templates-for-zyxel
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: 'Templates/Network devices'
@@ -47,8 +47,8 @@ zabbix_export:
                 - 1h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: network
           triggers:
             -
               uuid: 40839f3008b84e3c9ffa8858bd2ab616
@@ -57,6 +57,10 @@ zabbix_export:
               opdata: 'Current state: {ITEM.LASTVALUE1}'
               priority: WARNING
               description: 'SNMP is not available for polling. Please check device connectivity and SNMP settings.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 9b04315c5e9a41eea5f50623c83f21d0
           name: 'ZYXEL AAM1212-51 / IES-612: Contact'
@@ -80,8 +84,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
         -
           uuid: 6b29fd2b27fe4788bef1e4072430d5bd
           name: 'ZYXEL AAM1212-51 / IES-612: ZyNOS F/W Version'
@@ -101,8 +105,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
           triggers:
             -
               uuid: 02ba3941993f48ca8d5f40b3b19804e8
@@ -112,6 +116,10 @@ zabbix_export:
               priority: INFO
               description: 'Firmware version has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: ea699e392c154a79927a056ff050c59d
           name: 'ZYXEL AAM1212-51 / IES-612: Location'
@@ -134,8 +142,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
         -
           uuid: d2cabaa6e083489b8b11e6a349ba1bc9
           name: 'ZYXEL AAM1212-51 / IES-612: MAC address'
@@ -161,8 +169,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
         -
           uuid: 31840a6849f7437bbb77334128c9e90b
           name: 'ZYXEL AAM1212-51 / IES-612: Hardware model name'
@@ -189,8 +197,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
           triggers:
             -
               uuid: 5a3f459afc4f42fb90849e98c7639a96
@@ -198,6 +206,10 @@ zabbix_export:
               name: 'ZYXEL AAM1212-51 / IES-612: Template does not match hardware'
               priority: INFO
               description: 'This template is for Zyxel AAM1212-51 / IES-612, but connected to {ITEM.VALUE}'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 59628c9211c444228b6d8d9ddb30af54
           name: 'ZYXEL AAM1212-51 / IES-612: Host name'
@@ -221,8 +233,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
         -
           uuid: 33df8d594d7f4e4aa148927b117f30df
           name: 'ZYXEL AAM1212-51 / IES-612: Hardware serial number'
@@ -244,8 +256,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
           triggers:
             -
               uuid: 7528520bca7c4524b7451aeaca440cc5
@@ -254,6 +266,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 4efb46536e8a43e78cd26ae90bd2ab83
           name: 'ZYXEL AAM1212-51 / IES-612: Alarm status'
@@ -319,8 +335,11 @@ zabbix_export:
                   return outArray.join();
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: line-card
+            -
+              tag: interface
+              value: 'slot-{#ZYXEL.SLOT.ID}'
           triggers:
             -
               uuid: eec541b07a434770b2a3301825cc5e82
@@ -328,6 +347,10 @@ zabbix_export:
               name: 'ZYXEL AAM1212-51 / IES-612: Port {#SNMPINDEX} alarm'
               priority: AVERAGE
               description: 'The slot reported an error.'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 6fe78b9b065243b8bcebf8f6c234f868
           name: 'ZYXEL AAM1212-51 / IES-612: Uptime'
@@ -350,8 +373,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 819190f68248439292fc4622c3eec5a9
@@ -360,6 +383,10 @@ zabbix_export:
               priority: INFO
               description: 'Uptime is less than 10 minutes'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
       discovery_rules:
         -
           uuid: c0fa2c901419420eaaa2a64e59fbad29
@@ -406,8 +433,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 010b15528a8d498bb8f77db9c548bc8e
               name: 'ZYXEL AAM1212-51 / IES-612: Port {#SNMPINDEX}: ATUC attenuation'
@@ -433,8 +466,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 0c78247a1003496abab584a526777a40
@@ -442,6 +481,10 @@ zabbix_export:
                   name: 'ZYXEL AAM1212-51 / IES-612: High the DSL line attenuation in Port {#SNMPINDEX} (>{$ZYXEL.ADSL.ATN.MAX}dB for 5m)'
                   priority: WARNING
                   description: 'The reductions in amplitude of the downstream and upstream DSL signals.'
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
             -
               uuid: 382d9f2f9458423eb887b6fd28697c3a
               name: 'ZYXEL AAM1212-51 / IES-612: Port {#SNMPINDEX}: ATUC output power'
@@ -466,8 +509,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: a273e455881948a895eb60b453ce8f61
               name: 'ZYXEL AAM1212-51 / IES-612: Port {#SNMPINDEX}: ATUC noise margin'
@@ -493,8 +542,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 14cbae6c16c245b09ed46e0cc01a556c
@@ -502,6 +557,10 @@ zabbix_export:
                   name: 'ZYXEL AAM1212-51 / IES-612: Low the DSL line noise margins in Port {#SNMPINDEX} (<{$ZYXEL.ADSL.SNR.MIN}dB for 5m)'
                   priority: WARNING
                   description: 'Signal-to-noise margin (SNR Margin) which is the difference between the actual SNR and the SNR required to sync at a specific speed'
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
             -
               uuid: 3bfa258832dd49cca9ced6d5d78252d1
               name: 'ZYXEL AAM1212-51 / IES-612: Port {#SNMPINDEX}: ATUR attenuation'
@@ -527,8 +586,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: e917c9a8d6bb4af3a40c6c5b41f90c22
@@ -536,6 +601,10 @@ zabbix_export:
                   name: 'ZYXEL AAM1212-51 / IES-612: High the DSL line attenuation in Port {#SNMPINDEX} (>{$ZYXEL.ADSL.ATN.MAX}dB for 5m)'
                   priority: WARNING
                   description: 'The reductions in amplitude of the downstream and upstream DSL signals.'
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
             -
               uuid: da2105dce83d4f619b69a9c8e5875bac
               name: 'ZYXEL AAM1212-51 / IES-612: Port {#SNMPINDEX}: ATUR output power'
@@ -560,8 +629,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: e59b98a685874f888557eb3d1c41a828
               name: 'ZYXEL AAM1212-51 / IES-612: Port {#SNMPINDEX}: ATUR noise margin'
@@ -587,8 +662,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 125b08332e2f409985cade88ab3842f1
@@ -596,6 +677,10 @@ zabbix_export:
                   name: 'ZYXEL AAM1212-51 / IES-612: Low the DSL line noise margins in Port {#SNMPINDEX} (<{$ZYXEL.ADSL.SNR.MIN}dB for 5m)'
                   priority: WARNING
                   description: 'Signal-to-noise margin (SNR Margin) which is the difference between the actual SNR and the SNR required to sync at a specific speed'
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
             -
               uuid: 70fa53318d354503b44b70696cb8ccd2
               name: 'ZYXEL AAM1212-51 / IES-612: Port {#SNMPINDEX}: Incoming traffic'
@@ -619,8 +704,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 53241d402d0f4b4ca826f9712ad1af69
               name: 'ZYXEL AAM1212-51 / IES-612: Port {#SNMPINDEX}: Interface name'
@@ -640,8 +731,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 53ff6ee2132a4503890c35919baa2fd8
               name: 'ZYXEL AAM1212-51 / IES-612: Port {#SNMPINDEX}: Operational status'
@@ -663,8 +760,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 956fc99c2c5341a2b29ba2f302cc0a3a
@@ -681,6 +784,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 021b85f4efea4be9834e7959ed2471f5
               name: 'ZYXEL AAM1212-51 / IES-612: Port {#SNMPINDEX}: Outgoing traffic'
@@ -705,8 +812,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           graph_prototypes:
             -
               uuid: 09d34a6f9dd2499b8759e15301eefdb5
@@ -786,8 +899,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#ZYXEL.IF.NAME}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: f5dd08da51664f1d82a16b0826cdb9ce
               name: 'ZYXEL AAM1212-51 / IES-612: Port {#ZYXEL.IF.NAME}: Incoming traffic'
@@ -811,8 +930,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#ZYXEL.IF.NAME}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: e2a630669e924f069b98d11a32737411
               name: 'ZYXEL AAM1212-51 / IES-612: Port {#ZYXEL.IF.NAME}: Interface name'
@@ -832,8 +957,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#ZYXEL.IF.NAME}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 6232538bf48a4f12a1f85164dc95bcf8
               name: 'ZYXEL AAM1212-51 / IES-612: Port {#ZYXEL.IF.NAME}: Operational status'
@@ -855,8 +986,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#ZYXEL.IF.NAME}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 805f49836f794aad9ee00f66dd90ffc1
@@ -873,6 +1010,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: d69676fc00e64c97afd7da416891b0ef
               name: 'ZYXEL AAM1212-51 / IES-612: Port {#ZYXEL.IF.NAME}: Outgoing traffic'
@@ -897,8 +1038,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#ZYXEL.IF.NAME}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           graph_prototypes:
             -
               uuid: 4f5b714c04a44fbb9a64399c831b2980
@@ -960,8 +1107,11 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: sensor
+                -
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 321b2efb6e8e4117949b3644cc101ff2
@@ -970,6 +1120,10 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the temperature'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
           graph_prototypes:
             -
               uuid: 00cd199f1e114fcbafbd3dd19c1b2f47
@@ -1012,8 +1166,11 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Power supply'
+                  tag: component
+                  value: sensor
+                -
+                  tag: component
+                  value: voltage
               trigger_prototypes:
                 -
                   uuid: a7aa1ae207bb462bb23d3f2fca2c3533
@@ -1022,6 +1179,10 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the power supply'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
           graph_prototypes:
             -
               uuid: afdd9501f85c4c9f9a81b8f16968990b
@@ -1048,6 +1209,19 @@ zabbix_export:
                       outArr.push(item)
                   });
                   return JSON.stringify(outArr);
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: aam1212-51
+        -
+          tag: target
+          value: dslam
+        -
+          tag: target
+          value: zyxel
       macros:
         -
           macro: '{$SNMP.TIMEOUT}'
diff --git a/templates/net/zyxel_snmp/zyxel_es3500-8pd_snmp/README.md b/templates/net/zyxel_snmp/zyxel_es3500-8pd_snmp/README.md
index 75dc6cb1e38..de16b5ce1e7 100644
--- a/templates/net/zyxel_snmp/zyxel_es3500-8pd_snmp/README.md
+++ b/templates/net/zyxel_snmp/zyxel_es3500-8pd_snmp/README.md
@@ -46,12 +46,12 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|Temperature discovery |<p>An entry in tempTable.</p><p>Index of temperature unit. 1:MAC, 2:CPU, 3:PHY</p> |SNMP |zyxel.3500_8pd.temp.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
-|Voltage discovery |<p>An entry in voltageTable.</p> |SNMP |zyxel.3500_8pd.volt.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
 |Interface discovery |<p>-</p> |SNMP |zyxel.3500_8pd.net.if.discovery<p>**Filter**:</p>AND <p>- {#ZYXEL.IF.NAME} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.NAME.MATCHES}`</p><p>- {#ZYXEL.IF.NAME} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.NAME.NOT_MATCHES}`</p><p>- {#ZYXEL.IF.LINKUPTYPE} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.MATCHES}`</p><p>- {#ZYXEL.IF.LINKUPTYPE} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.NOT_MATCHES}`</p><p>**Overrides:**</p><p>Don't create triggers for matching interface<br> - {#ZYXEL.IF.NAME} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}`<br>  - TRIGGER_PROTOTYPE REGEXP `.*` - NO_DISCOVER</p> |
-|SFP without DDM discovery |<p>SFP module discovery.</p> |SNMP |zyxel.3500_8pd.sfp.discovery<p>**Filter**:</p>AND <p>- {#ZYXEL.SFP.STATUS} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFP.STATUS.MATCHES}`</p><p>- {#ZYXEL.SFP.STATUS} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFP.STATUS.NOT_MATCHES}`</p> |
-|SFP with DDM discovery |<p>SFP DDM module discovery.</p> |SNMP |zyxel.3500_8pd.sfp.ddm.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>**Filter**:</p>AND <p>- {#ZYXEL.SFP.DESCRIPTION} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFPDDM.DESC.MATCHES}`</p><p>- {#ZYXEL.SFP.DESCRIPTION} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFPDDM.DESC.NOT_MATCHES}`</p> |
 |Memory pool discovery |<p>-</p> |SNMP |zyxel.3500_8pd.memory.discovery |
+|SFP with DDM discovery |<p>SFP DDM module discovery.</p> |SNMP |zyxel.3500_8pd.sfp.ddm.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>**Filter**:</p>AND <p>- {#ZYXEL.SFP.DESCRIPTION} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFPDDM.DESC.MATCHES}`</p><p>- {#ZYXEL.SFP.DESCRIPTION} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFPDDM.DESC.NOT_MATCHES}`</p> |
+|SFP without DDM discovery |<p>SFP module discovery.</p> |SNMP |zyxel.3500_8pd.sfp.discovery<p>**Filter**:</p>AND <p>- {#ZYXEL.SFP.STATUS} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFP.STATUS.MATCHES}`</p><p>- {#ZYXEL.SFP.STATUS} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFP.STATUS.NOT_MATCHES}`</p> |
+|Temperature discovery |<p>An entry in tempTable.</p><p>Index of temperature unit. 1:MAC, 2:CPU, 3:PHY</p> |SNMP |zyxel.3500_8pd.temp.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
+|Voltage discovery |<p>An entry in voltageTable.</p> |SNMP |zyxel.3500_8pd.volt.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
 
 ## Items collected
 
@@ -66,32 +66,32 @@ There are no template links in this template.
 |Inventory |ZYXEL ES3500-8PD: ZyNOS F/W Version |<p>MIB: ZYXEL-ES3500-8PD-MIB</p> |SNMP |zyxel.3500_8pd.fwversion<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
 |Inventory |ZYXEL ES3500-8PD: Hardware serial number |<p>MIB: ZYXEL-ES3500-8PD-MIB</p><p>Serial number</p> |SNMP |zyxel.3500_8pd.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Memory |ZYXEL ES3500-8PD: Memory "{#ZYXEL.MEMORY.NAME}" utilization |<p>MIB: ZYXEL-ES3500-8PD-MIB</p><p>Utilization of memory pool in %.</p> |SNMP |zyxel.3500_8pd.memory[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL ES3500-8PD: Port {#SNMPINDEX}: Speed Duplex |<p>MIB:  ZYXEL-ES3500-8PD-MIB</p><p>Transmission mode</p> |SNMP |zyxel.3500_8pd.net.if.speed_duplex[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL ES3500-8PD: Port {#SNMPINDEX}: Interface description |<p>MIB:  ZYXEL-ES3500-8PD-MIB</p><p>A textual string containing information about the interface</p> |SNMP |zyxel.3500_8pd.net.if.name[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL ES3500-8PD: Port {#SNMPINDEX}: Link type |<p>MIB:  ZYXEL-ES3500-8PD-MIB</p><p>Physical connection type</p> |SNMP |zyxel.3500_8pd.net.if.link_type[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL ES3500-8PD: Port {#SNMPINDEX}: Interface name |<p>MIB: IF-MIB</p><p>A textual string containing information about the interface</p> |SNMP |zyxel.3500_8pd.net.if.descr[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL ES3500-8PD: Port {#SNMPINDEX}: Operational status |<p>MIB: IF-MIB</p><p>The current operational state of the interface.</p><p>The testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.3500_8pd.net.if.operstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL ES3500-8PD: Port {#SNMPINDEX}: Administrative status |<p>MIB: IF-MIB</p><p>The desired state of the interface.  The</p><p>testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.3500_8pd.net.if.adminstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL ES3500-8PD: Port {#SNMPINDEX}: Incoming traffic |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface,</p><p>including framing characters.</p> |SNMP |zyxel.3500_8pd.net.if.in.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL ES3500-8PD: Port {#SNMPINDEX}: Incoming unicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were not addressed to a multicast</p><p>or broadcast address at this sub-layer</p> |SNMP |zyxel.3500_8pd.net.if.in.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL ES3500-8PD: Port {#SNMPINDEX}: Incoming multicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a multicast</p><p>address at this sub-layer.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.3500_8pd.net.if.in.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL ES3500-8PD: Port {#SNMPINDEX}: Incoming broadcast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a broadcast</p><p>address at this sub-layer.</p> |SNMP |zyxel.3500_8pd.net.if.in.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL ES3500-8PD: Port {#SNMPINDEX}: Outgoing traffic |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the</p><p>interface, including framing characters.  This object is a</p><p>64-bit version of ifOutOctets.</p> |SNMP |zyxel.3500_8pd.net.if.out.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL ES3500-8PD: Port {#SNMPINDEX}: Outgoing unicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were not addressed to a</p><p>multicast or broadcast address at this sub-layer, including</p><p>those that were discarded or not sent.</p> |SNMP |zyxel.3500_8pd.net.if.out.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL ES3500-8PD: Port {#SNMPINDEX}: Outgoing multicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>multicast address at this sub-layer, including those that</p><p>were discarded or not sent.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.3500_8pd.net.if.out.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL ES3500-8PD: Port {#SNMPINDEX}: Outgoing broadcast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>broadcast address at this sub-layer, including those that</p><p>were discarded or not sent.</p> |SNMP |zyxel.3500_8pd.net.if.out.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL ES3500-8PD: Port {#SNMPINDEX}: Link speed |<p>MIB: IF-MIB</p><p>An estimate of the interface's current bandwidth in bits per second</p> |SNMP |zyxel.3500_8pd.net.if.highspeed[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1000000`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL ES3500-8PD: Port {#SNMPINDEX}: Incoming utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.3500_8pd.net.if.in.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(//zyxel.3500_8pd.net.if.in.traffic[{#SNMPINDEX}]) * (last(//zyxel.3500_8pd.net.if.highspeed[{#SNMPINDEX}]) <> 0) / ( last(//zyxel.3500_8pd.net.if.highspeed[{#SNMPINDEX}]) + (last(//zyxel.3500_8pd.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100` |
-|Network_interfaces |ZYXEL ES3500-8PD: Port {#SNMPINDEX}: Outgoing utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.3500_8pd.net.if.out.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(//zyxel.3500_8pd.net.if.out.traffic[{#SNMPINDEX}]) * (last(//zyxel.3500_8pd.net.if.highspeed[{#SNMPINDEX}]) <> 0) / ( last(//zyxel.3500_8pd.net.if.highspeed[{#SNMPINDEX}]) + (last(//zyxel.3500_8pd.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100` |
-|Network_interfaces |ZYXEL ES3500-8PD: SFP {#SNMPINDEX}: Status |<p>MIB: ZYXEL-ES3500-8PD-MIB</p><p>Transceiver module status.</p> |SNMP |zyxel.3500_8pd.sfp.status[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL ES3500-8PD: SFP {#SNMPINDEX}: Vendor |<p>MIB: ZYXEL-ES3500-8PD-MIB</p><p>Transceiver module vendor name.</p> |SNMP |zyxel.3500_8pd.sfp.vendor[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL ES3500-8PD: SFP {#SNMPINDEX}: Part number |<p>MIB: ZYXEL-ES3500-8PD-MIB</p><p>Part number provided by transceiver module vendor.</p> |SNMP |zyxel.3500_8pd.sfp.part[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL ES3500-8PD: SFP {#SNMPINDEX}: Serial number |<p>MIB: ZYXEL-ES3500-8PD-MIB</p><p>Serial number provided by transceiver module vendor.</p> |SNMP |zyxel.3500_8pd.sfp.serialnumber[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL ES3500-8PD: SFP {#SNMPINDEX}: Revision |<p>MIB: ZYXEL-ES3500-8PD-MIB</p><p>Revision level for part number provided by transceiver module vendor.</p> |SNMP |zyxel.3500_8pd.sfp.revision[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL ES3500-8PD: SFP {#SNMPINDEX}: Date code |<p>MIB: ZYXEL-ES3500-8PD-MIB</p><p>Transceiver module vendor's manufacturing date code.</p> |SNMP |zyxel.3500_8pd.sfp.datecode[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL ES3500-8PD: SFP {#SNMPINDEX}: Transceiver |<p>MIB: ZYXEL-ES3500-8PD-MIB</p><p>Transceiver module type names.</p> |SNMP |zyxel.3500_8pd.sfp.transceiver[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL ES3500-8PD: SFP {#ZYXEL.SFP.PORT}: {#ZYXEL.SFP.DESCRIPTION} |<p>MIB: ZYXEL-ES3500-8PD-MIB</p><p>Transceiver module DDM data ({#ZYXEL.SFP.DESCRIPTION}).</p> |SNMP |zyxel.3500_8pd.sfp.ddm[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.01`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Power_supply |ZYXEL ES3500-8PD: Nominal "{#ZYXEL.VOLT.NOMINAL}" |<p>MIB: ZYXEL-ES3500-8PD-MIB</p><p>The current voltage reading.</p> |SNMP |zyxel.3500_8pd.volt[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL ES3500-8PD: Port {#SNMPINDEX}: Speed Duplex |<p>MIB:  ZYXEL-ES3500-8PD-MIB</p><p>Transmission mode</p> |SNMP |zyxel.3500_8pd.net.if.speed_duplex[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL ES3500-8PD: Port {#SNMPINDEX}: Interface description |<p>MIB:  ZYXEL-ES3500-8PD-MIB</p><p>A textual string containing information about the interface</p> |SNMP |zyxel.3500_8pd.net.if.name[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL ES3500-8PD: Port {#SNMPINDEX}: Link type |<p>MIB:  ZYXEL-ES3500-8PD-MIB</p><p>Physical connection type</p> |SNMP |zyxel.3500_8pd.net.if.link_type[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL ES3500-8PD: Port {#SNMPINDEX}: Interface name |<p>MIB: IF-MIB</p><p>A textual string containing information about the interface</p> |SNMP |zyxel.3500_8pd.net.if.descr[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL ES3500-8PD: Port {#SNMPINDEX}: Operational status |<p>MIB: IF-MIB</p><p>The current operational state of the interface.</p><p>The testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.3500_8pd.net.if.operstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL ES3500-8PD: Port {#SNMPINDEX}: Administrative status |<p>MIB: IF-MIB</p><p>The desired state of the interface.  The</p><p>testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.3500_8pd.net.if.adminstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL ES3500-8PD: Port {#SNMPINDEX}: Incoming traffic |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface,</p><p>including framing characters.</p> |SNMP |zyxel.3500_8pd.net.if.in.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL ES3500-8PD: Port {#SNMPINDEX}: Incoming unicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were not addressed to a multicast</p><p>or broadcast address at this sub-layer</p> |SNMP |zyxel.3500_8pd.net.if.in.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL ES3500-8PD: Port {#SNMPINDEX}: Incoming multicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a multicast</p><p>address at this sub-layer.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.3500_8pd.net.if.in.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL ES3500-8PD: Port {#SNMPINDEX}: Incoming broadcast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a broadcast</p><p>address at this sub-layer.</p> |SNMP |zyxel.3500_8pd.net.if.in.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL ES3500-8PD: Port {#SNMPINDEX}: Outgoing traffic |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the</p><p>interface, including framing characters.  This object is a</p><p>64-bit version of ifOutOctets.</p> |SNMP |zyxel.3500_8pd.net.if.out.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL ES3500-8PD: Port {#SNMPINDEX}: Outgoing unicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were not addressed to a</p><p>multicast or broadcast address at this sub-layer, including</p><p>those that were discarded or not sent.</p> |SNMP |zyxel.3500_8pd.net.if.out.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL ES3500-8PD: Port {#SNMPINDEX}: Outgoing multicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>multicast address at this sub-layer, including those that</p><p>were discarded or not sent.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.3500_8pd.net.if.out.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL ES3500-8PD: Port {#SNMPINDEX}: Outgoing broadcast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>broadcast address at this sub-layer, including those that</p><p>were discarded or not sent.</p> |SNMP |zyxel.3500_8pd.net.if.out.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL ES3500-8PD: Port {#SNMPINDEX}: Link speed |<p>MIB: IF-MIB</p><p>An estimate of the interface's current bandwidth in bits per second</p> |SNMP |zyxel.3500_8pd.net.if.highspeed[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1000000`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL ES3500-8PD: Port {#SNMPINDEX}: Incoming utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.3500_8pd.net.if.in.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(//zyxel.3500_8pd.net.if.in.traffic[{#SNMPINDEX}]) * (last(//zyxel.3500_8pd.net.if.highspeed[{#SNMPINDEX}]) <> 0) / ( last(//zyxel.3500_8pd.net.if.highspeed[{#SNMPINDEX}]) + (last(//zyxel.3500_8pd.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100` |
+|Network interfaces |ZYXEL ES3500-8PD: Port {#SNMPINDEX}: Outgoing utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.3500_8pd.net.if.out.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(//zyxel.3500_8pd.net.if.out.traffic[{#SNMPINDEX}]) * (last(//zyxel.3500_8pd.net.if.highspeed[{#SNMPINDEX}]) <> 0) / ( last(//zyxel.3500_8pd.net.if.highspeed[{#SNMPINDEX}]) + (last(//zyxel.3500_8pd.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100` |
+|Network interfaces |ZYXEL ES3500-8PD: SFP {#SNMPINDEX}: Status |<p>MIB: ZYXEL-ES3500-8PD-MIB</p><p>Transceiver module status.</p> |SNMP |zyxel.3500_8pd.sfp.status[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL ES3500-8PD: SFP {#SNMPINDEX}: Vendor |<p>MIB: ZYXEL-ES3500-8PD-MIB</p><p>Transceiver module vendor name.</p> |SNMP |zyxel.3500_8pd.sfp.vendor[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL ES3500-8PD: SFP {#SNMPINDEX}: Part number |<p>MIB: ZYXEL-ES3500-8PD-MIB</p><p>Part number provided by transceiver module vendor.</p> |SNMP |zyxel.3500_8pd.sfp.part[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL ES3500-8PD: SFP {#SNMPINDEX}: Serial number |<p>MIB: ZYXEL-ES3500-8PD-MIB</p><p>Serial number provided by transceiver module vendor.</p> |SNMP |zyxel.3500_8pd.sfp.serialnumber[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL ES3500-8PD: SFP {#SNMPINDEX}: Revision |<p>MIB: ZYXEL-ES3500-8PD-MIB</p><p>Revision level for part number provided by transceiver module vendor.</p> |SNMP |zyxel.3500_8pd.sfp.revision[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL ES3500-8PD: SFP {#SNMPINDEX}: Date code |<p>MIB: ZYXEL-ES3500-8PD-MIB</p><p>Transceiver module vendor's manufacturing date code.</p> |SNMP |zyxel.3500_8pd.sfp.datecode[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL ES3500-8PD: SFP {#SNMPINDEX}: Transceiver |<p>MIB: ZYXEL-ES3500-8PD-MIB</p><p>Transceiver module type names.</p> |SNMP |zyxel.3500_8pd.sfp.transceiver[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL ES3500-8PD: SFP {#ZYXEL.SFP.PORT}: {#ZYXEL.SFP.DESCRIPTION} |<p>MIB: ZYXEL-ES3500-8PD-MIB</p><p>Transceiver module DDM data ({#ZYXEL.SFP.DESCRIPTION}).</p> |SNMP |zyxel.3500_8pd.sfp.ddm[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.01`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Power supply |ZYXEL ES3500-8PD: Nominal "{#ZYXEL.VOLT.NOMINAL}" |<p>MIB: ZYXEL-ES3500-8PD-MIB</p><p>The current voltage reading.</p> |SNMP |zyxel.3500_8pd.volt[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Status |ZYXEL ES3500-8PD: SNMP agent availability |<p>-</p> |INTERNAL |zabbix[host,snmp,available]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Status |ZYXEL ES3500-8PD: Uptime |<p>MIB: RFC1213-MIB</p><p>The time (in hundredths of a second) since the</p><p>network management portion of the system was last</p><p>re-initialized.</p> |SNMP |zyxel.3500_8pd.uptime<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.01`</p> |
 |Temperature |ZYXEL ES3500-8PD: Temperature "{#ZYXEL.TEMP.ID}" |<p>MIB: ZYXEL-ES3500-8PD-MIB</p><p>The current temperature measured at this sensor</p> |SNMP |zyxel.3500_8pd.temp[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
@@ -118,7 +118,7 @@ There are no template links in this template.
 
 Please report any issues with the template at https://support.zabbix.com
 
-You can also provide a feedback, discuss the template or ask for help with it at [ZABBIX forums](https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/422668-discussion-thread-for-official-zabbix-templates-for-zyxel).
+You can also provide feedback, discuss the template or ask for help with it at [ZABBIX forums](https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/422668-discussion-thread-for-official-zabbix-templates-for-zyxel).
 
 ## Known Issues
 
diff --git a/templates/net/zyxel_snmp/zyxel_es3500-8pd_snmp/template_net_zyxel_es3500-8pd_snmp.yaml b/templates/net/zyxel_snmp/zyxel_es3500-8pd_snmp/template_net_zyxel_es3500-8pd_snmp.yaml
index ba4d76a1542..2f5659fdec4 100644
--- a/templates/net/zyxel_snmp/zyxel_es3500-8pd_snmp/template_net_zyxel_es3500-8pd_snmp.yaml
+++ b/templates/net/zyxel_snmp/zyxel_es3500-8pd_snmp/template_net_zyxel_es3500-8pd_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-17T06:34:00Z'
+  date: '2022-01-26T09:54:06Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -27,7 +27,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/422668-discussion-thread-for-official-zabbix-templates-for-zyxel
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: 'Templates/Network devices'
@@ -47,8 +47,8 @@ zabbix_export:
                 - 1h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: network
           triggers:
             -
               uuid: 3bbbd93c114f4bf5b8f4788ca6825afd
@@ -57,6 +57,10 @@ zabbix_export:
               opdata: 'Current state: {ITEM.LASTVALUE1}'
               priority: WARNING
               description: 'SNMP is not available for polling. Please check device connectivity and SNMP settings.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 6d513a036f8547219b1120fc4fffff1d
           name: 'ZYXEL ES3500-8PD: Contact'
@@ -80,8 +84,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
         -
           uuid: e7fd0f225802477aabbbcbfe5ac4a7f6
           name: 'ZYXEL ES3500-8PD: CPU utilization'
@@ -97,8 +101,8 @@ zabbix_export:
             getting the values.
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
           triggers:
             -
               uuid: 3cf67f911a854d2ebeb9e006f3f97738
@@ -107,6 +111,10 @@ zabbix_export:
               opdata: 'Current utilization: {ITEM.LASTVALUE1}'
               priority: WARNING
               description: 'CPU utilization is too high. The system might be slow to respond.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 8749f59cbfeb4c43b7753901f3219716
           name: 'ZYXEL ES3500-8PD: ZyNOS F/W Version'
@@ -139,8 +147,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
           triggers:
             -
               uuid: bd6d0fe201094c00b6c93d7c04c27729
@@ -150,6 +158,10 @@ zabbix_export:
               priority: INFO
               description: 'Firmware version has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: cbccb45e9d1d4b529cce2d43e6c96a24
           name: 'ZYXEL ES3500-8PD: Location'
@@ -172,8 +184,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
         -
           uuid: 1479a543105a4cf2b524bf8d042afd00
           name: 'ZYXEL ES3500-8PD: MAC address'
@@ -199,8 +211,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
         -
           uuid: c753caf7686e49968931df18076a5d4f
           name: 'ZYXEL ES3500-8PD: Hardware model name'
@@ -227,8 +239,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
           triggers:
             -
               uuid: e03ca45643354a18a9d6ffbb38a07654
@@ -236,6 +248,10 @@ zabbix_export:
               name: 'ZYXEL ES3500-8PD: Template does not match hardware'
               priority: INFO
               description: 'This template is for Zyxel ES3500-8PD, but connected to {ITEM.VALUE}'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 2072ac4b4437425a9ef1496b90c64990
           name: 'ZYXEL ES3500-8PD: Host name'
@@ -259,8 +275,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
         -
           uuid: 93a3b8ef959e41fe822abb959f090939
           name: 'ZYXEL ES3500-8PD: Hardware serial number'
@@ -282,8 +298,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
           triggers:
             -
               uuid: 83548aba74c148e28e6611d5abfb9694
@@ -292,6 +308,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: bbd24719955740e0acc2316a945dac38
           name: 'ZYXEL ES3500-8PD: Uptime'
@@ -314,8 +334,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: eb7a268bfa324366953221e3c1788127
@@ -324,6 +344,10 @@ zabbix_export:
               priority: INFO
               description: 'Uptime is less than 10 minutes'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
       discovery_rules:
         -
           uuid: dfc515bfe86642e784735637bdb6c0a7
@@ -351,8 +375,8 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: Memory
+                  tag: component
+                  value: memory
               trigger_prototypes:
                 -
                   uuid: c59c3730eea44cf7a842fe46aa12fa3d
@@ -360,6 +384,10 @@ zabbix_export:
                   name: 'ZYXEL ES3500-8PD: High memory utilization in "{#ZYXEL.MEMORY.NAME}" pool (>{$MEMORY.UTIL.MAX}% for 5m)'
                   priority: AVERAGE
                   description: 'The system is running out of free memory.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: c71d57f8ed0b470faae1bfd7033fbcf0
           name: 'Interface discovery'
@@ -410,8 +438,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 1daef38185b14a96b8f0fce757c48677
               name: 'ZYXEL ES3500-8PD: Port {#SNMPINDEX}: Interface name'
@@ -431,8 +465,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 4de0488610054ed9bd869dc48a07174e
               name: 'ZYXEL ES3500-8PD: Port {#SNMPINDEX}: Link speed'
@@ -455,8 +495,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 55cf0d86b8bc4a6fa6806c9f8bce7ee9
               name: 'ZYXEL ES3500-8PD: Port {#SNMPINDEX}: Incoming broadcast packages'
@@ -477,8 +523,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 0ce5c7ae49284615a41aba4cdd0f565b
               name: 'ZYXEL ES3500-8PD: Port {#SNMPINDEX}: Incoming multicast packages'
@@ -500,8 +552,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 34a86d17de7e4725aa6e5893c1e52526
               name: 'ZYXEL ES3500-8PD: Port {#SNMPINDEX}: Incoming traffic'
@@ -525,8 +583,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: b1c630d6f06748b88d695dfdb734cd19
               name: 'ZYXEL ES3500-8PD: Port {#SNMPINDEX}: Incoming unicast packages'
@@ -547,8 +611,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: f24ad30d48ca427eb3b19d4459cab733
               name: 'ZYXEL ES3500-8PD: Port {#SNMPINDEX}: Incoming utilization'
@@ -572,8 +642,14 @@ zabbix_export:
                     - 'return +parseFloat(value).toFixed(0);'
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 8c141ab269eb4a8891937a1847312890
               name: 'ZYXEL ES3500-8PD: Port {#SNMPINDEX}: Link type'
@@ -593,8 +669,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 018c1028b7904fbea8b1bb0d2fac1621
               name: 'ZYXEL ES3500-8PD: Port {#SNMPINDEX}: Interface description'
@@ -614,8 +696,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 4f75b84c02b4496db2cbedca8df00c04
               name: 'ZYXEL ES3500-8PD: Port {#SNMPINDEX}: Operational status'
@@ -637,8 +725,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 27ba4832c79d447186ae6de254aad9d7
@@ -655,6 +749,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: bb4c00143a4f4cc2b445daeffdcf6b57
               name: 'ZYXEL ES3500-8PD: Port {#SNMPINDEX}: Outgoing broadcast packages'
@@ -676,8 +774,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 103385b00f6442beab10712ca42d5719
               name: 'ZYXEL ES3500-8PD: Port {#SNMPINDEX}: Outgoing multicast packages'
@@ -700,8 +804,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 08cd8a42816040d582d3192a9d8c2fb7
               name: 'ZYXEL ES3500-8PD: Port {#SNMPINDEX}: Outgoing traffic'
@@ -726,8 +836,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: df030eba0fd548d5be224e2fe120373c
               name: 'ZYXEL ES3500-8PD: Port {#SNMPINDEX}: Outgoing unicast packages'
@@ -749,8 +865,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: cabb6da9aa3e4ae0ae6938b3f3d47138
               name: 'ZYXEL ES3500-8PD: Port {#SNMPINDEX}: Outgoing utilization'
@@ -774,8 +896,14 @@ zabbix_export:
                     - 'return +parseFloat(value).toFixed(0);'
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 5200e032f5f6438e8326799208072845
               name: 'ZYXEL ES3500-8PD: Port {#SNMPINDEX}: Speed Duplex'
@@ -795,8 +923,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           graph_prototypes:
             -
               uuid: a4b7fd4158464655a71732de5ebc9a9d
@@ -932,8 +1066,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#ZYXEL.SFP.PORT}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 8ce109a9f09b41458a4e9d8698238ad0
@@ -941,12 +1081,20 @@ zabbix_export:
                   name: 'ZYXEL ES3500-8PD: SFP {#ZYXEL.SFP.PORT}: High {#ZYXEL.SFP.DESCRIPTION} (over {#ZYXEL.SFP.WARN.MAX}{#ZYXEL.SFP.UNIT})'
                   priority: WARNING
                   description: 'The upper threshold value of the parameter is exceeded'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: 6ecef48a1fdd4e16afe9472f59e0ad1a
                   expression: 'last(/ZYXEL ES3500-8PD SNMP/zyxel.3500_8pd.sfp.ddm[{#SNMPINDEX}]) < {#ZYXEL.SFP.WARN.MIN}'
                   name: 'ZYXEL ES3500-8PD: SFP {#ZYXEL.SFP.PORT}: Low {#ZYXEL.SFP.DESCRIPTION} (less than {#ZYXEL.SFP.WARN.MIN}{#ZYXEL.SFP.UNIT})'
                   priority: WARNING
                   description: 'The parameter values are less than the lower threshold'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
           graph_prototypes:
             -
               uuid: c114cc7fee5c4c8fa3301db0eb3b60f7
@@ -1020,8 +1168,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 2b30a4497cbd497886c52ae79ad03a01
               name: 'ZYXEL ES3500-8PD: SFP {#SNMPINDEX}: Part number'
@@ -1042,8 +1196,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 25aa375ed4a345e6b975bcb238cf530d
               name: 'ZYXEL ES3500-8PD: SFP {#SNMPINDEX}: Revision'
@@ -1064,8 +1224,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 3f24d3aa58624ed0ad7a137fc9b1611a
               name: 'ZYXEL ES3500-8PD: SFP {#SNMPINDEX}: Serial number'
@@ -1086,8 +1252,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 46739144d51b441886d544829749cf21
@@ -1096,6 +1268,10 @@ zabbix_export:
                   priority: INFO
                   description: 'SFP {#SNMPINDEX} serial number has changed. Ack to close'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 054942c20bca4459b26e41aca8657e4c
               name: 'ZYXEL ES3500-8PD: SFP {#SNMPINDEX}: Status'
@@ -1116,8 +1292,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 7621973ef61b47c9bc034eec3d008957
               name: 'ZYXEL ES3500-8PD: SFP {#SNMPINDEX}: Transceiver'
@@ -1138,8 +1320,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 715feecd140b4e9ca350b41490f7c7f9
               name: 'ZYXEL ES3500-8PD: SFP {#SNMPINDEX}: Vendor'
@@ -1160,8 +1348,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
         -
           uuid: 9c8f5212222a42bcbd42f8d848476804
           name: 'Temperature discovery'
@@ -1191,8 +1385,11 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: sensor
+                -
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 51fad2cd7daf49ad9027f44fd9ea81af
@@ -1201,6 +1398,10 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the temperature'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
           graph_prototypes:
             -
               uuid: a1931b48befb4c76a4d5a7ff6c15cbaf
@@ -1256,8 +1457,11 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Power supply'
+                  tag: component
+                  value: sensor
+                -
+                  tag: component
+                  value: voltage
               trigger_prototypes:
                 -
                   uuid: 2cce1a60cfea4bb89e1b9582f6045d3c
@@ -1266,6 +1470,10 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the power supply'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
           graph_prototypes:
             -
               uuid: 94ee588ae558416da5bcf4c199797d93
@@ -1289,6 +1497,19 @@ zabbix_export:
                   outArr.push(item)
                   });
                   return JSON.stringify(outArr);
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: es3500-8pd
+        -
+          tag: target
+          value: switch
+        -
+          tag: target
+          value: zyxel
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/net/zyxel_snmp/zyxel_gs4012f_snmp/README.md b/templates/net/zyxel_snmp/zyxel_gs4012f_snmp/README.md
index 923ca43d4ea..d26498852c7 100644
--- a/templates/net/zyxel_snmp/zyxel_gs4012f_snmp/README.md
+++ b/templates/net/zyxel_snmp/zyxel_gs4012f_snmp/README.md
@@ -41,9 +41,9 @@ There are no template links in this template.
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
 |Fan discovery |<p>An entry in fanRpmTable.</p> |SNMP |zyxel.4012f.fan.discovery |
+|Interface discovery |<p>-</p> |SNMP |zyxel.4012f.net.if.discovery<p>**Filter**:</p>AND <p>- {#ZYXEL.IF.NAME} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.NAME.MATCHES}`</p><p>- {#ZYXEL.IF.NAME} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.NAME.NOT_MATCHES}`</p><p>- {#ZYXEL.IF.LINKUPTYPE} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.MATCHES}`</p><p>- {#ZYXEL.IF.LINKUPTYPE} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.NOT_MATCHES}`</p><p>**Overrides:**</p><p>Don't create triggers for matching interface<br> - {#ZYXEL.IF.NAME} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}`<br>  - TRIGGER_PROTOTYPE REGEXP `.*` - NO_DISCOVER</p> |
 |Temperature discovery |<p>An entry in tempTable.</p><p>Index of temperature unit. 1:MAC, 2:CPU, 3:PHY</p> |SNMP |zyxel.4012f.temp.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
 |Voltage discovery |<p>An entry in voltageTable.</p> |SNMP |zyxel.4012f.volt.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
-|Interface discovery |<p>-</p> |SNMP |zyxel.4012f.net.if.discovery<p>**Filter**:</p>AND <p>- {#ZYXEL.IF.NAME} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.NAME.MATCHES}`</p><p>- {#ZYXEL.IF.NAME} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.NAME.NOT_MATCHES}`</p><p>- {#ZYXEL.IF.LINKUPTYPE} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.MATCHES}`</p><p>- {#ZYXEL.IF.LINKUPTYPE} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.NOT_MATCHES}`</p><p>**Overrides:**</p><p>Don't create triggers for matching interface<br> - {#ZYXEL.IF.NAME} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}`<br>  - TRIGGER_PROTOTYPE REGEXP `.*` - NO_DISCOVER</p> |
 
 ## Items collected
 
@@ -58,24 +58,24 @@ There are no template links in this template.
 |Inventory |ZYXEL GS-4012F: MAC address |<p>MIB: IF-MIB</p><p>The interface's address at the protocol layer</p><p>immediately `below' the network layer in the</p><p>protocol stack.  For interfaces which do not have</p><p>such an address (e.g., a serial line), this object</p><p>should contain an octet string of zero length.</p> |SNMP |zyxel.4012f.mac<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Inventory |ZYXEL GS-4012F: ZyNOS F/W Version |<p>MIB: ZYXEL-GS4012F-MIB</p> |SNMP |zyxel.4012f.fwversion<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
 |Inventory |ZYXEL GS-4012F: Hardware serial number |<p>MIB: ZYXEL-GS4012F-MIB</p><p>Serial number</p> |SNMP |zyxel.4012f.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL GS-4012F: Port {#SNMPINDEX}: Speed Duplex |<p>MIB: ZYXEL-GS4012F-MIB</p><p>Transmission mode</p> |SNMP |zyxel.4012f.net.if.speed_duplex[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL GS-4012F: Port {#SNMPINDEX}: Interface description |<p>MIB: ZYXEL-GS4012F-MIB</p><p>A textual string containing information about the interface</p> |SNMP |zyxel.4012f.net.if.name[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL GS-4012F: Port {#SNMPINDEX}: Link type |<p>MIB: ZYXEL-GS4012F-MIB</p><p>Physical connection type</p> |SNMP |zyxel.4012f.net.if.link_type[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL GS-4012F: Port {#SNMPINDEX}: Interface name |<p>MIB: IF-MIB</p><p>A textual string containing information about the interface</p> |SNMP |zyxel.4012f.net.if.descr[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL GS-4012F: Port {#SNMPINDEX}: Operational status |<p>MIB: IF-MIB</p><p>The current operational state of the interface.</p><p>The testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.4012f.net.if.operstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL GS-4012F: Port {#SNMPINDEX}: Administrative status |<p>MIB: IF-MIB</p><p>The desired state of the interface.  The</p><p>testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.4012f.net.if.adminstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL GS-4012F: Port {#SNMPINDEX}: Incoming traffic |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface,</p><p>including framing characters.</p> |SNMP |zyxel.4012f.net.if.in.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL GS-4012F: Port {#SNMPINDEX}: Incoming unicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were not addressed to a multicast</p><p>or broadcast address at this sub-layer</p> |SNMP |zyxel.4012f.net.if.in.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL GS-4012F: Port {#SNMPINDEX}: Incoming multicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a multicast</p><p>address at this sub-layer.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.4012f.net.if.in.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL GS-4012F: Port {#SNMPINDEX}: Incoming broadcast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a broadcast</p><p>address at this sub-layer.</p> |SNMP |zyxel.4012f.net.if.in.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL GS-4012F: Port {#SNMPINDEX}: Outgoing traffic |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the</p><p>interface, including framing characters.  This object is a</p><p>64-bit version of ifOutOctets.</p> |SNMP |zyxel.4012f.net.if.out.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL GS-4012F: Port {#SNMPINDEX}: Outgoing unicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were not addressed to a</p><p>multicast or broadcast address at this sub-layer, including</p><p>those that were discarded or not sent.</p> |SNMP |zyxel.4012f.net.if.out.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL GS-4012F: Port {#SNMPINDEX}: Outgoing multicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>multicast address at this sub-layer, including those that</p><p>were discarded or not sent.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.4012f.net.if.out.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL GS-4012F: Port {#SNMPINDEX}: Outgoing broadcast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>broadcast address at this sub-layer, including those that</p><p>were discarded or not sent.</p> |SNMP |zyxel.4012f.net.if.out.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL GS-4012F: Port {#SNMPINDEX}: Link speed |<p>MIB: IF-MIB</p><p>An estimate of the interface's current bandwidth in bits per second</p> |SNMP |zyxel.4012f.net.if.highspeed[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1000000`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL GS-4012F: Port {#SNMPINDEX}: Incoming utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.4012f.net.if.in.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(//zyxel.4012f.net.if.in.traffic[{#SNMPINDEX}]) * (last(//zyxel.4012f.net.if.highspeed[{#SNMPINDEX}]) <> 0) / ( last(//zyxel.4012f.net.if.highspeed[{#SNMPINDEX}]) + (last(//zyxel.4012f.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100` |
-|Network_interfaces |ZYXEL GS-4012F: Port {#SNMPINDEX}: Outgoing utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.4012f.net.if.out.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(//zyxel.4012f.net.if.out.traffic[{#SNMPINDEX}]) * (last(//zyxel.4012f.net.if.highspeed[{#SNMPINDEX}]) <> 0) / ( last(//zyxel.4012f.net.if.highspeed[{#SNMPINDEX}]) + (last(//zyxel.4012f.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100` |
-|Power_supply |ZYXEL GS-4012F: Nominal "{#ZYXEL.VOLT.NOMINAL}" |<p>MIB: ZYXEL-GS4012F-MIB</p><p>The current voltage reading.</p> |SNMP |zyxel.4012f.volt[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL GS-4012F: Port {#SNMPINDEX}: Speed Duplex |<p>MIB: ZYXEL-GS4012F-MIB</p><p>Transmission mode</p> |SNMP |zyxel.4012f.net.if.speed_duplex[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL GS-4012F: Port {#SNMPINDEX}: Interface description |<p>MIB: ZYXEL-GS4012F-MIB</p><p>A textual string containing information about the interface</p> |SNMP |zyxel.4012f.net.if.name[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL GS-4012F: Port {#SNMPINDEX}: Link type |<p>MIB: ZYXEL-GS4012F-MIB</p><p>Physical connection type</p> |SNMP |zyxel.4012f.net.if.link_type[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL GS-4012F: Port {#SNMPINDEX}: Interface name |<p>MIB: IF-MIB</p><p>A textual string containing information about the interface</p> |SNMP |zyxel.4012f.net.if.descr[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL GS-4012F: Port {#SNMPINDEX}: Operational status |<p>MIB: IF-MIB</p><p>The current operational state of the interface.</p><p>The testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.4012f.net.if.operstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL GS-4012F: Port {#SNMPINDEX}: Administrative status |<p>MIB: IF-MIB</p><p>The desired state of the interface.  The</p><p>testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.4012f.net.if.adminstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL GS-4012F: Port {#SNMPINDEX}: Incoming traffic |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface,</p><p>including framing characters.</p> |SNMP |zyxel.4012f.net.if.in.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL GS-4012F: Port {#SNMPINDEX}: Incoming unicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were not addressed to a multicast</p><p>or broadcast address at this sub-layer</p> |SNMP |zyxel.4012f.net.if.in.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL GS-4012F: Port {#SNMPINDEX}: Incoming multicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a multicast</p><p>address at this sub-layer.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.4012f.net.if.in.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL GS-4012F: Port {#SNMPINDEX}: Incoming broadcast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a broadcast</p><p>address at this sub-layer.</p> |SNMP |zyxel.4012f.net.if.in.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL GS-4012F: Port {#SNMPINDEX}: Outgoing traffic |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the</p><p>interface, including framing characters.  This object is a</p><p>64-bit version of ifOutOctets.</p> |SNMP |zyxel.4012f.net.if.out.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL GS-4012F: Port {#SNMPINDEX}: Outgoing unicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were not addressed to a</p><p>multicast or broadcast address at this sub-layer, including</p><p>those that were discarded or not sent.</p> |SNMP |zyxel.4012f.net.if.out.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL GS-4012F: Port {#SNMPINDEX}: Outgoing multicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>multicast address at this sub-layer, including those that</p><p>were discarded or not sent.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.4012f.net.if.out.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL GS-4012F: Port {#SNMPINDEX}: Outgoing broadcast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>broadcast address at this sub-layer, including those that</p><p>were discarded or not sent.</p> |SNMP |zyxel.4012f.net.if.out.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL GS-4012F: Port {#SNMPINDEX}: Link speed |<p>MIB: IF-MIB</p><p>An estimate of the interface's current bandwidth in bits per second</p> |SNMP |zyxel.4012f.net.if.highspeed[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1000000`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL GS-4012F: Port {#SNMPINDEX}: Incoming utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.4012f.net.if.in.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(//zyxel.4012f.net.if.in.traffic[{#SNMPINDEX}]) * (last(//zyxel.4012f.net.if.highspeed[{#SNMPINDEX}]) <> 0) / ( last(//zyxel.4012f.net.if.highspeed[{#SNMPINDEX}]) + (last(//zyxel.4012f.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100` |
+|Network interfaces |ZYXEL GS-4012F: Port {#SNMPINDEX}: Outgoing utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.4012f.net.if.out.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(//zyxel.4012f.net.if.out.traffic[{#SNMPINDEX}]) * (last(//zyxel.4012f.net.if.highspeed[{#SNMPINDEX}]) <> 0) / ( last(//zyxel.4012f.net.if.highspeed[{#SNMPINDEX}]) + (last(//zyxel.4012f.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100` |
+|Power supply |ZYXEL GS-4012F: Nominal "{#ZYXEL.VOLT.NOMINAL}" |<p>MIB: ZYXEL-GS4012F-MIB</p><p>The current voltage reading.</p> |SNMP |zyxel.4012f.volt[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Status |ZYXEL GS-4012F: SNMP agent availability |<p>-</p> |INTERNAL |zabbix[host,snmp,available]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Status |ZYXEL GS-4012F: Uptime |<p>MIB: RFC1213-MIB</p><p>The time (in hundredths of a second) since the</p><p>network management portion of the system was last</p><p>re-initialized.</p> |SNMP |zyxel.4012f.uptime<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.01`</p> |
 |Temperature |ZYXEL GS-4012F: Temperature "{#ZYXEL.TEMP.ID}" |<p>MIB: ZYXEL-GS4012F-MIB</p><p>The current temperature measured at this sensor</p> |SNMP |zyxel.4012f.temp[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
@@ -99,7 +99,7 @@ There are no template links in this template.
 
 Please report any issues with the template at https://support.zabbix.com
 
-You can also provide a feedback, discuss the template or ask for help with it at [ZABBIX forums](https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/422668-discussion-thread-for-official-zabbix-templates-for-zyxel).
+You can also provide feedback, discuss the template or ask for help with it at [ZABBIX forums](https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/422668-discussion-thread-for-official-zabbix-templates-for-zyxel).
 
 ## Known Issues
 
diff --git a/templates/net/zyxel_snmp/zyxel_gs4012f_snmp/template_net_zyxel_gs4012f_snmp.yaml b/templates/net/zyxel_snmp/zyxel_gs4012f_snmp/template_net_zyxel_gs4012f_snmp.yaml
index fbca99a95fd..95858de4f50 100644
--- a/templates/net/zyxel_snmp/zyxel_gs4012f_snmp/template_net_zyxel_gs4012f_snmp.yaml
+++ b/templates/net/zyxel_snmp/zyxel_gs4012f_snmp/template_net_zyxel_gs4012f_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-17T06:34:05Z'
+  date: '2022-01-26T09:48:33Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -26,7 +26,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/422668-discussion-thread-for-official-zabbix-templates-for-zyxel
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: 'Templates/Network devices'
@@ -46,8 +46,8 @@ zabbix_export:
                 - 1h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: network
           triggers:
             -
               uuid: 07b74d3face24c838c7efe8dfb87564e
@@ -56,6 +56,10 @@ zabbix_export:
               opdata: 'Current state: {ITEM.LASTVALUE1}'
               priority: WARNING
               description: 'SNMP is not available for polling. Please check device connectivity and SNMP settings.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 831444715edf4a12baf6a5727ba9276c
           name: 'ZYXEL GS-4012F: Contact'
@@ -79,8 +83,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
         -
           uuid: e2a6ce044f6d40bebb50927cc70bd593
           name: 'ZYXEL GS-4012F: CPU utilization'
@@ -96,8 +100,8 @@ zabbix_export:
             getting the values.
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
           triggers:
             -
               uuid: 2052d9e6becd48e5a3aed8037eaf9e87
@@ -106,6 +110,10 @@ zabbix_export:
               opdata: 'Current utilization: {ITEM.LASTVALUE1}'
               priority: WARNING
               description: 'CPU utilization is too high. The system might be slow to respond.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: adb85140eb8c4b6489078dc79bd61a87
           name: 'ZYXEL GS-4012F: ZyNOS F/W Version'
@@ -138,8 +146,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
           triggers:
             -
               uuid: ecde6db248674039a30874f29e704e65
@@ -149,6 +157,10 @@ zabbix_export:
               priority: INFO
               description: 'Firmware version has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: f55214647bab4544adb7d9a63e8be69d
           name: 'ZYXEL GS-4012F: Location'
@@ -171,8 +183,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
         -
           uuid: 770d70d2ebcb4978b6c6fae0692ab77f
           name: 'ZYXEL GS-4012F: MAC address'
@@ -198,8 +210,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
         -
           uuid: 25c5e9b3d34f4bb8805e2a6c43934f51
           name: 'ZYXEL GS-4012F: Hardware model name'
@@ -226,8 +238,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
           triggers:
             -
               uuid: 1ba1faabe15c4d46adaa4dc74c5dc05c
@@ -235,6 +247,10 @@ zabbix_export:
               name: 'ZYXEL GS-4012F: Template does not match hardware'
               priority: INFO
               description: 'This template is for Zyxel GS-4012F, but connected to {ITEM.VALUE}'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 38fb81dca1db49bc83343ba197bfe980
           name: 'ZYXEL GS-4012F: Host name'
@@ -258,8 +274,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
         -
           uuid: 0080e896f1384245887a191d87496fa9
           name: 'ZYXEL GS-4012F: Hardware serial number'
@@ -281,8 +297,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
           triggers:
             -
               uuid: ae941404115d4b10809bce603528ceaa
@@ -291,6 +307,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 1c14e77679fe4ee6b167036d8888867e
           name: 'ZYXEL GS-4012F: Uptime'
@@ -313,8 +333,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 93c70a5dd2504d0d9b13a17af942d45e
@@ -323,6 +343,10 @@ zabbix_export:
               priority: INFO
               description: 'Uptime is less than 10 minutes'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
       discovery_rules:
         -
           uuid: 344cd89247db49ba854ab6edb504086d
@@ -351,8 +375,11 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: Fans
+                  tag: component
+                  value: fan
+                -
+                  tag: component
+                  value: sensor
               trigger_prototypes:
                 -
                   uuid: c91993daf9e44102a04b1ff2b72bf773
@@ -361,6 +388,10 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the fan unit'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
           graph_prototypes:
             -
               uuid: 9c17e54a98324a9bb35c3a4234efe55f
@@ -421,8 +452,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 32abe2903d1c4652a74a44c5154f1451
               name: 'ZYXEL GS-4012F: Port {#SNMPINDEX}: Interface name'
@@ -442,8 +479,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 42040f2ca85e4f80bdc4bdc9d0ef5966
               name: 'ZYXEL GS-4012F: Port {#SNMPINDEX}: Link speed'
@@ -466,8 +509,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: a71a364726524a6e9d00eb4098fa5faa
               name: 'ZYXEL GS-4012F: Port {#SNMPINDEX}: Incoming broadcast packages'
@@ -488,8 +537,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 8dda9a8e70bc44c5acca08284eb94bac
               name: 'ZYXEL GS-4012F: Port {#SNMPINDEX}: Incoming multicast packages'
@@ -511,8 +566,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 7240d04927a742dd93844c1fcc68dba0
               name: 'ZYXEL GS-4012F: Port {#SNMPINDEX}: Incoming traffic'
@@ -536,8 +597,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 4b7a80cf38d44dd9b270dcbc5c44ecfc
               name: 'ZYXEL GS-4012F: Port {#SNMPINDEX}: Incoming unicast packages'
@@ -558,8 +625,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 8c0eca407f47404a86d26c5fb1885f87
               name: 'ZYXEL GS-4012F: Port {#SNMPINDEX}: Incoming utilization'
@@ -583,8 +656,14 @@ zabbix_export:
                     - 'return +parseFloat(value).toFixed(0);'
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: a63165d407e740c38cab55aefeccbca8
               name: 'ZYXEL GS-4012F: Port {#SNMPINDEX}: Link type'
@@ -604,8 +683,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 5c439eae60184abd8ec9b209cda19f8b
               name: 'ZYXEL GS-4012F: Port {#SNMPINDEX}: Interface description'
@@ -625,8 +710,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 033b0e5b141b437c805b845f2e3f54a0
               name: 'ZYXEL GS-4012F: Port {#SNMPINDEX}: Operational status'
@@ -648,8 +739,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 9c332411a6db46acaab2b49ccabd2970
@@ -666,6 +763,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 0f3decaec17a4812aac826056cce9e8a
               name: 'ZYXEL GS-4012F: Port {#SNMPINDEX}: Outgoing broadcast packages'
@@ -687,8 +788,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 5ac33c29b537409cb6347548290e5ecc
               name: 'ZYXEL GS-4012F: Port {#SNMPINDEX}: Outgoing multicast packages'
@@ -711,8 +818,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 69ab1d86cd0347b49e2500a1d8e7e6a8
               name: 'ZYXEL GS-4012F: Port {#SNMPINDEX}: Outgoing traffic'
@@ -737,8 +850,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 870c54f85d57473c8b48ed896d5e2b2b
               name: 'ZYXEL GS-4012F: Port {#SNMPINDEX}: Outgoing unicast packages'
@@ -760,8 +879,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 98fffdb492a149b7b684e3867b113d37
               name: 'ZYXEL GS-4012F: Port {#SNMPINDEX}: Outgoing utilization'
@@ -785,8 +910,14 @@ zabbix_export:
                     - 'return +parseFloat(value).toFixed(0);'
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 64037c50f0344d02ae06690e91c7ead8
               name: 'ZYXEL GS-4012F: Port {#SNMPINDEX}: Speed Duplex'
@@ -806,8 +937,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           graph_prototypes:
             -
               uuid: 1cad0c1a40a8472da2edee9cd889e6cf
@@ -927,8 +1064,11 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: sensor
+                -
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 719aad00708e4fd3b99997834c5d68b2
@@ -937,6 +1077,10 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the temperature'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
           graph_prototypes:
             -
               uuid: f2dbed78c1d2440480cff0d1b243a546
@@ -992,8 +1136,11 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Power supply'
+                  tag: component
+                  value: sensor
+                -
+                  tag: component
+                  value: voltage
               trigger_prototypes:
                 -
                   uuid: 7d28666404bd4cedb687214846f89d4a
@@ -1002,6 +1149,10 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the power supply'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
           graph_prototypes:
             -
               uuid: 021bf935acc542d89a0a26120e995671
@@ -1025,6 +1176,19 @@ zabbix_export:
                   outArr.push(item)
                   });
                   return JSON.stringify(outArr);
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: gs-4012f
+        -
+          tag: target
+          value: switch
+        -
+          tag: target
+          value: zyxel
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/net/zyxel_snmp/zyxel_ies-500x_snmp/README.md b/templates/net/zyxel_snmp/zyxel_ies-500x_snmp/README.md
index 217bb958f5e..7fd62650aae 100644
--- a/templates/net/zyxel_snmp/zyxel_ies-500x_snmp/README.md
+++ b/templates/net/zyxel_snmp/zyxel_ies-500x_snmp/README.md
@@ -43,15 +43,15 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|Slot discovery |<p>The table which contains the slot information in a chassis.</p> |SNMP |zyxel.ies500x.slot.discovery<p>**Filter**:</p>AND <p>- {#ZYXEL.SLOTSTATUS} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SLOT.STATUS.MATCHES}`</p><p>- {#ZYXEL.SLOTSTATUS} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SLOT.STATUS.NOT_MATCHES}`</p> |
-|Fan discovery |<p>An entry in fanRpmTable.</p> |SNMP |zyxel.ies500x.fan.discovery |
-|Temperature discovery |<p>An entry in tempTable.</p> |SNMP |zyxel.ies500x.temp.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
-|Voltage discovery |<p>An entry in voltageTable.</p> |SNMP |zyxel.ies500x.volt.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
+|ADSL interface discovery |<p>-</p> |SNMP |zyxel.ies500x.net.adsl.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>**Filter**:</p>AND <p>- {#ZYXEL.IF.DESC} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.DESC.MATCHES}`</p><p>- {#ZYXEL.IF.DESC} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.DESC.NOT_MATCHES}`</p><p>- {#ZYXEL.IF.LINKSTATUS} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKSTATUS.MATCHES}`</p><p>- {#ZYXEL.IF.LINKSTATUS} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKSTATUS.NOT_MATCHES}`</p><p>- {#ZYXEL.IF.NAME} MATCHES_REGEX `adsl`</p><p>**Overrides:**</p><p>Don't create triggers for matching interface<br> - {#ZYXEL.IF.NAME} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}`<br>  - TRIGGER_PROTOTYPE REGEXP `.*` - NO_DISCOVER</p> |
 |CPU discovery |<p>A table that contains CPU utilization information.</p><p>This table is supported by R1.03 and later versions.</p> |SNMP |zyxel.ies500x.cpu.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
+|Ethernet interface discovery |<p>-</p> |SNMP |zyxel.ies500x.net.if.discovery<p>**Filter**:</p>AND <p>- {#ZYXEL.IF.DESC} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.DESC.MATCHES}`</p><p>- {#ZYXEL.IF.DESC} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.DESC.NOT_MATCHES}`</p><p>- {#ZYXEL.IF.LINKSTATUS} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKSTATUS.MATCHES}`</p><p>- {#ZYXEL.IF.LINKSTATUS} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKSTATUS.NOT_MATCHES}`</p><p>- {#ZYXEL.IF.NAME} MATCHES_REGEX `enet`</p><p>**Overrides:**</p><p>Don't create triggers for matching interface<br> - {#ZYXEL.IF.NAME} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}`<br>  - TRIGGER_PROTOTYPE REGEXP `.*` - NO_DISCOVER</p> |
+|Fan discovery |<p>An entry in fanRpmTable.</p> |SNMP |zyxel.ies500x.fan.discovery |
 |Memory discovery |<p>A table that contains memory usage information.</p> |SNMP |zyxel.ies500x.memory.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
 |Packet buffer discovery |<p>A table that contains packet buffer usage information.</p> |SNMP |zyxel.ies500x.buffer.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
-|Ethernet interface discovery |<p>-</p> |SNMP |zyxel.ies500x.net.if.discovery<p>**Filter**:</p>AND <p>- {#ZYXEL.IF.DESC} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.DESC.MATCHES}`</p><p>- {#ZYXEL.IF.DESC} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.DESC.NOT_MATCHES}`</p><p>- {#ZYXEL.IF.LINKSTATUS} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKSTATUS.MATCHES}`</p><p>- {#ZYXEL.IF.LINKSTATUS} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKSTATUS.NOT_MATCHES}`</p><p>- {#ZYXEL.IF.NAME} MATCHES_REGEX `enet`</p><p>**Overrides:**</p><p>Don't create triggers for matching interface<br> - {#ZYXEL.IF.NAME} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}`<br>  - TRIGGER_PROTOTYPE REGEXP `.*` - NO_DISCOVER</p> |
-|ADSL interface discovery |<p>-</p> |SNMP |zyxel.ies500x.net.adsl.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>**Filter**:</p>AND <p>- {#ZYXEL.IF.DESC} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.DESC.MATCHES}`</p><p>- {#ZYXEL.IF.DESC} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.DESC.NOT_MATCHES}`</p><p>- {#ZYXEL.IF.LINKSTATUS} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKSTATUS.MATCHES}`</p><p>- {#ZYXEL.IF.LINKSTATUS} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKSTATUS.NOT_MATCHES}`</p><p>- {#ZYXEL.IF.NAME} MATCHES_REGEX `adsl`</p><p>**Overrides:**</p><p>Don't create triggers for matching interface<br> - {#ZYXEL.IF.NAME} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}`<br>  - TRIGGER_PROTOTYPE REGEXP `.*` - NO_DISCOVER</p> |
+|Slot discovery |<p>The table which contains the slot information in a chassis.</p> |SNMP |zyxel.ies500x.slot.discovery<p>**Filter**:</p>AND <p>- {#ZYXEL.SLOTSTATUS} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SLOT.STATUS.MATCHES}`</p><p>- {#ZYXEL.SLOTSTATUS} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SLOT.STATUS.NOT_MATCHES}`</p> |
+|Temperature discovery |<p>An entry in tempTable.</p> |SNMP |zyxel.ies500x.temp.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
+|Voltage discovery |<p>An entry in voltageTable.</p> |SNMP |zyxel.ies500x.volt.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
 
 ## Items collected
 
@@ -66,52 +66,52 @@ There are no template links in this template.
 |Inventory |ZYXEL IES-500x: MAC address |<p>MIB: IF-MIB</p><p>The interface's address at the protocol layer</p><p>immediately `below' the network layer in the</p><p>protocol stack.  For interfaces which do not have</p><p>such an address (e.g., a serial line), this object</p><p>should contain an octet string of zero length.</p> |SNMP |zyxel.ies500x.mac<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Memory |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID}: Memory utilization |<p>MIB: ZYXEL-IES5000-MIB</p><p>The memory usage in the past 60 seconds.</p> |SNMP |zyxel.ies500x.memory[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Memory |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID}: Packet buffer utilization |<p>MIB: ZYXEL-IES5000-MIB</p><p>The packet buffer usage in the past 60 seconds.</p> |SNMP |zyxel.ies500x.buffer[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID}: Type |<p>MIB: ZYXEL-IES5000-MIB</p><p>Card type of the plug-in card.</p> |SNMP |zyxel.ies500x.slot.type[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID}: Description |<p>MIB: ZYXEL-IES5000-MIB</p><p>The descriptions of the plug-in card.</p> |SNMP |zyxel.ies500x.slot.desc[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID}: Firmware version |<p>MIB: ZYXEL-IES5000-MIB</p><p>The firmware version of the plug-in card.</p> |SNMP |zyxel.ies500x.slot.fw.ver[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID}: Driver version |<p>MIB: ZYXEL-IES5000-MIB</p><p>The DSL driver of the plug-in card.</p> |SNMP |zyxel.ies500x.slot.dv.ver[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID}: DSL modem code version |<p>MIB: ZYXEL-IES5000-MIB</p><p>The DSL modem code version of the plug-in card.</p> |SNMP |zyxel.ies500x.slot.cv.ver[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID}: Status |<p>MIB: ZYXEL-IES5000-MIB</p><p>The module state of the plug-in card.</p> |SNMP |zyxel.ies500x.slot.status[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID}: Alarm status |<p>MIB: ZYXEL-IES5000-MIB</p><p>This variable indicates the alarm status of the module.</p><p>It is a bit map represented a sum, therefore, it can represent</p><p>multiple defects simultaneously. The moduleNoDefect should be set</p><p>if and only if no other flag is set.</p><p>The various bit positions are:</p><p>1   moduleNoDefect</p><p>2   moduleOverHeat</p><p>3   moduleFanRpmLow</p><p>4   moduleVoltageLow</p><p>5   moduleThermalSensorFailure</p><p>6   modulePullOut</p><p>7   powerDC48VAFailure</p><p>8   powerDC48VBFailure</p><p>9   extAlarmInputTrigger</p><p>10   moduleDown</p><p>11   mscSwitchOverOK</p><p>12   networkTopologyChange</p><p>13   macSpoof</p><p>14   cpuHigh</p><p>15   memoryUsageHigh</p><p>16   packetBufferUsageHigh</p><p>17   loopguardOccurence</p> |SNMP |zyxel.ies500x.slot.alarm[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
-|Network_interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID}: Hardware version |<p>MIB: ZYXEL-IES5000-MIB</p><p>The hardware version of the plug-in card.</p> |SNMP |zyxel.ies500x.slot.hw.ver[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID}: Serial number |<p>MIB: ZYXEL-IES5000-MIB</p><p>The serial number of the plug-in card.</p> |SNMP |zyxel.ies500x.slot.serial[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID}: Uptime |<p>MIB: ZYXEL-IES5000-MIB</p><p>The time (in seconds) since the plug-in card was last re-initialized.</p> |SNMP |zyxel.ies500x.slot.uptime[{#SNMPINDEX}] |
-|Network_interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID}: MAC address 1 |<p>MIB: ZYXEL-IES5000-MIB</p><p>The MAC Address of the plug-in card.</p> |SNMP |zyxel.ies500x.slot.mac1[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID}: MAC address 2 |<p>MIB: ZYXEL-IES5000-MIB</p><p>The MAC Address of the plug-in card.</p> |SNMP |zyxel.ies500x.slot.mac2[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL IES-500x: Port {#SNMPINDEX}: Interface description |<p>MIB: IF-MIB</p><p>A textual string containing information about the interface</p> |SNMP |zyxel.ies500x.net.if.descr[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL IES-500x: Port {#SNMPINDEX}: Interface name |<p>MIB: IF-MIB</p><p>A textual string containing information about the interface</p> |SNMP |zyxel.ies500x.net.if.name[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL IES-500x: Port {#SNMPINDEX}: Operational status |<p>MIB: IF-MIB</p><p>The current operational state of the interface.</p><p>The testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.ies500x.net.if.operstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL IES-500x: Port {#SNMPINDEX}: Administrative status |<p>MIB: IF-MIB</p><p>The desired state of the interface.  The</p><p>testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.ies500x.net.if.adminstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL IES-500x: Port {#SNMPINDEX}: Incoming traffic |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface,</p><p>including framing characters.</p> |SNMP |zyxel.ies500x.net.if.in.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL IES-500x: Port {#SNMPINDEX}: Incoming unicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were not addressed to a multicast</p><p>or broadcast address at this sub-layer</p> |SNMP |zyxel.ies500x.net.if.in.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL IES-500x: Port {#SNMPINDEX}: Incoming multicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a multicast</p><p>address at this sub-layer.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.ies500x.net.if.in.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL IES-500x: Port {#SNMPINDEX}: Incoming broadcast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a broadcast</p><p>address at this sub-layer.</p> |SNMP |zyxel.ies500x.net.if.in.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL IES-500x: Port {#SNMPINDEX}: Outgoing traffic |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the</p><p>interface, including framing characters.  This object is a</p><p>64-bit version of ifOutOctets.</p> |SNMP |zyxel.ies500x.net.if.out.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL IES-500x: Port {#SNMPINDEX}: Outgoing unicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were not addressed to a</p><p>multicast or broadcast address at this sub-layer, including</p><p>those that were discarded or not sent.</p> |SNMP |zyxel.ies500x.net.if.out.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL IES-500x: Port {#SNMPINDEX}: Outgoing multicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>multicast address at this sub-layer, including those that</p><p>were discarded or not sent.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.ies500x.net.if.out.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL IES-500x: Port {#SNMPINDEX}: Outgoing broadcast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>broadcast address at this sub-layer, including those that</p><p>were discarded or not sent.</p> |SNMP |zyxel.ies500x.net.if.out.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL IES-500x: Port {#SNMPINDEX}: Link speed |<p>MIB: IF-MIB</p><p>An estimate of the interface's current bandwidth in bits per second</p> |SNMP |zyxel.ies500x.net.if.highspeed[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1000000`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL IES-500x: Port {#SNMPINDEX}: Incoming utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.ies500x.net.if.in.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(//zyxel.ies500x.net.if.in.traffic[{#SNMPINDEX}]) * (last(//zyxel.ies500x.net.if.highspeed[{#SNMPINDEX}]) <> 0) /( last(//zyxel.ies500x.net.if.highspeed[{#SNMPINDEX}]) + (last(//zyxel.ies500x.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100` |
-|Network_interfaces |ZYXEL IES-500x: Port {#SNMPINDEX}: Outgoing utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.ies500x.net.if.out.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(//zyxel.ies500x.net.if.out.traffic[{#SNMPINDEX}]) * (last(//zyxel.ies500x.net.if.highspeed[{#SNMPINDEX}]) <> 0) /( last(//zyxel.ies500x.net.if.highspeed[{#SNMPINDEX}]) + (last(//zyxel.ies500x.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100` |
-|Network_interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Interface description |<p>MIB: IF-MIB</p><p>A textual string containing information about the interface</p> |SNMP |zyxel.ies500x.net.adsl.descr[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Interface name |<p>MIB: IF-MIB</p><p>A textual string containing information about the interface</p> |SNMP |zyxel.ies500x.net.adsl.name[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Operational status |<p>MIB: IF-MIB</p><p>The current operational state of the interface.</p><p>The testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.ies500x.net.adsl.operstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Administrative status |<p>MIB: IF-MIB</p><p>The desired state of the interface.  The</p><p>testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.ies500x.net.adsl.adminstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Incoming traffic |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface,</p><p>including framing characters.</p> |SNMP |zyxel.ies500x.net.adsl.in.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Incoming unicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were not addressed to a multicast</p><p>or broadcast address at this sub-layer</p> |SNMP |zyxel.ies500x.net.adsl.in.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Incoming multicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a multicast</p><p>address at this sub-layer.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.ies500x.net.adsl.in.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Incoming broadcast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a broadcast</p><p>address at this sub-layer.</p> |SNMP |zyxel.ies500x.net.adsl.in.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Outgoing traffic |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the</p><p>interface, including framing characters.  This object is a</p><p>64-bit version of ifOutOctets.</p> |SNMP |zyxel.ies500x.net.adsl.out.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Outgoing unicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were not addressed to a</p><p>multicast or broadcast address at this sub-layer, including</p><p>those that were discarded or not sent.</p> |SNMP |zyxel.ies500x.net.adsl.out.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Outgoing multicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>multicast address at this sub-layer, including those that</p><p>were discarded or not sent.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.ies500x.net.adsl.out.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Outgoing broadcast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>broadcast address at this sub-layer, including those that</p><p>were discarded or not sent.</p> |SNMP |zyxel.ies500x.net.adsl.out.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: ATUC noise margin |<p>MIB: ADSL-LINE-MIB</p><p>Noise Margin as seen by this ATU with respect to its</p><p>received signal in tenth dB.</p><p>The Info Atuc fields show data acquired from the ATUC (ADSL Termination Unit – Central), in this case ZYXEL IES-500x, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.ies500x.net.adsl.atuc.snrmgn[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: ATUC attenuation |<p>MIB: ADSL-LINE-MIB</p><p>Measured difference in the total power transmitted by</p><p>the peer ATU and the total power received by this ATU.</p><p>The Info Atuc fields show data acquired from the ATUC (ADSL Termination Unit – Central), in this case ZYXEL IES-500x, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.ies500x.net.adsl.atuc.atn[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: ATUC output power |<p>MIB: ADSL-LINE-MIB</p><p>Measured total output power transmitted by this ATU.</p><p>The Info Atuc fields show data acquired from the ATUC (ADSL Termination Unit – Central), in this case ZYXEL IES-500x, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.ies500x.net.adsl.atuc.outpwr[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: ATUR noise margin |<p>MIB: ADSL-LINE-MIB</p><p>Noise Margin as seen by this ATU with respect to its</p><p>received signal in tenth dB.</p><p>The Info Atur fields show data acquired from the ATUR (ADSL Termination Unit – Remote), in this case the subscriber's ADSL modem or router, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.ies500x.net.adsl.atur.snrmgn[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: ATUR attenuation |<p>MIB: ADSL-LINE-MIB</p><p>Measured difference in the total power transmitted by</p><p>the peer ATU and the total power received by this ATU.</p><p>The Info Atur fields show data acquired from the ATUR (ADSL Termination Unit – Remote), in this case the subscriber's ADSL modem or router, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.ies500x.net.adsl.atur.atn[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: ATUR output power |<p>MIB: ADSL-LINE-MIB</p><p>Measured total output power transmitted by this ATU.</p><p>The Info Atur fields show data acquired from the ATUR (ADSL Termination Unit – Remote), in this case the subscriber's ADSL modem or router, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.ies500x.net.adsl.atur.outpwr[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Power_supply |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID}: Nominal "{#ZYXEL.VOLT.NOMINAL}" |<p>MIB: ZYXEL-IES5000-MIB</p><p>The current voltage reading.</p> |SNMP |zyxel.ies500x.volt[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID}: Type |<p>MIB: ZYXEL-IES5000-MIB</p><p>Card type of the plug-in card.</p> |SNMP |zyxel.ies500x.slot.type[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID}: Description |<p>MIB: ZYXEL-IES5000-MIB</p><p>The descriptions of the plug-in card.</p> |SNMP |zyxel.ies500x.slot.desc[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID}: Firmware version |<p>MIB: ZYXEL-IES5000-MIB</p><p>The firmware version of the plug-in card.</p> |SNMP |zyxel.ies500x.slot.fw.ver[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID}: Driver version |<p>MIB: ZYXEL-IES5000-MIB</p><p>The DSL driver of the plug-in card.</p> |SNMP |zyxel.ies500x.slot.dv.ver[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID}: DSL modem code version |<p>MIB: ZYXEL-IES5000-MIB</p><p>The DSL modem code version of the plug-in card.</p> |SNMP |zyxel.ies500x.slot.cv.ver[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID}: Status |<p>MIB: ZYXEL-IES5000-MIB</p><p>The module state of the plug-in card.</p> |SNMP |zyxel.ies500x.slot.status[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID}: Alarm status |<p>MIB: ZYXEL-IES5000-MIB</p><p>This variable indicates the alarm status of the module.</p><p>It is a bit map represented a sum, therefore, it can represent</p><p>multiple defects simultaneously. The moduleNoDefect should be set</p><p>if and only if no other flag is set.</p><p>The various bit positions are:</p><p>1   moduleNoDefect</p><p>2   moduleOverHeat</p><p>3   moduleFanRpmLow</p><p>4   moduleVoltageLow</p><p>5   moduleThermalSensorFailure</p><p>6   modulePullOut</p><p>7   powerDC48VAFailure</p><p>8   powerDC48VBFailure</p><p>9   extAlarmInputTrigger</p><p>10   moduleDown</p><p>11   mscSwitchOverOK</p><p>12   networkTopologyChange</p><p>13   macSpoof</p><p>14   cpuHigh</p><p>15   memoryUsageHigh</p><p>16   packetBufferUsageHigh</p><p>17   loopguardOccurence</p> |SNMP |zyxel.ies500x.slot.alarm[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
+|Network interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID}: Hardware version |<p>MIB: ZYXEL-IES5000-MIB</p><p>The hardware version of the plug-in card.</p> |SNMP |zyxel.ies500x.slot.hw.ver[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID}: Serial number |<p>MIB: ZYXEL-IES5000-MIB</p><p>The serial number of the plug-in card.</p> |SNMP |zyxel.ies500x.slot.serial[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID}: Uptime |<p>MIB: ZYXEL-IES5000-MIB</p><p>The time (in seconds) since the plug-in card was last re-initialized.</p> |SNMP |zyxel.ies500x.slot.uptime[{#SNMPINDEX}] |
+|Network interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID}: MAC address 1 |<p>MIB: ZYXEL-IES5000-MIB</p><p>The MAC Address of the plug-in card.</p> |SNMP |zyxel.ies500x.slot.mac1[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID}: MAC address 2 |<p>MIB: ZYXEL-IES5000-MIB</p><p>The MAC Address of the plug-in card.</p> |SNMP |zyxel.ies500x.slot.mac2[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL IES-500x: Port {#SNMPINDEX}: Interface description |<p>MIB: IF-MIB</p><p>A textual string containing information about the interface</p> |SNMP |zyxel.ies500x.net.if.descr[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL IES-500x: Port {#SNMPINDEX}: Interface name |<p>MIB: IF-MIB</p><p>A textual string containing information about the interface</p> |SNMP |zyxel.ies500x.net.if.name[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL IES-500x: Port {#SNMPINDEX}: Operational status |<p>MIB: IF-MIB</p><p>The current operational state of the interface.</p><p>The testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.ies500x.net.if.operstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL IES-500x: Port {#SNMPINDEX}: Administrative status |<p>MIB: IF-MIB</p><p>The desired state of the interface.  The</p><p>testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.ies500x.net.if.adminstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL IES-500x: Port {#SNMPINDEX}: Incoming traffic |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface,</p><p>including framing characters.</p> |SNMP |zyxel.ies500x.net.if.in.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL IES-500x: Port {#SNMPINDEX}: Incoming unicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were not addressed to a multicast</p><p>or broadcast address at this sub-layer</p> |SNMP |zyxel.ies500x.net.if.in.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL IES-500x: Port {#SNMPINDEX}: Incoming multicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a multicast</p><p>address at this sub-layer.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.ies500x.net.if.in.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL IES-500x: Port {#SNMPINDEX}: Incoming broadcast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a broadcast</p><p>address at this sub-layer.</p> |SNMP |zyxel.ies500x.net.if.in.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL IES-500x: Port {#SNMPINDEX}: Outgoing traffic |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the</p><p>interface, including framing characters.  This object is a</p><p>64-bit version of ifOutOctets.</p> |SNMP |zyxel.ies500x.net.if.out.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL IES-500x: Port {#SNMPINDEX}: Outgoing unicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were not addressed to a</p><p>multicast or broadcast address at this sub-layer, including</p><p>those that were discarded or not sent.</p> |SNMP |zyxel.ies500x.net.if.out.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL IES-500x: Port {#SNMPINDEX}: Outgoing multicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>multicast address at this sub-layer, including those that</p><p>were discarded or not sent.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.ies500x.net.if.out.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL IES-500x: Port {#SNMPINDEX}: Outgoing broadcast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>broadcast address at this sub-layer, including those that</p><p>were discarded or not sent.</p> |SNMP |zyxel.ies500x.net.if.out.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL IES-500x: Port {#SNMPINDEX}: Link speed |<p>MIB: IF-MIB</p><p>An estimate of the interface's current bandwidth in bits per second</p> |SNMP |zyxel.ies500x.net.if.highspeed[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1000000`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL IES-500x: Port {#SNMPINDEX}: Incoming utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.ies500x.net.if.in.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(//zyxel.ies500x.net.if.in.traffic[{#SNMPINDEX}]) * (last(//zyxel.ies500x.net.if.highspeed[{#SNMPINDEX}]) <> 0) /( last(//zyxel.ies500x.net.if.highspeed[{#SNMPINDEX}]) + (last(//zyxel.ies500x.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100` |
+|Network interfaces |ZYXEL IES-500x: Port {#SNMPINDEX}: Outgoing utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.ies500x.net.if.out.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(//zyxel.ies500x.net.if.out.traffic[{#SNMPINDEX}]) * (last(//zyxel.ies500x.net.if.highspeed[{#SNMPINDEX}]) <> 0) /( last(//zyxel.ies500x.net.if.highspeed[{#SNMPINDEX}]) + (last(//zyxel.ies500x.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100` |
+|Network interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Interface description |<p>MIB: IF-MIB</p><p>A textual string containing information about the interface</p> |SNMP |zyxel.ies500x.net.adsl.descr[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Interface name |<p>MIB: IF-MIB</p><p>A textual string containing information about the interface</p> |SNMP |zyxel.ies500x.net.adsl.name[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Operational status |<p>MIB: IF-MIB</p><p>The current operational state of the interface.</p><p>The testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.ies500x.net.adsl.operstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Administrative status |<p>MIB: IF-MIB</p><p>The desired state of the interface.  The</p><p>testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.ies500x.net.adsl.adminstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Incoming traffic |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface,</p><p>including framing characters.</p> |SNMP |zyxel.ies500x.net.adsl.in.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Incoming unicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were not addressed to a multicast</p><p>or broadcast address at this sub-layer</p> |SNMP |zyxel.ies500x.net.adsl.in.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Incoming multicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a multicast</p><p>address at this sub-layer.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.ies500x.net.adsl.in.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Incoming broadcast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a broadcast</p><p>address at this sub-layer.</p> |SNMP |zyxel.ies500x.net.adsl.in.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Outgoing traffic |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the</p><p>interface, including framing characters.  This object is a</p><p>64-bit version of ifOutOctets.</p> |SNMP |zyxel.ies500x.net.adsl.out.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Outgoing unicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were not addressed to a</p><p>multicast or broadcast address at this sub-layer, including</p><p>those that were discarded or not sent.</p> |SNMP |zyxel.ies500x.net.adsl.out.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Outgoing multicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>multicast address at this sub-layer, including those that</p><p>were discarded or not sent.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.ies500x.net.adsl.out.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Outgoing broadcast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>broadcast address at this sub-layer, including those that</p><p>were discarded or not sent.</p> |SNMP |zyxel.ies500x.net.adsl.out.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: ATUC noise margin |<p>MIB: ADSL-LINE-MIB</p><p>Noise Margin as seen by this ATU with respect to its</p><p>received signal in tenth dB.</p><p>The Info Atuc fields show data acquired from the ATUC (ADSL Termination Unit – Central), in this case ZYXEL IES-500x, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.ies500x.net.adsl.atuc.snrmgn[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: ATUC attenuation |<p>MIB: ADSL-LINE-MIB</p><p>Measured difference in the total power transmitted by</p><p>the peer ATU and the total power received by this ATU.</p><p>The Info Atuc fields show data acquired from the ATUC (ADSL Termination Unit – Central), in this case ZYXEL IES-500x, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.ies500x.net.adsl.atuc.atn[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: ATUC output power |<p>MIB: ADSL-LINE-MIB</p><p>Measured total output power transmitted by this ATU.</p><p>The Info Atuc fields show data acquired from the ATUC (ADSL Termination Unit – Central), in this case ZYXEL IES-500x, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.ies500x.net.adsl.atuc.outpwr[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: ATUR noise margin |<p>MIB: ADSL-LINE-MIB</p><p>Noise Margin as seen by this ATU with respect to its</p><p>received signal in tenth dB.</p><p>The Info Atur fields show data acquired from the ATUR (ADSL Termination Unit – Remote), in this case the subscriber's ADSL modem or router, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.ies500x.net.adsl.atur.snrmgn[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: ATUR attenuation |<p>MIB: ADSL-LINE-MIB</p><p>Measured difference in the total power transmitted by</p><p>the peer ATU and the total power received by this ATU.</p><p>The Info Atur fields show data acquired from the ATUR (ADSL Termination Unit – Remote), in this case the subscriber's ADSL modem or router, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.ies500x.net.adsl.atur.atn[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: ATUR output power |<p>MIB: ADSL-LINE-MIB</p><p>Measured total output power transmitted by this ATU.</p><p>The Info Atur fields show data acquired from the ATUR (ADSL Termination Unit – Remote), in this case the subscriber's ADSL modem or router, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.ies500x.net.adsl.atur.outpwr[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Power supply |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID}: Nominal "{#ZYXEL.VOLT.NOMINAL}" |<p>MIB: ZYXEL-IES5000-MIB</p><p>The current voltage reading.</p> |SNMP |zyxel.ies500x.volt[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Status |ZYXEL IES-500x: SNMP agent availability |<p>-</p> |INTERNAL |zabbix[host,snmp,available]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Status |ZYXEL IES-500x: Uptime |<p>MIB: RFC1213-MIB</p><p>The time (in hundredths of a second) since the</p><p>network management portion of the system was last</p><p>re-initialized.</p> |SNMP |zyxel.ies500x.uptime<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.01`</p> |
 |Temperature |ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID}: Temperature "{#ZYXEL.TEMP.ID}" |<p>MIB: ZYXEL-IES5000-MIB</p><p>The current temperature measured at this sensor</p> |SNMP |zyxel.ies500x.temp[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
@@ -147,7 +147,7 @@ There are no template links in this template.
 
 Please report any issues with the template at https://support.zabbix.com
 
-You can also provide a feedback, discuss the template or ask for help with it at [ZABBIX forums](https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/422668-discussion-thread-for-official-zabbix-templates-for-zyxel).
+You can also provide feedback, discuss the template or ask for help with it at [ZABBIX forums](https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/422668-discussion-thread-for-official-zabbix-templates-for-zyxel).
 
 ## Known Issues
 
diff --git a/templates/net/zyxel_snmp/zyxel_ies-500x_snmp/template_net_zyxel_ies-500x_snmp.yaml b/templates/net/zyxel_snmp/zyxel_ies-500x_snmp/template_net_zyxel_ies-500x_snmp.yaml
index 7d44e57e5b0..14d83502963 100644
--- a/templates/net/zyxel_snmp/zyxel_ies-500x_snmp/template_net_zyxel_ies-500x_snmp.yaml
+++ b/templates/net/zyxel_snmp/zyxel_ies-500x_snmp/template_net_zyxel_ies-500x_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-17T06:34:10Z'
+  date: '2022-01-26T10:44:30Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -27,7 +27,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/422668-discussion-thread-for-official-zabbix-templates-for-zyxel
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: 'Templates/Network devices'
@@ -47,8 +47,8 @@ zabbix_export:
                 - 1h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: network
           triggers:
             -
               uuid: 73967d1d3d01458c8e947a1aacb838b0
@@ -57,6 +57,10 @@ zabbix_export:
               opdata: 'Current state: {ITEM.LASTVALUE1}'
               priority: WARNING
               description: 'SNMP is not available for polling. Please check device connectivity and SNMP settings.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 5bc150cfc9b147e68b5d15a750546a3f
           name: 'ZYXEL IES-500x: Contact'
@@ -80,8 +84,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
         -
           uuid: cd669772d4454a359f1c372dce4a01de
           name: 'ZYXEL IES-500x: Location'
@@ -104,8 +108,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
         -
           uuid: 591148b198854413aed834874bf8f137
           name: 'ZYXEL IES-500x: MAC address'
@@ -131,8 +135,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
         -
           uuid: aa26dcc1d8c54feaaa70d42c6ff4d1c7
           name: 'ZYXEL IES-500x: Hardware model name'
@@ -159,8 +163,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
           triggers:
             -
               uuid: d4b378535f5c4299af1295029e94f9d1
@@ -168,6 +172,10 @@ zabbix_export:
               name: 'ZYXEL IES-500x: Template does not match hardware'
               priority: INFO
               description: 'This template is for Zyxel IES-500x, but connected to {ITEM.VALUE}'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: ee9da829778e4da69fde78f72b5b0783
           name: 'ZYXEL IES-500x: Host name'
@@ -191,8 +199,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
         -
           uuid: 28df2d29a94d429d811dd40ceb510fcf
           name: 'ZYXEL IES-500x: Uptime'
@@ -215,8 +223,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: d618295a763f42cd9063fad5cd600c34
@@ -225,6 +233,10 @@ zabbix_export:
               priority: INFO
               description: 'Uptime is less than 10 minutes'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
       discovery_rules:
         -
           uuid: 2ddba614e41f4014abef703418439e2a
@@ -253,8 +265,8 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Slot {#ZYXEL.SLOT.ID}'
+                  tag: component
+                  value: system
               trigger_prototypes:
                 -
                   uuid: b02248180f314948bdbb68e8b940cb99
@@ -262,6 +274,10 @@ zabbix_export:
                   name: 'ZYXEL IES-500x: High Packet buffer utilization in Slot {#ZYXEL.SLOT.ID} (>{#ZYXEL.BUFFERHIGHTHRESH}% for 5m)'
                   priority: AVERAGE
                   description: 'The system is running out of free buffer.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 83573a387ef24596bf7e4171506a9ea5
@@ -314,8 +330,8 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Slot {#ZYXEL.SLOT.ID}'
+                  tag: component
+                  value: cpu
               trigger_prototypes:
                 -
                   uuid: e2e689642a884509a5254e946deaf69f
@@ -324,6 +340,10 @@ zabbix_export:
                   opdata: 'Current utilization: {ITEM.LASTVALUE1}'
                   priority: WARNING
                   description: 'CPU utilization is too high. The system might be slow to respond.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: c9a9a54478ba46bbb91b4945c977a823
@@ -374,8 +394,11 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: Fans
+                  tag: component
+                  value: fan
+                -
+                  tag: component
+                  value: sensor
               trigger_prototypes:
                 -
                   uuid: 9e249839db314f05a7a3cd16172ae9a7
@@ -384,6 +407,10 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the fan unit'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
           graph_prototypes:
             -
               uuid: 79f318a961b5418e888de36f8ffe17e7
@@ -421,8 +448,8 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Slot {#ZYXEL.SLOT.ID}'
+                  tag: component
+                  value: memory
               trigger_prototypes:
                 -
                   uuid: c3099861742f4303af838a0bf3921fac
@@ -430,6 +457,10 @@ zabbix_export:
                   name: 'ZYXEL IES-500x: High memory utilization in Slot {#ZYXEL.SLOT.ID} pool (>{#ZYXEL.MEMORYHIGHTHRESH}% for 5m)'
                   priority: AVERAGE
                   description: 'The system is running out of free memory.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 0b72c4f49d434e0c9a7de3a6617511ea
@@ -507,8 +538,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 3a97021a210442c3bdc461060fbe700b
               name: 'ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: ATUC attenuation'
@@ -534,8 +571,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 375982ea68ec4800aa27a50a89fd79d5
@@ -543,6 +586,10 @@ zabbix_export:
                   name: 'ZYXEL IES-500x: High the DSL line attenuation in Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID} (>{$ZYXEL.ADSL.ATN.MAX}dB for 5m)'
                   priority: WARNING
                   description: 'The reductions in amplitude of the downstream and upstream DSL signals.'
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
             -
               uuid: 62f3eb71d01946a68d799aa6ed1d29a3
               name: 'ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: ATUC output power'
@@ -567,8 +614,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 540251c3a4024e4289194130853be305
               name: 'ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: ATUC noise margin'
@@ -594,8 +647,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 8d2f57548d4e47f2981a4fd79d065246
@@ -603,6 +662,10 @@ zabbix_export:
                   name: 'ZYXEL IES-500x: Low the DSL line noise margins in Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID} (<{$ZYXEL.ADSL.SNR.MIN}dB for 5m)'
                   priority: WARNING
                   description: 'Signal-to-noise margin (SNR Margin) which is the difference between the actual SNR and the SNR required to sync at a specific speed'
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
             -
               uuid: a664c452a98d4478b4663aa7cca9c19c
               name: 'ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: ATUR attenuation'
@@ -628,8 +691,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 1dec7ed135a348b1a1cebb3b4319d77f
@@ -637,6 +706,10 @@ zabbix_export:
                   name: 'ZYXEL IES-500x: High the DSL line attenuation in Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID} (>{$ZYXEL.ADSL.ATN.MAX}dB for 5m)'
                   priority: WARNING
                   description: 'The reductions in amplitude of the downstream and upstream DSL signals.'
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
             -
               uuid: 91a4b40293d54fe8bc8894303055cba3
               name: 'ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: ATUR output power'
@@ -661,8 +734,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 691ffcf882c54ebe8d0dfa305d8497e0
               name: 'ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: ATUR noise margin'
@@ -688,8 +767,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 7f8f4a2bff14464fbe2f956be87ad56d
@@ -697,6 +782,10 @@ zabbix_export:
                   name: 'ZYXEL IES-500x: Low the DSL line noise margins in Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID} (<{$ZYXEL.ADSL.SNR.MIN}dB for 5m)'
                   priority: WARNING
                   description: 'Signal-to-noise margin (SNR Margin) which is the difference between the actual SNR and the SNR required to sync at a specific speed'
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
             -
               uuid: c00cf2ee74c0476f9118594d04e6640d
               name: 'ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Interface description'
@@ -716,8 +805,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 3df0ee0298c2445f81e1aca8ee748a50
               name: 'ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Incoming broadcast packages'
@@ -738,8 +833,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 05799441c906425d8f584ead3e9b909b
               name: 'ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Incoming multicast packages'
@@ -761,8 +862,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: fff4c400f6774b9ba5e47fbeb214e5ec
               name: 'ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Incoming traffic'
@@ -786,8 +893,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 4ffe4823f03b4c738b305f03ae4f1d55
               name: 'ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Incoming unicast packages'
@@ -808,8 +921,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 514910a945e34befa0ecc22ea0b89783
               name: 'ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Interface name'
@@ -829,8 +948,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 216ad17a0c3348d7a250697f768a6481
               name: 'ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Operational status'
@@ -852,8 +977,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 8afcc973a7e94a0782a057205cc1b8ed
@@ -870,6 +1001,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 7eec054602cb4f988999d80b29f25a32
               name: 'ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Outgoing broadcast packages'
@@ -891,8 +1026,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 420fa08f36bf487cb0af6dc64f335e7b
               name: 'ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Outgoing multicast packages'
@@ -915,8 +1056,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 70a1342e17634500ac9c896c66177de6
               name: 'ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Outgoing traffic'
@@ -941,8 +1088,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 5c2f168d421e4b81a3d62e415ec8218a
               name: 'ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Outgoing unicast packages'
@@ -964,8 +1117,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           graph_prototypes:
             -
               uuid: a98704946d534a06909de85a05d75224
@@ -1106,8 +1265,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 7bd13f8dd37c417dbbc92abbcbefbdde
               name: 'ZYXEL IES-500x: Port {#SNMPINDEX}: Interface description'
@@ -1127,8 +1292,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 7ab66a4640ee4852ad0e587eb1076f9d
               name: 'ZYXEL IES-500x: Port {#SNMPINDEX}: Link speed'
@@ -1151,8 +1322,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 0b1508bec31642c381b4bab5b1c394fb
               name: 'ZYXEL IES-500x: Port {#SNMPINDEX}: Incoming broadcast packages'
@@ -1173,8 +1350,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 5a77fb99febd45feaadbb4f1c6f58ead
               name: 'ZYXEL IES-500x: Port {#SNMPINDEX}: Incoming multicast packages'
@@ -1196,8 +1379,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: a4375745658546598b786c43bafb629f
               name: 'ZYXEL IES-500x: Port {#SNMPINDEX}: Incoming traffic'
@@ -1221,8 +1410,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: eb00c7f533b24a06b3b9b926dc8aff2d
               name: 'ZYXEL IES-500x: Port {#SNMPINDEX}: Incoming unicast packages'
@@ -1243,8 +1438,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: c90cfe865d7a4fdd89970e086b04a9a7
               name: 'ZYXEL IES-500x: Port {#SNMPINDEX}: Incoming utilization'
@@ -1268,8 +1469,14 @@ zabbix_export:
                     - 'return +parseFloat(value).toFixed(0);'
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: bbbd8624e0e24db8b062625a2de1785b
               name: 'ZYXEL IES-500x: Port {#SNMPINDEX}: Interface name'
@@ -1289,8 +1496,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: d3e519c9648c4c58a7e55a9c90d8a3c0
               name: 'ZYXEL IES-500x: Port {#SNMPINDEX}: Operational status'
@@ -1312,8 +1525,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 71a10836f3094184bba728a0cf4d005a
@@ -1330,6 +1549,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 7816c8845baa498a96cc6d0a4049357c
               name: 'ZYXEL IES-500x: Port {#SNMPINDEX}: Outgoing broadcast packages'
@@ -1351,8 +1574,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: bbd80eaceee848019cfef5e20f0c356a
               name: 'ZYXEL IES-500x: Port {#SNMPINDEX}: Outgoing multicast packages'
@@ -1375,8 +1604,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: c9f694268c334213a39c09dbadcdd067
               name: 'ZYXEL IES-500x: Port {#SNMPINDEX}: Outgoing traffic'
@@ -1401,8 +1636,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: f929a7e5d0b741c4b557715fbc5a7e1f
               name: 'ZYXEL IES-500x: Port {#SNMPINDEX}: Outgoing unicast packages'
@@ -1424,8 +1665,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 74beae2dcc424702a906aa736e9f9d0f
               name: 'ZYXEL IES-500x: Port {#SNMPINDEX}: Outgoing utilization'
@@ -1449,8 +1696,14 @@ zabbix_export:
                     - 'return +parseFloat(value).toFixed(0);'
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           graph_prototypes:
             -
               uuid: cb09087451b3472ab5d04f18c829acc9
@@ -1627,8 +1880,11 @@ zabbix_export:
                       return outArray.join();
               tags:
                 -
-                  tag: Application
-                  value: 'Slot {#ZYXEL.SLOT.ID}'
+                  tag: component
+                  value: line-card
+                -
+                  tag: interface
+                  value: 'slot-{#ZYXEL.SLOT.ID}'
               trigger_prototypes:
                 -
                   uuid: d2dd1a23dbbb467e90ab99ff59a817a2
@@ -1636,6 +1892,10 @@ zabbix_export:
                   name: 'ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID} alarm'
                   priority: AVERAGE
                   description: 'The slot reported an error.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: a58ef41b02d94d16abe294bc26fc0874
               name: 'ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID}: DSL modem code version'
@@ -1656,8 +1916,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Slot {#ZYXEL.SLOT.ID}'
+                  tag: component
+                  value: firmware
+                -
+                  tag: component
+                  value: line-card
+                -
+                  tag: interface
+                  value: 'slot-{#ZYXEL.SLOT.ID}'
               trigger_prototypes:
                 -
                   uuid: 1b163693dc87407db836021da67bdccc
@@ -1667,6 +1933,10 @@ zabbix_export:
                   priority: INFO
                   description: 'Firmware version has changed. Ack to close'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: bf65cd99df724b64a4cad64c0681ab27
               name: 'ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID}: Description'
@@ -1686,8 +1956,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Slot {#ZYXEL.SLOT.ID}'
+                  tag: component
+                  value: line-card
+                -
+                  tag: interface
+                  value: 'slot-{#ZYXEL.SLOT.ID}'
             -
               uuid: 081fb5758fb6412890a54630d737f239
               name: 'ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID}: Driver version'
@@ -1708,8 +1981,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Slot {#ZYXEL.SLOT.ID}'
+                  tag: component
+                  value: firmware
+                -
+                  tag: component
+                  value: line-card
+                -
+                  tag: interface
+                  value: 'slot-{#ZYXEL.SLOT.ID}'
               trigger_prototypes:
                 -
                   uuid: 44f7087bcb524593a419887c199fb613
@@ -1719,6 +1998,10 @@ zabbix_export:
                   priority: INFO
                   description: 'Firmware version has changed. Ack to close'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 6b3a925397094b00aa31efee03a226fa
               name: 'ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID}: Firmware version'
@@ -1739,8 +2022,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Slot {#ZYXEL.SLOT.ID}'
+                  tag: component
+                  value: firmware
+                -
+                  tag: component
+                  value: line-card
+                -
+                  tag: interface
+                  value: 'slot-{#ZYXEL.SLOT.ID}'
               trigger_prototypes:
                 -
                   uuid: 6de6e5adadf04a79813ed7778b454043
@@ -1750,6 +2039,10 @@ zabbix_export:
                   priority: INFO
                   description: 'Firmware version has changed. Ack to close'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: c16e15224326406ba5f4c58a1c2e3b2c
               name: 'ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID}: Hardware version'
@@ -1770,8 +2063,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Slot {#ZYXEL.SLOT.ID}'
+                  tag: component
+                  value: firmware
+                -
+                  tag: component
+                  value: line-card
+                -
+                  tag: interface
+                  value: 'slot-{#ZYXEL.SLOT.ID}'
               trigger_prototypes:
                 -
                   uuid: 42969016e9c846a8954ebf95d2ff0ffc
@@ -1781,6 +2080,10 @@ zabbix_export:
                   priority: INFO
                   description: 'Firmware version has changed. Ack to close'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: eed64c81e4b54ccd9d7f0e5b86ede083
               name: 'ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID}: MAC address 1'
@@ -1800,8 +2103,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Slot {#ZYXEL.SLOT.ID}'
+                  tag: component
+                  value: line-card
+                -
+                  tag: interface
+                  value: 'slot-{#ZYXEL.SLOT.ID}'
             -
               uuid: d0fdd2a7dcb348b58dd3bea0357f84b3
               name: 'ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID}: MAC address 2'
@@ -1821,8 +2127,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Slot {#ZYXEL.SLOT.ID}'
+                  tag: component
+                  value: line-card
+                -
+                  tag: interface
+                  value: 'slot-{#ZYXEL.SLOT.ID}'
             -
               uuid: 6f9532e9368344ad8f7d35273e14c358
               name: 'ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID}: Serial number'
@@ -1842,8 +2151,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Slot {#ZYXEL.SLOT.ID}'
+                  tag: component
+                  value: line-card
+                -
+                  tag: interface
+                  value: 'slot-{#ZYXEL.SLOT.ID}'
               trigger_prototypes:
                 -
                   uuid: 0994c0ab8b004dc280d1a036e7043cc0
@@ -1852,6 +2164,10 @@ zabbix_export:
                   priority: INFO
                   description: 'Slot {#ZYXEL.SLOT.ID} serial number has changed. Ack to close'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 7b8791b7c91e4c14aa56a29617a6fa81
               name: 'ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID}: Status'
@@ -1871,8 +2187,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Slot {#ZYXEL.SLOT.ID}'
+                  tag: component
+                  value: line-card
+                -
+                  tag: interface
+                  value: 'slot-{#ZYXEL.SLOT.ID}'
             -
               uuid: 9387847247134f3296e077713407686e
               name: 'ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID}: Type'
@@ -1892,8 +2211,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Slot {#ZYXEL.SLOT.ID}'
+                  tag: component
+                  value: line-card
+                -
+                  tag: interface
+                  value: 'slot-{#ZYXEL.SLOT.ID}'
             -
               uuid: be141094a1ee4b2391bf8684ddca86e6
               name: 'ZYXEL IES-500x: Slot {#ZYXEL.SLOT.ID}: Uptime'
@@ -1907,8 +2229,11 @@ zabbix_export:
                 The time (in seconds) since the plug-in card was last re-initialized.
               tags:
                 -
-                  tag: Application
-                  value: 'Slot {#ZYXEL.SLOT.ID}'
+                  tag: component
+                  value: line-card
+                -
+                  tag: interface
+                  value: 'slot-{#ZYXEL.SLOT.ID}'
               trigger_prototypes:
                 -
                   uuid: 6717069c115147b095321f2c4c5ec51b
@@ -1917,6 +2242,10 @@ zabbix_export:
                   priority: INFO
                   description: 'Uptime is less than 10 minutes'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
         -
           uuid: c2d924fbfe3b44a58454e6a4392aa6a8
           name: 'Temperature discovery'
@@ -1944,8 +2273,11 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Slot {#ZYXEL.SLOT.ID}'
+                  tag: component
+                  value: sensor
+                -
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: c4993b2d52e04808862ac0d043b0e982
@@ -1954,6 +2286,10 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the temperature'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
           graph_prototypes:
             -
               uuid: 3b8799c609344e749de0da409b666714
@@ -2009,8 +2345,11 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Slot {#ZYXEL.SLOT.ID}'
+                  tag: component
+                  value: sensor
+                -
+                  tag: component
+                  value: voltage
               trigger_prototypes:
                 -
                   uuid: 55bc511ff2094a86b10c542e896d10e2
@@ -2019,6 +2358,10 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the power supply'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
           graph_prototypes:
             -
               uuid: bf0cfa212f934287b8dd3e405f8d1de3
@@ -2045,6 +2388,22 @@ zabbix_export:
                       outArr.push(item)
                   });
                   return JSON.stringify(outArr);
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: dslam
+        -
+          tag: target
+          value: ies-5000
+        -
+          tag: target
+          value: ies-5005
+        -
+          tag: target
+          value: zyxel
       macros:
         -
           macro: '{$SNMP.TIMEOUT}'
diff --git a/templates/net/zyxel_snmp/zyxel_ies-6000_snmp/README.md b/templates/net/zyxel_snmp/zyxel_ies-6000_snmp/README.md
index 05632931027..4b9f7c9bcd4 100644
--- a/templates/net/zyxel_snmp/zyxel_ies-6000_snmp/README.md
+++ b/templates/net/zyxel_snmp/zyxel_ies-6000_snmp/README.md
@@ -43,15 +43,15 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|Slot discovery |<p>The table which contains the slot information in a chassis.</p> |SNMP |zyxel.ies6000.slot.discovery<p>**Filter**:</p>AND <p>- {#ZYXEL.SLOTSTATUS} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SLOT.STATUS.MATCHES}`</p><p>- {#ZYXEL.SLOTSTATUS} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SLOT.STATUS.NOT_MATCHES}`</p> |
-|Fan discovery |<p>An entry in fanRpmTable.</p> |SNMP |zyxel.ies6000.fan.discovery |
-|Temperature discovery |<p>An entry in tempTable.</p> |SNMP |zyxel.ies6000.temp.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
-|Voltage discovery |<p>An entry in voltageTable.</p> |SNMP |zyxel.ies6000.volt.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
+|ADSL interface discovery |<p>-</p> |SNMP |zyxel.ies6000.net.adsl.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>**Filter**:</p>AND <p>- {#ZYXEL.IF.DESC} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.DESC.MATCHES}`</p><p>- {#ZYXEL.IF.DESC} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.DESC.NOT_MATCHES}`</p><p>- {#ZYXEL.IF.LINKSTATUS} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKSTATUS.MATCHES}`</p><p>- {#ZYXEL.IF.LINKSTATUS} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKSTATUS.NOT_MATCHES}`</p><p>- {#ZYXEL.IF.NAME} MATCHES_REGEX `adsl`</p><p>**Overrides:**</p><p>Don't create triggers for matching interface<br> - {#ZYXEL.IF.NAME} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}`<br>  - TRIGGER_PROTOTYPE REGEXP `.*` - NO_DISCOVER</p> |
 |CPU discovery |<p>A table that contains CPU utilization information.</p><p>This table is supported by R1.03 and later versions.</p> |SNMP |zyxel.ies6000.cpu.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
+|Ethernet interface discovery |<p>-</p> |SNMP |zyxel.ies6000.net.if.discovery<p>**Filter**:</p>AND <p>- {#ZYXEL.IF.DESC} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.DESC.MATCHES}`</p><p>- {#ZYXEL.IF.DESC} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.DESC.NOT_MATCHES}`</p><p>- {#ZYXEL.IF.LINKSTATUS} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKSTATUS.MATCHES}`</p><p>- {#ZYXEL.IF.LINKSTATUS} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKSTATUS.NOT_MATCHES}`</p><p>- {#ZYXEL.IF.NAME} MATCHES_REGEX `enet`</p><p>**Overrides:**</p><p>Don't create triggers for matching interface<br> - {#ZYXEL.IF.NAME} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}`<br>  - TRIGGER_PROTOTYPE REGEXP `.*` - NO_DISCOVER</p> |
+|Fan discovery |<p>An entry in fanRpmTable.</p> |SNMP |zyxel.ies6000.fan.discovery |
 |Memory discovery |<p>A table that contains memory usage information.</p> |SNMP |zyxel.ies6000.memory.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
 |Packet buffer discovery |<p>A table that contains packet buffer usage information.</p> |SNMP |zyxel.ies6000.buffer.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
-|Ethernet interface discovery |<p>-</p> |SNMP |zyxel.ies6000.net.if.discovery<p>**Filter**:</p>AND <p>- {#ZYXEL.IF.DESC} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.DESC.MATCHES}`</p><p>- {#ZYXEL.IF.DESC} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.DESC.NOT_MATCHES}`</p><p>- {#ZYXEL.IF.LINKSTATUS} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKSTATUS.MATCHES}`</p><p>- {#ZYXEL.IF.LINKSTATUS} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKSTATUS.NOT_MATCHES}`</p><p>- {#ZYXEL.IF.NAME} MATCHES_REGEX `enet`</p><p>**Overrides:**</p><p>Don't create triggers for matching interface<br> - {#ZYXEL.IF.NAME} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}`<br>  - TRIGGER_PROTOTYPE REGEXP `.*` - NO_DISCOVER</p> |
-|ADSL interface discovery |<p>-</p> |SNMP |zyxel.ies6000.net.adsl.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>**Filter**:</p>AND <p>- {#ZYXEL.IF.DESC} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.DESC.MATCHES}`</p><p>- {#ZYXEL.IF.DESC} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.DESC.NOT_MATCHES}`</p><p>- {#ZYXEL.IF.LINKSTATUS} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKSTATUS.MATCHES}`</p><p>- {#ZYXEL.IF.LINKSTATUS} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKSTATUS.NOT_MATCHES}`</p><p>- {#ZYXEL.IF.NAME} MATCHES_REGEX `adsl`</p><p>**Overrides:**</p><p>Don't create triggers for matching interface<br> - {#ZYXEL.IF.NAME} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}`<br>  - TRIGGER_PROTOTYPE REGEXP `.*` - NO_DISCOVER</p> |
+|Slot discovery |<p>The table which contains the slot information in a chassis.</p> |SNMP |zyxel.ies6000.slot.discovery<p>**Filter**:</p>AND <p>- {#ZYXEL.SLOTSTATUS} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SLOT.STATUS.MATCHES}`</p><p>- {#ZYXEL.SLOTSTATUS} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SLOT.STATUS.NOT_MATCHES}`</p> |
+|Temperature discovery |<p>An entry in tempTable.</p> |SNMP |zyxel.ies6000.temp.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
+|Voltage discovery |<p>An entry in voltageTable.</p> |SNMP |zyxel.ies6000.volt.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
 
 ## Items collected
 
@@ -66,52 +66,52 @@ There are no template links in this template.
 |Inventory |ZYXEL IES-6000: MAC address |<p>MIB: IF-MIB</p><p>The interface's address at the protocol layer</p><p>immediately `below' the network layer in the</p><p>protocol stack.  For interfaces which do not have</p><p>such an address (e.g., a serial line), this object</p><p>should contain an octet string of zero length.</p> |SNMP |zyxel.ies6000.mac<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Memory |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID}: Memory utilization |<p>MIB: ZYXEL-IES5000-MIB</p><p>The memory usage in the past 60 seconds.</p> |SNMP |zyxel.ies6000.memory[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Memory |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID}: Packet buffer utilization |<p>MIB: ZYXEL-IES5000-MIB</p><p>The packet buffer usage in the past 60 seconds.</p> |SNMP |zyxel.ies6000.buffer[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID}: Type |<p>MIB: ZYXEL-IES5000-MIB</p><p>Card type of the plug-in card.</p> |SNMP |zyxel.ies6000.slot.type[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID}: Description |<p>MIB: ZYXEL-IES5000-MIB</p><p>The descriptions of the plug-in card.</p> |SNMP |zyxel.ies6000.slot.desc[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID}: Firmware version |<p>MIB: ZYXEL-IES5000-MIB</p><p>The firmware version of the plug-in card.</p> |SNMP |zyxel.ies6000.slot.fw.ver[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID}: Driver version |<p>MIB: ZYXEL-IES5000-MIB</p><p>The DSL driver of the plug-in card.</p> |SNMP |zyxel.ies6000.slot.dv.ver[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID}: DSL modem code version |<p>MIB: ZYXEL-IES5000-MIB</p><p>The DSL modem code version of the plug-in card.</p> |SNMP |zyxel.ies6000.slot.cv.ver[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID}: Status |<p>MIB: ZYXEL-IES5000-MIB</p><p>The module state of the plug-in card.</p> |SNMP |zyxel.ies6000.slot.status[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID}: Alarm status |<p>MIB: ZYXEL-IES5000-MIB</p><p>This variable indicates the alarm status of the module.</p><p>It is a bit map represented a sum, therefore, it can represent</p><p>multiple defects simultaneously. The moduleNoDefect should be set</p><p>if and only if no other flag is set.</p><p>The various bit positions are:</p><p>1   moduleNoDefect</p><p>2   moduleOverHeat</p><p>3   moduleFanRpmLow</p><p>4   moduleVoltageLow</p><p>5   moduleThermalSensorFailure</p><p>6   modulePullOut</p><p>7   powerDC48VAFailure</p><p>8   powerDC48VBFailure</p><p>9   extAlarmInputTrigger</p><p>10   moduleDown</p><p>11   mscSwitchOverOK</p><p>12   networkTopologyChange</p><p>13   macSpoof</p><p>14   cpuHigh</p><p>15   memoryUsageHigh</p><p>16   packetBufferUsageHigh</p><p>17   loopguardOccurence</p> |SNMP |zyxel.ies6000.slot.alarm[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
-|Network_interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID}: Hardware version |<p>MIB: ZYXEL-IES5000-MIB</p><p>The hardware version of the plug-in card.</p> |SNMP |zyxel.ies6000.slot.hw.ver[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID}: Serial number |<p>MIB: ZYXEL-IES5000-MIB</p><p>The serial number of the plug-in card.</p> |SNMP |zyxel.ies6000.slot.serial[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID}: Uptime |<p>MIB: ZYXEL-IES5000-MIB</p><p>The time (in seconds) since the plug-in card was last re-initialized.</p> |SNMP |zyxel.ies6000.slot.uptime[{#SNMPINDEX}] |
-|Network_interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID}: MAC address 1 |<p>MIB: ZYXEL-IES5000-MIB</p><p>The MAC Address of the plug-in card.</p> |SNMP |zyxel.ies6000.slot.mac1[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID}: MAC address 2 |<p>MIB: ZYXEL-IES5000-MIB</p><p>The MAC Address of the plug-in card.</p> |SNMP |zyxel.ies6000.slot.mac2[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL IES-6000: Port {#SNMPINDEX}: Interface description |<p>MIB: IF-MIB</p><p>A textual string containing information about the interface</p> |SNMP |zyxel.ies6000.net.if.descr[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL IES-6000: Port {#SNMPINDEX}: Interface name |<p>MIB: IF-MIB</p><p>A textual string containing information about the interface</p> |SNMP |zyxel.ies6000.net.if.name[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL IES-6000: Port {#SNMPINDEX}: Operational status |<p>MIB: IF-MIB</p><p>The current operational state of the interface.</p><p>The testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.ies6000.net.if.operstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL IES-6000: Port {#SNMPINDEX}: Administrative status |<p>MIB: IF-MIB</p><p>The desired state of the interface.  The</p><p>testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.ies6000.net.if.adminstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL IES-6000: Port {#SNMPINDEX}: Incoming traffic |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface,</p><p>including framing characters.</p> |SNMP |zyxel.ies6000.net.if.in.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL IES-6000: Port {#SNMPINDEX}: Incoming unicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were not addressed to a multicast</p><p>or broadcast address at this sub-layer</p> |SNMP |zyxel.ies6000.net.if.in.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL IES-6000: Port {#SNMPINDEX}: Incoming multicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a multicast</p><p>address at this sub-layer.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.ies6000.net.if.in.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL IES-6000: Port {#SNMPINDEX}: Incoming broadcast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a broadcast</p><p>address at this sub-layer.</p> |SNMP |zyxel.ies6000.net.if.in.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL IES-6000: Port {#SNMPINDEX}: Outgoing traffic |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the</p><p>interface, including framing characters.  This object is a</p><p>64-bit version of ifOutOctets.</p> |SNMP |zyxel.ies6000.net.if.out.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL IES-6000: Port {#SNMPINDEX}: Outgoing unicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were not addressed to a</p><p>multicast or broadcast address at this sub-layer, including</p><p>those that were discarded or not sent.</p> |SNMP |zyxel.ies6000.net.if.out.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL IES-6000: Port {#SNMPINDEX}: Outgoing multicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>multicast address at this sub-layer, including those that</p><p>were discarded or not sent.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.ies6000.net.if.out.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL IES-6000: Port {#SNMPINDEX}: Outgoing broadcast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>broadcast address at this sub-layer, including those that</p><p>were discarded or not sent.</p> |SNMP |zyxel.ies6000.net.if.out.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL IES-6000: Port {#SNMPINDEX}: Link speed |<p>MIB: IF-MIB</p><p>An estimate of the interface's current bandwidth in bits per second</p> |SNMP |zyxel.ies6000.net.if.highspeed[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1000000`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL IES-6000: Port {#SNMPINDEX}: Incoming utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.ies6000.net.if.in.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(//zyxel.ies6000.net.if.in.traffic[{#SNMPINDEX}]) * (last(//zyxel.ies6000.net.if.highspeed[{#SNMPINDEX}]) <> 0) /( last(//zyxel.ies6000.net.if.highspeed[{#SNMPINDEX}]) + (last(//zyxel.ies6000.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100` |
-|Network_interfaces |ZYXEL IES-6000: Port {#SNMPINDEX}: Outgoing utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.ies6000.net.if.out.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(//zyxel.ies6000.net.if.out.traffic[{#SNMPINDEX}]) * (last(//zyxel.ies6000.net.if.highspeed[{#SNMPINDEX}]) <> 0) /( last(//zyxel.ies6000.net.if.highspeed[{#SNMPINDEX}]) + (last(//zyxel.ies6000.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100` |
-|Network_interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Interface description |<p>MIB: IF-MIB</p><p>A textual string containing information about the interface</p> |SNMP |zyxel.ies6000.net.adsl.descr[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Interface name |<p>MIB: IF-MIB</p><p>A textual string containing information about the interface</p> |SNMP |zyxel.ies6000.net.adsl.name[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Operational status |<p>MIB: IF-MIB</p><p>The current operational state of the interface.</p><p>The testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.ies6000.net.adsl.operstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Administrative status |<p>MIB: IF-MIB</p><p>The desired state of the interface.  The</p><p>testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.ies6000.net.adsl.adminstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Incoming traffic |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface,</p><p>including framing characters.</p> |SNMP |zyxel.ies6000.net.adsl.in.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Incoming unicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were not addressed to a multicast</p><p>or broadcast address at this sub-layer</p> |SNMP |zyxel.ies6000.net.adsl.in.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Incoming multicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a multicast</p><p>address at this sub-layer.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.ies6000.net.adsl.in.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Incoming broadcast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a broadcast</p><p>address at this sub-layer.</p> |SNMP |zyxel.ies6000.net.adsl.in.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Outgoing traffic |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the</p><p>interface, including framing characters.  This object is a</p><p>64-bit version of ifOutOctets.</p> |SNMP |zyxel.ies6000.net.adsl.out.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Outgoing unicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were not addressed to a</p><p>multicast or broadcast address at this sub-layer, including</p><p>those that were discarded or not sent.</p> |SNMP |zyxel.ies6000.net.adsl.out.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Outgoing multicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>multicast address at this sub-layer, including those that</p><p>were discarded or not sent.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.ies6000.net.adsl.out.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Outgoing broadcast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>broadcast address at this sub-layer, including those that</p><p>were discarded or not sent.</p> |SNMP |zyxel.ies6000.net.adsl.out.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: ATUC noise margin |<p>MIB: ADSL-LINE-MIB</p><p>Noise Margin as seen by this ATU with respect to its</p><p>received signal in tenth dB.</p><p>The Info Atuc fields show data acquired from the ATUC (ADSL Termination Unit – Central), in this case ZYXEL IES-6000, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.ies6000.net.adsl.atuc.snrmgn[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: ATUC attenuation |<p>MIB: ADSL-LINE-MIB</p><p>Measured difference in the total power transmitted by</p><p>the peer ATU and the total power received by this ATU.</p><p>The Info Atuc fields show data acquired from the ATUC (ADSL Termination Unit – Central), in this case ZYXEL IES-6000, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.ies6000.net.adsl.atuc.atn[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: ATUC output power |<p>MIB: ADSL-LINE-MIB</p><p>Measured total output power transmitted by this ATU.</p><p>The Info Atuc fields show data acquired from the ATUC (ADSL Termination Unit – Central), in this case ZYXEL IES-6000, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.ies6000.net.adsl.atuc.outpwr[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: ATUR noise margin |<p>MIB: ADSL-LINE-MIB</p><p>Noise Margin as seen by this ATU with respect to its</p><p>received signal in tenth dB.</p><p>The Info Atur fields show data acquired from the ATUR (ADSL Termination Unit – Remote), in this case the subscriber's ADSL modem or router, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.ies6000.net.adsl.atur.snrmgn[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: ATUR attenuation |<p>MIB: ADSL-LINE-MIB</p><p>Measured difference in the total power transmitted by</p><p>the peer ATU and the total power received by this ATU.</p><p>The Info Atur fields show data acquired from the ATUR (ADSL Termination Unit – Remote), in this case the subscriber's ADSL modem or router, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.ies6000.net.adsl.atur.atn[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: ATUR output power |<p>MIB: ADSL-LINE-MIB</p><p>Measured total output power transmitted by this ATU.</p><p>The Info Atur fields show data acquired from the ATUR (ADSL Termination Unit – Remote), in this case the subscriber's ADSL modem or router, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.ies6000.net.adsl.atur.outpwr[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Power_supply |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID}: Nominal "{#ZYXEL.VOLT.NOMINAL}" |<p>MIB: ZYXEL-IES5000-MIB</p><p>The current voltage reading.</p> |SNMP |zyxel.ies6000.volt[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID}: Type |<p>MIB: ZYXEL-IES5000-MIB</p><p>Card type of the plug-in card.</p> |SNMP |zyxel.ies6000.slot.type[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID}: Description |<p>MIB: ZYXEL-IES5000-MIB</p><p>The descriptions of the plug-in card.</p> |SNMP |zyxel.ies6000.slot.desc[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID}: Firmware version |<p>MIB: ZYXEL-IES5000-MIB</p><p>The firmware version of the plug-in card.</p> |SNMP |zyxel.ies6000.slot.fw.ver[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID}: Driver version |<p>MIB: ZYXEL-IES5000-MIB</p><p>The DSL driver of the plug-in card.</p> |SNMP |zyxel.ies6000.slot.dv.ver[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID}: DSL modem code version |<p>MIB: ZYXEL-IES5000-MIB</p><p>The DSL modem code version of the plug-in card.</p> |SNMP |zyxel.ies6000.slot.cv.ver[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID}: Status |<p>MIB: ZYXEL-IES5000-MIB</p><p>The module state of the plug-in card.</p> |SNMP |zyxel.ies6000.slot.status[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID}: Alarm status |<p>MIB: ZYXEL-IES5000-MIB</p><p>This variable indicates the alarm status of the module.</p><p>It is a bit map represented a sum, therefore, it can represent</p><p>multiple defects simultaneously. The moduleNoDefect should be set</p><p>if and only if no other flag is set.</p><p>The various bit positions are:</p><p>1   moduleNoDefect</p><p>2   moduleOverHeat</p><p>3   moduleFanRpmLow</p><p>4   moduleVoltageLow</p><p>5   moduleThermalSensorFailure</p><p>6   modulePullOut</p><p>7   powerDC48VAFailure</p><p>8   powerDC48VBFailure</p><p>9   extAlarmInputTrigger</p><p>10   moduleDown</p><p>11   mscSwitchOverOK</p><p>12   networkTopologyChange</p><p>13   macSpoof</p><p>14   cpuHigh</p><p>15   memoryUsageHigh</p><p>16   packetBufferUsageHigh</p><p>17   loopguardOccurence</p> |SNMP |zyxel.ies6000.slot.alarm[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
+|Network interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID}: Hardware version |<p>MIB: ZYXEL-IES5000-MIB</p><p>The hardware version of the plug-in card.</p> |SNMP |zyxel.ies6000.slot.hw.ver[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID}: Serial number |<p>MIB: ZYXEL-IES5000-MIB</p><p>The serial number of the plug-in card.</p> |SNMP |zyxel.ies6000.slot.serial[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID}: Uptime |<p>MIB: ZYXEL-IES5000-MIB</p><p>The time (in seconds) since the plug-in card was last re-initialized.</p> |SNMP |zyxel.ies6000.slot.uptime[{#SNMPINDEX}] |
+|Network interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID}: MAC address 1 |<p>MIB: ZYXEL-IES5000-MIB</p><p>The MAC Address of the plug-in card.</p> |SNMP |zyxel.ies6000.slot.mac1[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID}: MAC address 2 |<p>MIB: ZYXEL-IES5000-MIB</p><p>The MAC Address of the plug-in card.</p> |SNMP |zyxel.ies6000.slot.mac2[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL IES-6000: Port {#SNMPINDEX}: Interface description |<p>MIB: IF-MIB</p><p>A textual string containing information about the interface</p> |SNMP |zyxel.ies6000.net.if.descr[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL IES-6000: Port {#SNMPINDEX}: Interface name |<p>MIB: IF-MIB</p><p>A textual string containing information about the interface</p> |SNMP |zyxel.ies6000.net.if.name[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL IES-6000: Port {#SNMPINDEX}: Operational status |<p>MIB: IF-MIB</p><p>The current operational state of the interface.</p><p>The testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.ies6000.net.if.operstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL IES-6000: Port {#SNMPINDEX}: Administrative status |<p>MIB: IF-MIB</p><p>The desired state of the interface.  The</p><p>testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.ies6000.net.if.adminstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL IES-6000: Port {#SNMPINDEX}: Incoming traffic |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface,</p><p>including framing characters.</p> |SNMP |zyxel.ies6000.net.if.in.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL IES-6000: Port {#SNMPINDEX}: Incoming unicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were not addressed to a multicast</p><p>or broadcast address at this sub-layer</p> |SNMP |zyxel.ies6000.net.if.in.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL IES-6000: Port {#SNMPINDEX}: Incoming multicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a multicast</p><p>address at this sub-layer.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.ies6000.net.if.in.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL IES-6000: Port {#SNMPINDEX}: Incoming broadcast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a broadcast</p><p>address at this sub-layer.</p> |SNMP |zyxel.ies6000.net.if.in.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL IES-6000: Port {#SNMPINDEX}: Outgoing traffic |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the</p><p>interface, including framing characters.  This object is a</p><p>64-bit version of ifOutOctets.</p> |SNMP |zyxel.ies6000.net.if.out.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL IES-6000: Port {#SNMPINDEX}: Outgoing unicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were not addressed to a</p><p>multicast or broadcast address at this sub-layer, including</p><p>those that were discarded or not sent.</p> |SNMP |zyxel.ies6000.net.if.out.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL IES-6000: Port {#SNMPINDEX}: Outgoing multicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>multicast address at this sub-layer, including those that</p><p>were discarded or not sent.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.ies6000.net.if.out.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL IES-6000: Port {#SNMPINDEX}: Outgoing broadcast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>broadcast address at this sub-layer, including those that</p><p>were discarded or not sent.</p> |SNMP |zyxel.ies6000.net.if.out.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL IES-6000: Port {#SNMPINDEX}: Link speed |<p>MIB: IF-MIB</p><p>An estimate of the interface's current bandwidth in bits per second</p> |SNMP |zyxel.ies6000.net.if.highspeed[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1000000`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL IES-6000: Port {#SNMPINDEX}: Incoming utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.ies6000.net.if.in.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(//zyxel.ies6000.net.if.in.traffic[{#SNMPINDEX}]) * (last(//zyxel.ies6000.net.if.highspeed[{#SNMPINDEX}]) <> 0) /( last(//zyxel.ies6000.net.if.highspeed[{#SNMPINDEX}]) + (last(//zyxel.ies6000.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100` |
+|Network interfaces |ZYXEL IES-6000: Port {#SNMPINDEX}: Outgoing utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.ies6000.net.if.out.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(//zyxel.ies6000.net.if.out.traffic[{#SNMPINDEX}]) * (last(//zyxel.ies6000.net.if.highspeed[{#SNMPINDEX}]) <> 0) /( last(//zyxel.ies6000.net.if.highspeed[{#SNMPINDEX}]) + (last(//zyxel.ies6000.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100` |
+|Network interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Interface description |<p>MIB: IF-MIB</p><p>A textual string containing information about the interface</p> |SNMP |zyxel.ies6000.net.adsl.descr[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Interface name |<p>MIB: IF-MIB</p><p>A textual string containing information about the interface</p> |SNMP |zyxel.ies6000.net.adsl.name[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Operational status |<p>MIB: IF-MIB</p><p>The current operational state of the interface.</p><p>The testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.ies6000.net.adsl.operstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Administrative status |<p>MIB: IF-MIB</p><p>The desired state of the interface.  The</p><p>testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.ies6000.net.adsl.adminstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Incoming traffic |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface,</p><p>including framing characters.</p> |SNMP |zyxel.ies6000.net.adsl.in.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Incoming unicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were not addressed to a multicast</p><p>or broadcast address at this sub-layer</p> |SNMP |zyxel.ies6000.net.adsl.in.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Incoming multicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a multicast</p><p>address at this sub-layer.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.ies6000.net.adsl.in.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Incoming broadcast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a broadcast</p><p>address at this sub-layer.</p> |SNMP |zyxel.ies6000.net.adsl.in.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Outgoing traffic |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the</p><p>interface, including framing characters.  This object is a</p><p>64-bit version of ifOutOctets.</p> |SNMP |zyxel.ies6000.net.adsl.out.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Outgoing unicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were not addressed to a</p><p>multicast or broadcast address at this sub-layer, including</p><p>those that were discarded or not sent.</p> |SNMP |zyxel.ies6000.net.adsl.out.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Outgoing multicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>multicast address at this sub-layer, including those that</p><p>were discarded or not sent.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.ies6000.net.adsl.out.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Outgoing broadcast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>broadcast address at this sub-layer, including those that</p><p>were discarded or not sent.</p> |SNMP |zyxel.ies6000.net.adsl.out.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: ATUC noise margin |<p>MIB: ADSL-LINE-MIB</p><p>Noise Margin as seen by this ATU with respect to its</p><p>received signal in tenth dB.</p><p>The Info Atuc fields show data acquired from the ATUC (ADSL Termination Unit – Central), in this case ZYXEL IES-6000, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.ies6000.net.adsl.atuc.snrmgn[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: ATUC attenuation |<p>MIB: ADSL-LINE-MIB</p><p>Measured difference in the total power transmitted by</p><p>the peer ATU and the total power received by this ATU.</p><p>The Info Atuc fields show data acquired from the ATUC (ADSL Termination Unit – Central), in this case ZYXEL IES-6000, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.ies6000.net.adsl.atuc.atn[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: ATUC output power |<p>MIB: ADSL-LINE-MIB</p><p>Measured total output power transmitted by this ATU.</p><p>The Info Atuc fields show data acquired from the ATUC (ADSL Termination Unit – Central), in this case ZYXEL IES-6000, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.ies6000.net.adsl.atuc.outpwr[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: ATUR noise margin |<p>MIB: ADSL-LINE-MIB</p><p>Noise Margin as seen by this ATU with respect to its</p><p>received signal in tenth dB.</p><p>The Info Atur fields show data acquired from the ATUR (ADSL Termination Unit – Remote), in this case the subscriber's ADSL modem or router, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.ies6000.net.adsl.atur.snrmgn[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: ATUR attenuation |<p>MIB: ADSL-LINE-MIB</p><p>Measured difference in the total power transmitted by</p><p>the peer ATU and the total power received by this ATU.</p><p>The Info Atur fields show data acquired from the ATUR (ADSL Termination Unit – Remote), in this case the subscriber's ADSL modem or router, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.ies6000.net.adsl.atur.atn[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: ATUR output power |<p>MIB: ADSL-LINE-MIB</p><p>Measured total output power transmitted by this ATU.</p><p>The Info Atur fields show data acquired from the ATUR (ADSL Termination Unit – Remote), in this case the subscriber's ADSL modem or router, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.ies6000.net.adsl.atur.outpwr[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Power supply |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID}: Nominal "{#ZYXEL.VOLT.NOMINAL}" |<p>MIB: ZYXEL-IES5000-MIB</p><p>The current voltage reading.</p> |SNMP |zyxel.ies6000.volt[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Status |ZYXEL IES-6000: SNMP agent availability |<p>-</p> |INTERNAL |zabbix[host,snmp,available]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Status |ZYXEL IES-6000: Uptime |<p>MIB: RFC1213-MIB</p><p>The time (in hundredths of a second) since the</p><p>network management portion of the system was last</p><p>re-initialized.</p> |SNMP |zyxel.ies6000.uptime<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.01`</p> |
 |Temperature |ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID}: Temperature "{#ZYXEL.TEMP.ID}" |<p>MIB: ZYXEL-IES5000-MIB</p><p>The current temperature measured at this sensor</p> |SNMP |zyxel.ies6000.temp[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
@@ -147,7 +147,7 @@ There are no template links in this template.
 
 Please report any issues with the template at https://support.zabbix.com
 
-You can also provide a feedback, discuss the template or ask for help with it at [ZABBIX forums](https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/422668-discussion-thread-for-official-zabbix-templates-for-zyxel).
+You can also provide feedback, discuss the template or ask for help with it at [ZABBIX forums](https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/422668-discussion-thread-for-official-zabbix-templates-for-zyxel).
 
 ## Known Issues
 
diff --git a/templates/net/zyxel_snmp/zyxel_ies-6000_snmp/template_net_zyxel_ies-6000_snmp.yaml b/templates/net/zyxel_snmp/zyxel_ies-6000_snmp/template_net_zyxel_ies-6000_snmp.yaml
index 160c76fb9f9..e7b45718446 100644
--- a/templates/net/zyxel_snmp/zyxel_ies-6000_snmp/template_net_zyxel_ies-6000_snmp.yaml
+++ b/templates/net/zyxel_snmp/zyxel_ies-6000_snmp/template_net_zyxel_ies-6000_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-17T06:34:14Z'
+  date: '2022-01-26T10:45:24Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -27,7 +27,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/422668-discussion-thread-for-official-zabbix-templates-for-zyxel
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: 'Templates/Network devices'
@@ -47,8 +47,8 @@ zabbix_export:
                 - 1h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: network
           triggers:
             -
               uuid: 41eb76d6be3e47b8b0ca1296470372aa
@@ -57,6 +57,10 @@ zabbix_export:
               opdata: 'Current state: {ITEM.LASTVALUE1}'
               priority: WARNING
               description: 'SNMP is not available for polling. Please check device connectivity and SNMP settings.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: c4856aae926047078d33bc760833ec12
           name: 'ZYXEL IES-6000: Contact'
@@ -80,8 +84,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
         -
           uuid: 631f2bc2963c4abb8d01b5cca6179d77
           name: 'ZYXEL IES-6000: Location'
@@ -104,8 +108,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
         -
           uuid: 663131027cc84bd188fb4e5bd240777c
           name: 'ZYXEL IES-6000: MAC address'
@@ -131,8 +135,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
         -
           uuid: a91730326e1c4479bb330110a15ee689
           name: 'ZYXEL IES-6000: Hardware model name'
@@ -159,8 +163,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
           triggers:
             -
               uuid: 7f6f8bdde2644182a892792ff2bb7c68
@@ -168,6 +172,10 @@ zabbix_export:
               name: 'ZYXEL IES-6000: Template does not match hardware'
               priority: INFO
               description: 'This template is for Zyxel IES-6000, but connected to {ITEM.VALUE}'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 2062eb7816e242668936c020e6e1d532
           name: 'ZYXEL IES-6000: Host name'
@@ -191,8 +199,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
         -
           uuid: e79a790f3ca54943997f1d0b3e74943d
           name: 'ZYXEL IES-6000: Uptime'
@@ -215,8 +223,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 7a52520cc3dc4350bd7aa14260899f1c
@@ -225,6 +233,10 @@ zabbix_export:
               priority: INFO
               description: 'Uptime is less than 10 minutes'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
       discovery_rules:
         -
           uuid: 6023c8a68b5547dcab838414cbf544ea
@@ -253,8 +265,8 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Slot {#ZYXEL.SLOT.ID}'
+                  tag: component
+                  value: system
               trigger_prototypes:
                 -
                   uuid: 1173ae0cf9f440f595366a6da7a4c672
@@ -262,6 +274,10 @@ zabbix_export:
                   name: 'ZYXEL IES-6000: High Packet buffer utilization in Slot {#ZYXEL.SLOT.ID} (>{#ZYXEL.BUFFERHIGHTHRESH}% for 5m)'
                   priority: AVERAGE
                   description: 'The system is running out of free buffer.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: fcb46fd73a884e60b1ba3d4e8873bbce
@@ -314,8 +330,8 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Slot {#ZYXEL.SLOT.ID}'
+                  tag: component
+                  value: cpu
               trigger_prototypes:
                 -
                   uuid: 0d882e8f017e46c78727437bd55759d4
@@ -324,6 +340,10 @@ zabbix_export:
                   opdata: 'Current utilization: {ITEM.LASTVALUE1}'
                   priority: WARNING
                   description: 'CPU utilization is too high. The system might be slow to respond.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 6c3837433afe4a1cb64038c62743be15
@@ -374,8 +394,11 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: Fans
+                  tag: component
+                  value: fan
+                -
+                  tag: component
+                  value: sensor
               trigger_prototypes:
                 -
                   uuid: d5f65aebabf741798dcd0b452302aefb
@@ -384,6 +407,10 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the fan unit'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
           graph_prototypes:
             -
               uuid: 48736da52a8947e6a69cef3a9980bfbb
@@ -421,8 +448,8 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Slot {#ZYXEL.SLOT.ID}'
+                  tag: component
+                  value: memory
               trigger_prototypes:
                 -
                   uuid: 64108d56dc6d43148f67503383fc6705
@@ -430,6 +457,10 @@ zabbix_export:
                   name: 'ZYXEL IES-6000: High memory utilization in Slot {#ZYXEL.SLOT.ID} pool (>{#ZYXEL.MEMORYHIGHTHRESH}% for 5m)'
                   priority: AVERAGE
                   description: 'The system is running out of free memory.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: c85c2345f80448feb2253a10ec16778a
@@ -507,8 +538,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: dfd46b4bf39140b391bb2a8ab21db668
               name: 'ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: ATUC attenuation'
@@ -534,8 +571,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: e1233b29eb764b0bb5a2ce35f79060bf
@@ -543,6 +586,10 @@ zabbix_export:
                   name: 'ZYXEL IES-6000: High the DSL line attenuation in Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID} (>{$ZYXEL.ADSL.ATN.MAX}dB for 5m)'
                   priority: WARNING
                   description: 'The reductions in amplitude of the downstream and upstream DSL signals.'
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
             -
               uuid: 0b77f799291548de84478dff54742afe
               name: 'ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: ATUC output power'
@@ -567,8 +614,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 292d33986274498b819ab0b6b3ac3c21
               name: 'ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: ATUC noise margin'
@@ -594,8 +647,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: d7392fd0c372459bb21b9a85a47ccb8c
@@ -603,6 +662,10 @@ zabbix_export:
                   name: 'ZYXEL IES-6000: Low the DSL line noise margins in Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID} (<{$ZYXEL.ADSL.SNR.MIN}dB for 5m)'
                   priority: WARNING
                   description: 'Signal-to-noise margin (SNR Margin) which is the difference between the actual SNR and the SNR required to sync at a specific speed'
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
             -
               uuid: f6d71feb40954a88a2fa5ebe35af25cb
               name: 'ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: ATUR attenuation'
@@ -628,8 +691,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 2ef5b800bb4148ce82bed8c4bf977a35
@@ -637,6 +706,10 @@ zabbix_export:
                   name: 'ZYXEL IES-6000: High the DSL line attenuation in Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID} (>{$ZYXEL.ADSL.ATN.MAX}dB for 5m)'
                   priority: WARNING
                   description: 'The reductions in amplitude of the downstream and upstream DSL signals.'
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
             -
               uuid: c4d523e2ef9c4d7d901383e19876af80
               name: 'ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: ATUR output power'
@@ -661,8 +734,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: ad834d61ca834dd987784180211320f7
               name: 'ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: ATUR noise margin'
@@ -688,8 +767,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: ba6eb4b3b6904b5dac4c057d3f6f3c17
@@ -697,6 +782,10 @@ zabbix_export:
                   name: 'ZYXEL IES-6000: Low the DSL line noise margins in Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID} (<{$ZYXEL.ADSL.SNR.MIN}dB for 5m)'
                   priority: WARNING
                   description: 'Signal-to-noise margin (SNR Margin) which is the difference between the actual SNR and the SNR required to sync at a specific speed'
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
             -
               uuid: 2349bae6bb864a4f8c6c8d9b0087503f
               name: 'ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Interface description'
@@ -716,8 +805,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: fd6e0cff15834d9ea5d5f5f570608abb
               name: 'ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Incoming broadcast packages'
@@ -738,8 +833,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: eff728cc8d824bb98a840e07c0c370ed
               name: 'ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Incoming multicast packages'
@@ -761,8 +862,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: f689c73f2aae4b4aa1688c584c88a562
               name: 'ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Incoming traffic'
@@ -786,8 +893,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 26a0ded897e745208787710bca306658
               name: 'ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Incoming unicast packages'
@@ -808,8 +921,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 8d0583741866478cb77f21e4e8e982ec
               name: 'ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Interface name'
@@ -829,8 +948,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: ba66aeea219840929dfbc7b8cb61b2ab
               name: 'ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Operational status'
@@ -852,8 +977,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 3fbe4b16a94648089df78829ee7e683f
@@ -870,6 +1001,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: d4911b93b2084ca5b4e1c5a91bbb50af
               name: 'ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Outgoing broadcast packages'
@@ -891,8 +1026,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: d2d5d679e4974b3099111cb79506cbab
               name: 'ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Outgoing multicast packages'
@@ -915,8 +1056,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 982554d0208a422d94b53a55ca566239
               name: 'ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Outgoing traffic'
@@ -941,8 +1088,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 49c3f935e21248b69ea351e1210cc62d
               name: 'ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}: Outgoing unicast packages'
@@ -964,8 +1117,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           graph_prototypes:
             -
               uuid: e8a72d0fe2d745ffbffae11b379297e4
@@ -1106,8 +1265,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: a70d2041768945a6906ab0cbe0f518ae
               name: 'ZYXEL IES-6000: Port {#SNMPINDEX}: Interface description'
@@ -1127,8 +1292,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: cee8836a0e00466fbe72a5de85007a49
               name: 'ZYXEL IES-6000: Port {#SNMPINDEX}: Link speed'
@@ -1151,8 +1322,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: a37e15f8480e47bf8b8f542e65df0a80
               name: 'ZYXEL IES-6000: Port {#SNMPINDEX}: Incoming broadcast packages'
@@ -1173,8 +1350,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: c3c7164096c845b599267186f66aa8ee
               name: 'ZYXEL IES-6000: Port {#SNMPINDEX}: Incoming multicast packages'
@@ -1196,8 +1379,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 03aeeb2bb9c9454ebd91714fff1eb713
               name: 'ZYXEL IES-6000: Port {#SNMPINDEX}: Incoming traffic'
@@ -1221,8 +1410,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: c2b9296b58bf4617b86348c82f88b1c2
               name: 'ZYXEL IES-6000: Port {#SNMPINDEX}: Incoming unicast packages'
@@ -1243,8 +1438,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 2dc6ed1aacb84706bccd26c9c4e1e944
               name: 'ZYXEL IES-6000: Port {#SNMPINDEX}: Incoming utilization'
@@ -1268,8 +1469,14 @@ zabbix_export:
                     - 'return +parseFloat(value).toFixed(0);'
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: c4a8c8d0b51d496cbae4089ffee1e531
               name: 'ZYXEL IES-6000: Port {#SNMPINDEX}: Interface name'
@@ -1289,8 +1496,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 00c015d42840420c9878ef84177c8d42
               name: 'ZYXEL IES-6000: Port {#SNMPINDEX}: Operational status'
@@ -1312,8 +1525,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: a9aac7e6c66a4a69a77f8c165f9a9d5c
@@ -1330,6 +1549,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: ff5b7d95366d47c68589c65b4b0dcb15
               name: 'ZYXEL IES-6000: Port {#SNMPINDEX}: Outgoing broadcast packages'
@@ -1351,8 +1574,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: e88787c50f654d5295d03b55d94810bf
               name: 'ZYXEL IES-6000: Port {#SNMPINDEX}: Outgoing multicast packages'
@@ -1375,8 +1604,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: ac2959db86d44152b4a87294ee817dd7
               name: 'ZYXEL IES-6000: Port {#SNMPINDEX}: Outgoing traffic'
@@ -1401,8 +1636,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: c11fc8f0eacc42e5a6ca2443bdca60ce
               name: 'ZYXEL IES-6000: Port {#SNMPINDEX}: Outgoing unicast packages'
@@ -1424,8 +1665,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 6ef41c7cc0074674b43d583a8fa36868
               name: 'ZYXEL IES-6000: Port {#SNMPINDEX}: Outgoing utilization'
@@ -1449,8 +1696,14 @@ zabbix_export:
                     - 'return +parseFloat(value).toFixed(0);'
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           graph_prototypes:
             -
               uuid: 006679b6dfd64b65ad13de41be74783d
@@ -1627,8 +1880,11 @@ zabbix_export:
                       return outArray.join();
               tags:
                 -
-                  tag: Application
-                  value: 'Slot {#ZYXEL.SLOT.ID}'
+                  tag: component
+                  value: line-card
+                -
+                  tag: interface
+                  value: 'slot-{#ZYXEL.SLOT.ID}'
               trigger_prototypes:
                 -
                   uuid: c3f610ab856e42c7bb6460f552779e12
@@ -1636,6 +1892,10 @@ zabbix_export:
                   name: 'ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID} alarm'
                   priority: AVERAGE
                   description: 'The slot reported an error.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 6ce4b55490ed425b8fbc1ad337071730
               name: 'ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID}: DSL modem code version'
@@ -1656,8 +1916,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Slot {#ZYXEL.SLOT.ID}'
+                  tag: component
+                  value: firmware
+                -
+                  tag: component
+                  value: line-card
+                -
+                  tag: interface
+                  value: 'slot-{#ZYXEL.SLOT.ID}'
               trigger_prototypes:
                 -
                   uuid: c62327e51d27445b893e80bf77c9696c
@@ -1667,6 +1933,10 @@ zabbix_export:
                   priority: INFO
                   description: 'Firmware version has changed. Ack to close'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 780fdca5ba10495d8ae1dfec6a655d4a
               name: 'ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID}: Description'
@@ -1686,8 +1956,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Slot {#ZYXEL.SLOT.ID}'
+                  tag: component
+                  value: line-card
+                -
+                  tag: interface
+                  value: 'slot-{#ZYXEL.SLOT.ID}'
             -
               uuid: a0dc5b9a8968401a832dfd76cda474f1
               name: 'ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID}: Driver version'
@@ -1708,8 +1981,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Slot {#ZYXEL.SLOT.ID}'
+                  tag: component
+                  value: firmware
+                -
+                  tag: component
+                  value: line-card
+                -
+                  tag: interface
+                  value: 'slot-{#ZYXEL.SLOT.ID}'
               trigger_prototypes:
                 -
                   uuid: 63a4bdc73f8c49a7abb914f47e162dec
@@ -1719,6 +1998,10 @@ zabbix_export:
                   priority: INFO
                   description: 'Firmware version has changed. Ack to close'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: e74a7678743c4739b98160a9cf3d516b
               name: 'ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID}: Firmware version'
@@ -1739,8 +2022,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Slot {#ZYXEL.SLOT.ID}'
+                  tag: component
+                  value: firmware
+                -
+                  tag: component
+                  value: line-card
+                -
+                  tag: interface
+                  value: 'slot-{#ZYXEL.SLOT.ID}'
               trigger_prototypes:
                 -
                   uuid: 7a2ef454d9624fd78416d2e1345be9a5
@@ -1750,6 +2039,10 @@ zabbix_export:
                   priority: INFO
                   description: 'Firmware version has changed. Ack to close'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 96ee73d987be4576b6b40f21d43ebbac
               name: 'ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID}: Hardware version'
@@ -1770,8 +2063,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Slot {#ZYXEL.SLOT.ID}'
+                  tag: component
+                  value: firmware
+                -
+                  tag: component
+                  value: line-card
+                -
+                  tag: interface
+                  value: 'slot-{#ZYXEL.SLOT.ID}'
               trigger_prototypes:
                 -
                   uuid: 537f28be56984664822b574a2064453b
@@ -1781,6 +2080,10 @@ zabbix_export:
                   priority: INFO
                   description: 'Firmware version has changed. Ack to close'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: aa0c1799930a46d9a658f26bf3549a18
               name: 'ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID}: MAC address 1'
@@ -1800,8 +2103,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Slot {#ZYXEL.SLOT.ID}'
+                  tag: component
+                  value: line-card
+                -
+                  tag: interface
+                  value: 'slot-{#ZYXEL.SLOT.ID}'
             -
               uuid: 6fdbc67b2612400c9e8372b310ca496e
               name: 'ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID}: MAC address 2'
@@ -1821,8 +2127,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Slot {#ZYXEL.SLOT.ID}'
+                  tag: component
+                  value: line-card
+                -
+                  tag: interface
+                  value: 'slot-{#ZYXEL.SLOT.ID}'
             -
               uuid: 5edbf1b21ca5436a9522f5dcfe80b61d
               name: 'ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID}: Serial number'
@@ -1842,8 +2151,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Slot {#ZYXEL.SLOT.ID}'
+                  tag: component
+                  value: line-card
+                -
+                  tag: interface
+                  value: 'slot-{#ZYXEL.SLOT.ID}'
               trigger_prototypes:
                 -
                   uuid: 3fbbcffe1c46497d89fe0d987a5f6eff
@@ -1852,6 +2164,10 @@ zabbix_export:
                   priority: INFO
                   description: 'Slot {#ZYXEL.SLOT.ID} serial number has changed. Ack to close'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 5eeedb8e70764975872bd6dc6bc10821
               name: 'ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID}: Status'
@@ -1871,8 +2187,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Slot {#ZYXEL.SLOT.ID}'
+                  tag: component
+                  value: line-card
+                -
+                  tag: interface
+                  value: 'slot-{#ZYXEL.SLOT.ID}'
             -
               uuid: ea78751ce7954aa5b84caf9bdfcfeefd
               name: 'ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID}: Type'
@@ -1892,8 +2211,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Slot {#ZYXEL.SLOT.ID}'
+                  tag: component
+                  value: line-card
+                -
+                  tag: interface
+                  value: 'slot-{#ZYXEL.SLOT.ID}'
             -
               uuid: 37de3e96e8d8420192e6aae7a56ff9ef
               name: 'ZYXEL IES-6000: Slot {#ZYXEL.SLOT.ID}: Uptime'
@@ -1907,8 +2229,11 @@ zabbix_export:
                 The time (in seconds) since the plug-in card was last re-initialized.
               tags:
                 -
-                  tag: Application
-                  value: 'Slot {#ZYXEL.SLOT.ID}'
+                  tag: component
+                  value: line-card
+                -
+                  tag: interface
+                  value: 'slot-{#ZYXEL.SLOT.ID}'
               trigger_prototypes:
                 -
                   uuid: 50e43c41d0e241238b65da25c12d1616
@@ -1917,6 +2242,10 @@ zabbix_export:
                   priority: INFO
                   description: 'Uptime is less than 10 minutes'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
         -
           uuid: 65972390ff734a088e984ac6531833c6
           name: 'Temperature discovery'
@@ -1944,8 +2273,11 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Slot {#ZYXEL.SLOT.ID}'
+                  tag: component
+                  value: sensor
+                -
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: c517b703b5084e9b8053fb139e3350ae
@@ -1954,6 +2286,10 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the temperature'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
           graph_prototypes:
             -
               uuid: 8e885ce1061b4400abce9eaad1271ea1
@@ -2009,8 +2345,11 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Slot {#ZYXEL.SLOT.ID}'
+                  tag: component
+                  value: sensor
+                -
+                  tag: component
+                  value: voltage
               trigger_prototypes:
                 -
                   uuid: 14c98fc8b4864a3c87062510a079d948
@@ -2019,6 +2358,10 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the power supply'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
           graph_prototypes:
             -
               uuid: d7f01a58a08a4403818242a907152f78
@@ -2045,6 +2388,19 @@ zabbix_export:
                       outArr.push(item)
                   });
                   return JSON.stringify(outArr);
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: dslam
+        -
+          tag: target
+          value: ies-6000
+        -
+          tag: target
+          value: zyxel
       macros:
         -
           macro: '{$SNMP.TIMEOUT}'
diff --git a/templates/net/zyxel_snmp/zyxel_ies1248-51_snmp/README.md b/templates/net/zyxel_snmp/zyxel_ies1248-51_snmp/README.md
index 133feb92cd4..71f99616888 100644
--- a/templates/net/zyxel_snmp/zyxel_ies1248-51_snmp/README.md
+++ b/templates/net/zyxel_snmp/zyxel_ies1248-51_snmp/README.md
@@ -39,11 +39,11 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
+|ADSL interface discovery |<p>-</p> |SNMP |zyxel.ies1248.net.adsl.discovery<p>**Filter**:</p>AND <p>- {#ZYXEL.IF.LINKSTATUS} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKSTATUS.MATCHES}`</p><p>- {#ZYXEL.IF.LINKSTATUS} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKSTATUS.NOT_MATCHES}`</p><p>- {#ZYXEL.IF.NAME} MATCHES_REGEX `adsl`</p><p>**Overrides:**</p><p>Don't create triggers for matching interface<br> - {#ZYXEL.IF.NAME} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}`<br>  - TRIGGER_PROTOTYPE REGEXP `.*` - NO_DISCOVER</p> |
+|Ethernet interface discovery |<p>-</p> |SNMP |zyxel.ies1248.net.if.discovery<p>**Filter**:</p>AND <p>- {#ZYXEL.IF.LINKSTATUS} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKSTATUS.MATCHES}`</p><p>- {#ZYXEL.IF.LINKSTATUS} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKSTATUS.NOT_MATCHES}`</p><p>- {#ZYXEL.IF.NAME} MATCHES_REGEX `enet`</p><p>**Overrides:**</p><p>Trigger disabled<br> - {#ZYXEL.IF.NAME} MATCHES_REGEX `.*`<br>  - TRIGGER_PROTOTYPE REGEXP `.*` - NO_DISCOVER</p><p>Trigger enabled<br> - {#ZYXEL.IF.NAME} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}`<br>  - TRIGGER_PROTOTYPE REGEXP `.*` - DISCOVER</p> |
 |Fan discovery |<p>An entry in fanRpmTable.</p> |SNMP |zyxel.ies1248.fan.discovery |
 |Temperature discovery |<p>An entry in tempTable.</p> |SNMP |zyxel.ies1248.temp.discovery |
 |Voltage discovery |<p>An entry in voltageTable.</p> |SNMP |zyxel.ies1248.volt.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
-|Ethernet interface discovery |<p>-</p> |SNMP |zyxel.ies1248.net.if.discovery<p>**Filter**:</p>AND <p>- {#ZYXEL.IF.LINKSTATUS} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKSTATUS.MATCHES}`</p><p>- {#ZYXEL.IF.LINKSTATUS} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKSTATUS.NOT_MATCHES}`</p><p>- {#ZYXEL.IF.NAME} MATCHES_REGEX `enet`</p><p>**Overrides:**</p><p>Trigger disabled<br> - {#ZYXEL.IF.NAME} MATCHES_REGEX `.*`<br>  - TRIGGER_PROTOTYPE REGEXP `.*` - NO_DISCOVER</p><p>Trigger enabled<br> - {#ZYXEL.IF.NAME} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}`<br>  - TRIGGER_PROTOTYPE REGEXP `.*` - DISCOVER</p> |
-|ADSL interface discovery |<p>-</p> |SNMP |zyxel.ies1248.net.adsl.discovery<p>**Filter**:</p>AND <p>- {#ZYXEL.IF.LINKSTATUS} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKSTATUS.MATCHES}`</p><p>- {#ZYXEL.IF.LINKSTATUS} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKSTATUS.NOT_MATCHES}`</p><p>- {#ZYXEL.IF.NAME} MATCHES_REGEX `adsl`</p><p>**Overrides:**</p><p>Don't create triggers for matching interface<br> - {#ZYXEL.IF.NAME} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}`<br>  - TRIGGER_PROTOTYPE REGEXP `.*` - NO_DISCOVER</p> |
 
 ## Items collected
 
@@ -57,23 +57,23 @@ There are no template links in this template.
 |Inventory |ZYXEL IES1248-51: MAC address |<p>MIB: IF-MIB</p><p>The interface's address at the protocol layer</p><p>immediately `below' the network layer in the</p><p>protocol stack.  For interfaces which do not have</p><p>such an address (e.g., a serial line), this object</p><p>should contain an octet string of zero length.</p> |SNMP |zyxel.ies1248.mac<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Inventory |ZYXEL IES1248-51: ZyNOS F/W Version |<p>MIB: ZYXEL-IESCOMMON-MIB</p> |SNMP |zyxel.ies1248.fwversion<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Inventory |ZYXEL IES1248-51: Hardware serial number |<p>MIB: ZYXEL-IESCOMMON-MIB</p><p>Serial number</p> |SNMP |zyxel.ies1248.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL IES1248-51: Port {#SNMPINDEX}: Interface name |<p>MIB: IF-MIB</p><p>A textual string containing information about the interface</p> |SNMP |zyxel.ies1248.net.if.name[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL IES1248-51: Port {#ZYXEL.IF.NAME}: Operational status |<p>MIB: IF-MIB</p><p>The current operational state of the interface.</p><p>The testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.ies1248.net.if.operstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL IES1248-51: Port {#ZYXEL.IF.NAME}: Administrative status |<p>MIB: IF-MIB</p><p>The desired state of the interface.  The</p><p>testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.ies1248.net.if.adminstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL IES1248-51: Port {#ZYXEL.IF.NAME}: Incoming traffic |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface,</p><p>including framing characters.</p> |SNMP |zyxel.ies1248.net.if.in.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL IES1248-51: Port {#ZYXEL.IF.NAME}: Outgoing traffic |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the</p><p>interface, including framing characters.  This object is a</p><p>64-bit version of ifOutOctets.</p> |SNMP |zyxel.ies1248.net.if.out.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL IES1248-51: Port {#SNMPINDEX}: Interface name |<p>MIB: IF-MIB</p><p>A textual string containing information about the interface</p> |SNMP |zyxel.ies1248.net.adsl.name[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL IES1248-51: Port {#SNMPINDEX}: Operational status |<p>MIB: IF-MIB</p><p>The current operational state of the interface.</p><p>The testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.ies1248.net.adsl.operstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL IES1248-51: Port {#SNMPINDEX}: Administrative status |<p>MIB: IF-MIB</p><p>The desired state of the interface.  The</p><p>testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.ies1248.net.adsl.adminstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL IES1248-51: Port {#SNMPINDEX}: Incoming traffic |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface,</p><p>including framing characters.</p> |SNMP |zyxel.ies1248.net.adsl.in.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL IES1248-51: Port {#SNMPINDEX}: Outgoing traffic |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the</p><p>interface, including framing characters.  This object is a</p><p>64-bit version of ifOutOctets.</p> |SNMP |zyxel.ies1248.net.adsl.out.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL IES1248-51: Port {#SNMPINDEX}: ATUC noise margin |<p>MIB: ADSL-LINE-MIB</p><p>Noise Margin as seen by this ATU with respect to its</p><p>received signal in tenth dB.</p><p>The Info Atuc fields show data acquired from the ATUC (ADSL Termination Unit – Central), in this case ZYXEL IES1248-51, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.ies1248.net.adsl.atuc.snrmgn[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL IES1248-51: Port {#SNMPINDEX}: ATUC attenuation |<p>MIB: ADSL-LINE-MIB</p><p>Measured difference in the total power transmitted by</p><p>the peer ATU and the total power received by this ATU.</p><p>The Info Atuc fields show data acquired from the ATUC (ADSL Termination Unit – Central), in this case ZYXEL IES1248-51, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.ies1248.net.adsl.atuc.atn[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL IES1248-51: Port {#SNMPINDEX}: ATUC output power |<p>MIB: ADSL-LINE-MIB</p><p>Measured total output power transmitted by this ATU.</p><p>The Info Atuc fields show data acquired from the ATUC (ADSL Termination Unit – Central), in this case ZYXEL IES1248-51, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.ies1248.net.adsl.atuc.outpwr[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL IES1248-51: Port {#SNMPINDEX}: ATUR noise margin |<p>MIB: ADSL-LINE-MIB</p><p>Noise Margin as seen by this ATU with respect to its</p><p>received signal in tenth dB.</p><p>The Info Atur fields show data acquired from the ATUR (ADSL Termination Unit – Remote), in this case the subscriber's ADSL modem or router, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.ies1248.net.adsl.atur.snrmgn[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL IES1248-51: Port {#SNMPINDEX}: ATUR attenuation |<p>MIB: ADSL-LINE-MIB</p><p>Measured difference in the total power transmitted by</p><p>the peer ATU and the total power received by this ATU.</p><p>The Info Atur fields show data acquired from the ATUR (ADSL Termination Unit – Remote), in this case the subscriber's ADSL modem or router, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.ies1248.net.adsl.atur.atn[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL IES1248-51: Port {#SNMPINDEX}: ATUR output power |<p>MIB: ADSL-LINE-MIB</p><p>Measured total output power transmitted by this ATU.</p><p>The Info Atur fields show data acquired from the ATUR (ADSL Termination Unit – Remote), in this case the subscriber's ADSL modem or router, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.ies1248.net.adsl.atur.outpwr[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Power_supply |ZYXEL IES1248-51: Nominal "{#ZYXEL.VOLT.NOMINAL}" |<p>MIB: ZYXEL-IESCOMMON-MIB</p><p>The current voltage reading.</p> |SNMP |zyxel.ies1248.volt[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL IES1248-51: Port {#SNMPINDEX}: Interface name |<p>MIB: IF-MIB</p><p>A textual string containing information about the interface</p> |SNMP |zyxel.ies1248.net.if.name[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL IES1248-51: Port {#ZYXEL.IF.NAME}: Operational status |<p>MIB: IF-MIB</p><p>The current operational state of the interface.</p><p>The testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.ies1248.net.if.operstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL IES1248-51: Port {#ZYXEL.IF.NAME}: Administrative status |<p>MIB: IF-MIB</p><p>The desired state of the interface.  The</p><p>testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.ies1248.net.if.adminstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL IES1248-51: Port {#ZYXEL.IF.NAME}: Incoming traffic |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface,</p><p>including framing characters.</p> |SNMP |zyxel.ies1248.net.if.in.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL IES1248-51: Port {#ZYXEL.IF.NAME}: Outgoing traffic |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the</p><p>interface, including framing characters.  This object is a</p><p>64-bit version of ifOutOctets.</p> |SNMP |zyxel.ies1248.net.if.out.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL IES1248-51: Port {#SNMPINDEX}: Interface name |<p>MIB: IF-MIB</p><p>A textual string containing information about the interface</p> |SNMP |zyxel.ies1248.net.adsl.name[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL IES1248-51: Port {#SNMPINDEX}: Operational status |<p>MIB: IF-MIB</p><p>The current operational state of the interface.</p><p>The testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.ies1248.net.adsl.operstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL IES1248-51: Port {#SNMPINDEX}: Administrative status |<p>MIB: IF-MIB</p><p>The desired state of the interface.  The</p><p>testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.ies1248.net.adsl.adminstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL IES1248-51: Port {#SNMPINDEX}: Incoming traffic |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface,</p><p>including framing characters.</p> |SNMP |zyxel.ies1248.net.adsl.in.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL IES1248-51: Port {#SNMPINDEX}: Outgoing traffic |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the</p><p>interface, including framing characters.  This object is a</p><p>64-bit version of ifOutOctets.</p> |SNMP |zyxel.ies1248.net.adsl.out.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL IES1248-51: Port {#SNMPINDEX}: ATUC noise margin |<p>MIB: ADSL-LINE-MIB</p><p>Noise Margin as seen by this ATU with respect to its</p><p>received signal in tenth dB.</p><p>The Info Atuc fields show data acquired from the ATUC (ADSL Termination Unit – Central), in this case ZYXEL IES1248-51, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.ies1248.net.adsl.atuc.snrmgn[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL IES1248-51: Port {#SNMPINDEX}: ATUC attenuation |<p>MIB: ADSL-LINE-MIB</p><p>Measured difference in the total power transmitted by</p><p>the peer ATU and the total power received by this ATU.</p><p>The Info Atuc fields show data acquired from the ATUC (ADSL Termination Unit – Central), in this case ZYXEL IES1248-51, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.ies1248.net.adsl.atuc.atn[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL IES1248-51: Port {#SNMPINDEX}: ATUC output power |<p>MIB: ADSL-LINE-MIB</p><p>Measured total output power transmitted by this ATU.</p><p>The Info Atuc fields show data acquired from the ATUC (ADSL Termination Unit – Central), in this case ZYXEL IES1248-51, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.ies1248.net.adsl.atuc.outpwr[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL IES1248-51: Port {#SNMPINDEX}: ATUR noise margin |<p>MIB: ADSL-LINE-MIB</p><p>Noise Margin as seen by this ATU with respect to its</p><p>received signal in tenth dB.</p><p>The Info Atur fields show data acquired from the ATUR (ADSL Termination Unit – Remote), in this case the subscriber's ADSL modem or router, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.ies1248.net.adsl.atur.snrmgn[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL IES1248-51: Port {#SNMPINDEX}: ATUR attenuation |<p>MIB: ADSL-LINE-MIB</p><p>Measured difference in the total power transmitted by</p><p>the peer ATU and the total power received by this ATU.</p><p>The Info Atur fields show data acquired from the ATUR (ADSL Termination Unit – Remote), in this case the subscriber's ADSL modem or router, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.ies1248.net.adsl.atur.atn[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL IES1248-51: Port {#SNMPINDEX}: ATUR output power |<p>MIB: ADSL-LINE-MIB</p><p>Measured total output power transmitted by this ATU.</p><p>The Info Atur fields show data acquired from the ATUR (ADSL Termination Unit – Remote), in this case the subscriber's ADSL modem or router, during negotiation/provisioning message interchanges.</p> |SNMP |zyxel.ies1248.net.adsl.atur.outpwr[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Power supply |ZYXEL IES1248-51: Nominal "{#ZYXEL.VOLT.NOMINAL}" |<p>MIB: ZYXEL-IESCOMMON-MIB</p><p>The current voltage reading.</p> |SNMP |zyxel.ies1248.volt[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Status |ZYXEL IES1248-51: SNMP agent availability |<p>-</p> |INTERNAL |zabbix[host,snmp,available]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Status |ZYXEL IES1248-51: Uptime |<p>MIB: RFC1213-MIB</p><p>The time (in hundredths of a second) since the</p><p>network management portion of the system was last</p><p>re-initialized.</p> |SNMP |zyxel.ies1248.uptime<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.01`</p> |
 |Status |ZYXEL IES1248-51: Alarm status |<p>MIB: ZYXEL-IESCOMMON-MIB</p><p>This variable indicates the alarm status of the module.</p><p>It is a bit map represented a sum, therefore, it can represent</p><p>multiple defects simultaneously. The moduleNoDefect should be set</p><p>if and only if no other flag is set.</p><p>The various bit positions are:</p><p>1   moduleNoDefect</p><p>2   moduleOverHeat</p><p>3   moduleFanRpmLow</p><p>4   moduleVoltageLow</p><p>5   moduleThermalSensorFailure</p><p>6   modulePullOut</p><p>7   powerDC48VAFailure</p><p>8   powerDC48VBFailure</p><p>9   extAlarmInputTrigger</p><p>10   moduleDown</p><p>11   mscSwitchOverOK</p><p>12   networkTopologyChange</p><p>13   macSpoof</p><p>14   cpuHigh</p><p>15   memoryUsageHigh</p><p>16   packetBufferUsageHigh</p><p>17   loopguardOccurence</p> |SNMP |zyxel.ies1248.slot.alarm<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
@@ -103,7 +103,7 @@ There are no template links in this template.
 
 Please report any issues with the template at https://support.zabbix.com
 
-You can also provide a feedback, discuss the template or ask for help with it at [ZABBIX forums](https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/422668-discussion-thread-for-official-zabbix-templates-for-zyxel).
+You can also provide feedback, discuss the template or ask for help with it at [ZABBIX forums](https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/422668-discussion-thread-for-official-zabbix-templates-for-zyxel).
 
 ## Known Issues
 
diff --git a/templates/net/zyxel_snmp/zyxel_ies1248-51_snmp/template_net_zyxel_ies1248-51_snmp.yaml b/templates/net/zyxel_snmp/zyxel_ies1248-51_snmp/template_net_zyxel_ies1248-51_snmp.yaml
index a4c20a3c53c..0334df74093 100644
--- a/templates/net/zyxel_snmp/zyxel_ies1248-51_snmp/template_net_zyxel_ies1248-51_snmp.yaml
+++ b/templates/net/zyxel_snmp/zyxel_ies1248-51_snmp/template_net_zyxel_ies1248-51_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-17T06:34:19Z'
+  date: '2022-01-26T10:45:02Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -27,7 +27,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/422668-discussion-thread-for-official-zabbix-templates-for-zyxel
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: 'Templates/Network devices'
@@ -47,8 +47,8 @@ zabbix_export:
                 - 1h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: network
           triggers:
             -
               uuid: 40466f29b8e54dc88cb49e818fc48281
@@ -57,6 +57,10 @@ zabbix_export:
               opdata: 'Current state: {ITEM.LASTVALUE1}'
               priority: WARNING
               description: 'SNMP is not available for polling. Please check device connectivity and SNMP settings.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: a01b8490f3b94ac5ab500d67171cfe1a
           name: 'ZYXEL IES1248-51: Contact'
@@ -80,8 +84,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
         -
           uuid: 56974ccbede04e9eb966951ac3c88250
           name: 'ZYXEL IES1248-51: ZyNOS F/W Version'
@@ -101,8 +105,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
           triggers:
             -
               uuid: b64e891456674457ab4abf994b097277
@@ -112,6 +116,10 @@ zabbix_export:
               priority: INFO
               description: 'Firmware version has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 600e6a8b9dd549b69f64f1a536bce7de
           name: 'ZYXEL IES1248-51: Location'
@@ -134,8 +142,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
         -
           uuid: ad09c90a951a4c41b935a70f58f5c26a
           name: 'ZYXEL IES1248-51: MAC address'
@@ -161,8 +169,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
         -
           uuid: 427ef42e55ca498db16d078ed41e7ad9
           name: 'ZYXEL IES1248-51: Hardware model name'
@@ -189,8 +197,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
           triggers:
             -
               uuid: 21b638f9f1154b6bb78a652d8e54c1c2
@@ -198,6 +206,10 @@ zabbix_export:
               name: 'ZYXEL IES1248-51: Template does not match hardware'
               priority: INFO
               description: 'This template is for Zyxel IES1248-51, but connected to {ITEM.VALUE}'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 8c6546b670d4455aa1234c35bb033ac7
           name: 'ZYXEL IES1248-51: Host name'
@@ -221,8 +233,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
         -
           uuid: 0d30380bb9a24bd1939d16287d5d0711
           name: 'ZYXEL IES1248-51: Hardware serial number'
@@ -244,8 +256,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
           triggers:
             -
               uuid: 2f2972169c164053a8d439b0e572b0c6
@@ -254,6 +266,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: bafdca2040ba44be911fd1e5a09f3298
           name: 'ZYXEL IES1248-51: Alarm status'
@@ -319,8 +335,11 @@ zabbix_export:
                   return outArray.join();
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: line-card
+            -
+              tag: interface
+              value: 'slot-{#ZYXEL.SLOT.ID}'
           triggers:
             -
               uuid: 6b1b1b27241f42229e8b159320371356
@@ -328,6 +347,10 @@ zabbix_export:
               name: 'ZYXEL IES1248-51: Port {#SNMPINDEX} alarm'
               priority: AVERAGE
               description: 'The slot reported an error.'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: ba41848140394ac29fe9b77e77627f20
           name: 'ZYXEL IES1248-51: Uptime'
@@ -350,8 +373,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: bbccceac3dc24b9ab76a820fe5be4788
@@ -360,6 +383,10 @@ zabbix_export:
               priority: INFO
               description: 'Uptime is less than 10 minutes'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
       discovery_rules:
         -
           uuid: 9ffacb42c2fe4abd9e8d10e4b8803fc2
@@ -388,8 +415,11 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: Fans
+                  tag: component
+                  value: fan
+                -
+                  tag: component
+                  value: sensor
               trigger_prototypes:
                 -
                   uuid: 86f18f4e598443ab9e0ec30554d78e1a
@@ -398,6 +428,10 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the fan unit'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
           graph_prototypes:
             -
               uuid: f8d2136dab70403a98da660bcf4c02a2
@@ -453,8 +487,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 7c13234155f343bc90bf1584a7f0fb3f
               name: 'ZYXEL IES1248-51: Port {#SNMPINDEX}: ATUC attenuation'
@@ -480,8 +520,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 23e50c0031c1457596b1366a40606ef9
@@ -489,6 +535,10 @@ zabbix_export:
                   name: 'ZYXEL IES1248-51: High the DSL line attenuation in Port {#SNMPINDEX} (>{$ZYXEL.ADSL.ATN.MAX}dB for 5m)'
                   priority: WARNING
                   description: 'The reductions in amplitude of the downstream and upstream DSL signals.'
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
             -
               uuid: 524bf397c9a640c48716fa20e4c45034
               name: 'ZYXEL IES1248-51: Port {#SNMPINDEX}: ATUC output power'
@@ -513,8 +563,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: ed1768b17f0f434392c5cbc91ddd5222
               name: 'ZYXEL IES1248-51: Port {#SNMPINDEX}: ATUC noise margin'
@@ -540,8 +596,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 23bbc44b2f114afe99a8175a2b7f0ddd
@@ -549,6 +611,10 @@ zabbix_export:
                   name: 'ZYXEL IES1248-51: Low the DSL line noise margins in Port {#SNMPINDEX} (<{$ZYXEL.ADSL.SNR.MIN}dB for 5m)'
                   priority: WARNING
                   description: 'Signal-to-noise margin (SNR Margin) which is the difference between the actual SNR and the SNR required to sync at a specific speed'
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
             -
               uuid: 0dd3a9f10abb4a8a92f627228c9fbb52
               name: 'ZYXEL IES1248-51: Port {#SNMPINDEX}: ATUR attenuation'
@@ -574,8 +640,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 2132fed26fe54a7daa017b7264c37f1c
@@ -583,6 +655,10 @@ zabbix_export:
                   name: 'ZYXEL IES1248-51: High the DSL line attenuation in Port {#SNMPINDEX} (>{$ZYXEL.ADSL.ATN.MAX}dB for 5m)'
                   priority: WARNING
                   description: 'The reductions in amplitude of the downstream and upstream DSL signals.'
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
             -
               uuid: 54c5b104d96945eca7cf402a2e910f90
               name: 'ZYXEL IES1248-51: Port {#SNMPINDEX}: ATUR output power'
@@ -607,8 +683,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 9744b18d3eec4bd2954ec7ea29e341fd
               name: 'ZYXEL IES1248-51: Port {#SNMPINDEX}: ATUR noise margin'
@@ -634,8 +716,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 2d8f752b376f4c10bc8efbd39c8f45a9
@@ -643,6 +731,10 @@ zabbix_export:
                   name: 'ZYXEL IES1248-51: Low the DSL line noise margins in Port {#SNMPINDEX} (<{$ZYXEL.ADSL.SNR.MIN}dB for 5m)'
                   priority: WARNING
                   description: 'Signal-to-noise margin (SNR Margin) which is the difference between the actual SNR and the SNR required to sync at a specific speed'
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
             -
               uuid: b7f622f72f98417cab3954717d311080
               name: 'ZYXEL IES1248-51: Port {#SNMPINDEX}: Incoming traffic'
@@ -666,8 +758,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: bff933861d744ee5a3229c2c6b1dc4c0
               name: 'ZYXEL IES1248-51: Port {#SNMPINDEX}: Interface name'
@@ -687,8 +785,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 25c07c59e30e42b191162fa40066c8b8
               name: 'ZYXEL IES1248-51: Port {#SNMPINDEX}: Operational status'
@@ -710,8 +814,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 93a58c14939d4c3491646171910fe5ad
@@ -728,6 +838,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 6df1c990c9dc49caa151dfc989d055b9
               name: 'ZYXEL IES1248-51: Port {#SNMPINDEX}: Outgoing traffic'
@@ -752,8 +866,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           graph_prototypes:
             -
               uuid: 7c9c5ff332394b97a311225de08b6bc6
@@ -833,8 +953,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#ZYXEL.IF.NAME}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: de5cf230831840cc985b63ba58d05059
               name: 'ZYXEL IES1248-51: Port {#ZYXEL.IF.NAME}: Incoming traffic'
@@ -858,8 +984,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#ZYXEL.IF.NAME}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: eeb4236d4ebe4cb396413f13d1fa669b
               name: 'ZYXEL IES1248-51: Port {#SNMPINDEX}: Interface name'
@@ -879,8 +1011,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#ZYXEL.IF.NAME}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: cd0bbc3c587a47e6a2a2307343a377b7
               name: 'ZYXEL IES1248-51: Port {#ZYXEL.IF.NAME}: Operational status'
@@ -902,8 +1040,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#ZYXEL.IF.NAME}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 8d90a989c82a4890a3a1a0b8eeb53462
@@ -920,6 +1064,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 2e39a01f6315444cb3ae47836945b514
               name: 'ZYXEL IES1248-51: Port {#ZYXEL.IF.NAME}: Outgoing traffic'
@@ -944,8 +1092,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#ZYXEL.IF.NAME}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           graph_prototypes:
             -
               uuid: 1988adb1e96b423a8df3c55ea2f63d47
@@ -1022,8 +1176,11 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: sensor
+                -
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: f0d7f5282c784224b0cd5f76d3c2ad90
@@ -1032,6 +1189,10 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the temperature'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
           graph_prototypes:
             -
               uuid: a5ec11a8936746c492fcf2e4462c7ca7
@@ -1074,8 +1235,11 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Power supply'
+                  tag: component
+                  value: sensor
+                -
+                  tag: component
+                  value: voltage
               trigger_prototypes:
                 -
                   uuid: 9815420fe46c45ce8731b9688b4a543e
@@ -1084,6 +1248,10 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the power supply'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
           graph_prototypes:
             -
               uuid: ebbc2726558c4504aa6bd22844d0bc83
@@ -1110,6 +1278,19 @@ zabbix_export:
                       outArr.push(item)
                   });
                   return JSON.stringify(outArr);
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: aam1248-51
+        -
+          tag: target
+          value: dslam
+        -
+          tag: target
+          value: zyxel
       macros:
         -
           macro: '{$SNMP.TIMEOUT}'
diff --git a/templates/net/zyxel_snmp/zyxel_mes-3528_snmp/README.md b/templates/net/zyxel_snmp/zyxel_mes-3528_snmp/README.md
index 52b0a8a85e1..f0f51bafe6f 100644
--- a/templates/net/zyxel_snmp/zyxel_mes-3528_snmp/README.md
+++ b/templates/net/zyxel_snmp/zyxel_mes-3528_snmp/README.md
@@ -46,8 +46,8 @@ There are no template links in this template.
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
 |Interface discovery |<p>-</p> |SNMP |zyxel.3528.net.if.discovery<p>**Filter**:</p>AND <p>- {#ZYXEL.IF.NAME} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.NAME.MATCHES}`</p><p>- {#ZYXEL.IF.NAME} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.NAME.NOT_MATCHES}`</p><p>- {#ZYXEL.IF.LINKUPTYPE} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.MATCHES}`</p><p>- {#ZYXEL.IF.LINKUPTYPE} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.NOT_MATCHES}`</p><p>**Overrides:**</p><p>Don't create triggers for matching interface<br> - {#ZYXEL.IF.NAME} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}`<br>  - TRIGGER_PROTOTYPE REGEXP `.*` - NO_DISCOVER</p> |
-|SFP without DDM discovery |<p>SFP module discovery.</p> |SNMP |zyxel.3528.sfp.discovery<p>**Filter**:</p>AND <p>- {#ZYXEL.SFP.STATUS} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFP.STATUS.MATCHES}`</p><p>- {#ZYXEL.SFP.STATUS} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFP.STATUS.NOT_MATCHES}`</p> |
 |SFP with DDM discovery |<p>SFP DDM module discovery.</p> |SNMP |zyxel.3528.sfp.ddm.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>**Filter**:</p>AND <p>- {#ZYXEL.SFP.DESCRIPTION} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFPDDM.DESC.MATCHES}`</p><p>- {#ZYXEL.SFP.DESCRIPTION} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFPDDM.DESC.NOT_MATCHES}`</p> |
+|SFP without DDM discovery |<p>SFP module discovery.</p> |SNMP |zyxel.3528.sfp.discovery<p>**Filter**:</p>AND <p>- {#ZYXEL.SFP.STATUS} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFP.STATUS.MATCHES}`</p><p>- {#ZYXEL.SFP.STATUS} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFP.STATUS.NOT_MATCHES}`</p> |
 
 ## Items collected
 
@@ -61,31 +61,31 @@ There are no template links in this template.
 |Inventory |ZYXEL MES-3528: MAC address |<p>MIB: IF-MIB</p><p>The interface's address at the protocol layer</p><p>immediately `below' the network layer in the</p><p>protocol stack.  For interfaces which do not have</p><p>such an address (e.g., a serial line), this object</p><p>should contain an octet string of zero length.</p> |SNMP |zyxel.3528.mac<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Inventory |ZYXEL MES-3528: ZyNOS F/W Version |<p>MIB: ZYXEL-MES3528-MIB</p> |SNMP |zyxel.3528.fwversion<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
 |Inventory |ZYXEL MES-3528: Hardware serial number |<p>MIB: ZYXEL-MES3528-MIB</p><p>Serial number</p> |SNMP |zyxel.3528.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL MES-3528: Port {#SNMPINDEX}: Speed Duplex |<p>MIB:  ZYXEL-MES3528-MIB</p><p>Transmission mode</p> |SNMP |zyxel.3528.net.if.speed_duplex[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL MES-3528: Port {#SNMPINDEX}: Interface description |<p>MIB:  ZYXEL-MES3528-MIB</p><p>A textual string containing information about the interface</p> |SNMP |zyxel.3528.net.if.name[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL MES-3528: Port {#SNMPINDEX}: Link type |<p>MIB:  ZYXEL-MES3528-MIB</p><p>Physical connection type</p> |SNMP |zyxel.3528.net.if.link_type[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL MES-3528: Port {#SNMPINDEX}: Interface name |<p>MIB: IF-MIB</p><p>A textual string containing information about the interface</p> |SNMP |zyxel.3528.net.if.descr[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL MES-3528: Port {#SNMPINDEX}: Operational status |<p>MIB: IF-MIB</p><p>The current operational state of the interface.</p><p>The testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.3528.net.if.operstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL MES-3528: Port {#SNMPINDEX}: Administrative status |<p>MIB: IF-MIB</p><p>The desired state of the interface.  The</p><p>testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.3528.net.if.adminstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL MES-3528: Port {#SNMPINDEX}: Incoming traffic |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface,</p><p>including framing characters.</p> |SNMP |zyxel.3528.net.if.in.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL MES-3528: Port {#SNMPINDEX}: Incoming unicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were not addressed to a multicast</p><p>or broadcast address at this sub-layer</p> |SNMP |zyxel.3528.net.if.in.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL MES-3528: Port {#SNMPINDEX}: Incoming multicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a multicast</p><p>address at this sub-layer.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.3528.net.if.in.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL MES-3528: Port {#SNMPINDEX}: Incoming broadcast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a broadcast</p><p>address at this sub-layer.</p> |SNMP |zyxel.3528.net.if.in.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL MES-3528: Port {#SNMPINDEX}: Outgoing traffic |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the</p><p>interface, including framing characters.  This object is a</p><p>64-bit version of ifOutOctets.</p> |SNMP |zyxel.3528.net.if.out.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL MES-3528: Port {#SNMPINDEX}: Outgoing unicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were not addressed to a</p><p>multicast or broadcast address at this sub-layer, including</p><p>those that were discarded or not sent.</p> |SNMP |zyxel.3528.net.if.out.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL MES-3528: Port {#SNMPINDEX}: Outgoing multicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>multicast address at this sub-layer, including those that</p><p>were discarded or not sent.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.3528.net.if.out.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL MES-3528: Port {#SNMPINDEX}: Outgoing broadcast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>broadcast address at this sub-layer, including those that</p><p>were discarded or not sent.</p> |SNMP |zyxel.3528.net.if.out.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL MES-3528: Port {#SNMPINDEX}: Link speed |<p>MIB: IF-MIB</p><p>An estimate of the interface's current bandwidth in bits per second</p> |SNMP |zyxel.3528.net.if.highspeed[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1000000`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL MES-3528: Port {#SNMPINDEX}: Incoming utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.3528.net.if.in.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(//zyxel.3528.net.if.in.traffic[{#SNMPINDEX}]) * (last(//zyxel.3528.net.if.highspeed[{#SNMPINDEX}]) <> 0) / ( last(//zyxel.3528.net.if.highspeed[{#SNMPINDEX}]) + (last(//zyxel.3528.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100` |
-|Network_interfaces |ZYXEL MES-3528: Port {#SNMPINDEX}: Outgoing utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.3528.net.if.out.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(//zyxel.3528.net.if.out.traffic[{#SNMPINDEX}]) * (last(//zyxel.3528.net.if.highspeed[{#SNMPINDEX}]) <> 0) / ( last(//zyxel.3528.net.if.highspeed[{#SNMPINDEX}]) + (last(//zyxel.3528.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100` |
-|Network_interfaces |ZYXEL MES-3528: SFP {#SNMPINDEX}: Status |<p>MIB: ZYXEL-MES3528-MIB</p><p>Transceiver module status.</p> |SNMP |zyxel.3528.sfp.status[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL MES-3528: SFP {#SNMPINDEX}: Vendor |<p>MIB: ZYXEL-MES3528-MIB</p><p>Transceiver module vendor name.</p> |SNMP |zyxel.3528.sfp.vendor[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL MES-3528: SFP {#SNMPINDEX}: Part number |<p>MIB: ZYXEL-MES3528-MIB</p><p>Part number provided by transceiver module vendor.</p> |SNMP |zyxel.3528.sfp.part[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL MES-3528: SFP {#SNMPINDEX}: Serial number |<p>MIB: ZYXEL-MES3528-MIB</p><p>Serial number provided by transceiver module vendor.</p> |SNMP |zyxel.3528.sfp.serialnumber[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL MES-3528: SFP {#SNMPINDEX}: Revision |<p>MIB: ZYXEL-MES3528-MIB</p><p>Revision level for part number provided by transceiver module vendor.</p> |SNMP |zyxel.3528.sfp.revision[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL MES-3528: SFP {#SNMPINDEX}: Date code |<p>MIB: ZYXEL-MES3528-MIB</p><p>Transceiver module vendor's manufacturing date code.</p> |SNMP |zyxel.3528.sfp.datecode[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL MES-3528: SFP {#SNMPINDEX}: Transceiver |<p>MIB: ZYXEL-MES3528-MIB</p><p>Transceiver module type names.</p> |SNMP |zyxel.3528.sfp.transceiver[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL MES-3528: SFP {#ZYXEL.SFP.PORT}: {#ZYXEL.SFP.DESCRIPTION} |<p>MIB: ZYXEL-MES3528-MIB</p><p>Transceiver module DDM data ({#ZYXEL.SFP.DESCRIPTION}).</p> |SNMP |zyxel.3528.sfp.ddm[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.01`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL MES-3528: Port {#SNMPINDEX}: Speed Duplex |<p>MIB:  ZYXEL-MES3528-MIB</p><p>Transmission mode</p> |SNMP |zyxel.3528.net.if.speed_duplex[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL MES-3528: Port {#SNMPINDEX}: Interface description |<p>MIB:  ZYXEL-MES3528-MIB</p><p>A textual string containing information about the interface</p> |SNMP |zyxel.3528.net.if.name[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL MES-3528: Port {#SNMPINDEX}: Link type |<p>MIB:  ZYXEL-MES3528-MIB</p><p>Physical connection type</p> |SNMP |zyxel.3528.net.if.link_type[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL MES-3528: Port {#SNMPINDEX}: Interface name |<p>MIB: IF-MIB</p><p>A textual string containing information about the interface</p> |SNMP |zyxel.3528.net.if.descr[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL MES-3528: Port {#SNMPINDEX}: Operational status |<p>MIB: IF-MIB</p><p>The current operational state of the interface.</p><p>The testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.3528.net.if.operstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL MES-3528: Port {#SNMPINDEX}: Administrative status |<p>MIB: IF-MIB</p><p>The desired state of the interface.  The</p><p>testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.3528.net.if.adminstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL MES-3528: Port {#SNMPINDEX}: Incoming traffic |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface,</p><p>including framing characters.</p> |SNMP |zyxel.3528.net.if.in.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL MES-3528: Port {#SNMPINDEX}: Incoming unicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were not addressed to a multicast</p><p>or broadcast address at this sub-layer</p> |SNMP |zyxel.3528.net.if.in.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL MES-3528: Port {#SNMPINDEX}: Incoming multicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a multicast</p><p>address at this sub-layer.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.3528.net.if.in.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL MES-3528: Port {#SNMPINDEX}: Incoming broadcast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a broadcast</p><p>address at this sub-layer.</p> |SNMP |zyxel.3528.net.if.in.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL MES-3528: Port {#SNMPINDEX}: Outgoing traffic |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the</p><p>interface, including framing characters.  This object is a</p><p>64-bit version of ifOutOctets.</p> |SNMP |zyxel.3528.net.if.out.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL MES-3528: Port {#SNMPINDEX}: Outgoing unicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were not addressed to a</p><p>multicast or broadcast address at this sub-layer, including</p><p>those that were discarded or not sent.</p> |SNMP |zyxel.3528.net.if.out.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL MES-3528: Port {#SNMPINDEX}: Outgoing multicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>multicast address at this sub-layer, including those that</p><p>were discarded or not sent.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.3528.net.if.out.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL MES-3528: Port {#SNMPINDEX}: Outgoing broadcast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>broadcast address at this sub-layer, including those that</p><p>were discarded or not sent.</p> |SNMP |zyxel.3528.net.if.out.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL MES-3528: Port {#SNMPINDEX}: Link speed |<p>MIB: IF-MIB</p><p>An estimate of the interface's current bandwidth in bits per second</p> |SNMP |zyxel.3528.net.if.highspeed[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1000000`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL MES-3528: Port {#SNMPINDEX}: Incoming utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.3528.net.if.in.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(//zyxel.3528.net.if.in.traffic[{#SNMPINDEX}]) * (last(//zyxel.3528.net.if.highspeed[{#SNMPINDEX}]) <> 0) / ( last(//zyxel.3528.net.if.highspeed[{#SNMPINDEX}]) + (last(//zyxel.3528.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100` |
+|Network interfaces |ZYXEL MES-3528: Port {#SNMPINDEX}: Outgoing utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.3528.net.if.out.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(//zyxel.3528.net.if.out.traffic[{#SNMPINDEX}]) * (last(//zyxel.3528.net.if.highspeed[{#SNMPINDEX}]) <> 0) / ( last(//zyxel.3528.net.if.highspeed[{#SNMPINDEX}]) + (last(//zyxel.3528.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100` |
+|Network interfaces |ZYXEL MES-3528: SFP {#SNMPINDEX}: Status |<p>MIB: ZYXEL-MES3528-MIB</p><p>Transceiver module status.</p> |SNMP |zyxel.3528.sfp.status[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL MES-3528: SFP {#SNMPINDEX}: Vendor |<p>MIB: ZYXEL-MES3528-MIB</p><p>Transceiver module vendor name.</p> |SNMP |zyxel.3528.sfp.vendor[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL MES-3528: SFP {#SNMPINDEX}: Part number |<p>MIB: ZYXEL-MES3528-MIB</p><p>Part number provided by transceiver module vendor.</p> |SNMP |zyxel.3528.sfp.part[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL MES-3528: SFP {#SNMPINDEX}: Serial number |<p>MIB: ZYXEL-MES3528-MIB</p><p>Serial number provided by transceiver module vendor.</p> |SNMP |zyxel.3528.sfp.serialnumber[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL MES-3528: SFP {#SNMPINDEX}: Revision |<p>MIB: ZYXEL-MES3528-MIB</p><p>Revision level for part number provided by transceiver module vendor.</p> |SNMP |zyxel.3528.sfp.revision[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL MES-3528: SFP {#SNMPINDEX}: Date code |<p>MIB: ZYXEL-MES3528-MIB</p><p>Transceiver module vendor's manufacturing date code.</p> |SNMP |zyxel.3528.sfp.datecode[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL MES-3528: SFP {#SNMPINDEX}: Transceiver |<p>MIB: ZYXEL-MES3528-MIB</p><p>Transceiver module type names.</p> |SNMP |zyxel.3528.sfp.transceiver[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL MES-3528: SFP {#ZYXEL.SFP.PORT}: {#ZYXEL.SFP.DESCRIPTION} |<p>MIB: ZYXEL-MES3528-MIB</p><p>Transceiver module DDM data ({#ZYXEL.SFP.DESCRIPTION}).</p> |SNMP |zyxel.3528.sfp.ddm[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.01`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Status |ZYXEL MES-3528: SNMP agent availability |<p>-</p> |INTERNAL |zabbix[host,snmp,available]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Status |ZYXEL MES-3528: Uptime |<p>MIB: RFC1213-MIB</p><p>The time (in hundredths of a second) since the</p><p>network management portion of the system was last</p><p>re-initialized.</p> |SNMP |zyxel.3528.uptime<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.01`</p> |
 
@@ -108,7 +108,7 @@ There are no template links in this template.
 
 Please report any issues with the template at https://support.zabbix.com
 
-You can also provide a feedback, discuss the template or ask for help with it at [ZABBIX forums](https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/422668-discussion-thread-for-official-zabbix-templates-for-zyxel).
+You can also provide feedback, discuss the template or ask for help with it at [ZABBIX forums](https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/422668-discussion-thread-for-official-zabbix-templates-for-zyxel).
 
 ## Known Issues
 
diff --git a/templates/net/zyxel_snmp/zyxel_mes-3528_snmp/template_net_zyxel_mes-3528_snmp.yaml b/templates/net/zyxel_snmp/zyxel_mes-3528_snmp/template_net_zyxel_mes-3528_snmp.yaml
index 0f1ea6b51a0..e18fb193041 100644
--- a/templates/net/zyxel_snmp/zyxel_mes-3528_snmp/template_net_zyxel_mes-3528_snmp.yaml
+++ b/templates/net/zyxel_snmp/zyxel_mes-3528_snmp/template_net_zyxel_mes-3528_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-17T06:34:24Z'
+  date: '2022-01-26T09:58:25Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -27,7 +27,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/422668-discussion-thread-for-official-zabbix-templates-for-zyxel
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: 'Templates/Network devices'
@@ -47,8 +47,8 @@ zabbix_export:
                 - 1h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: network
           triggers:
             -
               uuid: 0e38d148fc29439488b3b23ee308b1d9
@@ -57,6 +57,10 @@ zabbix_export:
               opdata: 'Current state: {ITEM.LASTVALUE1}'
               priority: WARNING
               description: 'SNMP is not available for polling. Please check device connectivity and SNMP settings.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 7f947ff733314b23be2cea634a1fba75
           name: 'ZYXEL MES-3528: Contact'
@@ -80,8 +84,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
         -
           uuid: c7bd32a8835842d7b469f2323cc8a308
           name: 'ZYXEL MES-3528: CPU utilization'
@@ -97,8 +101,8 @@ zabbix_export:
             getting the values.
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
           triggers:
             -
               uuid: 247a25a4976a45eca78853aea112cdd6
@@ -107,6 +111,10 @@ zabbix_export:
               opdata: 'Current utilization: {ITEM.LASTVALUE1}'
               priority: WARNING
               description: 'CPU utilization is too high. The system might be slow to respond.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: c650e217f92c4e2ca1ec94f391dfe706
           name: 'ZYXEL MES-3528: ZyNOS F/W Version'
@@ -139,8 +147,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
           triggers:
             -
               uuid: 7c4cfa75447a4eeda874d916d052eb6e
@@ -150,6 +158,10 @@ zabbix_export:
               priority: INFO
               description: 'Firmware version has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 679445d352f14db4b5401efa5661447d
           name: 'ZYXEL MES-3528: Location'
@@ -172,8 +184,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
         -
           uuid: 1b4f56edba2a486a9c48ccafaa10eb09
           name: 'ZYXEL MES-3528: MAC address'
@@ -199,8 +211,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
         -
           uuid: 050fbf9b7c544678b79b37572984f698
           name: 'ZYXEL MES-3528: Hardware model name'
@@ -227,8 +239,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
           triggers:
             -
               uuid: b98e244abe2a4bd481be50048234afe6
@@ -236,6 +248,10 @@ zabbix_export:
               name: 'ZYXEL MES-3528: Template does not match hardware'
               priority: INFO
               description: 'This template is for Zyxel MES-3528, but connected to {ITEM.VALUE}'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 2411ebd40ee94b6285f4a6abf6127e04
           name: 'ZYXEL MES-3528: Host name'
@@ -259,8 +275,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
         -
           uuid: ea25cf79e45f40398580afd48e0bb9c8
           name: 'ZYXEL MES-3528: Hardware serial number'
@@ -282,8 +298,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
           triggers:
             -
               uuid: d08bc1ffb11e4bbc98851c30595e996c
@@ -292,6 +308,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 351295fe155543c18930541c20ccac58
           name: 'ZYXEL MES-3528: Uptime'
@@ -314,8 +334,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: d138c874f4de4f3a97a0c615d589826a
@@ -324,6 +344,10 @@ zabbix_export:
               priority: INFO
               description: 'Uptime is less than 10 minutes'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
       discovery_rules:
         -
           uuid: ebe2a413217c4239805f3f592f551b7c
@@ -375,8 +399,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: e719364c125048e8a1fb6712e507863b
               name: 'ZYXEL MES-3528: Port {#SNMPINDEX}: Interface name'
@@ -396,8 +426,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: b2225fa57c0d468b9b0a40b220d50639
               name: 'ZYXEL MES-3528: Port {#SNMPINDEX}: Link speed'
@@ -420,8 +456,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 9f1720f6286a4b038724563a32f97844
               name: 'ZYXEL MES-3528: Port {#SNMPINDEX}: Incoming broadcast packages'
@@ -442,8 +484,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 184f7cfcfe964ea9b2b310a666c77420
               name: 'ZYXEL MES-3528: Port {#SNMPINDEX}: Incoming multicast packages'
@@ -465,8 +513,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 41f4b8bb9e1c461e8ef834348589e468
               name: 'ZYXEL MES-3528: Port {#SNMPINDEX}: Incoming traffic'
@@ -490,8 +544,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 681460dffc9242fba072eacd503fd190
               name: 'ZYXEL MES-3528: Port {#SNMPINDEX}: Incoming unicast packages'
@@ -512,8 +572,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: c2792996d52045c9ad4c955f6330264e
               name: 'ZYXEL MES-3528: Port {#SNMPINDEX}: Incoming utilization'
@@ -537,8 +603,14 @@ zabbix_export:
                     - 'return +parseFloat(value).toFixed(0);'
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 9a45866adc3043ad81c7778b4334b317
               name: 'ZYXEL MES-3528: Port {#SNMPINDEX}: Link type'
@@ -558,8 +630,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 5a30094c57b54d89b1d61a73616e186e
               name: 'ZYXEL MES-3528: Port {#SNMPINDEX}: Interface description'
@@ -579,8 +657,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 1ed72a56523b48e89b964f6c4afc8800
               name: 'ZYXEL MES-3528: Port {#SNMPINDEX}: Operational status'
@@ -602,8 +686,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: c23272db35f44fe6958e3b5e31a52974
@@ -620,6 +710,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 873ba4c47c1c4525b52d53e6d98e8b6e
               name: 'ZYXEL MES-3528: Port {#SNMPINDEX}: Outgoing broadcast packages'
@@ -641,8 +735,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 9dae4fa8d9c2494aa01478dc9605b066
               name: 'ZYXEL MES-3528: Port {#SNMPINDEX}: Outgoing multicast packages'
@@ -665,8 +765,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 63f92516450d4dbcbea481231caf89f6
               name: 'ZYXEL MES-3528: Port {#SNMPINDEX}: Outgoing traffic'
@@ -691,8 +797,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: d7b17c5521a94b13b3ef6528fedcf5e0
               name: 'ZYXEL MES-3528: Port {#SNMPINDEX}: Outgoing unicast packages'
@@ -714,8 +826,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 3dd1d62e9cdb402b888b7ccbe3cbb182
               name: 'ZYXEL MES-3528: Port {#SNMPINDEX}: Outgoing utilization'
@@ -739,8 +857,14 @@ zabbix_export:
                     - 'return +parseFloat(value).toFixed(0);'
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 284e41a49397492590bbcf34e1881553
               name: 'ZYXEL MES-3528: Port {#SNMPINDEX}: Speed Duplex'
@@ -760,8 +884,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           graph_prototypes:
             -
               uuid: d021344604284e9ca127851ae1cb95ff
@@ -897,8 +1027,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#ZYXEL.SFP.PORT}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: f9e2991ea38343c8b2c9815bf733aef8
@@ -906,12 +1042,20 @@ zabbix_export:
                   name: 'ZYXEL MES-3528: SFP {#ZYXEL.SFP.PORT}: High {#ZYXEL.SFP.DESCRIPTION} (over {#ZYXEL.SFP.WARN.MAX}{#ZYXEL.SFP.UNIT})'
                   priority: WARNING
                   description: 'The upper threshold value of the parameter is exceeded'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: 341bff907cd943219bbed92773d9b005
                   expression: 'last(/ZYXEL MES-3528 SNMP/zyxel.3528.sfp.ddm[{#SNMPINDEX}]) < {#ZYXEL.SFP.WARN.MIN}'
                   name: 'ZYXEL MES-3528: SFP {#ZYXEL.SFP.PORT}: Low {#ZYXEL.SFP.DESCRIPTION} (less than {#ZYXEL.SFP.WARN.MIN}{#ZYXEL.SFP.UNIT})'
                   priority: WARNING
                   description: 'The parameter values are less than the lower threshold'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
           graph_prototypes:
             -
               uuid: ed8f780aa61845309aebfa522e3e9f3d
@@ -985,8 +1129,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 9d9e08755fa444efb408d3db30843098
               name: 'ZYXEL MES-3528: SFP {#SNMPINDEX}: Part number'
@@ -1007,8 +1157,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 90952405b1504eabb6e5436eaa179f5a
               name: 'ZYXEL MES-3528: SFP {#SNMPINDEX}: Revision'
@@ -1029,8 +1185,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 83d084e9a0554e8eae31b0bd38aefe72
               name: 'ZYXEL MES-3528: SFP {#SNMPINDEX}: Serial number'
@@ -1051,8 +1213,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 5cd22f26211a428099d2a41c5c41efab
@@ -1061,6 +1229,10 @@ zabbix_export:
                   priority: INFO
                   description: 'SFP {#SNMPINDEX} serial number has changed. Ack to close'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: ecbd3db41592408d8e9fe0d1d6078a3f
               name: 'ZYXEL MES-3528: SFP {#SNMPINDEX}: Status'
@@ -1081,8 +1253,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 049cbbcea720493f9638d08f928710cb
               name: 'ZYXEL MES-3528: SFP {#SNMPINDEX}: Transceiver'
@@ -1103,8 +1281,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 5ece25cae49f47169a335be40dee744a
               name: 'ZYXEL MES-3528: SFP {#SNMPINDEX}: Vendor'
@@ -1125,8 +1309,27 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: mes-3528
+        -
+          tag: target
+          value: switch
+        -
+          tag: target
+          value: zyxel
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/net/zyxel_snmp/zyxel_mes3500-10_snmp/README.md b/templates/net/zyxel_snmp/zyxel_mes3500-10_snmp/README.md
index 907ebef5bab..90ea8d44309 100644
--- a/templates/net/zyxel_snmp/zyxel_mes3500-10_snmp/README.md
+++ b/templates/net/zyxel_snmp/zyxel_mes3500-10_snmp/README.md
@@ -46,12 +46,12 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|Temperature discovery |<p>An entry in tempTable.</p><p>Index of temperature unit. 1:MAC, 2:CPU, 3:PHY</p> |SNMP |zyxel.3500_10.temp.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
-|Voltage discovery |<p>An entry in voltageTable.</p> |SNMP |zyxel.3500_10.volt.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
 |Interface discovery |<p>-</p> |SNMP |zyxel.3500_10.net.if.discovery<p>**Filter**:</p>AND <p>- {#ZYXEL.IF.NAME} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.NAME.MATCHES}`</p><p>- {#ZYXEL.IF.NAME} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.NAME.NOT_MATCHES}`</p><p>- {#ZYXEL.IF.LINKUPTYPE} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.MATCHES}`</p><p>- {#ZYXEL.IF.LINKUPTYPE} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.NOT_MATCHES}`</p><p>**Overrides:**</p><p>Don't create triggers for matching interface<br> - {#ZYXEL.IF.NAME} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}`<br>  - TRIGGER_PROTOTYPE REGEXP `.*` - NO_DISCOVER</p> |
-|SFP without DDM discovery |<p>SFP module discovery.</p> |SNMP |zyxel.3500_10.sfp.discovery<p>**Filter**:</p>AND <p>- {#ZYXEL.SFP.STATUS} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFP.STATUS.MATCHES}`</p><p>- {#ZYXEL.SFP.STATUS} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFP.STATUS.NOT_MATCHES}`</p> |
-|SFP with DDM discovery |<p>SFP DDM module discovery.</p> |SNMP |zyxel.3500_10.sfp.ddm.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>**Filter**:</p>AND <p>- {#ZYXEL.SFP.DESCRIPTION} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFPDDM.DESC.MATCHES}`</p><p>- {#ZYXEL.SFP.DESCRIPTION} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFPDDM.DESC.NOT_MATCHES}`</p> |
 |Memory pool discovery |<p>-</p> |SNMP |zyxel.3500_10.memory.discovery |
+|SFP with DDM discovery |<p>SFP DDM module discovery.</p> |SNMP |zyxel.3500_10.sfp.ddm.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>**Filter**:</p>AND <p>- {#ZYXEL.SFP.DESCRIPTION} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFPDDM.DESC.MATCHES}`</p><p>- {#ZYXEL.SFP.DESCRIPTION} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFPDDM.DESC.NOT_MATCHES}`</p> |
+|SFP without DDM discovery |<p>SFP module discovery.</p> |SNMP |zyxel.3500_10.sfp.discovery<p>**Filter**:</p>AND <p>- {#ZYXEL.SFP.STATUS} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFP.STATUS.MATCHES}`</p><p>- {#ZYXEL.SFP.STATUS} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFP.STATUS.NOT_MATCHES}`</p> |
+|Temperature discovery |<p>An entry in tempTable.</p><p>Index of temperature unit. 1:MAC, 2:CPU, 3:PHY</p> |SNMP |zyxel.3500_10.temp.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
+|Voltage discovery |<p>An entry in voltageTable.</p> |SNMP |zyxel.3500_10.volt.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
 
 ## Items collected
 
@@ -66,32 +66,32 @@ There are no template links in this template.
 |Inventory |ZYXEL MES3500-10: ZyNOS F/W Version |<p>MIB: ZYXEL-MES3500-10-MIB</p> |SNMP |zyxel.3500_10.fwversion<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
 |Inventory |ZYXEL MES3500-10: Hardware serial number |<p>MIB: ZYXEL-MES3500-10-MIB</p><p>Serial number</p> |SNMP |zyxel.3500_10.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Memory |ZYXEL MES3500-10: Memory "{#ZYXEL.MEMORY.NAME}" utilization |<p>MIB: ZYXEL-MES3500-10-MIB</p><p>Utilization of memory pool in %.</p> |SNMP |zyxel.3500_10.memory[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL MES3500-10: Port {#SNMPINDEX}: Speed Duplex |<p>MIB:  ZYXEL-MES3500-10-MIB</p><p>Transmission mode</p> |SNMP |zyxel.3500_10.net.if.speed_duplex[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL MES3500-10: Port {#SNMPINDEX}: Interface description |<p>MIB:  ZYXEL-MES3500-10-MIB</p><p>A textual string containing information about the interface</p> |SNMP |zyxel.3500_10.net.if.name[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL MES3500-10: Port {#SNMPINDEX}: Link type |<p>MIB:  ZYXEL-MES3500-10-MIB</p><p>Physical connection type</p> |SNMP |zyxel.3500_10.net.if.link_type[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL MES3500-10: Port {#SNMPINDEX}: Interface name |<p>MIB: IF-MIB</p><p>A textual string containing information about the interface</p> |SNMP |zyxel.3500_10.net.if.descr[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL MES3500-10: Port {#SNMPINDEX}: Operational status |<p>MIB: IF-MIB</p><p>The current operational state of the interface.</p><p>The testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.3500_10.net.if.operstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL MES3500-10: Port {#SNMPINDEX}: Administrative status |<p>MIB: IF-MIB</p><p>The desired state of the interface.  The</p><p>testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.3500_10.net.if.adminstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL MES3500-10: Port {#SNMPINDEX}: Incoming traffic |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface,</p><p>including framing characters.</p> |SNMP |zyxel.3500_10.net.if.in.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL MES3500-10: Port {#SNMPINDEX}: Incoming unicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were not addressed to a multicast</p><p>or broadcast address at this sub-layer</p> |SNMP |zyxel.3500_10.net.if.in.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL MES3500-10: Port {#SNMPINDEX}: Incoming multicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a multicast</p><p>address at this sub-layer.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.3500_10.net.if.in.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL MES3500-10: Port {#SNMPINDEX}: Incoming broadcast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a broadcast</p><p>address at this sub-layer.</p> |SNMP |zyxel.3500_10.net.if.in.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL MES3500-10: Port {#SNMPINDEX}: Outgoing traffic |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the</p><p>interface, including framing characters.  This object is a</p><p>64-bit version of ifOutOctets.</p> |SNMP |zyxel.3500_10.net.if.out.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL MES3500-10: Port {#SNMPINDEX}: Outgoing unicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were not addressed to a</p><p>multicast or broadcast address at this sub-layer, including</p><p>those that were discarded or not sent.</p> |SNMP |zyxel.3500_10.net.if.out.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL MES3500-10: Port {#SNMPINDEX}: Outgoing multicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>multicast address at this sub-layer, including those that</p><p>were discarded or not sent.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.3500_10.net.if.out.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL MES3500-10: Port {#SNMPINDEX}: Outgoing broadcast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>broadcast address at this sub-layer, including those that</p><p>were discarded or not sent.</p> |SNMP |zyxel.3500_10.net.if.out.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL MES3500-10: Port {#SNMPINDEX}: Link speed |<p>MIB: IF-MIB</p><p>An estimate of the interface's current bandwidth in bits per second</p> |SNMP |zyxel.3500_10.net.if.highspeed[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1000000`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL MES3500-10: Port {#SNMPINDEX}: Incoming utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.3500_10.net.if.in.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(//zyxel.3500_10.net.if.in.traffic[{#SNMPINDEX}]) * (last(//zyxel.3500_10.net.if.highspeed[{#SNMPINDEX}]) <> 0) / ( last(//zyxel.3500_10.net.if.highspeed[{#SNMPINDEX}]) + (last(//zyxel.3500_10.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100` |
-|Network_interfaces |ZYXEL MES3500-10: Port {#SNMPINDEX}: Outgoing utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.3500_10.net.if.out.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(//zyxel.3500_10.net.if.out.traffic[{#SNMPINDEX}]) * (last(//zyxel.3500_10.net.if.highspeed[{#SNMPINDEX}]) <> 0) / ( last(//zyxel.3500_10.net.if.highspeed[{#SNMPINDEX}]) + (last(//zyxel.3500_10.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100` |
-|Network_interfaces |ZYXEL MES3500-10: SFP {#SNMPINDEX}: Status |<p>MIB: ZYXEL-MES3500-10-MIB</p><p>Transceiver module status.</p> |SNMP |zyxel.3500_10.sfp.status[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL MES3500-10: SFP {#SNMPINDEX}: Vendor |<p>MIB: ZYXEL-MES3500-10-MIB</p><p>Transceiver module vendor name.</p> |SNMP |zyxel.3500_10.sfp.vendor[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL MES3500-10: SFP {#SNMPINDEX}: Part number |<p>MIB: ZYXEL-MES3500-10-MIB</p><p>Part number provided by transceiver module vendor.</p> |SNMP |zyxel.3500_10.sfp.part[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL MES3500-10: SFP {#SNMPINDEX}: Serial number |<p>MIB: ZYXEL-MES3500-10-MIB</p><p>Serial number provided by transceiver module vendor.</p> |SNMP |zyxel.3500_10.sfp.serialnumber[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL MES3500-10: SFP {#SNMPINDEX}: Revision |<p>MIB: ZYXEL-MES3500-10-MIB</p><p>Revision level for part number provided by transceiver module vendor.</p> |SNMP |zyxel.3500_10.sfp.revision[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL MES3500-10: SFP {#SNMPINDEX}: Date code |<p>MIB: ZYXEL-MES3500-10-MIB</p><p>Transceiver module vendor's manufacturing date code.</p> |SNMP |zyxel.3500_10.sfp.datecode[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL MES3500-10: SFP {#SNMPINDEX}: Transceiver |<p>MIB: ZYXEL-MES3500-10-MIB</p><p>Transceiver module type names.</p> |SNMP |zyxel.3500_10.sfp.transceiver[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL MES3500-10: SFP {#ZYXEL.SFP.PORT}: {#ZYXEL.SFP.DESCRIPTION} |<p>MIB: ZYXEL-MES3500-10-MIB</p><p>Transceiver module DDM data ({#ZYXEL.SFP.DESCRIPTION}).</p> |SNMP |zyxel.3500_10.sfp.ddm[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.01`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Power_supply |ZYXEL MES3500-10: Nominal "{#ZYXEL.VOLT.NOMINAL}" |<p>MIB: ZYXEL-MES3500-10-MIB</p><p>The current voltage reading.</p> |SNMP |zyxel.3500_10.volt[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL MES3500-10: Port {#SNMPINDEX}: Speed Duplex |<p>MIB:  ZYXEL-MES3500-10-MIB</p><p>Transmission mode</p> |SNMP |zyxel.3500_10.net.if.speed_duplex[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL MES3500-10: Port {#SNMPINDEX}: Interface description |<p>MIB:  ZYXEL-MES3500-10-MIB</p><p>A textual string containing information about the interface</p> |SNMP |zyxel.3500_10.net.if.name[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL MES3500-10: Port {#SNMPINDEX}: Link type |<p>MIB:  ZYXEL-MES3500-10-MIB</p><p>Physical connection type</p> |SNMP |zyxel.3500_10.net.if.link_type[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL MES3500-10: Port {#SNMPINDEX}: Interface name |<p>MIB: IF-MIB</p><p>A textual string containing information about the interface</p> |SNMP |zyxel.3500_10.net.if.descr[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL MES3500-10: Port {#SNMPINDEX}: Operational status |<p>MIB: IF-MIB</p><p>The current operational state of the interface.</p><p>The testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.3500_10.net.if.operstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL MES3500-10: Port {#SNMPINDEX}: Administrative status |<p>MIB: IF-MIB</p><p>The desired state of the interface.  The</p><p>testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.3500_10.net.if.adminstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL MES3500-10: Port {#SNMPINDEX}: Incoming traffic |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface,</p><p>including framing characters.</p> |SNMP |zyxel.3500_10.net.if.in.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL MES3500-10: Port {#SNMPINDEX}: Incoming unicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were not addressed to a multicast</p><p>or broadcast address at this sub-layer</p> |SNMP |zyxel.3500_10.net.if.in.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL MES3500-10: Port {#SNMPINDEX}: Incoming multicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a multicast</p><p>address at this sub-layer.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.3500_10.net.if.in.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL MES3500-10: Port {#SNMPINDEX}: Incoming broadcast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a broadcast</p><p>address at this sub-layer.</p> |SNMP |zyxel.3500_10.net.if.in.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL MES3500-10: Port {#SNMPINDEX}: Outgoing traffic |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the</p><p>interface, including framing characters.  This object is a</p><p>64-bit version of ifOutOctets.</p> |SNMP |zyxel.3500_10.net.if.out.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL MES3500-10: Port {#SNMPINDEX}: Outgoing unicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were not addressed to a</p><p>multicast or broadcast address at this sub-layer, including</p><p>those that were discarded or not sent.</p> |SNMP |zyxel.3500_10.net.if.out.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL MES3500-10: Port {#SNMPINDEX}: Outgoing multicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>multicast address at this sub-layer, including those that</p><p>were discarded or not sent.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.3500_10.net.if.out.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL MES3500-10: Port {#SNMPINDEX}: Outgoing broadcast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>broadcast address at this sub-layer, including those that</p><p>were discarded or not sent.</p> |SNMP |zyxel.3500_10.net.if.out.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL MES3500-10: Port {#SNMPINDEX}: Link speed |<p>MIB: IF-MIB</p><p>An estimate of the interface's current bandwidth in bits per second</p> |SNMP |zyxel.3500_10.net.if.highspeed[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1000000`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL MES3500-10: Port {#SNMPINDEX}: Incoming utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.3500_10.net.if.in.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(//zyxel.3500_10.net.if.in.traffic[{#SNMPINDEX}]) * (last(//zyxel.3500_10.net.if.highspeed[{#SNMPINDEX}]) <> 0) / ( last(//zyxel.3500_10.net.if.highspeed[{#SNMPINDEX}]) + (last(//zyxel.3500_10.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100` |
+|Network interfaces |ZYXEL MES3500-10: Port {#SNMPINDEX}: Outgoing utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.3500_10.net.if.out.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(//zyxel.3500_10.net.if.out.traffic[{#SNMPINDEX}]) * (last(//zyxel.3500_10.net.if.highspeed[{#SNMPINDEX}]) <> 0) / ( last(//zyxel.3500_10.net.if.highspeed[{#SNMPINDEX}]) + (last(//zyxel.3500_10.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100` |
+|Network interfaces |ZYXEL MES3500-10: SFP {#SNMPINDEX}: Status |<p>MIB: ZYXEL-MES3500-10-MIB</p><p>Transceiver module status.</p> |SNMP |zyxel.3500_10.sfp.status[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL MES3500-10: SFP {#SNMPINDEX}: Vendor |<p>MIB: ZYXEL-MES3500-10-MIB</p><p>Transceiver module vendor name.</p> |SNMP |zyxel.3500_10.sfp.vendor[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL MES3500-10: SFP {#SNMPINDEX}: Part number |<p>MIB: ZYXEL-MES3500-10-MIB</p><p>Part number provided by transceiver module vendor.</p> |SNMP |zyxel.3500_10.sfp.part[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL MES3500-10: SFP {#SNMPINDEX}: Serial number |<p>MIB: ZYXEL-MES3500-10-MIB</p><p>Serial number provided by transceiver module vendor.</p> |SNMP |zyxel.3500_10.sfp.serialnumber[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL MES3500-10: SFP {#SNMPINDEX}: Revision |<p>MIB: ZYXEL-MES3500-10-MIB</p><p>Revision level for part number provided by transceiver module vendor.</p> |SNMP |zyxel.3500_10.sfp.revision[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL MES3500-10: SFP {#SNMPINDEX}: Date code |<p>MIB: ZYXEL-MES3500-10-MIB</p><p>Transceiver module vendor's manufacturing date code.</p> |SNMP |zyxel.3500_10.sfp.datecode[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL MES3500-10: SFP {#SNMPINDEX}: Transceiver |<p>MIB: ZYXEL-MES3500-10-MIB</p><p>Transceiver module type names.</p> |SNMP |zyxel.3500_10.sfp.transceiver[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL MES3500-10: SFP {#ZYXEL.SFP.PORT}: {#ZYXEL.SFP.DESCRIPTION} |<p>MIB: ZYXEL-MES3500-10-MIB</p><p>Transceiver module DDM data ({#ZYXEL.SFP.DESCRIPTION}).</p> |SNMP |zyxel.3500_10.sfp.ddm[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.01`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Power supply |ZYXEL MES3500-10: Nominal "{#ZYXEL.VOLT.NOMINAL}" |<p>MIB: ZYXEL-MES3500-10-MIB</p><p>The current voltage reading.</p> |SNMP |zyxel.3500_10.volt[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Status |ZYXEL MES3500-10: SNMP agent availability |<p>-</p> |INTERNAL |zabbix[host,snmp,available]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Status |ZYXEL MES3500-10: Uptime |<p>MIB: RFC1213-MIB</p><p>The time (in hundredths of a second) since the</p><p>network management portion of the system was last</p><p>re-initialized.</p> |SNMP |zyxel.3500_10.uptime<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.01`</p> |
 |Temperature |ZYXEL MES3500-10: Temperature "{#ZYXEL.TEMP.ID}" |<p>MIB: ZYXEL-MES3500-10-MIB</p><p>The current temperature measured at this sensor</p> |SNMP |zyxel.3500_10.temp[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
@@ -118,7 +118,7 @@ There are no template links in this template.
 
 Please report any issues with the template at https://support.zabbix.com
 
-You can also provide a feedback, discuss the template or ask for help with it at [ZABBIX forums](https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/422668-discussion-thread-for-official-zabbix-templates-for-zyxel).
+You can also provide feedback, discuss the template or ask for help with it at [ZABBIX forums](https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/422668-discussion-thread-for-official-zabbix-templates-for-zyxel).
 
 ## Known Issues
 
diff --git a/templates/net/zyxel_snmp/zyxel_mes3500-10_snmp/template_net_zyxel_mes3500-10_snmp.yaml b/templates/net/zyxel_snmp/zyxel_mes3500-10_snmp/template_net_zyxel_mes3500-10_snmp.yaml
index ef3220940c9..31cc9b4c318 100644
--- a/templates/net/zyxel_snmp/zyxel_mes3500-10_snmp/template_net_zyxel_mes3500-10_snmp.yaml
+++ b/templates/net/zyxel_snmp/zyxel_mes3500-10_snmp/template_net_zyxel_mes3500-10_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-17T06:34:29Z'
+  date: '2022-01-26T09:46:10Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -27,7 +27,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/422668-discussion-thread-for-official-zabbix-templates-for-zyxel
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: 'Templates/Network devices'
@@ -47,8 +47,8 @@ zabbix_export:
                 - 1h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: network
           triggers:
             -
               uuid: c33a4bffd5464934b4b9f1e7160806e1
@@ -57,6 +57,10 @@ zabbix_export:
               opdata: 'Current state: {ITEM.LASTVALUE1}'
               priority: WARNING
               description: 'SNMP is not available for polling. Please check device connectivity and SNMP settings.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 84a1eb118ad2453ca5a5ccca6111516b
           name: 'ZYXEL MES3500-10: Contact'
@@ -80,8 +84,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
         -
           uuid: dd6585221297476885e900c54a820ae7
           name: 'ZYXEL MES3500-10: CPU utilization'
@@ -97,8 +101,8 @@ zabbix_export:
             getting the values.
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
           triggers:
             -
               uuid: 0d31c154f8f34ed18a99558f7839bbb6
@@ -107,6 +111,10 @@ zabbix_export:
               opdata: 'Current utilization: {ITEM.LASTVALUE1}'
               priority: WARNING
               description: 'CPU utilization is too high. The system might be slow to respond.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 144931a31b2a4a52978679a6a029fc8e
           name: 'ZYXEL MES3500-10: ZyNOS F/W Version'
@@ -139,8 +147,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
           triggers:
             -
               uuid: db567c7693b6437e89ef7a5b78c889f9
@@ -150,6 +158,10 @@ zabbix_export:
               priority: INFO
               description: 'Firmware version has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 0005f568cd384734b9f21e846648cd5f
           name: 'ZYXEL MES3500-10: Location'
@@ -172,8 +184,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
         -
           uuid: 3bc8285eebad410996c4697022038345
           name: 'ZYXEL MES3500-10: MAC address'
@@ -199,8 +211,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
         -
           uuid: b270937507f345f88421cf1825c29917
           name: 'ZYXEL MES3500-10: Hardware model name'
@@ -227,8 +239,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
           triggers:
             -
               uuid: 27f1cb5a297c4b1eafd4056317a37f01
@@ -236,6 +248,10 @@ zabbix_export:
               name: 'ZYXEL MES3500-10: Template does not match hardware'
               priority: INFO
               description: 'This template is for Zyxel MES3500-10, but connected to {ITEM.VALUE}'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 831783fc67ab49b1be0ae5132fb2d8df
           name: 'ZYXEL MES3500-10: Host name'
@@ -259,8 +275,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
         -
           uuid: a0d17f11a5624f4e8520ee5e583ad322
           name: 'ZYXEL MES3500-10: Hardware serial number'
@@ -282,8 +298,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
           triggers:
             -
               uuid: ee14abdf61b04a90adf6e2afcc3d73f4
@@ -292,6 +308,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: d581384242074b07a4c5cd03a562827c
           name: 'ZYXEL MES3500-10: Uptime'
@@ -314,8 +334,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 9899ada82b0e4507948a8a0068e5640d
@@ -324,6 +344,10 @@ zabbix_export:
               priority: INFO
               description: 'Uptime is less than 10 minutes'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
       discovery_rules:
         -
           uuid: ae66d16a5531489580d394e040950ecb
@@ -351,8 +375,8 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: Memory
+                  tag: component
+                  value: memory
               trigger_prototypes:
                 -
                   uuid: 91609e57df4941faa9fee17051f8ac24
@@ -360,6 +384,10 @@ zabbix_export:
                   name: 'ZYXEL MES3500-10: High memory utilization in "{#ZYXEL.MEMORY.NAME}" pool (>{$MEMORY.UTIL.MAX}% for 5m)'
                   priority: AVERAGE
                   description: 'The system is running out of free memory.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: b8cd74eeb2b94ceeba49157ccb617bb8
           name: 'Interface discovery'
@@ -410,8 +438,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 5a4b1c62b5834ecea8a90b71cb7c5f2e
               name: 'ZYXEL MES3500-10: Port {#SNMPINDEX}: Interface name'
@@ -431,8 +465,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: bba418acc01d4732891c775c68bad518
               name: 'ZYXEL MES3500-10: Port {#SNMPINDEX}: Link speed'
@@ -455,8 +495,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 7c6f62ebe1ec48e080c0edb36cf2304c
               name: 'ZYXEL MES3500-10: Port {#SNMPINDEX}: Incoming broadcast packages'
@@ -477,8 +523,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 846dfcfcdd974d1e9f8ec71f54f8933b
               name: 'ZYXEL MES3500-10: Port {#SNMPINDEX}: Incoming multicast packages'
@@ -500,8 +552,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: b1843c913e6d4f638e43da1c92807a4f
               name: 'ZYXEL MES3500-10: Port {#SNMPINDEX}: Incoming traffic'
@@ -525,8 +583,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 31e8e47755804816882d2070ecfca130
               name: 'ZYXEL MES3500-10: Port {#SNMPINDEX}: Incoming unicast packages'
@@ -547,8 +611,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: e4963aa170554edebb356515c04aaafb
               name: 'ZYXEL MES3500-10: Port {#SNMPINDEX}: Incoming utilization'
@@ -572,8 +642,14 @@ zabbix_export:
                     - 'return +parseFloat(value).toFixed(0);'
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 66572368d798449baa945b3985156e07
               name: 'ZYXEL MES3500-10: Port {#SNMPINDEX}: Link type'
@@ -593,8 +669,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 4c45f11441f4450e9f310ffb1d999a68
               name: 'ZYXEL MES3500-10: Port {#SNMPINDEX}: Interface description'
@@ -614,8 +696,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: a2269b48020a46c193830f8cc1ef3595
               name: 'ZYXEL MES3500-10: Port {#SNMPINDEX}: Operational status'
@@ -637,8 +725,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: fb9bb0e2ceb643f495b93bbaf04b0cc1
@@ -655,6 +749,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 521a2ac2ff0c42c282380c45bd12706f
               name: 'ZYXEL MES3500-10: Port {#SNMPINDEX}: Outgoing broadcast packages'
@@ -676,8 +774,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 7638a07162bd4668b086f0d07d4a6513
               name: 'ZYXEL MES3500-10: Port {#SNMPINDEX}: Outgoing multicast packages'
@@ -700,8 +804,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: f563a76ec9ae4f62ad1601f1d91549d2
               name: 'ZYXEL MES3500-10: Port {#SNMPINDEX}: Outgoing traffic'
@@ -726,8 +836,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 8888c9da5191443facfec4c865181d18
               name: 'ZYXEL MES3500-10: Port {#SNMPINDEX}: Outgoing unicast packages'
@@ -749,8 +865,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: dffcc1796e8b4a3c84f9d925b3644215
               name: 'ZYXEL MES3500-10: Port {#SNMPINDEX}: Outgoing utilization'
@@ -774,8 +896,14 @@ zabbix_export:
                     - 'return +parseFloat(value).toFixed(0);'
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: a54d1c46a1c842b88854be651c4e4caa
               name: 'ZYXEL MES3500-10: Port {#SNMPINDEX}: Speed Duplex'
@@ -795,8 +923,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           graph_prototypes:
             -
               uuid: 914bb954a2ef42939825074378d001bc
@@ -932,8 +1066,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#ZYXEL.SFP.PORT}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: bc09d6c1771d4d04afe86f49dbd98852
@@ -941,12 +1081,20 @@ zabbix_export:
                   name: 'ZYXEL MES3500-10: SFP {#ZYXEL.SFP.PORT}: High {#ZYXEL.SFP.DESCRIPTION} (over {#ZYXEL.SFP.WARN.MAX}{#ZYXEL.SFP.UNIT})'
                   priority: WARNING
                   description: 'The upper threshold value of the parameter is exceeded'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: d05ae92b624347cc9a8fe1154995f3f9
                   expression: 'last(/ZYXEL MES3500-10 SNMP/zyxel.3500_10.sfp.ddm[{#SNMPINDEX}]) < {#ZYXEL.SFP.WARN.MIN}'
                   name: 'ZYXEL MES3500-10: SFP {#ZYXEL.SFP.PORT}: Low {#ZYXEL.SFP.DESCRIPTION} (less than {#ZYXEL.SFP.WARN.MIN}{#ZYXEL.SFP.UNIT})'
                   priority: WARNING
                   description: 'The parameter values are less than the lower threshold'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
           graph_prototypes:
             -
               uuid: 1b5db1876c0a4acf9d45ac26a9739778
@@ -1020,8 +1168,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 2f338f7f29464e0b88ebe7d3ec69050a
               name: 'ZYXEL MES3500-10: SFP {#SNMPINDEX}: Part number'
@@ -1042,8 +1196,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 53582950f20e474ba4b6f46c42bc3216
               name: 'ZYXEL MES3500-10: SFP {#SNMPINDEX}: Revision'
@@ -1064,8 +1224,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: cecd4ba3b9014400a2d5d5b1b98f5463
               name: 'ZYXEL MES3500-10: SFP {#SNMPINDEX}: Serial number'
@@ -1086,8 +1252,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 8832e1fa622449f582218cf5a7bf6b75
@@ -1096,6 +1268,10 @@ zabbix_export:
                   priority: INFO
                   description: 'SFP {#SNMPINDEX} serial number has changed. Ack to close'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: b09aad7939cb4897bff413ef956bebfe
               name: 'ZYXEL MES3500-10: SFP {#SNMPINDEX}: Status'
@@ -1116,8 +1292,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 3878fecf990d4cb6aba13225b2bbfa59
               name: 'ZYXEL MES3500-10: SFP {#SNMPINDEX}: Transceiver'
@@ -1138,8 +1320,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 3c8dfe57cab242c2ade6139e8666e621
               name: 'ZYXEL MES3500-10: SFP {#SNMPINDEX}: Vendor'
@@ -1160,8 +1348,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
         -
           uuid: 39ef9d256f8847fca6077524f01270c1
           name: 'Temperature discovery'
@@ -1191,8 +1385,11 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: sensor
+                -
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 6970c577993343dfaa97f4317acf0f08
@@ -1201,6 +1398,10 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the temperature'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
           graph_prototypes:
             -
               uuid: 0c7b7b235f174e048bd3da37d1ed0913
@@ -1256,8 +1457,11 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Power supply'
+                  tag: component
+                  value: sensor
+                -
+                  tag: component
+                  value: voltage
               trigger_prototypes:
                 -
                   uuid: c86b60bc2d0842e28f0718314db4cde0
@@ -1266,6 +1470,10 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the power supply'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
           graph_prototypes:
             -
               uuid: 909d64e8063647de90f9fd61375c40a9
@@ -1289,6 +1497,19 @@ zabbix_export:
                   outArr.push(item)
                   });
                   return JSON.stringify(outArr);
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: mes3500-10
+        -
+          tag: target
+          value: switch
+        -
+          tag: target
+          value: zyxel
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/net/zyxel_snmp/zyxel_mes3500-24_snmp/README.md b/templates/net/zyxel_snmp/zyxel_mes3500-24_snmp/README.md
index ba1f3f25617..4b87edf1c59 100644
--- a/templates/net/zyxel_snmp/zyxel_mes3500-24_snmp/README.md
+++ b/templates/net/zyxel_snmp/zyxel_mes3500-24_snmp/README.md
@@ -46,12 +46,12 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|Temperature discovery |<p>An entry in tempTable.</p><p>Index of temperature unit. 1:MAC, 2:CPU, 3:PHY</p> |SNMP |zyxel.3500_24.temp.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
-|Voltage discovery |<p>An entry in voltageTable.</p> |SNMP |zyxel.3500_24.volt.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
 |Interface discovery |<p>-</p> |SNMP |zyxel.3500_24.net.if.discovery<p>**Filter**:</p>AND <p>- {#ZYXEL.IF.NAME} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.NAME.MATCHES}`</p><p>- {#ZYXEL.IF.NAME} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.NAME.NOT_MATCHES}`</p><p>- {#ZYXEL.IF.LINKUPTYPE} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.MATCHES}`</p><p>- {#ZYXEL.IF.LINKUPTYPE} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.NOT_MATCHES}`</p><p>**Overrides:**</p><p>Don't create triggers for matching interface<br> - {#ZYXEL.IF.NAME} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}`<br>  - TRIGGER_PROTOTYPE REGEXP `.*` - NO_DISCOVER</p> |
-|SFP without DDM discovery |<p>SFP module discovery.</p> |SNMP |zyxel.3500_24.sfp.discovery<p>**Filter**:</p>AND <p>- {#ZYXEL.SFP.STATUS} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFP.STATUS.MATCHES}`</p><p>- {#ZYXEL.SFP.STATUS} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFP.STATUS.NOT_MATCHES}`</p> |
-|SFP with DDM discovery |<p>SFP DDM module discovery.</p> |SNMP |zyxel.3500_24.sfp.ddm.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>**Filter**:</p>AND <p>- {#ZYXEL.SFP.DESCRIPTION} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFPDDM.DESC.MATCHES}`</p><p>- {#ZYXEL.SFP.DESCRIPTION} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFPDDM.DESC.NOT_MATCHES}`</p> |
 |Memory pool discovery |<p>-</p> |SNMP |zyxel.3500_24.memory.discovery |
+|SFP with DDM discovery |<p>SFP DDM module discovery.</p> |SNMP |zyxel.3500_24.sfp.ddm.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>**Filter**:</p>AND <p>- {#ZYXEL.SFP.DESCRIPTION} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFPDDM.DESC.MATCHES}`</p><p>- {#ZYXEL.SFP.DESCRIPTION} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFPDDM.DESC.NOT_MATCHES}`</p> |
+|SFP without DDM discovery |<p>SFP module discovery.</p> |SNMP |zyxel.3500_24.sfp.discovery<p>**Filter**:</p>AND <p>- {#ZYXEL.SFP.STATUS} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFP.STATUS.MATCHES}`</p><p>- {#ZYXEL.SFP.STATUS} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFP.STATUS.NOT_MATCHES}`</p> |
+|Temperature discovery |<p>An entry in tempTable.</p><p>Index of temperature unit. 1:MAC, 2:CPU, 3:PHY</p> |SNMP |zyxel.3500_24.temp.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
+|Voltage discovery |<p>An entry in voltageTable.</p> |SNMP |zyxel.3500_24.volt.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
 
 ## Items collected
 
@@ -66,32 +66,32 @@ There are no template links in this template.
 |Inventory |ZYXEL MES3500-24: ZyNOS F/W Version |<p>MIB: ZYXEL-MES3500-24-MIB</p> |SNMP |zyxel.3500_24.fwversion<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
 |Inventory |ZYXEL MES3500-24: Hardware serial number |<p>MIB: ZYXEL-MES3500-24-MIB</p><p>Serial number</p> |SNMP |zyxel.3500_24.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Memory |ZYXEL MES3500-24: Memory "{#ZYXEL.MEMORY.NAME}" utilization |<p>MIB: ZYXEL-MES3500-24-MIB</p><p>Utilization of memory pool in %.</p> |SNMP |zyxel.3500_24.memory[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL MES3500-24: Port {#SNMPINDEX}: Speed Duplex |<p>MIB:  ZYXEL-MES3500-24-MIB</p><p>Transmission mode</p> |SNMP |zyxel.3500_24.net.if.speed_duplex[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL MES3500-24: Port {#SNMPINDEX}: Interface description |<p>MIB:  ZYXEL-MES3500-24-MIB</p><p>A textual string containing information about the interface</p> |SNMP |zyxel.3500_24.net.if.name[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL MES3500-24: Port {#SNMPINDEX}: Link type |<p>MIB:  ZYXEL-MES3500-24-MIB</p><p>Physical connection type</p> |SNMP |zyxel.3500_24.net.if.link_type[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL MES3500-24: Port {#SNMPINDEX}: Interface name |<p>MIB: IF-MIB</p><p>A textual string containing information about the interface</p> |SNMP |zyxel.3500_24.net.if.descr[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL MES3500-24: Port {#SNMPINDEX}: Operational status |<p>MIB: IF-MIB</p><p>The current operational state of the interface.</p><p>The testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.3500_24.net.if.operstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL MES3500-24: Port {#SNMPINDEX}: Administrative status |<p>MIB: IF-MIB</p><p>The desired state of the interface.  The</p><p>testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.3500_24.net.if.adminstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL MES3500-24: Port {#SNMPINDEX}: Incoming traffic |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface,</p><p>including framing characters.</p> |SNMP |zyxel.3500_24.net.if.in.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL MES3500-24: Port {#SNMPINDEX}: Incoming unicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were not addressed to a multicast</p><p>or broadcast address at this sub-layer</p> |SNMP |zyxel.3500_24.net.if.in.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL MES3500-24: Port {#SNMPINDEX}: Incoming multicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a multicast</p><p>address at this sub-layer.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.3500_24.net.if.in.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL MES3500-24: Port {#SNMPINDEX}: Incoming broadcast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a broadcast</p><p>address at this sub-layer.</p> |SNMP |zyxel.3500_24.net.if.in.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL MES3500-24: Port {#SNMPINDEX}: Outgoing traffic |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the</p><p>interface, including framing characters.  This object is a</p><p>64-bit version of ifOutOctets.</p> |SNMP |zyxel.3500_24.net.if.out.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL MES3500-24: Port {#SNMPINDEX}: Outgoing unicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were not addressed to a</p><p>multicast or broadcast address at this sub-layer, including</p><p>those that were discarded or not sent.</p> |SNMP |zyxel.3500_24.net.if.out.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL MES3500-24: Port {#SNMPINDEX}: Outgoing multicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>multicast address at this sub-layer, including those that</p><p>were discarded or not sent.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.3500_24.net.if.out.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL MES3500-24: Port {#SNMPINDEX}: Outgoing broadcast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>broadcast address at this sub-layer, including those that</p><p>were discarded or not sent.</p> |SNMP |zyxel.3500_24.net.if.out.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL MES3500-24: Port {#SNMPINDEX}: Link speed |<p>MIB: IF-MIB</p><p>An estimate of the interface's current bandwidth in bits per second</p> |SNMP |zyxel.3500_24.net.if.highspeed[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1000000`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL MES3500-24: Port {#SNMPINDEX}: Incoming utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.3500_24.net.if.in.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(//zyxel.3500_24.net.if.in.traffic[{#SNMPINDEX}]) * (last(//zyxel.3500_24.net.if.highspeed[{#SNMPINDEX}]) <> 0) / ( last(//zyxel.3500_24.net.if.highspeed[{#SNMPINDEX}]) + (last(//zyxel.3500_24.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100` |
-|Network_interfaces |ZYXEL MES3500-24: Port {#SNMPINDEX}: Outgoing utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.3500_24.net.if.out.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(//zyxel.3500_24.net.if.out.traffic[{#SNMPINDEX}]) * (last(//zyxel.3500_24.net.if.highspeed[{#SNMPINDEX}]) <> 0) / ( last(//zyxel.3500_24.net.if.highspeed[{#SNMPINDEX}]) + (last(//zyxel.3500_24.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100` |
-|Network_interfaces |ZYXEL MES3500-24: SFP {#SNMPINDEX}: Status |<p>MIB: ZYXEL-MES3500-24-MIB</p><p>Transceiver module status.</p> |SNMP |zyxel.3500_24.sfp.status[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL MES3500-24: SFP {#SNMPINDEX}: Vendor |<p>MIB: ZYXEL-MES3500-24-MIB</p><p>Transceiver module vendor name.</p> |SNMP |zyxel.3500_24.sfp.vendor[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL MES3500-24: SFP {#SNMPINDEX}: Part number |<p>MIB: ZYXEL-MES3500-24-MIB</p><p>Part number provided by transceiver module vendor.</p> |SNMP |zyxel.3500_24.sfp.part[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL MES3500-24: SFP {#SNMPINDEX}: Serial number |<p>MIB: ZYXEL-MES3500-24-MIB</p><p>Serial number provided by transceiver module vendor.</p> |SNMP |zyxel.3500_24.sfp.serialnumber[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL MES3500-24: SFP {#SNMPINDEX}: Revision |<p>MIB: ZYXEL-MES3500-24-MIB</p><p>Revision level for part number provided by transceiver module vendor.</p> |SNMP |zyxel.3500_24.sfp.revision[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL MES3500-24: SFP {#SNMPINDEX}: Date code |<p>MIB: ZYXEL-MES3500-24-MIB</p><p>Transceiver module vendor's manufacturing date code.</p> |SNMP |zyxel.3500_24.sfp.datecode[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL MES3500-24: SFP {#SNMPINDEX}: Transceiver |<p>MIB: ZYXEL-MES3500-24-MIB</p><p>Transceiver module type names.</p> |SNMP |zyxel.3500_24.sfp.transceiver[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL MES3500-24: SFP {#ZYXEL.SFP.PORT}: {#ZYXEL.SFP.DESCRIPTION} |<p>MIB: ZYXEL-MES3500-24-MIB</p><p>Transceiver module DDM data ({#ZYXEL.SFP.DESCRIPTION}).</p> |SNMP |zyxel.3500_24.sfp.ddm[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.01`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Power_supply |ZYXEL MES3500-24: Nominal "{#ZYXEL.VOLT.NOMINAL}" |<p>MIB: ZYXEL-MES3500-24-MIB</p><p>The current voltage reading.</p> |SNMP |zyxel.3500_24.volt[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL MES3500-24: Port {#SNMPINDEX}: Speed Duplex |<p>MIB:  ZYXEL-MES3500-24-MIB</p><p>Transmission mode</p> |SNMP |zyxel.3500_24.net.if.speed_duplex[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL MES3500-24: Port {#SNMPINDEX}: Interface description |<p>MIB:  ZYXEL-MES3500-24-MIB</p><p>A textual string containing information about the interface</p> |SNMP |zyxel.3500_24.net.if.name[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL MES3500-24: Port {#SNMPINDEX}: Link type |<p>MIB:  ZYXEL-MES3500-24-MIB</p><p>Physical connection type</p> |SNMP |zyxel.3500_24.net.if.link_type[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL MES3500-24: Port {#SNMPINDEX}: Interface name |<p>MIB: IF-MIB</p><p>A textual string containing information about the interface</p> |SNMP |zyxel.3500_24.net.if.descr[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL MES3500-24: Port {#SNMPINDEX}: Operational status |<p>MIB: IF-MIB</p><p>The current operational state of the interface.</p><p>The testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.3500_24.net.if.operstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL MES3500-24: Port {#SNMPINDEX}: Administrative status |<p>MIB: IF-MIB</p><p>The desired state of the interface.  The</p><p>testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.3500_24.net.if.adminstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL MES3500-24: Port {#SNMPINDEX}: Incoming traffic |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface,</p><p>including framing characters.</p> |SNMP |zyxel.3500_24.net.if.in.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL MES3500-24: Port {#SNMPINDEX}: Incoming unicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were not addressed to a multicast</p><p>or broadcast address at this sub-layer</p> |SNMP |zyxel.3500_24.net.if.in.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL MES3500-24: Port {#SNMPINDEX}: Incoming multicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a multicast</p><p>address at this sub-layer.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.3500_24.net.if.in.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL MES3500-24: Port {#SNMPINDEX}: Incoming broadcast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a broadcast</p><p>address at this sub-layer.</p> |SNMP |zyxel.3500_24.net.if.in.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL MES3500-24: Port {#SNMPINDEX}: Outgoing traffic |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the</p><p>interface, including framing characters.  This object is a</p><p>64-bit version of ifOutOctets.</p> |SNMP |zyxel.3500_24.net.if.out.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL MES3500-24: Port {#SNMPINDEX}: Outgoing unicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were not addressed to a</p><p>multicast or broadcast address at this sub-layer, including</p><p>those that were discarded or not sent.</p> |SNMP |zyxel.3500_24.net.if.out.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL MES3500-24: Port {#SNMPINDEX}: Outgoing multicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>multicast address at this sub-layer, including those that</p><p>were discarded or not sent.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.3500_24.net.if.out.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL MES3500-24: Port {#SNMPINDEX}: Outgoing broadcast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>broadcast address at this sub-layer, including those that</p><p>were discarded or not sent.</p> |SNMP |zyxel.3500_24.net.if.out.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL MES3500-24: Port {#SNMPINDEX}: Link speed |<p>MIB: IF-MIB</p><p>An estimate of the interface's current bandwidth in bits per second</p> |SNMP |zyxel.3500_24.net.if.highspeed[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1000000`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL MES3500-24: Port {#SNMPINDEX}: Incoming utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.3500_24.net.if.in.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(//zyxel.3500_24.net.if.in.traffic[{#SNMPINDEX}]) * (last(//zyxel.3500_24.net.if.highspeed[{#SNMPINDEX}]) <> 0) / ( last(//zyxel.3500_24.net.if.highspeed[{#SNMPINDEX}]) + (last(//zyxel.3500_24.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100` |
+|Network interfaces |ZYXEL MES3500-24: Port {#SNMPINDEX}: Outgoing utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.3500_24.net.if.out.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(//zyxel.3500_24.net.if.out.traffic[{#SNMPINDEX}]) * (last(//zyxel.3500_24.net.if.highspeed[{#SNMPINDEX}]) <> 0) / ( last(//zyxel.3500_24.net.if.highspeed[{#SNMPINDEX}]) + (last(//zyxel.3500_24.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100` |
+|Network interfaces |ZYXEL MES3500-24: SFP {#SNMPINDEX}: Status |<p>MIB: ZYXEL-MES3500-24-MIB</p><p>Transceiver module status.</p> |SNMP |zyxel.3500_24.sfp.status[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL MES3500-24: SFP {#SNMPINDEX}: Vendor |<p>MIB: ZYXEL-MES3500-24-MIB</p><p>Transceiver module vendor name.</p> |SNMP |zyxel.3500_24.sfp.vendor[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL MES3500-24: SFP {#SNMPINDEX}: Part number |<p>MIB: ZYXEL-MES3500-24-MIB</p><p>Part number provided by transceiver module vendor.</p> |SNMP |zyxel.3500_24.sfp.part[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL MES3500-24: SFP {#SNMPINDEX}: Serial number |<p>MIB: ZYXEL-MES3500-24-MIB</p><p>Serial number provided by transceiver module vendor.</p> |SNMP |zyxel.3500_24.sfp.serialnumber[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL MES3500-24: SFP {#SNMPINDEX}: Revision |<p>MIB: ZYXEL-MES3500-24-MIB</p><p>Revision level for part number provided by transceiver module vendor.</p> |SNMP |zyxel.3500_24.sfp.revision[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL MES3500-24: SFP {#SNMPINDEX}: Date code |<p>MIB: ZYXEL-MES3500-24-MIB</p><p>Transceiver module vendor's manufacturing date code.</p> |SNMP |zyxel.3500_24.sfp.datecode[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL MES3500-24: SFP {#SNMPINDEX}: Transceiver |<p>MIB: ZYXEL-MES3500-24-MIB</p><p>Transceiver module type names.</p> |SNMP |zyxel.3500_24.sfp.transceiver[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL MES3500-24: SFP {#ZYXEL.SFP.PORT}: {#ZYXEL.SFP.DESCRIPTION} |<p>MIB: ZYXEL-MES3500-24-MIB</p><p>Transceiver module DDM data ({#ZYXEL.SFP.DESCRIPTION}).</p> |SNMP |zyxel.3500_24.sfp.ddm[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.01`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Power supply |ZYXEL MES3500-24: Nominal "{#ZYXEL.VOLT.NOMINAL}" |<p>MIB: ZYXEL-MES3500-24-MIB</p><p>The current voltage reading.</p> |SNMP |zyxel.3500_24.volt[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Status |ZYXEL MES3500-24: SNMP agent availability |<p>-</p> |INTERNAL |zabbix[host,snmp,available]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Status |ZYXEL MES3500-24: Uptime |<p>MIB: RFC1213-MIB</p><p>The time (in hundredths of a second) since the</p><p>network management portion of the system was last</p><p>re-initialized.</p> |SNMP |zyxel.3500_24.uptime<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.01`</p> |
 |Temperature |ZYXEL MES3500-24: Temperature "{#ZYXEL.TEMP.ID}" |<p>MIB: ZYXEL-MES3500-24-MIB</p><p>The current temperature measured at this sensor</p> |SNMP |zyxel.3500_24.temp[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
@@ -118,7 +118,7 @@ There are no template links in this template.
 
 Please report any issues with the template at https://support.zabbix.com
 
-You can also provide a feedback, discuss the template or ask for help with it at [ZABBIX forums](https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/422668-discussion-thread-for-official-zabbix-templates-for-zyxel).
+You can also provide feedback, discuss the template or ask for help with it at [ZABBIX forums](https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/422668-discussion-thread-for-official-zabbix-templates-for-zyxel).
 
 ## Known Issues
 
diff --git a/templates/net/zyxel_snmp/zyxel_mes3500-24_snmp/template_net_zyxel_mes3500-24_snmp.yaml b/templates/net/zyxel_snmp/zyxel_mes3500-24_snmp/template_net_zyxel_mes3500-24_snmp.yaml
index c483845006e..73b81de818d 100644
--- a/templates/net/zyxel_snmp/zyxel_mes3500-24_snmp/template_net_zyxel_mes3500-24_snmp.yaml
+++ b/templates/net/zyxel_snmp/zyxel_mes3500-24_snmp/template_net_zyxel_mes3500-24_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-17T06:34:33Z'
+  date: '2022-01-26T09:55:34Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -27,7 +27,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/422668-discussion-thread-for-official-zabbix-templates-for-zyxel
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: 'Templates/Network devices'
@@ -47,8 +47,8 @@ zabbix_export:
                 - 1h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: network
           triggers:
             -
               uuid: 96435fde17384c6bb4f9811ad9ca184a
@@ -57,6 +57,10 @@ zabbix_export:
               opdata: 'Current state: {ITEM.LASTVALUE1}'
               priority: WARNING
               description: 'SNMP is not available for polling. Please check device connectivity and SNMP settings.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 7e1745e5130f4b7cb2b31814fecd6792
           name: 'ZYXEL MES3500-24: Contact'
@@ -80,8 +84,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
         -
           uuid: 31029f8a8cc541908b8f765b27254ecd
           name: 'ZYXEL MES3500-24: CPU utilization'
@@ -97,8 +101,8 @@ zabbix_export:
             getting the values.
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
           triggers:
             -
               uuid: 911d1c7e921f43af8ab3c0035be57a27
@@ -107,6 +111,10 @@ zabbix_export:
               opdata: 'Current utilization: {ITEM.LASTVALUE1}'
               priority: WARNING
               description: 'CPU utilization is too high. The system might be slow to respond.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 53e694b360254f2896301e78cf982650
           name: 'ZYXEL MES3500-24: ZyNOS F/W Version'
@@ -139,8 +147,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
           triggers:
             -
               uuid: f3daea29a34b4cf992d3c23ba8a64d2e
@@ -150,6 +158,10 @@ zabbix_export:
               priority: INFO
               description: 'Firmware version has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 5aa2128d8530415f855a0d33b7fb9c7f
           name: 'ZYXEL MES3500-24: Location'
@@ -172,8 +184,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
         -
           uuid: a8209492e29040a3896abf35019e6cdd
           name: 'ZYXEL MES3500-24: MAC address'
@@ -199,8 +211,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
         -
           uuid: 1820c7b7d903402dab0d7c8fb251f9bc
           name: 'ZYXEL MES3500-24: Hardware model name'
@@ -227,8 +239,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
           triggers:
             -
               uuid: ab363c150ecd447ea4d3a3a9c311b992
@@ -236,6 +248,10 @@ zabbix_export:
               name: 'ZYXEL MES3500-24: Template does not match hardware'
               priority: INFO
               description: 'This template is for Zyxel MES3500-24, but connected to {ITEM.VALUE}'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: b5fc886ab5b94f929e866d4a2e9c5648
           name: 'ZYXEL MES3500-24: Host name'
@@ -259,8 +275,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
         -
           uuid: b5243eb2c7664203acb4f5e6bc8da296
           name: 'ZYXEL MES3500-24: Hardware serial number'
@@ -282,8 +298,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
           triggers:
             -
               uuid: a475d29129664eec82fc7ed85cb74df9
@@ -292,6 +308,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 00c831c6cc9d415e91319b6bec15423d
           name: 'ZYXEL MES3500-24: Uptime'
@@ -314,8 +334,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: c389b0db83bc404e8cb84ce65db79700
@@ -324,6 +344,10 @@ zabbix_export:
               priority: INFO
               description: 'Uptime is less than 10 minutes'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
       discovery_rules:
         -
           uuid: 263079e9c77c4539b248a5b62b5f1b0f
@@ -351,8 +375,8 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: Memory
+                  tag: component
+                  value: memory
               trigger_prototypes:
                 -
                   uuid: 66802198e0764ee29cdf557378b5566b
@@ -360,6 +384,10 @@ zabbix_export:
                   name: 'ZYXEL MES3500-24: High memory utilization in "{#ZYXEL.MEMORY.NAME}" pool (>{$MEMORY.UTIL.MAX}% for 5m)'
                   priority: AVERAGE
                   description: 'The system is running out of free memory.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 0f57f2a82f764b908fbc8f4d828203c6
           name: 'Interface discovery'
@@ -410,8 +438,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 7309a7b73c2848088c282096c334d541
               name: 'ZYXEL MES3500-24: Port {#SNMPINDEX}: Interface name'
@@ -431,8 +465,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 72efe5b4f1584d438739298561b3c8ab
               name: 'ZYXEL MES3500-24: Port {#SNMPINDEX}: Link speed'
@@ -455,8 +495,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: f11f5928218a4b619b31b597895a13b2
               name: 'ZYXEL MES3500-24: Port {#SNMPINDEX}: Incoming broadcast packages'
@@ -477,8 +523,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 22a65221bc194c03909956179180808a
               name: 'ZYXEL MES3500-24: Port {#SNMPINDEX}: Incoming multicast packages'
@@ -500,8 +552,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: e759a09d0f504567bd2fc0dd9c0d8395
               name: 'ZYXEL MES3500-24: Port {#SNMPINDEX}: Incoming traffic'
@@ -525,8 +583,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 16df754a1ac94c0588e1b6be5e175ed7
               name: 'ZYXEL MES3500-24: Port {#SNMPINDEX}: Incoming unicast packages'
@@ -547,8 +611,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 5051b4a19bad47a8b546fbfb6d5ea85e
               name: 'ZYXEL MES3500-24: Port {#SNMPINDEX}: Incoming utilization'
@@ -572,8 +642,14 @@ zabbix_export:
                     - 'return +parseFloat(value).toFixed(0);'
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 25f6b400af8a40b29bf83ac988bc3cd8
               name: 'ZYXEL MES3500-24: Port {#SNMPINDEX}: Link type'
@@ -593,8 +669,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 6d860666d83b4886b04bb1ff2ecb19d9
               name: 'ZYXEL MES3500-24: Port {#SNMPINDEX}: Interface description'
@@ -614,8 +696,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: adf6ce16961240a9a7775de2e41df3d1
               name: 'ZYXEL MES3500-24: Port {#SNMPINDEX}: Operational status'
@@ -637,8 +725,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 5a9faa35f7d547a987e78075832cf38e
@@ -655,6 +749,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 9119a0ba755e426580310376d6a70b5f
               name: 'ZYXEL MES3500-24: Port {#SNMPINDEX}: Outgoing broadcast packages'
@@ -676,8 +774,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: b13b8fecada34eed8f40ee79e2a12295
               name: 'ZYXEL MES3500-24: Port {#SNMPINDEX}: Outgoing multicast packages'
@@ -700,8 +804,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: d15d6b6ab8af4d5d8501784bb590af08
               name: 'ZYXEL MES3500-24: Port {#SNMPINDEX}: Outgoing traffic'
@@ -726,8 +836,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 08e0d078c5224b0885ea8c03af9328e4
               name: 'ZYXEL MES3500-24: Port {#SNMPINDEX}: Outgoing unicast packages'
@@ -749,8 +865,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 40b0f81094014f6cb667c143b5345795
               name: 'ZYXEL MES3500-24: Port {#SNMPINDEX}: Outgoing utilization'
@@ -774,8 +896,14 @@ zabbix_export:
                     - 'return +parseFloat(value).toFixed(0);'
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: a814c27268e648f18ac9c82d5a5f78cb
               name: 'ZYXEL MES3500-24: Port {#SNMPINDEX}: Speed Duplex'
@@ -795,8 +923,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           graph_prototypes:
             -
               uuid: 2b07fe7c9bd14177b8cc8c05e3975ac9
@@ -932,8 +1066,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#ZYXEL.SFP.PORT}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: ef830e34f83347bebba87a72208d805b
@@ -941,12 +1081,20 @@ zabbix_export:
                   name: 'ZYXEL MES3500-24: SFP {#ZYXEL.SFP.PORT}: High {#ZYXEL.SFP.DESCRIPTION} (over {#ZYXEL.SFP.WARN.MAX}{#ZYXEL.SFP.UNIT})'
                   priority: WARNING
                   description: 'The upper threshold value of the parameter is exceeded'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: 229f44666e6043a1a8e34437ad24e3ae
                   expression: 'last(/ZYXEL MES3500-24 SNMP/zyxel.3500_24.sfp.ddm[{#SNMPINDEX}]) < {#ZYXEL.SFP.WARN.MIN}'
                   name: 'ZYXEL MES3500-24: SFP {#ZYXEL.SFP.PORT}: Low {#ZYXEL.SFP.DESCRIPTION} (less than {#ZYXEL.SFP.WARN.MIN}{#ZYXEL.SFP.UNIT})'
                   priority: WARNING
                   description: 'The parameter values are less than the lower threshold'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
           graph_prototypes:
             -
               uuid: 14b916383368427cad794b92d5d706e9
@@ -1020,8 +1168,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: b8b4d20515d748ac9bc77f8223294861
               name: 'ZYXEL MES3500-24: SFP {#SNMPINDEX}: Part number'
@@ -1042,8 +1196,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 380d4a1f3aa041fea4108c08d7108344
               name: 'ZYXEL MES3500-24: SFP {#SNMPINDEX}: Revision'
@@ -1064,8 +1224,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 24dc72b317284f568e962b461bbb33de
               name: 'ZYXEL MES3500-24: SFP {#SNMPINDEX}: Serial number'
@@ -1086,8 +1252,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: f84b378d79b74174842cc49af29c2a0c
@@ -1096,6 +1268,10 @@ zabbix_export:
                   priority: INFO
                   description: 'SFP {#SNMPINDEX} serial number has changed. Ack to close'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 0b8041b750ed4734b70cce707c4782ad
               name: 'ZYXEL MES3500-24: SFP {#SNMPINDEX}: Status'
@@ -1116,8 +1292,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: cf254d7b5d0d4525b8f871863a1ced2d
               name: 'ZYXEL MES3500-24: SFP {#SNMPINDEX}: Transceiver'
@@ -1138,8 +1320,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: cda45fc5cf1d44779e1a5eda3f120df2
               name: 'ZYXEL MES3500-24: SFP {#SNMPINDEX}: Vendor'
@@ -1160,8 +1348,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
         -
           uuid: 034f5965d39940d29ac58641f3b01183
           name: 'Temperature discovery'
@@ -1191,8 +1385,11 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: sensor
+                -
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 9963d3848c774563881689da1bcddefc
@@ -1201,6 +1398,10 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the temperature'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
           graph_prototypes:
             -
               uuid: 5e06e88aca5b492aa9c623e4ef727b5d
@@ -1256,8 +1457,11 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Power supply'
+                  tag: component
+                  value: sensor
+                -
+                  tag: component
+                  value: voltage
               trigger_prototypes:
                 -
                   uuid: 2eef8cabb2e141dd8b6d1868ebc79db4
@@ -1266,6 +1470,10 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the power supply'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
           graph_prototypes:
             -
               uuid: 40f7ab2435d345279b8a7a52bad06dcd
@@ -1289,6 +1497,19 @@ zabbix_export:
                   outArr.push(item)
                   });
                   return JSON.stringify(outArr);
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: mes3500-24
+        -
+          tag: target
+          value: switch
+        -
+          tag: target
+          value: zyxel
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/net/zyxel_snmp/zyxel_mgs-3712_snmp/README.md b/templates/net/zyxel_snmp/zyxel_mgs-3712_snmp/README.md
index a1fe3d83bf7..0b5b88cad95 100644
--- a/templates/net/zyxel_snmp/zyxel_mgs-3712_snmp/README.md
+++ b/templates/net/zyxel_snmp/zyxel_mgs-3712_snmp/README.md
@@ -46,11 +46,11 @@ There are no template links in this template.
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
 |Fan discovery |<p>An entry in fanRpmTable.</p> |SNMP |zyxel.3712.fan.discovery |
-|Temperature discovery |<p>An entry in tempTable.</p><p>Index of temperature unit. 1:MAC, 2:CPU, 3:PHY</p> |SNMP |zyxel.3712.temp.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
-|Voltage discovery |<p>An entry in voltageTable.</p> |SNMP |zyxel.3712.volt.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
 |Interface discovery |<p>-</p> |SNMP |zyxel.3712.net.if.discovery<p>**Filter**:</p>AND <p>- {#ZYXEL.IF.NAME} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.NAME.MATCHES}`</p><p>- {#ZYXEL.IF.NAME} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.NAME.NOT_MATCHES}`</p><p>- {#ZYXEL.IF.LINKUPTYPE} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.MATCHES}`</p><p>- {#ZYXEL.IF.LINKUPTYPE} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.NOT_MATCHES}`</p><p>**Overrides:**</p><p>Don't create triggers for matching interface<br> - {#ZYXEL.IF.NAME} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}`<br>  - TRIGGER_PROTOTYPE REGEXP `.*` - NO_DISCOVER</p> |
-|SFP without DDM discovery |<p>SFP module discovery.</p> |SNMP |zyxel.3712.sfp.discovery<p>**Filter**:</p>AND <p>- {#ZYXEL.SFP.STATUS} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFP.STATUS.MATCHES}`</p><p>- {#ZYXEL.SFP.STATUS} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFP.STATUS.NOT_MATCHES}`</p> |
 |SFP with DDM discovery |<p>SFP DDM module discovery.</p> |SNMP |zyxel.3712.sfp.ddm.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>**Filter**:</p>AND <p>- {#ZYXEL.SFP.DESCRIPTION} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFPDDM.DESC.MATCHES}`</p><p>- {#ZYXEL.SFP.DESCRIPTION} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFPDDM.DESC.NOT_MATCHES}`</p> |
+|SFP without DDM discovery |<p>SFP module discovery.</p> |SNMP |zyxel.3712.sfp.discovery<p>**Filter**:</p>AND <p>- {#ZYXEL.SFP.STATUS} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFP.STATUS.MATCHES}`</p><p>- {#ZYXEL.SFP.STATUS} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFP.STATUS.NOT_MATCHES}`</p> |
+|Temperature discovery |<p>An entry in tempTable.</p><p>Index of temperature unit. 1:MAC, 2:CPU, 3:PHY</p> |SNMP |zyxel.3712.temp.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
+|Voltage discovery |<p>An entry in voltageTable.</p> |SNMP |zyxel.3712.volt.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
 
 ## Items collected
 
@@ -65,32 +65,32 @@ There are no template links in this template.
 |Inventory |ZYXEL MGS-3712: MAC address |<p>MIB: IF-MIB</p><p>The interface's address at the protocol layer</p><p>immediately `below' the network layer in the</p><p>protocol stack.  For interfaces which do not have</p><p>such an address (e.g., a serial line), this object</p><p>should contain an octet string of zero length.</p> |SNMP |zyxel.3712.mac<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Inventory |ZYXEL MGS-3712: ZyNOS F/W Version |<p>MIB: ZYXEL-MGS3712F-MIB</p> |SNMP |zyxel.3712.fwversion<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
 |Inventory |ZYXEL MGS-3712: Hardware serial number |<p>MIB: ZYXEL-MGS3712F-MIB</p><p>Serial number</p> |SNMP |zyxel.3712.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL MGS-3712: Port {#SNMPINDEX}: Speed Duplex |<p>MIB: ZYXEL-MGS3712F-MIB</p><p>Transmission mode</p> |SNMP |zyxel.3712.net.if.speed_duplex[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL MGS-3712: Port {#SNMPINDEX}: Interface description |<p>MIB: ZYXEL-MGS3712F-MIB</p><p>A textual string containing information about the interface</p> |SNMP |zyxel.3712.net.if.name[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL MGS-3712: Port {#SNMPINDEX}: Link type |<p>MIB: ZYXEL-MGS3712F-MIB</p><p>Physical connection type</p> |SNMP |zyxel.3712.net.if.link_type[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL MGS-3712: Port {#SNMPINDEX}: Interface name |<p>MIB: IF-MIB</p><p>A textual string containing information about the interface</p> |SNMP |zyxel.3712.net.if.descr[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL MGS-3712: Port {#SNMPINDEX}: Operational status |<p>MIB: IF-MIB</p><p>The current operational state of the interface.</p><p>The testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.3712.net.if.operstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL MGS-3712: Port {#SNMPINDEX}: Administrative status |<p>MIB: IF-MIB</p><p>The desired state of the interface.  The</p><p>testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.3712.net.if.adminstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL MGS-3712: Port {#SNMPINDEX}: Incoming traffic |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface,</p><p>including framing characters.</p> |SNMP |zyxel.3712.net.if.in.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL MGS-3712: Port {#SNMPINDEX}: Incoming unicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were not addressed to a multicast</p><p>or broadcast address at this sub-layer</p> |SNMP |zyxel.3712.net.if.in.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL MGS-3712: Port {#SNMPINDEX}: Incoming multicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a multicast</p><p>address at this sub-layer.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.3712.net.if.in.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL MGS-3712: Port {#SNMPINDEX}: Incoming broadcast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a broadcast</p><p>address at this sub-layer.</p> |SNMP |zyxel.3712.net.if.in.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL MGS-3712: Port {#SNMPINDEX}: Outgoing traffic |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the</p><p>interface, including framing characters.  This object is a</p><p>64-bit version of ifOutOctets.</p> |SNMP |zyxel.3712.net.if.out.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL MGS-3712: Port {#SNMPINDEX}: Outgoing unicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were not addressed to a</p><p>multicast or broadcast address at this sub-layer, including</p><p>those that were discarded or not sent.</p> |SNMP |zyxel.3712.net.if.out.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL MGS-3712: Port {#SNMPINDEX}: Outgoing multicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>multicast address at this sub-layer, including those that</p><p>were discarded or not sent.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.3712.net.if.out.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL MGS-3712: Port {#SNMPINDEX}: Outgoing broadcast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>broadcast address at this sub-layer, including those that</p><p>were discarded or not sent.</p> |SNMP |zyxel.3712.net.if.out.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL MGS-3712: Port {#SNMPINDEX}: Link speed |<p>MIB: IF-MIB</p><p>An estimate of the interface's current bandwidth in bits per second</p> |SNMP |zyxel.3712.net.if.highspeed[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1000000`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL MGS-3712: Port {#SNMPINDEX}: Incoming utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.3712.net.if.in.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(//zyxel.3712.net.if.in.traffic[{#SNMPINDEX}]) * (last(//zyxel.3712.net.if.highspeed[{#SNMPINDEX}]) <> 0) / ( last(//zyxel.3712.net.if.highspeed[{#SNMPINDEX}]) + (last(//zyxel.3712.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100` |
-|Network_interfaces |ZYXEL MGS-3712: Port {#SNMPINDEX}: Outgoing utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.3712.net.if.out.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(//zyxel.3712.net.if.out.traffic[{#SNMPINDEX}]) * (last(//zyxel.3712.net.if.highspeed[{#SNMPINDEX}]) <> 0) / ( last(//zyxel.3712.net.if.highspeed[{#SNMPINDEX}]) + (last(//zyxel.3712.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100` |
-|Network_interfaces |ZYXEL MGS-3712: SFP {#SNMPINDEX}: Status |<p>MIB: ZYXEL-MGS3712F-MIB</p><p>Transceiver module status.</p> |SNMP |zyxel.3712.sfp.status[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL MGS-3712: SFP {#SNMPINDEX}: Vendor |<p>MIB: ZYXEL-MGS3712F-MIB</p><p>Transceiver module vendor name.</p> |SNMP |zyxel.3712.sfp.vendor[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL MGS-3712: SFP {#SNMPINDEX}: Part number |<p>MIB: ZYXEL-MGS3712F-MIB</p><p>Part number provided by transceiver module vendor.</p> |SNMP |zyxel.3712.sfp.part[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL MGS-3712: SFP {#SNMPINDEX}: Serial number |<p>MIB: ZYXEL-MGS3712F-MIB</p><p>Serial number provided by transceiver module vendor.</p> |SNMP |zyxel.3712.sfp.serialnumber[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL MGS-3712: SFP {#SNMPINDEX}: Revision |<p>MIB: ZYXEL-MGS3712F-MIB</p><p>Revision level for part number provided by transceiver module vendor.</p> |SNMP |zyxel.3712.sfp.revision[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL MGS-3712: SFP {#SNMPINDEX}: Date code |<p>MIB: ZYXEL-MGS3712F-MIB</p><p>Transceiver module vendor's manufacturing date code.</p> |SNMP |zyxel.3712.sfp.datecode[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL MGS-3712: SFP {#SNMPINDEX}: Transceiver |<p>MIB: ZYXEL-MGS3712F-MIB</p><p>Transceiver module type names.</p> |SNMP |zyxel.3712.sfp.transceiver[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL MGS-3712: SFP {#ZYXEL.SFP.PORT}: {#ZYXEL.SFP.DESCRIPTION} |<p>MIB: ZYXEL-MGS3712F-MIB</p><p>Transceiver module DDM data ({#ZYXEL.SFP.DESCRIPTION}).</p> |SNMP |zyxel.3712.sfp.ddm[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.01`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Power_supply |ZYXEL MGS-3712: Nominal "{#ZYXEL.VOLT.NOMINAL}" |<p>MIB: ZYXEL-MGS3712F-MIB</p><p>The current voltage reading.</p> |SNMP |zyxel.3712.volt[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL MGS-3712: Port {#SNMPINDEX}: Speed Duplex |<p>MIB: ZYXEL-MGS3712F-MIB</p><p>Transmission mode</p> |SNMP |zyxel.3712.net.if.speed_duplex[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL MGS-3712: Port {#SNMPINDEX}: Interface description |<p>MIB: ZYXEL-MGS3712F-MIB</p><p>A textual string containing information about the interface</p> |SNMP |zyxel.3712.net.if.name[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL MGS-3712: Port {#SNMPINDEX}: Link type |<p>MIB: ZYXEL-MGS3712F-MIB</p><p>Physical connection type</p> |SNMP |zyxel.3712.net.if.link_type[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL MGS-3712: Port {#SNMPINDEX}: Interface name |<p>MIB: IF-MIB</p><p>A textual string containing information about the interface</p> |SNMP |zyxel.3712.net.if.descr[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL MGS-3712: Port {#SNMPINDEX}: Operational status |<p>MIB: IF-MIB</p><p>The current operational state of the interface.</p><p>The testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.3712.net.if.operstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL MGS-3712: Port {#SNMPINDEX}: Administrative status |<p>MIB: IF-MIB</p><p>The desired state of the interface.  The</p><p>testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.3712.net.if.adminstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL MGS-3712: Port {#SNMPINDEX}: Incoming traffic |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface,</p><p>including framing characters.</p> |SNMP |zyxel.3712.net.if.in.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL MGS-3712: Port {#SNMPINDEX}: Incoming unicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were not addressed to a multicast</p><p>or broadcast address at this sub-layer</p> |SNMP |zyxel.3712.net.if.in.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL MGS-3712: Port {#SNMPINDEX}: Incoming multicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a multicast</p><p>address at this sub-layer.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.3712.net.if.in.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL MGS-3712: Port {#SNMPINDEX}: Incoming broadcast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a broadcast</p><p>address at this sub-layer.</p> |SNMP |zyxel.3712.net.if.in.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL MGS-3712: Port {#SNMPINDEX}: Outgoing traffic |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the</p><p>interface, including framing characters.  This object is a</p><p>64-bit version of ifOutOctets.</p> |SNMP |zyxel.3712.net.if.out.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL MGS-3712: Port {#SNMPINDEX}: Outgoing unicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were not addressed to a</p><p>multicast or broadcast address at this sub-layer, including</p><p>those that were discarded or not sent.</p> |SNMP |zyxel.3712.net.if.out.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL MGS-3712: Port {#SNMPINDEX}: Outgoing multicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>multicast address at this sub-layer, including those that</p><p>were discarded or not sent.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.3712.net.if.out.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL MGS-3712: Port {#SNMPINDEX}: Outgoing broadcast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>broadcast address at this sub-layer, including those that</p><p>were discarded or not sent.</p> |SNMP |zyxel.3712.net.if.out.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL MGS-3712: Port {#SNMPINDEX}: Link speed |<p>MIB: IF-MIB</p><p>An estimate of the interface's current bandwidth in bits per second</p> |SNMP |zyxel.3712.net.if.highspeed[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1000000`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL MGS-3712: Port {#SNMPINDEX}: Incoming utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.3712.net.if.in.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(//zyxel.3712.net.if.in.traffic[{#SNMPINDEX}]) * (last(//zyxel.3712.net.if.highspeed[{#SNMPINDEX}]) <> 0) / ( last(//zyxel.3712.net.if.highspeed[{#SNMPINDEX}]) + (last(//zyxel.3712.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100` |
+|Network interfaces |ZYXEL MGS-3712: Port {#SNMPINDEX}: Outgoing utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.3712.net.if.out.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(//zyxel.3712.net.if.out.traffic[{#SNMPINDEX}]) * (last(//zyxel.3712.net.if.highspeed[{#SNMPINDEX}]) <> 0) / ( last(//zyxel.3712.net.if.highspeed[{#SNMPINDEX}]) + (last(//zyxel.3712.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100` |
+|Network interfaces |ZYXEL MGS-3712: SFP {#SNMPINDEX}: Status |<p>MIB: ZYXEL-MGS3712F-MIB</p><p>Transceiver module status.</p> |SNMP |zyxel.3712.sfp.status[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL MGS-3712: SFP {#SNMPINDEX}: Vendor |<p>MIB: ZYXEL-MGS3712F-MIB</p><p>Transceiver module vendor name.</p> |SNMP |zyxel.3712.sfp.vendor[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL MGS-3712: SFP {#SNMPINDEX}: Part number |<p>MIB: ZYXEL-MGS3712F-MIB</p><p>Part number provided by transceiver module vendor.</p> |SNMP |zyxel.3712.sfp.part[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL MGS-3712: SFP {#SNMPINDEX}: Serial number |<p>MIB: ZYXEL-MGS3712F-MIB</p><p>Serial number provided by transceiver module vendor.</p> |SNMP |zyxel.3712.sfp.serialnumber[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL MGS-3712: SFP {#SNMPINDEX}: Revision |<p>MIB: ZYXEL-MGS3712F-MIB</p><p>Revision level for part number provided by transceiver module vendor.</p> |SNMP |zyxel.3712.sfp.revision[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL MGS-3712: SFP {#SNMPINDEX}: Date code |<p>MIB: ZYXEL-MGS3712F-MIB</p><p>Transceiver module vendor's manufacturing date code.</p> |SNMP |zyxel.3712.sfp.datecode[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL MGS-3712: SFP {#SNMPINDEX}: Transceiver |<p>MIB: ZYXEL-MGS3712F-MIB</p><p>Transceiver module type names.</p> |SNMP |zyxel.3712.sfp.transceiver[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL MGS-3712: SFP {#ZYXEL.SFP.PORT}: {#ZYXEL.SFP.DESCRIPTION} |<p>MIB: ZYXEL-MGS3712F-MIB</p><p>Transceiver module DDM data ({#ZYXEL.SFP.DESCRIPTION}).</p> |SNMP |zyxel.3712.sfp.ddm[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.01`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Power supply |ZYXEL MGS-3712: Nominal "{#ZYXEL.VOLT.NOMINAL}" |<p>MIB: ZYXEL-MGS3712F-MIB</p><p>The current voltage reading.</p> |SNMP |zyxel.3712.volt[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Status |ZYXEL MGS-3712: SNMP agent availability |<p>-</p> |INTERNAL |zabbix[host,snmp,available]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Status |ZYXEL MGS-3712: Uptime |<p>MIB: RFC1213-MIB</p><p>The time (in hundredths of a second) since the</p><p>network management portion of the system was last</p><p>re-initialized.</p> |SNMP |zyxel.3712.uptime<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.01`</p> |
 |Temperature |ZYXEL MGS-3712: Temperature "{#ZYXEL.TEMP.ID}" |<p>MIB: ZYXEL-MGS3712F-MIB</p><p>The current temperature measured at this sensor</p> |SNMP |zyxel.3712.temp[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
@@ -117,7 +117,7 @@ There are no template links in this template.
 
 Please report any issues with the template at https://support.zabbix.com
 
-You can also provide a feedback, discuss the template or ask for help with it at [ZABBIX forums](https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/422668-discussion-thread-for-official-zabbix-templates-for-zyxel).
+You can also provide feedback, discuss the template or ask for help with it at [ZABBIX forums](https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/422668-discussion-thread-for-official-zabbix-templates-for-zyxel).
 
 ## Known Issues
 
diff --git a/templates/net/zyxel_snmp/zyxel_mgs-3712_snmp/template_net_zyxel_mgs-3712_snmp.yaml b/templates/net/zyxel_snmp/zyxel_mgs-3712_snmp/template_net_zyxel_mgs-3712_snmp.yaml
index de9138df6b3..dfc308f381b 100644
--- a/templates/net/zyxel_snmp/zyxel_mgs-3712_snmp/template_net_zyxel_mgs-3712_snmp.yaml
+++ b/templates/net/zyxel_snmp/zyxel_mgs-3712_snmp/template_net_zyxel_mgs-3712_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-17T06:34:42Z'
+  date: '2022-01-26T09:49:56Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -26,7 +26,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/422668-discussion-thread-for-official-zabbix-templates-for-zyxel
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: 'Templates/Network devices'
@@ -46,8 +46,8 @@ zabbix_export:
                 - 1h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: network
           triggers:
             -
               uuid: 60787fd1204b42bfb515b1b204c1d14f
@@ -56,6 +56,10 @@ zabbix_export:
               opdata: 'Current state: {ITEM.LASTVALUE1}'
               priority: WARNING
               description: 'SNMP is not available for polling. Please check device connectivity and SNMP settings.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: b93b020818034096a973d8e171a099b2
           name: 'ZYXEL MGS-3712: Contact'
@@ -79,8 +83,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
         -
           uuid: 4d13bad4f29f41b1890fa9e2709dd461
           name: 'ZYXEL MGS-3712: CPU utilization'
@@ -96,8 +100,8 @@ zabbix_export:
             getting the values.
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
           triggers:
             -
               uuid: b1ca06637dbe4c9ca84e2811e780d5d5
@@ -106,6 +110,10 @@ zabbix_export:
               opdata: 'Current utilization: {ITEM.LASTVALUE1}'
               priority: WARNING
               description: 'CPU utilization is too high. The system might be slow to respond.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: efc31527c7af48729c1d5a229b115c55
           name: 'ZYXEL MGS-3712: ZyNOS F/W Version'
@@ -138,8 +146,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
           triggers:
             -
               uuid: de7d7e7d976c4b9894259c4e7fb5a4dd
@@ -149,6 +157,10 @@ zabbix_export:
               priority: INFO
               description: 'Firmware version has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: a52f578cc57448f0a43641c75be89ce9
           name: 'ZYXEL MGS-3712: Location'
@@ -171,8 +183,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
         -
           uuid: 26236c6667c9411393fb45af2324e318
           name: 'ZYXEL MGS-3712: MAC address'
@@ -198,8 +210,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
         -
           uuid: fc5d5cfb35a14ed597623db67433dcac
           name: 'ZYXEL MGS-3712: Hardware model name'
@@ -226,8 +238,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
           triggers:
             -
               uuid: e0b4c4f09f6f496cb035af320fcf96a0
@@ -235,6 +247,10 @@ zabbix_export:
               name: 'ZYXEL MGS-3712: Template does not match hardware'
               priority: INFO
               description: 'This template is for Zyxel MGS-3712, but connected to {ITEM.VALUE}'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 409fb8c9b315474db7602fba18702a1d
           name: 'ZYXEL MGS-3712: Host name'
@@ -258,8 +274,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
         -
           uuid: 91afb18daedc403a866302ef943beef7
           name: 'ZYXEL MGS-3712: Hardware serial number'
@@ -281,8 +297,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
           triggers:
             -
               uuid: 4a9495748e09477ca5f12443fff533c9
@@ -291,6 +307,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 692e0384fcf44ec1ac6df0d8925358e3
           name: 'ZYXEL MGS-3712: Uptime'
@@ -313,8 +333,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: eefe29ad784d40d3980a4cb1118dd816
@@ -323,6 +343,10 @@ zabbix_export:
               priority: INFO
               description: 'Uptime is less than 10 minutes'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
       discovery_rules:
         -
           uuid: 8402d05803ff481497a5e6f95874e983
@@ -351,8 +375,11 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: Fans
+                  tag: component
+                  value: fan
+                -
+                  tag: component
+                  value: sensor
               trigger_prototypes:
                 -
                   uuid: edc0057dbdb64fd584cc968c5d8bb41f
@@ -361,6 +388,10 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the fan unit'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
           graph_prototypes:
             -
               uuid: 06d4f886b788464fad9f0da91d78b0e4
@@ -421,8 +452,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: f6e2db1bdfd0451a9ca896ade8df790f
               name: 'ZYXEL MGS-3712: Port {#SNMPINDEX}: Interface name'
@@ -442,8 +479,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: ae4776dea7aa44e7a403aa8bab391a30
               name: 'ZYXEL MGS-3712: Port {#SNMPINDEX}: Link speed'
@@ -466,8 +509,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 5c48f1894ae449528d0ef9844c22dee2
               name: 'ZYXEL MGS-3712: Port {#SNMPINDEX}: Incoming broadcast packages'
@@ -488,8 +537,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 83b692f16c7f40899fb802686dccffb5
               name: 'ZYXEL MGS-3712: Port {#SNMPINDEX}: Incoming multicast packages'
@@ -511,8 +566,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: a9880181229d44e0a60f173820eb5d67
               name: 'ZYXEL MGS-3712: Port {#SNMPINDEX}: Incoming traffic'
@@ -536,8 +597,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 2555e749de034c2db2c7a800a8785695
               name: 'ZYXEL MGS-3712: Port {#SNMPINDEX}: Incoming unicast packages'
@@ -558,8 +625,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: ca42c0b40bf74f03b544b9d0dd678223
               name: 'ZYXEL MGS-3712: Port {#SNMPINDEX}: Incoming utilization'
@@ -583,8 +656,14 @@ zabbix_export:
                     - 'return +parseFloat(value).toFixed(0);'
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 4a4c54e3736246e1a534afa93303b481
               name: 'ZYXEL MGS-3712: Port {#SNMPINDEX}: Link type'
@@ -604,8 +683,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 2b4c245972454f24b703d4cb29581dfc
               name: 'ZYXEL MGS-3712: Port {#SNMPINDEX}: Interface description'
@@ -625,8 +710,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: e12e5d4b36db44c38968652a048f1a26
               name: 'ZYXEL MGS-3712: Port {#SNMPINDEX}: Operational status'
@@ -648,8 +739,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: e21751b08fe740f2ad9ad6bde6b879c4
@@ -666,6 +763,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: a28bbd54c2e54e90b7280f84e964c681
               name: 'ZYXEL MGS-3712: Port {#SNMPINDEX}: Outgoing broadcast packages'
@@ -687,8 +788,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 1f6f7e4f23ee4208a5288dd6eaf0aed8
               name: 'ZYXEL MGS-3712: Port {#SNMPINDEX}: Outgoing multicast packages'
@@ -711,8 +818,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 2e5d50c95f4942e08f54feb989058cd0
               name: 'ZYXEL MGS-3712: Port {#SNMPINDEX}: Outgoing traffic'
@@ -737,8 +850,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 8580f10654ea4020ae08d2917fdb8b17
               name: 'ZYXEL MGS-3712: Port {#SNMPINDEX}: Outgoing unicast packages'
@@ -760,8 +879,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: d8b945fc71534a00ba35867d62bc8703
               name: 'ZYXEL MGS-3712: Port {#SNMPINDEX}: Outgoing utilization'
@@ -785,8 +910,14 @@ zabbix_export:
                     - 'return +parseFloat(value).toFixed(0);'
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: b8c053a89b32400595d4a0673cfa1e81
               name: 'ZYXEL MGS-3712: Port {#SNMPINDEX}: Speed Duplex'
@@ -806,8 +937,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           graph_prototypes:
             -
               uuid: b2bed2a4ab7b42119009f4aabd979656
@@ -943,8 +1080,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#ZYXEL.SFP.PORT}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: e9d242819d7345a0b44cc14a392f05fa
@@ -952,12 +1095,20 @@ zabbix_export:
                   name: 'ZYXEL MGS-3712: SFP {#ZYXEL.SFP.PORT}: High {#ZYXEL.SFP.DESCRIPTION} (over {#ZYXEL.SFP.WARN.MAX}{#ZYXEL.SFP.UNIT})'
                   priority: WARNING
                   description: 'The upper threshold value of the parameter is exceeded'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: 177c2fe88ec24e3d9a5ea9f6b3f346d9
                   expression: 'last(/ZYXEL MGS-3712 SNMP/zyxel.3712.sfp.ddm[{#SNMPINDEX}]) < {#ZYXEL.SFP.WARN.MIN}'
                   name: 'ZYXEL MGS-3712: SFP {#ZYXEL.SFP.PORT}: Low {#ZYXEL.SFP.DESCRIPTION} (less than {#ZYXEL.SFP.WARN.MIN}{#ZYXEL.SFP.UNIT})'
                   priority: WARNING
                   description: 'The parameter values are less than the lower threshold'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
           graph_prototypes:
             -
               uuid: 2d432abf28354f4193d93b21bc5f1507
@@ -1031,8 +1182,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 184be2048cf64e7abf703cb16e1e128b
               name: 'ZYXEL MGS-3712: SFP {#SNMPINDEX}: Part number'
@@ -1053,8 +1210,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 80d2606b4d644993b13f7efd001ed096
               name: 'ZYXEL MGS-3712: SFP {#SNMPINDEX}: Revision'
@@ -1075,8 +1238,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 2d974479665844ae86511d471e190d51
               name: 'ZYXEL MGS-3712: SFP {#SNMPINDEX}: Serial number'
@@ -1097,8 +1266,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: aaa3492aa0c64e8a973d1a755fd24f50
@@ -1107,6 +1282,10 @@ zabbix_export:
                   priority: INFO
                   description: 'SFP {#SNMPINDEX} serial number has changed. Ack to close'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 46e11863a74f481aaea204148fe8b5b7
               name: 'ZYXEL MGS-3712: SFP {#SNMPINDEX}: Status'
@@ -1127,8 +1306,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: e2e07835d3ef431ea6c5559151dee258
               name: 'ZYXEL MGS-3712: SFP {#SNMPINDEX}: Transceiver'
@@ -1149,8 +1334,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 18f798a7ca0d4ea4a24a58c3bcdb9edd
               name: 'ZYXEL MGS-3712: SFP {#SNMPINDEX}: Vendor'
@@ -1171,8 +1362,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
         -
           uuid: 6a39668b647f49f19591451cc977cc92
           name: 'Temperature discovery'
@@ -1202,8 +1399,11 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: sensor
+                -
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: b5ba7daf05204f2b987b879a3d44fac2
@@ -1212,6 +1412,10 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the temperature'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
           graph_prototypes:
             -
               uuid: 952122594bf14cad9ce00e202209388a
@@ -1267,8 +1471,11 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Power supply'
+                  tag: component
+                  value: sensor
+                -
+                  tag: component
+                  value: voltage
               trigger_prototypes:
                 -
                   uuid: 02a7a32af7a440b6a7199b425305fdde
@@ -1277,6 +1484,10 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the power supply'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
           graph_prototypes:
             -
               uuid: 67b6c6c6085e45cbbb58fb93c1b6eb2f
@@ -1300,6 +1511,19 @@ zabbix_export:
                   outArr.push(item)
                   });
                   return JSON.stringify(outArr);
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: mgs-3712
+        -
+          tag: target
+          value: switch
+        -
+          tag: target
+          value: zyxel
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/net/zyxel_snmp/zyxel_mgs-3712f_snmp/README.md b/templates/net/zyxel_snmp/zyxel_mgs-3712f_snmp/README.md
index bf4a87e4a3e..37611855e9f 100644
--- a/templates/net/zyxel_snmp/zyxel_mgs-3712f_snmp/README.md
+++ b/templates/net/zyxel_snmp/zyxel_mgs-3712f_snmp/README.md
@@ -46,11 +46,11 @@ There are no template links in this template.
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
 |Fan discovery |<p>An entry in fanRpmTable.</p> |SNMP |zyxel.3712f.fan.discovery |
-|Temperature discovery |<p>An entry in tempTable.</p><p>Index of temperature unit. 1:MAC, 2:CPU, 3:PHY</p> |SNMP |zyxel.3712f.temp.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
-|Voltage discovery |<p>An entry in voltageTable.</p> |SNMP |zyxel.3712f.volt.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
 |Interface discovery |<p>-</p> |SNMP |zyxel.3712f.net.if.discovery<p>**Filter**:</p>AND <p>- {#ZYXEL.IF.NAME} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.NAME.MATCHES}`</p><p>- {#ZYXEL.IF.NAME} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.NAME.NOT_MATCHES}`</p><p>- {#ZYXEL.IF.LINKUPTYPE} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.MATCHES}`</p><p>- {#ZYXEL.IF.LINKUPTYPE} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.NOT_MATCHES}`</p><p>**Overrides:**</p><p>Don't create triggers for matching interface<br> - {#ZYXEL.IF.NAME} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}`<br>  - TRIGGER_PROTOTYPE REGEXP `.*` - NO_DISCOVER</p> |
-|SFP without DDM discovery |<p>SFP module discovery.</p> |SNMP |zyxel.3712f.sfp.discovery<p>**Filter**:</p>AND <p>- {#ZYXEL.SFP.STATUS} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFP.STATUS.MATCHES}`</p><p>- {#ZYXEL.SFP.STATUS} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFP.STATUS.NOT_MATCHES}`</p> |
 |SFP with DDM discovery |<p>SFP DDM module discovery.</p> |SNMP |zyxel.3712f.sfp.ddm.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>**Filter**:</p>AND <p>- {#ZYXEL.SFP.DESCRIPTION} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFPDDM.DESC.MATCHES}`</p><p>- {#ZYXEL.SFP.DESCRIPTION} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFPDDM.DESC.NOT_MATCHES}`</p> |
+|SFP without DDM discovery |<p>SFP module discovery.</p> |SNMP |zyxel.3712f.sfp.discovery<p>**Filter**:</p>AND <p>- {#ZYXEL.SFP.STATUS} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFP.STATUS.MATCHES}`</p><p>- {#ZYXEL.SFP.STATUS} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFP.STATUS.NOT_MATCHES}`</p> |
+|Temperature discovery |<p>An entry in tempTable.</p><p>Index of temperature unit. 1:MAC, 2:CPU, 3:PHY</p> |SNMP |zyxel.3712f.temp.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
+|Voltage discovery |<p>An entry in voltageTable.</p> |SNMP |zyxel.3712f.volt.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
 
 ## Items collected
 
@@ -65,32 +65,32 @@ There are no template links in this template.
 |Inventory |ZYXEL MGS-3712F: MAC address |<p>MIB: IF-MIB</p><p>The interface's address at the protocol layer</p><p>immediately `below' the network layer in the</p><p>protocol stack.  For interfaces which do not have</p><p>such an address (e.g., a serial line), this object</p><p>should contain an octet string of zero length.</p> |SNMP |zyxel.3712f.mac<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Inventory |ZYXEL MGS-3712F: ZyNOS F/W Version |<p>MIB: ZYXEL-MGS3712F-MIB</p> |SNMP |zyxel.3712f.fwversion<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
 |Inventory |ZYXEL MGS-3712F: Hardware serial number |<p>MIB: ZYXEL-MGS3712F-MIB</p><p>Serial number</p> |SNMP |zyxel.3712f.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL MGS-3712F: Port {#SNMPINDEX}: Speed Duplex |<p>MIB: ZYXEL-MGS3712F-MIB</p><p>Transmission mode</p> |SNMP |zyxel.3712f.net.if.speed_duplex[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL MGS-3712F: Port {#SNMPINDEX}: Interface description |<p>MIB: ZYXEL-MGS3712F-MIB</p><p>A textual string containing information about the interface</p> |SNMP |zyxel.3712f.net.if.name[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL MGS-3712F: Port {#SNMPINDEX}: Link type |<p>MIB: ZYXEL-MGS3712F-MIB</p><p>Physical connection type</p> |SNMP |zyxel.3712f.net.if.link_type[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL MGS-3712F: Port {#SNMPINDEX}: Interface name |<p>MIB: IF-MIB</p><p>A textual string containing information about the interface</p> |SNMP |zyxel.3712f.net.if.descr[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL MGS-3712F: Port {#SNMPINDEX}: Operational status |<p>MIB: IF-MIB</p><p>The current operational state of the interface.</p><p>The testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.3712f.net.if.operstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL MGS-3712F: Port {#SNMPINDEX}: Administrative status |<p>MIB: IF-MIB</p><p>The desired state of the interface.  The</p><p>testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.3712f.net.if.adminstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL MGS-3712F: Port {#SNMPINDEX}: Incoming traffic |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface,</p><p>including framing characters.</p> |SNMP |zyxel.3712f.net.if.in.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL MGS-3712F: Port {#SNMPINDEX}: Incoming unicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were not addressed to a multicast</p><p>or broadcast address at this sub-layer</p> |SNMP |zyxel.3712f.net.if.in.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL MGS-3712F: Port {#SNMPINDEX}: Incoming multicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a multicast</p><p>address at this sub-layer.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.3712f.net.if.in.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL MGS-3712F: Port {#SNMPINDEX}: Incoming broadcast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a broadcast</p><p>address at this sub-layer.</p> |SNMP |zyxel.3712f.net.if.in.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL MGS-3712F: Port {#SNMPINDEX}: Outgoing traffic |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the</p><p>interface, including framing characters.  This object is a</p><p>64-bit version of ifOutOctets.</p> |SNMP |zyxel.3712f.net.if.out.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL MGS-3712F: Port {#SNMPINDEX}: Outgoing unicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were not addressed to a</p><p>multicast or broadcast address at this sub-layer, including</p><p>those that were discarded or not sent.</p> |SNMP |zyxel.3712f.net.if.out.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL MGS-3712F: Port {#SNMPINDEX}: Outgoing multicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>multicast address at this sub-layer, including those that</p><p>were discarded or not sent.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.3712f.net.if.out.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL MGS-3712F: Port {#SNMPINDEX}: Outgoing broadcast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>broadcast address at this sub-layer, including those that</p><p>were discarded or not sent.</p> |SNMP |zyxel.3712f.net.if.out.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL MGS-3712F: Port {#SNMPINDEX}: Link speed |<p>MIB: IF-MIB</p><p>An estimate of the interface's current bandwidth in bits per second</p> |SNMP |zyxel.3712f.net.if.highspeed[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1000000`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL MGS-3712F: Port {#SNMPINDEX}: Incoming utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.3712f.net.if.in.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(//zyxel.3712f.net.if.in.traffic[{#SNMPINDEX}]) * (last(//zyxel.3712f.net.if.highspeed[{#SNMPINDEX}]) <> 0) / ( last(//zyxel.3712f.net.if.highspeed[{#SNMPINDEX}]) + (last(//zyxel.3712f.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100` |
-|Network_interfaces |ZYXEL MGS-3712F: Port {#SNMPINDEX}: Outgoing utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.3712f.net.if.out.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(//zyxel.3712f.net.if.out.traffic[{#SNMPINDEX}]) * (last(//zyxel.3712f.net.if.highspeed[{#SNMPINDEX}]) <> 0) / ( last(//zyxel.3712f.net.if.highspeed[{#SNMPINDEX}]) + (last(//zyxel.3712f.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100` |
-|Network_interfaces |ZYXEL MGS-3712F: SFP {#SNMPINDEX}: Status |<p>MIB: ZYXEL-MGS3712F-MIB</p><p>Transceiver module status.</p> |SNMP |zyxel.3712f.sfp.status[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL MGS-3712F: SFP {#SNMPINDEX}: Vendor |<p>MIB: ZYXEL-MGS3712F-MIB</p><p>Transceiver module vendor name.</p> |SNMP |zyxel.3712f.sfp.vendor[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL MGS-3712F: SFP {#SNMPINDEX}: Part number |<p>MIB: ZYXEL-MGS3712F-MIB</p><p>Part number provided by transceiver module vendor.</p> |SNMP |zyxel.3712f.sfp.part[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL MGS-3712F: SFP {#SNMPINDEX}: Serial number |<p>MIB: ZYXEL-MGS3712F-MIB</p><p>Serial number provided by transceiver module vendor.</p> |SNMP |zyxel.3712f.sfp.serialnumber[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL MGS-3712F: SFP {#SNMPINDEX}: Revision |<p>MIB: ZYXEL-MGS3712F-MIB</p><p>Revision level for part number provided by transceiver module vendor.</p> |SNMP |zyxel.3712f.sfp.revision[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL MGS-3712F: SFP {#SNMPINDEX}: Date code |<p>MIB: ZYXEL-MGS3712F-MIB</p><p>Transceiver module vendor's manufacturing date code.</p> |SNMP |zyxel.3712f.sfp.datecode[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL MGS-3712F: SFP {#SNMPINDEX}: Transceiver |<p>MIB: ZYXEL-MGS3712F-MIB</p><p>Transceiver module type names.</p> |SNMP |zyxel.3712f.sfp.transceiver[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL MGS-3712F: SFP {#ZYXEL.SFP.PORT}: {#ZYXEL.SFP.DESCRIPTION} |<p>MIB: ZYXEL-MGS3712F-MIB</p><p>Transceiver module DDM data ({#ZYXEL.SFP.DESCRIPTION}).</p> |SNMP |zyxel.3712f.sfp.ddm[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.01`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Power_supply |ZYXEL MGS-3712F: Nominal "{#ZYXEL.VOLT.NOMINAL}" |<p>MIB: ZYXEL-MGS3712F-MIB</p><p>The current voltage reading.</p> |SNMP |zyxel.3712f.volt[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL MGS-3712F: Port {#SNMPINDEX}: Speed Duplex |<p>MIB: ZYXEL-MGS3712F-MIB</p><p>Transmission mode</p> |SNMP |zyxel.3712f.net.if.speed_duplex[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL MGS-3712F: Port {#SNMPINDEX}: Interface description |<p>MIB: ZYXEL-MGS3712F-MIB</p><p>A textual string containing information about the interface</p> |SNMP |zyxel.3712f.net.if.name[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL MGS-3712F: Port {#SNMPINDEX}: Link type |<p>MIB: ZYXEL-MGS3712F-MIB</p><p>Physical connection type</p> |SNMP |zyxel.3712f.net.if.link_type[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL MGS-3712F: Port {#SNMPINDEX}: Interface name |<p>MIB: IF-MIB</p><p>A textual string containing information about the interface</p> |SNMP |zyxel.3712f.net.if.descr[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL MGS-3712F: Port {#SNMPINDEX}: Operational status |<p>MIB: IF-MIB</p><p>The current operational state of the interface.</p><p>The testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.3712f.net.if.operstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL MGS-3712F: Port {#SNMPINDEX}: Administrative status |<p>MIB: IF-MIB</p><p>The desired state of the interface.  The</p><p>testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.3712f.net.if.adminstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL MGS-3712F: Port {#SNMPINDEX}: Incoming traffic |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface,</p><p>including framing characters.</p> |SNMP |zyxel.3712f.net.if.in.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL MGS-3712F: Port {#SNMPINDEX}: Incoming unicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were not addressed to a multicast</p><p>or broadcast address at this sub-layer</p> |SNMP |zyxel.3712f.net.if.in.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL MGS-3712F: Port {#SNMPINDEX}: Incoming multicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a multicast</p><p>address at this sub-layer.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.3712f.net.if.in.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL MGS-3712F: Port {#SNMPINDEX}: Incoming broadcast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a broadcast</p><p>address at this sub-layer.</p> |SNMP |zyxel.3712f.net.if.in.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL MGS-3712F: Port {#SNMPINDEX}: Outgoing traffic |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the</p><p>interface, including framing characters.  This object is a</p><p>64-bit version of ifOutOctets.</p> |SNMP |zyxel.3712f.net.if.out.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL MGS-3712F: Port {#SNMPINDEX}: Outgoing unicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were not addressed to a</p><p>multicast or broadcast address at this sub-layer, including</p><p>those that were discarded or not sent.</p> |SNMP |zyxel.3712f.net.if.out.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL MGS-3712F: Port {#SNMPINDEX}: Outgoing multicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>multicast address at this sub-layer, including those that</p><p>were discarded or not sent.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.3712f.net.if.out.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL MGS-3712F: Port {#SNMPINDEX}: Outgoing broadcast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>broadcast address at this sub-layer, including those that</p><p>were discarded or not sent.</p> |SNMP |zyxel.3712f.net.if.out.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL MGS-3712F: Port {#SNMPINDEX}: Link speed |<p>MIB: IF-MIB</p><p>An estimate of the interface's current bandwidth in bits per second</p> |SNMP |zyxel.3712f.net.if.highspeed[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1000000`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL MGS-3712F: Port {#SNMPINDEX}: Incoming utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.3712f.net.if.in.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(//zyxel.3712f.net.if.in.traffic[{#SNMPINDEX}]) * (last(//zyxel.3712f.net.if.highspeed[{#SNMPINDEX}]) <> 0) / ( last(//zyxel.3712f.net.if.highspeed[{#SNMPINDEX}]) + (last(//zyxel.3712f.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100` |
+|Network interfaces |ZYXEL MGS-3712F: Port {#SNMPINDEX}: Outgoing utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.3712f.net.if.out.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(//zyxel.3712f.net.if.out.traffic[{#SNMPINDEX}]) * (last(//zyxel.3712f.net.if.highspeed[{#SNMPINDEX}]) <> 0) / ( last(//zyxel.3712f.net.if.highspeed[{#SNMPINDEX}]) + (last(//zyxel.3712f.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100` |
+|Network interfaces |ZYXEL MGS-3712F: SFP {#SNMPINDEX}: Status |<p>MIB: ZYXEL-MGS3712F-MIB</p><p>Transceiver module status.</p> |SNMP |zyxel.3712f.sfp.status[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL MGS-3712F: SFP {#SNMPINDEX}: Vendor |<p>MIB: ZYXEL-MGS3712F-MIB</p><p>Transceiver module vendor name.</p> |SNMP |zyxel.3712f.sfp.vendor[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL MGS-3712F: SFP {#SNMPINDEX}: Part number |<p>MIB: ZYXEL-MGS3712F-MIB</p><p>Part number provided by transceiver module vendor.</p> |SNMP |zyxel.3712f.sfp.part[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL MGS-3712F: SFP {#SNMPINDEX}: Serial number |<p>MIB: ZYXEL-MGS3712F-MIB</p><p>Serial number provided by transceiver module vendor.</p> |SNMP |zyxel.3712f.sfp.serialnumber[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL MGS-3712F: SFP {#SNMPINDEX}: Revision |<p>MIB: ZYXEL-MGS3712F-MIB</p><p>Revision level for part number provided by transceiver module vendor.</p> |SNMP |zyxel.3712f.sfp.revision[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL MGS-3712F: SFP {#SNMPINDEX}: Date code |<p>MIB: ZYXEL-MGS3712F-MIB</p><p>Transceiver module vendor's manufacturing date code.</p> |SNMP |zyxel.3712f.sfp.datecode[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL MGS-3712F: SFP {#SNMPINDEX}: Transceiver |<p>MIB: ZYXEL-MGS3712F-MIB</p><p>Transceiver module type names.</p> |SNMP |zyxel.3712f.sfp.transceiver[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL MGS-3712F: SFP {#ZYXEL.SFP.PORT}: {#ZYXEL.SFP.DESCRIPTION} |<p>MIB: ZYXEL-MGS3712F-MIB</p><p>Transceiver module DDM data ({#ZYXEL.SFP.DESCRIPTION}).</p> |SNMP |zyxel.3712f.sfp.ddm[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.01`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Power supply |ZYXEL MGS-3712F: Nominal "{#ZYXEL.VOLT.NOMINAL}" |<p>MIB: ZYXEL-MGS3712F-MIB</p><p>The current voltage reading.</p> |SNMP |zyxel.3712f.volt[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Status |ZYXEL MGS-3712F: SNMP agent availability |<p>-</p> |INTERNAL |zabbix[host,snmp,available]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Status |ZYXEL MGS-3712F: Uptime |<p>MIB: RFC1213-MIB</p><p>The time (in hundredths of a second) since the</p><p>network management portion of the system was last</p><p>re-initialized.</p> |SNMP |zyxel.3712f.uptime<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.01`</p> |
 |Temperature |ZYXEL MGS-3712F: Temperature "{#ZYXEL.TEMP.ID}" |<p>MIB: ZYXEL-MGS3712F-MIB</p><p>The current temperature measured at this sensor</p> |SNMP |zyxel.3712f.temp[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
@@ -117,7 +117,7 @@ There are no template links in this template.
 
 Please report any issues with the template at https://support.zabbix.com
 
-You can also provide a feedback, discuss the template or ask for help with it at [ZABBIX forums](https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/422668-discussion-thread-for-official-zabbix-templates-for-zyxel).
+You can also provide feedback, discuss the template or ask for help with it at [ZABBIX forums](https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/422668-discussion-thread-for-official-zabbix-templates-for-zyxel).
 
 ## Known Issues
 
diff --git a/templates/net/zyxel_snmp/zyxel_mgs-3712f_snmp/template_net_zyxel_mgs-3712f_snmp.yaml b/templates/net/zyxel_snmp/zyxel_mgs-3712f_snmp/template_net_zyxel_mgs-3712f_snmp.yaml
index ae2352cee13..814156c08f2 100644
--- a/templates/net/zyxel_snmp/zyxel_mgs-3712f_snmp/template_net_zyxel_mgs-3712f_snmp.yaml
+++ b/templates/net/zyxel_snmp/zyxel_mgs-3712f_snmp/template_net_zyxel_mgs-3712f_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-17T06:34:38Z'
+  date: '2022-01-26T09:47:12Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -26,7 +26,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/422668-discussion-thread-for-official-zabbix-templates-for-zyxel
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: 'Templates/Network devices'
@@ -46,8 +46,8 @@ zabbix_export:
                 - 1h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: network
           triggers:
             -
               uuid: c4244d60e8aa4cc380442992c031b2fd
@@ -56,6 +56,10 @@ zabbix_export:
               opdata: 'Current state: {ITEM.LASTVALUE1}'
               priority: WARNING
               description: 'SNMP is not available for polling. Please check device connectivity and SNMP settings.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 71ba1c991114432c9dca4f39b30e7872
           name: 'ZYXEL MGS-3712F: Contact'
@@ -79,8 +83,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
         -
           uuid: 69432e1306ae46eab178082cb5ed7bc3
           name: 'ZYXEL MGS-3712F: CPU utilization'
@@ -96,8 +100,8 @@ zabbix_export:
             getting the values.
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
           triggers:
             -
               uuid: 084cf3c89c9c48eeac9131d831a4f71b
@@ -106,6 +110,10 @@ zabbix_export:
               opdata: 'Current utilization: {ITEM.LASTVALUE1}'
               priority: WARNING
               description: 'CPU utilization is too high. The system might be slow to respond.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 4ced5f4185284f32b767036ffe41302c
           name: 'ZYXEL MGS-3712F: ZyNOS F/W Version'
@@ -138,8 +146,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
           triggers:
             -
               uuid: fbf62d3f9ce54baab9a16f3e123811ef
@@ -149,6 +157,10 @@ zabbix_export:
               priority: INFO
               description: 'Firmware version has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 98c18ebb978448098922d7930e2ed00b
           name: 'ZYXEL MGS-3712F: Location'
@@ -171,8 +183,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
         -
           uuid: bfd1233a36e94dfe93cd02ac95a7218e
           name: 'ZYXEL MGS-3712F: MAC address'
@@ -198,8 +210,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
         -
           uuid: e734e8fe661043ac84d55a2497a50cf5
           name: 'ZYXEL MGS-3712F: Hardware model name'
@@ -226,8 +238,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
           triggers:
             -
               uuid: bf3d28b088db48a59aaa9e88f6b13cb8
@@ -235,6 +247,10 @@ zabbix_export:
               name: 'ZYXEL MGS-3712F: Template does not match hardware'
               priority: INFO
               description: 'This template is for Zyxel MGS-3712F, but connected to {ITEM.VALUE}'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 026c51d2e28943e98056a934355a0161
           name: 'ZYXEL MGS-3712F: Host name'
@@ -258,8 +274,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
         -
           uuid: 97eaf488887c42b89a4e6f6103ceeef6
           name: 'ZYXEL MGS-3712F: Hardware serial number'
@@ -281,8 +297,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
           triggers:
             -
               uuid: ccb3fe676cd742af954b8c5e7898e5f0
@@ -291,6 +307,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: e5e21fdb6dae4dc49038f0801c87a5c6
           name: 'ZYXEL MGS-3712F: Uptime'
@@ -313,8 +333,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 6a31fdd61b9f4aa99c8ad15ff243c6b2
@@ -323,6 +343,10 @@ zabbix_export:
               priority: INFO
               description: 'Uptime is less than 10 minutes'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
       discovery_rules:
         -
           uuid: 0f15b0a5b34d4849800ea65b1f5e0916
@@ -351,8 +375,11 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: Fans
+                  tag: component
+                  value: fan
+                -
+                  tag: component
+                  value: sensor
               trigger_prototypes:
                 -
                   uuid: 4672af40f7434a419d063c6f00f4f9f8
@@ -361,6 +388,10 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the fan unit'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
           graph_prototypes:
             -
               uuid: 09b10e607e14466d8c49512955f6f30e
@@ -421,8 +452,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: ba54ef4ceafd4445bab7f2365c6c4404
               name: 'ZYXEL MGS-3712F: Port {#SNMPINDEX}: Interface name'
@@ -442,8 +479,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 1955d72ae95a4c53922a4a209c48af45
               name: 'ZYXEL MGS-3712F: Port {#SNMPINDEX}: Link speed'
@@ -466,8 +509,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 8971f0814f9f4a90a9163b83804665f1
               name: 'ZYXEL MGS-3712F: Port {#SNMPINDEX}: Incoming broadcast packages'
@@ -488,8 +537,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: b3f54f3b51474b608ae5f4cec6990b1a
               name: 'ZYXEL MGS-3712F: Port {#SNMPINDEX}: Incoming multicast packages'
@@ -511,8 +566,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: a4a13a2309d94ea7a6f935796c1f4623
               name: 'ZYXEL MGS-3712F: Port {#SNMPINDEX}: Incoming traffic'
@@ -536,8 +597,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: a1b595cd244340aea0dd9343a36619b6
               name: 'ZYXEL MGS-3712F: Port {#SNMPINDEX}: Incoming unicast packages'
@@ -558,8 +625,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 13f394481ad045ed8db3693be14ed2f1
               name: 'ZYXEL MGS-3712F: Port {#SNMPINDEX}: Incoming utilization'
@@ -583,8 +656,14 @@ zabbix_export:
                     - 'return +parseFloat(value).toFixed(0);'
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: c173d9fb0e4645f8b1b5cdd70881ea0a
               name: 'ZYXEL MGS-3712F: Port {#SNMPINDEX}: Link type'
@@ -604,8 +683,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: b0dc3f51f7f544e6ac7c14d4aaf5b7a6
               name: 'ZYXEL MGS-3712F: Port {#SNMPINDEX}: Interface description'
@@ -625,8 +710,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 0c940b9948f043b5a58e59cfd1e3f585
               name: 'ZYXEL MGS-3712F: Port {#SNMPINDEX}: Operational status'
@@ -648,8 +739,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: d92c1f55c21e4780ada69269d95c5f45
@@ -666,6 +763,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 759ec75f1155444187f970e3141e219b
               name: 'ZYXEL MGS-3712F: Port {#SNMPINDEX}: Outgoing broadcast packages'
@@ -687,8 +788,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 9cfa5cdeb08c403ea487107303fb52c9
               name: 'ZYXEL MGS-3712F: Port {#SNMPINDEX}: Outgoing multicast packages'
@@ -711,8 +818,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 44c57404960045998f6b11129c5c9e74
               name: 'ZYXEL MGS-3712F: Port {#SNMPINDEX}: Outgoing traffic'
@@ -737,8 +850,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: d618cdab510147dba8781669b62535d5
               name: 'ZYXEL MGS-3712F: Port {#SNMPINDEX}: Outgoing unicast packages'
@@ -760,8 +879,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 4ae2370776ea425095a8856ac4a51868
               name: 'ZYXEL MGS-3712F: Port {#SNMPINDEX}: Outgoing utilization'
@@ -785,8 +910,14 @@ zabbix_export:
                     - 'return +parseFloat(value).toFixed(0);'
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 9dabada8160e47138c2416002346fc2d
               name: 'ZYXEL MGS-3712F: Port {#SNMPINDEX}: Speed Duplex'
@@ -806,8 +937,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           graph_prototypes:
             -
               uuid: 6d6da920b3b841d2a348016bfa4fd529
@@ -943,8 +1080,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#ZYXEL.SFP.PORT}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 1ef8b878bd334f1eac9d9c4258d1f4f2
@@ -952,12 +1095,20 @@ zabbix_export:
                   name: 'ZYXEL MGS-3712F: SFP {#ZYXEL.SFP.PORT}: High {#ZYXEL.SFP.DESCRIPTION} (over {#ZYXEL.SFP.WARN.MAX}{#ZYXEL.SFP.UNIT})'
                   priority: WARNING
                   description: 'The upper threshold value of the parameter is exceeded'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: 6605455fa4764a578feff4ce12a20883
                   expression: 'last(/ZYXEL MGS-3712F SNMP/zyxel.3712f.sfp.ddm[{#SNMPINDEX}]) < {#ZYXEL.SFP.WARN.MIN}'
                   name: 'ZYXEL MGS-3712F: SFP {#ZYXEL.SFP.PORT}: Low {#ZYXEL.SFP.DESCRIPTION} (less than {#ZYXEL.SFP.WARN.MIN}{#ZYXEL.SFP.UNIT})'
                   priority: WARNING
                   description: 'The parameter values are less than the lower threshold'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
           graph_prototypes:
             -
               uuid: 1ea36937222d40b0a714b47fb0fceb36
@@ -1031,8 +1182,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 519c8737de814a6aabce25ea8ef52c1a
               name: 'ZYXEL MGS-3712F: SFP {#SNMPINDEX}: Part number'
@@ -1053,8 +1210,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: ea54a5a49aa4447ba77a28b4b110a77a
               name: 'ZYXEL MGS-3712F: SFP {#SNMPINDEX}: Revision'
@@ -1075,8 +1238,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: bb97e6edd8574888b6892a0d49849406
               name: 'ZYXEL MGS-3712F: SFP {#SNMPINDEX}: Serial number'
@@ -1097,8 +1266,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 8fc46b61f7854893839a307700627d18
@@ -1107,6 +1282,10 @@ zabbix_export:
                   priority: INFO
                   description: 'SFP {#SNMPINDEX} serial number has changed. Ack to close'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: b0a81abdecad42788715ad879c2d03fa
               name: 'ZYXEL MGS-3712F: SFP {#SNMPINDEX}: Status'
@@ -1127,8 +1306,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: db78a10438534c53bc0bc7ce09d784cd
               name: 'ZYXEL MGS-3712F: SFP {#SNMPINDEX}: Transceiver'
@@ -1149,8 +1334,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 536d22ea7a654bf99b26eeaa8e6761f7
               name: 'ZYXEL MGS-3712F: SFP {#SNMPINDEX}: Vendor'
@@ -1171,8 +1362,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
         -
           uuid: a6e733335bb24801bf006586185ffaff
           name: 'Temperature discovery'
@@ -1202,8 +1399,11 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: sensor
+                -
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: b0d3093a36984493a7ffe87c7c4d408e
@@ -1212,6 +1412,10 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the temperature'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
           graph_prototypes:
             -
               uuid: 75294455e2ce4c2cb902c6b58549c8d8
@@ -1267,8 +1471,11 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Power supply'
+                  tag: component
+                  value: sensor
+                -
+                  tag: component
+                  value: voltage
               trigger_prototypes:
                 -
                   uuid: 9a15b78bae564c879a5c95290cde63fe
@@ -1277,6 +1484,10 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the power supply'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
           graph_prototypes:
             -
               uuid: fd954391176a47728eec01caed2234b5
@@ -1300,6 +1511,19 @@ zabbix_export:
                   outArr.push(item)
                   });
                   return JSON.stringify(outArr);
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: mgs-3712f
+        -
+          tag: target
+          value: switch
+        -
+          tag: target
+          value: zyxel
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/net/zyxel_snmp/zyxel_mgs3500-24s_snmp/README.md b/templates/net/zyxel_snmp/zyxel_mgs3500-24s_snmp/README.md
index 3c03bbc3367..8ad7c311ce6 100644
--- a/templates/net/zyxel_snmp/zyxel_mgs3500-24s_snmp/README.md
+++ b/templates/net/zyxel_snmp/zyxel_mgs3500-24s_snmp/README.md
@@ -47,11 +47,11 @@ There are no template links in this template.
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
 |Fan discovery |<p>An entry in fanRpmTable.</p> |SNMP |zyxel.3500_24s.fan.discovery |
-|Temperature discovery |<p>An entry in tempTable.</p> |SNMP |zyxel.3500_24s.temp.discovery |
-|Voltage discovery |<p>An entry in voltageTable.</p> |SNMP |zyxel.3500_24s.volt.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
 |Interface discovery |<p>-</p> |SNMP |zyxel.3500_24s.net.if.discovery<p>**Filter**:</p>AND <p>- {#ZYXEL.IF.NAME} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.NAME.MATCHES}`</p><p>- {#ZYXEL.IF.NAME} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.NAME.NOT_MATCHES}`</p><p>- {#ZYXEL.IF.LINKUPTYPE} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.MATCHES}`</p><p>- {#ZYXEL.IF.LINKUPTYPE} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.NOT_MATCHES}`</p><p>**Overrides:**</p><p>Don't create triggers for matching interface<br> - {#ZYXEL.IF.NAME} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}`<br>  - TRIGGER_PROTOTYPE REGEXP `.*` - NO_DISCOVER</p> |
-|SFP without DDM discovery |<p>SFP module discovery.</p> |SNMP |zyxel.3500_24s.sfp.discovery<p>**Filter**:</p>AND <p>- {#ZYXEL.SFP.STATUS} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFP.STATUS.MATCHES}`</p><p>- {#ZYXEL.SFP.STATUS} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFP.STATUS.NOT_MATCHES}`</p> |
 |SFP with DDM discovery |<p>SFP DDM module discovery.</p> |SNMP |zyxel.3500_24s.sfp.ddm.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>**Filter**:</p>AND <p>- {#ZYXEL.SFP.DESCRIPTION} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFPDDM.DESC.MATCHES}`</p><p>- {#ZYXEL.SFP.DESCRIPTION} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFPDDM.DESC.NOT_MATCHES}`</p> |
+|SFP without DDM discovery |<p>SFP module discovery.</p> |SNMP |zyxel.3500_24s.sfp.discovery<p>**Filter**:</p>AND <p>- {#ZYXEL.SFP.STATUS} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFP.STATUS.MATCHES}`</p><p>- {#ZYXEL.SFP.STATUS} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFP.STATUS.NOT_MATCHES}`</p> |
+|Temperature discovery |<p>An entry in tempTable.</p> |SNMP |zyxel.3500_24s.temp.discovery |
+|Voltage discovery |<p>An entry in voltageTable.</p> |SNMP |zyxel.3500_24s.volt.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
 
 ## Items collected
 
@@ -67,32 +67,32 @@ There are no template links in this template.
 |Inventory |ZYXEL MES3500-24S: ZyNOS F/W Version |<p>MIB: ZYXEL-ES-COMMON</p> |SNMP |zyxel.3500_24s.fwversion<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Inventory |ZYXEL MES3500-24S: Hardware serial number |<p>MIB: ZYXEL-ES-COMMON</p><p>Serial number</p> |SNMP |zyxel.3500_24s.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Memory |ZYXEL MES3500-24S: Memory utilization |<p>MIB: ZYXEL-ES-COMMON</p><p>Show device memory usage in %.</p> |SNMP |zyxel.3500_24s.memusage |
-|Network_interfaces |ZYXEL MES3500-24S: Port {#SNMPINDEX}: Speed Duplex |<p>MIB: ZYXEL-PORT-MIB</p><p>Select The speed and the duplex mode of the Ethernet connection on this port. Selecting Auto</p><p>(auto-negotiation) allows one port to negotiate with a peer port automatically to obtain the</p><p>connection speed and duplex mode that both ends support. When auto-negotiation is turned on,</p><p>a port on the Switch negotiates with the peer automatically to determine the connection speed</p><p>and duplex mode. If the peer port does not support auto-negotiation or turns off this feature,</p><p>the Switch determines the connection speed by detecting the signal on the cable and using half</p><p>duplex mode. Thus requiring you to make sure that the settings of the peer port are the same in</p><p>order to connect.</p> |SNMP |zyxel.3500_24s.net.if.speed_duplex[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL MES3500-24S: Port {#SNMPINDEX}: Interface description |<p>MIB: ZYXEL-PORT-MIB</p><p>Descriptive name that identifies this port.</p> |SNMP |zyxel.3500_24s.net.if.name[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL MES3500-24S: Port {#SNMPINDEX}: Link type |<p>MIB: ZYXEL-PORT-MIB</p><p>The entry shows the linkUp cable type (copper, fiber, xfp or cx4) for the combo ports.</p> |SNMP |zyxel.3500_24s.net.if.link_type[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL MES3500-24S: Port {#SNMPINDEX}: Interface name |<p>MIB: IF-MIB</p><p>A textual string containing information about the interface</p> |SNMP |zyxel.3500_24s.net.if.descr[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL MES3500-24S: Port {#SNMPINDEX}: Operational status |<p>MIB: IF-MIB</p><p>The current operational state of the interface.</p><p>The testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.3500_24s.net.if.operstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL MES3500-24S: Port {#SNMPINDEX}: Administrative status |<p>MIB: IF-MIB</p><p>The desired state of the interface.  The</p><p>testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.3500_24s.net.if.adminstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL MES3500-24S: Port {#SNMPINDEX}: Incoming traffic |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface,</p><p>including framing characters.</p> |SNMP |zyxel.3500_24s.net.if.in.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL MES3500-24S: Port {#SNMPINDEX}: Incoming unicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were not addressed to a multicast</p><p>or broadcast address at this sub-layer</p> |SNMP |zyxel.3500_24s.net.if.in.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL MES3500-24S: Port {#SNMPINDEX}: Incoming multicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a multicast</p><p>address at this sub-layer.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.3500_24s.net.if.in.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL MES3500-24S: Port {#SNMPINDEX}: Incoming broadcast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a broadcast</p><p>address at this sub-layer.</p> |SNMP |zyxel.3500_24s.net.if.in.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL MES3500-24S: Port {#SNMPINDEX}: Outgoing traffic |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the</p><p>interface, including framing characters.  This object is a</p><p>64-bit version of ifOutOctets.</p> |SNMP |zyxel.3500_24s.net.if.out.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL MES3500-24S: Port {#SNMPINDEX}: Outgoing unicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were not addressed to a</p><p>multicast or broadcast address at this sub-layer, including</p><p>those that were discarded or not sent.</p> |SNMP |zyxel.3500_24s.net.if.out.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL MES3500-24S: Port {#SNMPINDEX}: Outgoing multicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>multicast address at this sub-layer, including those that</p><p>were discarded or not sent.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.3500_24s.net.if.out.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL MES3500-24S: Port {#SNMPINDEX}: Outgoing broadcast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>broadcast address at this sub-layer, including those that</p><p>were discarded or not sent.</p> |SNMP |zyxel.3500_24s.net.if.out.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL MES3500-24S: Port {#SNMPINDEX}: Link speed |<p>MIB: IF-MIB</p><p>An estimate of the interface's current bandwidth in bits per second</p> |SNMP |zyxel.3500_24s.net.if.highspeed[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1000000`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL MES3500-24S: Port {#SNMPINDEX}: Incoming utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.3500_24s.net.if.in.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(//zyxel.3500_24s.net.if.in.traffic[{#SNMPINDEX}]) * (last(//zyxel.3500_24s.net.if.highspeed[{#SNMPINDEX}]) <> 0) / ( last(//zyxel.3500_24s.net.if.highspeed[{#SNMPINDEX}]) + (last(//zyxel.3500_24s.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100` |
-|Network_interfaces |ZYXEL MES3500-24S: Port {#SNMPINDEX}: Outgoing utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.3500_24s.net.if.out.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(//zyxel.3500_24s.net.if.out.traffic[{#SNMPINDEX}]) * (last(//zyxel.3500_24s.net.if.highspeed[{#SNMPINDEX}]) <> 0) / ( last(//zyxel.3500_24s.net.if.highspeed[{#SNMPINDEX}]) + (last(//zyxel.3500_24s.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100` |
-|Network_interfaces |ZYXEL MES3500-24S: SFP {#SNMPINDEX}: Status |<p>MIB: ZYXEL-TRANSCEIVER-MIB</p><p>Transceiver module type.</p> |SNMP |zyxel.3500_24s.sfp.status[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL MES3500-24S: SFP {#SNMPINDEX}: Vendor |<p>MIB: ZYXEL-TRANSCEIVER-MIB</p><p>Transceiver module vendor name.</p> |SNMP |zyxel.3500_24s.sfp.vendor[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL MES3500-24S: SFP {#SNMPINDEX}: Part number |<p>MIB: ZYXEL-TRANSCEIVER-MIB</p><p>Part number provided by transceiver module vendor.</p> |SNMP |zyxel.3500_24s.sfp.part[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL MES3500-24S: SFP {#SNMPINDEX}: Serial number |<p>MIB: ZYXEL-TRANSCEIVER-MIB</p><p>Serial number provided by transceiver module vendor.</p> |SNMP |zyxel.3500_24s.sfp.serialnumber[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL MES3500-24S: SFP {#SNMPINDEX}: Revision |<p>MIB: ZYXEL-TRANSCEIVER-MIB</p><p>Revision level for part number provided by transceiver module vendor.</p> |SNMP |zyxel.3500_24s.sfp.revision[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL MES3500-24S: SFP {#SNMPINDEX}: Date code |<p>MIB: ZYXEL-TRANSCEIVER-MIB</p><p>Transceiver module vendor's manufacturing date code.</p> |SNMP |zyxel.3500_24s.sfp.datecode[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL MES3500-24S: SFP {#SNMPINDEX}: Transceiver |<p>MIB: ZYXEL-TRANSCEIVER-MIB</p><p>Transceiver module type names.</p> |SNMP |zyxel.3500_24s.sfp.transceiver[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL MES3500-24S: SFP {#ZYXEL.SFP.PORT}: {#ZYXEL.SFP.DESCRIPTION} |<p>MIB: ZYXEL-TRANSCEIVER-MIB</p><p>Transceiver module DDM data ({#ZYXEL.SFP.DESCRIPTION}).</p> |SNMP |zyxel.3500_24s.sfp.ddm[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.01`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Power_supply |ZYXEL MES3500-24S: Nominal "{#ZYXEL.DESCRIPTION}" |<p>MIB: ZYXEL-HW-MONITOR-MIB</p><p>The current voltage reading.</p> |SNMP |zyxel.3500_24s.volt[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL MES3500-24S: Port {#SNMPINDEX}: Speed Duplex |<p>MIB: ZYXEL-PORT-MIB</p><p>Select The speed and the duplex mode of the Ethernet connection on this port. Selecting Auto</p><p>(auto-negotiation) allows one port to negotiate with a peer port automatically to obtain the</p><p>connection speed and duplex mode that both ends support. When auto-negotiation is turned on,</p><p>a port on the Switch negotiates with the peer automatically to determine the connection speed</p><p>and duplex mode. If the peer port does not support auto-negotiation or turns off this feature,</p><p>the Switch determines the connection speed by detecting the signal on the cable and using half</p><p>duplex mode. Thus requiring you to make sure that the settings of the peer port are the same in</p><p>order to connect.</p> |SNMP |zyxel.3500_24s.net.if.speed_duplex[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL MES3500-24S: Port {#SNMPINDEX}: Interface description |<p>MIB: ZYXEL-PORT-MIB</p><p>Descriptive name that identifies this port.</p> |SNMP |zyxel.3500_24s.net.if.name[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL MES3500-24S: Port {#SNMPINDEX}: Link type |<p>MIB: ZYXEL-PORT-MIB</p><p>The entry shows the linkUp cable type (copper, fiber, xfp or cx4) for the combo ports.</p> |SNMP |zyxel.3500_24s.net.if.link_type[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL MES3500-24S: Port {#SNMPINDEX}: Interface name |<p>MIB: IF-MIB</p><p>A textual string containing information about the interface</p> |SNMP |zyxel.3500_24s.net.if.descr[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL MES3500-24S: Port {#SNMPINDEX}: Operational status |<p>MIB: IF-MIB</p><p>The current operational state of the interface.</p><p>The testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.3500_24s.net.if.operstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL MES3500-24S: Port {#SNMPINDEX}: Administrative status |<p>MIB: IF-MIB</p><p>The desired state of the interface.  The</p><p>testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.3500_24s.net.if.adminstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL MES3500-24S: Port {#SNMPINDEX}: Incoming traffic |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface,</p><p>including framing characters.</p> |SNMP |zyxel.3500_24s.net.if.in.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL MES3500-24S: Port {#SNMPINDEX}: Incoming unicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were not addressed to a multicast</p><p>or broadcast address at this sub-layer</p> |SNMP |zyxel.3500_24s.net.if.in.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL MES3500-24S: Port {#SNMPINDEX}: Incoming multicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a multicast</p><p>address at this sub-layer.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.3500_24s.net.if.in.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL MES3500-24S: Port {#SNMPINDEX}: Incoming broadcast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a broadcast</p><p>address at this sub-layer.</p> |SNMP |zyxel.3500_24s.net.if.in.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL MES3500-24S: Port {#SNMPINDEX}: Outgoing traffic |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the</p><p>interface, including framing characters.  This object is a</p><p>64-bit version of ifOutOctets.</p> |SNMP |zyxel.3500_24s.net.if.out.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL MES3500-24S: Port {#SNMPINDEX}: Outgoing unicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were not addressed to a</p><p>multicast or broadcast address at this sub-layer, including</p><p>those that were discarded or not sent.</p> |SNMP |zyxel.3500_24s.net.if.out.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL MES3500-24S: Port {#SNMPINDEX}: Outgoing multicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>multicast address at this sub-layer, including those that</p><p>were discarded or not sent.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.3500_24s.net.if.out.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL MES3500-24S: Port {#SNMPINDEX}: Outgoing broadcast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>broadcast address at this sub-layer, including those that</p><p>were discarded or not sent.</p> |SNMP |zyxel.3500_24s.net.if.out.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL MES3500-24S: Port {#SNMPINDEX}: Link speed |<p>MIB: IF-MIB</p><p>An estimate of the interface's current bandwidth in bits per second</p> |SNMP |zyxel.3500_24s.net.if.highspeed[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1000000`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL MES3500-24S: Port {#SNMPINDEX}: Incoming utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.3500_24s.net.if.in.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(//zyxel.3500_24s.net.if.in.traffic[{#SNMPINDEX}]) * (last(//zyxel.3500_24s.net.if.highspeed[{#SNMPINDEX}]) <> 0) / ( last(//zyxel.3500_24s.net.if.highspeed[{#SNMPINDEX}]) + (last(//zyxel.3500_24s.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100` |
+|Network interfaces |ZYXEL MES3500-24S: Port {#SNMPINDEX}: Outgoing utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.3500_24s.net.if.out.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(//zyxel.3500_24s.net.if.out.traffic[{#SNMPINDEX}]) * (last(//zyxel.3500_24s.net.if.highspeed[{#SNMPINDEX}]) <> 0) / ( last(//zyxel.3500_24s.net.if.highspeed[{#SNMPINDEX}]) + (last(//zyxel.3500_24s.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100` |
+|Network interfaces |ZYXEL MES3500-24S: SFP {#SNMPINDEX}: Status |<p>MIB: ZYXEL-TRANSCEIVER-MIB</p><p>Transceiver module type.</p> |SNMP |zyxel.3500_24s.sfp.status[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL MES3500-24S: SFP {#SNMPINDEX}: Vendor |<p>MIB: ZYXEL-TRANSCEIVER-MIB</p><p>Transceiver module vendor name.</p> |SNMP |zyxel.3500_24s.sfp.vendor[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL MES3500-24S: SFP {#SNMPINDEX}: Part number |<p>MIB: ZYXEL-TRANSCEIVER-MIB</p><p>Part number provided by transceiver module vendor.</p> |SNMP |zyxel.3500_24s.sfp.part[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL MES3500-24S: SFP {#SNMPINDEX}: Serial number |<p>MIB: ZYXEL-TRANSCEIVER-MIB</p><p>Serial number provided by transceiver module vendor.</p> |SNMP |zyxel.3500_24s.sfp.serialnumber[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL MES3500-24S: SFP {#SNMPINDEX}: Revision |<p>MIB: ZYXEL-TRANSCEIVER-MIB</p><p>Revision level for part number provided by transceiver module vendor.</p> |SNMP |zyxel.3500_24s.sfp.revision[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL MES3500-24S: SFP {#SNMPINDEX}: Date code |<p>MIB: ZYXEL-TRANSCEIVER-MIB</p><p>Transceiver module vendor's manufacturing date code.</p> |SNMP |zyxel.3500_24s.sfp.datecode[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL MES3500-24S: SFP {#SNMPINDEX}: Transceiver |<p>MIB: ZYXEL-TRANSCEIVER-MIB</p><p>Transceiver module type names.</p> |SNMP |zyxel.3500_24s.sfp.transceiver[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL MES3500-24S: SFP {#ZYXEL.SFP.PORT}: {#ZYXEL.SFP.DESCRIPTION} |<p>MIB: ZYXEL-TRANSCEIVER-MIB</p><p>Transceiver module DDM data ({#ZYXEL.SFP.DESCRIPTION}).</p> |SNMP |zyxel.3500_24s.sfp.ddm[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.01`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Power supply |ZYXEL MES3500-24S: Nominal "{#ZYXEL.DESCRIPTION}" |<p>MIB: ZYXEL-HW-MONITOR-MIB</p><p>The current voltage reading.</p> |SNMP |zyxel.3500_24s.volt[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Status |ZYXEL MES3500-24S: SNMP agent availability |<p>-</p> |INTERNAL |zabbix[host,snmp,available]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Status |ZYXEL MES3500-24S: Uptime |<p>MIB: RFC1213-MIB</p><p>The time (in hundredths of a second) since the</p><p>network management portion of the system was last</p><p>re-initialized.</p> |SNMP |zyxel.3500_24s.uptime<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.01`</p> |
 |Temperature |ZYXEL MES3500-24S: Temperature "{#ZYXEL.TEMPDESCRIPTION}" |<p>MIB: ZYXEL-HW-MONITOR-MIB</p><p>The current temperature measured at this sensor</p> |SNMP |zyxel.3500_24s.temp[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
@@ -120,7 +120,7 @@ There are no template links in this template.
 
 Please report any issues with the template at https://support.zabbix.com
 
-You can also provide a feedback, discuss the template or ask for help with it at [ZABBIX forums](https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/422668-discussion-thread-for-official-zabbix-templates-for-zyxel).
+You can also provide feedback, discuss the template or ask for help with it at [ZABBIX forums](https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/422668-discussion-thread-for-official-zabbix-templates-for-zyxel).
 
 ## Known Issues
 
diff --git a/templates/net/zyxel_snmp/zyxel_mgs3500-24s_snmp/template_net_zyxel_mgs3500-24s_snmp.yaml b/templates/net/zyxel_snmp/zyxel_mgs3500-24s_snmp/template_net_zyxel_mgs3500-24s_snmp.yaml
index 59cba439213..0a870da3c38 100644
--- a/templates/net/zyxel_snmp/zyxel_mgs3500-24s_snmp/template_net_zyxel_mgs3500-24s_snmp.yaml
+++ b/templates/net/zyxel_snmp/zyxel_mgs3500-24s_snmp/template_net_zyxel_mgs3500-24s_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-17T06:34:47Z'
+  date: '2022-01-26T10:43:23Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -29,7 +29,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/422668-discussion-thread-for-official-zabbix-templates-for-zyxel
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: 'Templates/Network devices'
@@ -49,8 +49,8 @@ zabbix_export:
                 - 1h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: network
           triggers:
             -
               uuid: d80bc493096b4da4857651e7e28829e7
@@ -59,6 +59,10 @@ zabbix_export:
               opdata: 'Current state: {ITEM.LASTVALUE1}'
               priority: WARNING
               description: 'SNMP is not available for polling. Please check device connectivity and SNMP settings.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: aa2cb34bb8a24ea883d13039175e7955
           name: 'ZYXEL MES3500-24S: Contact'
@@ -82,8 +86,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
         -
           uuid: 6fccaef6a6f84d97b825d46b62955b76
           name: 'ZYXEL MES3500-24S: CPU utilization'
@@ -99,8 +103,8 @@ zabbix_export:
             getting the values.
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
           triggers:
             -
               uuid: 7bf51ce2b7a64f3f8151edc224c601e8
@@ -109,6 +113,10 @@ zabbix_export:
               opdata: 'Current utilization: {ITEM.LASTVALUE1}'
               priority: WARNING
               description: 'CPU utilization is too high. The system might be slow to respond.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 37410c60fd224987920640313a0b229b
           name: 'ZYXEL MES3500-24S: ZyNOS F/W Version'
@@ -128,8 +136,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
           triggers:
             -
               uuid: 182e8b14935445268c096a3e4fdb5795
@@ -139,6 +147,10 @@ zabbix_export:
               priority: INFO
               description: 'Firmware version has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: a2ee7e4d0dbc463aa9fc997f14740d0b
           name: 'ZYXEL MES3500-24S: Location'
@@ -161,8 +173,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
         -
           uuid: 082f2005c90d4edebdddedd1ee946793
           name: 'ZYXEL MES3500-24S: MAC address'
@@ -188,8 +200,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
         -
           uuid: 1e8654e4f9ba487f971f5dc4c1fd5c9d
           name: 'ZYXEL MES3500-24S: Memory utilization'
@@ -202,8 +214,8 @@ zabbix_export:
             Show device memory usage in %.
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: d3a4dca93ad946589b1b83e0fe647dde
@@ -211,6 +223,13 @@ zabbix_export:
               name: 'ZYXEL MES3500-24S: High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
               priority: AVERAGE
               description: 'The system is running out of free memory.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: a7d255bd093744ef853335e1b961bef7
           name: 'ZYXEL MES3500-24S: Hardware model name'
@@ -237,8 +256,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
           triggers:
             -
               uuid: 96c011542d5b4473934e0de9e442479c
@@ -246,6 +265,10 @@ zabbix_export:
               name: 'ZYXEL MES3500-24S: Template does not match hardware'
               priority: INFO
               description: 'This template is for Zyxel MES3500-24S series, but connected to {ITEM.VALUE}'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 9225792a06444aabb120c390c68c2a06
           name: 'ZYXEL MES3500-24S: Host name'
@@ -269,8 +292,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
         -
           uuid: a9e8c7ae033b4f7e95aadd663f3656d9
           name: 'ZYXEL MES3500-24S: Hardware serial number'
@@ -292,8 +315,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
           triggers:
             -
               uuid: 90268ffbf33049d6adc6ed96badd67ec
@@ -302,6 +325,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: b3f7ffa22b174e2c8ed8bf0deeb62b42
           name: 'ZYXEL MES3500-24S: Uptime'
@@ -324,8 +351,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 6c8fce36fd9c49569be0ba2bfb70f478
@@ -334,6 +361,10 @@ zabbix_export:
               priority: INFO
               description: 'Uptime is less than 10 minutes'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
       discovery_rules:
         -
           uuid: a76d8952c6424abe926a5b9453bbc75d
@@ -362,8 +393,11 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: Fans
+                  tag: component
+                  value: fan
+                -
+                  tag: component
+                  value: sensor
               trigger_prototypes:
                 -
                   uuid: 19846f8e671945c68b065ac53ebb2d38
@@ -372,6 +406,10 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the fan unit'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
           graph_prototypes:
             -
               uuid: ed81cba771d34db3b50262ff0bbc73b4
@@ -432,8 +470,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: d4f846a781f543539e05bc139e01a462
               name: 'ZYXEL MES3500-24S: Port {#SNMPINDEX}: Interface name'
@@ -453,8 +497,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 27ac6ebffd2e47ecb9ebbece3ef3bb68
               name: 'ZYXEL MES3500-24S: Port {#SNMPINDEX}: Link speed'
@@ -477,8 +527,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: e406bba0c87a4607bc36d4be74ac5abb
               name: 'ZYXEL MES3500-24S: Port {#SNMPINDEX}: Incoming broadcast packages'
@@ -499,8 +555,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 18a759f3be5247b282fe7f685ae4d18b
               name: 'ZYXEL MES3500-24S: Port {#SNMPINDEX}: Incoming multicast packages'
@@ -522,8 +584,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 6b87de872fa84ec8bc9c1058716617ff
               name: 'ZYXEL MES3500-24S: Port {#SNMPINDEX}: Incoming traffic'
@@ -547,8 +615,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 6e04ed7c0b154deeb1a32150aff18b26
               name: 'ZYXEL MES3500-24S: Port {#SNMPINDEX}: Incoming unicast packages'
@@ -569,8 +643,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 197cf5fd63d541439b282e154bcd4ef1
               name: 'ZYXEL MES3500-24S: Port {#SNMPINDEX}: Incoming utilization'
@@ -594,8 +674,14 @@ zabbix_export:
                     - 'return +parseFloat(value).toFixed(0);'
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: f357ac3f816d4232a2ba6ff571d95773
               name: 'ZYXEL MES3500-24S: Port {#SNMPINDEX}: Link type'
@@ -615,8 +701,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 5a6debce6aa6420e8c76f50c24fb541e
               name: 'ZYXEL MES3500-24S: Port {#SNMPINDEX}: Interface description'
@@ -636,8 +728,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 419b897845244642a84a1bd224ec72a6
               name: 'ZYXEL MES3500-24S: Port {#SNMPINDEX}: Operational status'
@@ -659,8 +757,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 60f1b7c76a6b410db3f3a2ae40c3b74c
@@ -677,6 +781,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 2ca954bd5d90447288da9ac4d75ec976
               name: 'ZYXEL MES3500-24S: Port {#SNMPINDEX}: Outgoing broadcast packages'
@@ -698,8 +806,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: b229348293cd47b39e826f5be1285928
               name: 'ZYXEL MES3500-24S: Port {#SNMPINDEX}: Outgoing multicast packages'
@@ -722,8 +836,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 445163f587b24339adc9155bff798f7d
               name: 'ZYXEL MES3500-24S: Port {#SNMPINDEX}: Outgoing traffic'
@@ -748,8 +868,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 8f080d3c0bd045e59d22585878bccbff
               name: 'ZYXEL MES3500-24S: Port {#SNMPINDEX}: Outgoing unicast packages'
@@ -771,8 +897,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 43b466a87757484dae36abe07e946bff
               name: 'ZYXEL MES3500-24S: Port {#SNMPINDEX}: Outgoing utilization'
@@ -796,8 +928,14 @@ zabbix_export:
                     - 'return +parseFloat(value).toFixed(0);'
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: ff93002a2b5341a8a287fdc78c7e9c6d
               name: 'ZYXEL MES3500-24S: Port {#SNMPINDEX}: Speed Duplex'
@@ -824,8 +962,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           graph_prototypes:
             -
               uuid: 86f5f836fba94de9aed70cf58c6cf1d4
@@ -961,8 +1105,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#ZYXEL.SFP.PORT}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 2a75ca5b7ef444d0a96dcf2d7c824f03
@@ -970,12 +1120,20 @@ zabbix_export:
                   name: 'ZYXEL MES3500-24S: SFP {#ZYXEL.SFP.PORT}: High {#ZYXEL.SFP.DESCRIPTION} (over {#ZYXEL.SFP.WARN.MAX}{#ZYXEL.SFP.UNIT})'
                   priority: WARNING
                   description: 'The upper threshold value of the parameter is exceeded'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: f2989317c3f847da84979dde3b4f4db4
                   expression: 'last(/ZYXEL MES3500-24S SNMP/zyxel.3500_24s.sfp.ddm[{#SNMPINDEX}]) < {#ZYXEL.SFP.WARN.MIN}'
                   name: 'ZYXEL MES3500-24S: SFP {#ZYXEL.SFP.PORT}: Low {#ZYXEL.SFP.DESCRIPTION} (less than {#ZYXEL.SFP.WARN.MIN}{#ZYXEL.SFP.UNIT})'
                   priority: WARNING
                   description: 'The parameter values are less than the lower threshold'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
           graph_prototypes:
             -
               uuid: e5e5d83e9f9e429fb51ff79245335065
@@ -1049,8 +1207,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 745310ab6da449aa8150956c076a2223
               name: 'ZYXEL MES3500-24S: SFP {#SNMPINDEX}: Part number'
@@ -1071,8 +1235,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 4565c91a0641405ba4e3d853b5db86e5
               name: 'ZYXEL MES3500-24S: SFP {#SNMPINDEX}: Revision'
@@ -1093,8 +1263,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: b0fa1b76a33041bcab473b17b7b74eef
               name: 'ZYXEL MES3500-24S: SFP {#SNMPINDEX}: Serial number'
@@ -1115,8 +1291,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: f6533a3fe07c4f0290e7758ac4183a1f
@@ -1125,6 +1307,10 @@ zabbix_export:
                   priority: INFO
                   description: 'SFP {#SNMPINDEX} serial number has changed. Ack to close'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 80aa0e87f7b24dfe9b525be735aa1ec3
               name: 'ZYXEL MES3500-24S: SFP {#SNMPINDEX}: Status'
@@ -1145,8 +1331,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 5175fe53ba2d4bb6a3ad1aa673b67777
               name: 'ZYXEL MES3500-24S: SFP {#SNMPINDEX}: Transceiver'
@@ -1167,8 +1359,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 17c99b32a9674426807fdf5d469b324a
               name: 'ZYXEL MES3500-24S: SFP {#SNMPINDEX}: Vendor'
@@ -1189,8 +1387,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
         -
           uuid: 774dd069aeb948569d21396dd8dceea1
           name: 'Temperature discovery'
@@ -1218,8 +1422,11 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: sensor
+                -
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: c6db10ac3bec446e9152545119b555bc
@@ -1228,6 +1435,10 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the temperature'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
           graph_prototypes:
             -
               uuid: c238ae64f1ca4e948b36cb423669c864
@@ -1270,8 +1481,11 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Power supply'
+                  tag: component
+                  value: sensor
+                -
+                  tag: component
+                  value: voltage
               trigger_prototypes:
                 -
                   uuid: 52ac34f156aa434dace3447bb5745b34
@@ -1280,6 +1494,10 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the power supply'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
           graph_prototypes:
             -
               uuid: a94a590eed624cac8ece4ff2956419d8
@@ -1302,6 +1520,19 @@ zabbix_export:
                   outArr.push(item)
                   });
                   return JSON.stringify(outArr);
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: mes3500-24s
+        -
+          tag: target
+          value: switch
+        -
+          tag: target
+          value: zyxel
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/net/zyxel_snmp/zyxel_mgs3520-28x_snmp/README.md b/templates/net/zyxel_snmp/zyxel_mgs3520-28x_snmp/README.md
index 1834ce1a117..db27d806828 100644
--- a/templates/net/zyxel_snmp/zyxel_mgs3520-28x_snmp/README.md
+++ b/templates/net/zyxel_snmp/zyxel_mgs3520-28x_snmp/README.md
@@ -48,11 +48,11 @@ There are no template links in this template.
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
 |Fan discovery |<p>An entry in fanRpmTable.</p> |SNMP |zyxel.3520_28.fan.discovery |
-|Temperature discovery |<p>An entry in tempTable.</p> |SNMP |zyxel.3520_28.temp.discovery |
-|Voltage discovery |<p>An entry in voltageTable.</p> |SNMP |zyxel.3520_28.volt.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
 |Interface discovery |<p>-</p> |SNMP |zyxel.3520_28.net.if.discovery<p>**Filter**:</p>AND <p>- {#ZYXEL.IF.NAME} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.NAME.MATCHES}`</p><p>- {#ZYXEL.IF.NAME} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.NAME.NOT_MATCHES}`</p><p>- {#ZYXEL.IF.LINKUPTYPE} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.MATCHES}`</p><p>- {#ZYXEL.IF.LINKUPTYPE} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.NOT_MATCHES}`</p><p>**Overrides:**</p><p>Don't create triggers for matching interface<br> - {#ZYXEL.IF.NAME} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}`<br>  - TRIGGER_PROTOTYPE REGEXP `.*` - NO_DISCOVER</p> |
-|SFP without DDM discovery |<p>SFP module discovery.</p> |SNMP |zyxel.3520_28.sfp.discovery<p>**Filter**:</p>AND <p>- {#ZYXEL.SFP.STATUS} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFP.STATUS.MATCHES}`</p><p>- {#ZYXEL.SFP.STATUS} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFP.STATUS.NOT_MATCHES}`</p> |
 |SFP with DDM discovery |<p>SFP DDM module discovery.</p> |SNMP |zyxel.3520_28.sfp.ddm.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>**Filter**:</p>AND <p>- {#ZYXEL.SFP.DESCRIPTION} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFPDDM.DESC.MATCHES}`</p><p>- {#ZYXEL.SFP.DESCRIPTION} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFPDDM.DESC.NOT_MATCHES}`</p> |
+|SFP without DDM discovery |<p>SFP module discovery.</p> |SNMP |zyxel.3520_28.sfp.discovery<p>**Filter**:</p>AND <p>- {#ZYXEL.SFP.STATUS} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFP.STATUS.MATCHES}`</p><p>- {#ZYXEL.SFP.STATUS} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFP.STATUS.NOT_MATCHES}`</p> |
+|Temperature discovery |<p>An entry in tempTable.</p> |SNMP |zyxel.3520_28.temp.discovery |
+|Voltage discovery |<p>An entry in voltageTable.</p> |SNMP |zyxel.3520_28.volt.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
 
 ## Items collected
 
@@ -68,32 +68,32 @@ There are no template links in this template.
 |Inventory |ZYXEL MGS3520-28x: ZyNOS F/W Version |<p>MIB: ZYXEL-ES-COMMON</p> |SNMP |zyxel.3520_28.fwversion<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Inventory |ZYXEL MGS3520-28x: Hardware serial number |<p>MIB: ZYXEL-ES-COMMON</p><p>Serial number</p> |SNMP |zyxel.3520_28.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Memory |ZYXEL MGS3520-28x: Memory utilization |<p>MIB: ZYXEL-ES-COMMON</p><p>Show device memory usage in %.</p> |SNMP |zyxel.3520_28.memusage |
-|Network_interfaces |ZYXEL MGS3520-28x: Port {#SNMPINDEX}: Speed Duplex |<p>MIB: ZYXEL-PORT-MIB</p><p>Select The speed and the duplex mode of the Ethernet connection on this port. Selecting Auto</p><p>(auto-negotiation) allows one port to negotiate with a peer port automatically to obtain the</p><p>connection speed and duplex mode that both ends support. When auto-negotiation is turned on,</p><p>a port on the Switch negotiates with the peer automatically to determine the connection speed</p><p>and duplex mode. If the peer port does not support auto-negotiation or turns off this feature,</p><p>the Switch determines the connection speed by detecting the signal on the cable and using half</p><p>duplex mode. Thus requiring you to make sure that the settings of the peer port are the same in</p><p>order to connect.</p> |SNMP |zyxel.3520_28.net.if.speed_duplex[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL MGS3520-28x: Port {#SNMPINDEX}: Interface description |<p>MIB: ZYXEL-PORT-MIB</p><p>Descriptive name that identifies this port.</p> |SNMP |zyxel.3520_28.net.if.name[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL MGS3520-28x: Port {#SNMPINDEX}: Link type |<p>MIB: ZYXEL-PORT-MIB</p><p>The entry shows the linkUp cable type (copper, fiber, xfp or cx4) for the combo ports.</p> |SNMP |zyxel.3520_28.net.if.link_type[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL MGS3520-28x: Port {#SNMPINDEX}: Interface name |<p>MIB: IF-MIB</p><p>A textual string containing information about the interface</p> |SNMP |zyxel.3520_28.net.if.descr[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL MGS3520-28x: Port {#SNMPINDEX}: Operational status |<p>MIB: IF-MIB</p><p>The current operational state of the interface.</p><p>The testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.3520_28.net.if.operstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL MGS3520-28x: Port {#SNMPINDEX}: Administrative status |<p>MIB: IF-MIB</p><p>The desired state of the interface.  The</p><p>testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.3520_28.net.if.adminstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL MGS3520-28x: Port {#SNMPINDEX}: Incoming traffic |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface,</p><p>including framing characters.</p> |SNMP |zyxel.3520_28.net.if.in.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL MGS3520-28x: Port {#SNMPINDEX}: Incoming unicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were not addressed to a multicast</p><p>or broadcast address at this sub-layer</p> |SNMP |zyxel.3520_28.net.if.in.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL MGS3520-28x: Port {#SNMPINDEX}: Incoming multicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a multicast</p><p>address at this sub-layer.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.3520_28.net.if.in.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL MGS3520-28x: Port {#SNMPINDEX}: Incoming broadcast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a broadcast</p><p>address at this sub-layer.</p> |SNMP |zyxel.3520_28.net.if.in.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL MGS3520-28x: Port {#SNMPINDEX}: Outgoing traffic |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the</p><p>interface, including framing characters.  This object is a</p><p>64-bit version of ifOutOctets.</p> |SNMP |zyxel.3520_28.net.if.out.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL MGS3520-28x: Port {#SNMPINDEX}: Outgoing unicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were not addressed to a</p><p>multicast or broadcast address at this sub-layer, including</p><p>those that were discarded or not sent.</p> |SNMP |zyxel.3520_28.net.if.out.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL MGS3520-28x: Port {#SNMPINDEX}: Outgoing multicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>multicast address at this sub-layer, including those that</p><p>were discarded or not sent.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.3520_28.net.if.out.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL MGS3520-28x: Port {#SNMPINDEX}: Outgoing broadcast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>broadcast address at this sub-layer, including those that</p><p>were discarded or not sent.</p> |SNMP |zyxel.3520_28.net.if.out.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL MGS3520-28x: Port {#SNMPINDEX}: Link speed |<p>MIB: IF-MIB</p><p>An estimate of the interface's current bandwidth in bits per second</p> |SNMP |zyxel.3520_28.net.if.highspeed[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1000000`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL MGS3520-28x: Port {#SNMPINDEX}: Incoming utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.3520_28.net.if.in.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(//zyxel.3520_28.net.if.in.traffic[{#SNMPINDEX}]) * (last(//zyxel.3520_28.net.if.highspeed[{#SNMPINDEX}]) <> 0) / ( last(//zyxel.3520_28.net.if.highspeed[{#SNMPINDEX}]) + (last(//zyxel.3520_28.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100` |
-|Network_interfaces |ZYXEL MGS3520-28x: Port {#SNMPINDEX}: Outgoing utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.3520_28.net.if.out.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(//zyxel.3520_28.net.if.out.traffic[{#SNMPINDEX}]) * (last(//zyxel.3520_28.net.if.highspeed[{#SNMPINDEX}]) <> 0) / ( last(//zyxel.3520_28.net.if.highspeed[{#SNMPINDEX}]) + (last(//zyxel.3520_28.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100` |
-|Network_interfaces |ZYXEL MGS3520-28x: SFP {#SNMPINDEX}: Status |<p>MIB: ZYXEL-TRANSCEIVER-MIB</p><p>Transceiver module type.</p> |SNMP |zyxel.3520_28.sfp.status[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL MGS3520-28x: SFP {#SNMPINDEX}: Vendor |<p>MIB: ZYXEL-TRANSCEIVER-MIB</p><p>Transceiver module vendor name.</p> |SNMP |zyxel.3520_28.sfp.vendor[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL MGS3520-28x: SFP {#SNMPINDEX}: Part number |<p>MIB: ZYXEL-TRANSCEIVER-MIB</p><p>Part number provided by transceiver module vendor.</p> |SNMP |zyxel.3520_28.sfp.part[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL MGS3520-28x: SFP {#SNMPINDEX}: Serial number |<p>MIB: ZYXEL-TRANSCEIVER-MIB</p><p>Serial number provided by transceiver module vendor.</p> |SNMP |zyxel.3520_28.sfp.serialnumber[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL MGS3520-28x: SFP {#SNMPINDEX}: Revision |<p>MIB: ZYXEL-TRANSCEIVER-MIB</p><p>Revision level for part number provided by transceiver module vendor.</p> |SNMP |zyxel.3520_28.sfp.revision[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL MGS3520-28x: SFP {#SNMPINDEX}: Date code |<p>MIB: ZYXEL-TRANSCEIVER-MIB</p><p>Transceiver module vendor's manufacturing date code.</p> |SNMP |zyxel.3520_28.sfp.datecode[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL MGS3520-28x: SFP {#SNMPINDEX}: Transceiver |<p>MIB: ZYXEL-TRANSCEIVER-MIB</p><p>Transceiver module type names.</p> |SNMP |zyxel.3520_28.sfp.transceiver[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL MGS3520-28x: SFP {#ZYXEL.SFP.PORT}: {#ZYXEL.SFP.DESCRIPTION} |<p>MIB: ZYXEL-TRANSCEIVER-MIB</p><p>Transceiver module DDM data ({#ZYXEL.SFP.DESCRIPTION}).</p> |SNMP |zyxel.3520_28.sfp.ddm[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.01`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Power_supply |ZYXEL MGS3520-28x: Nominal "{#ZYXEL.DESCRIPTION}" |<p>MIB: ZYXEL-HW-MONITOR-MIB</p><p>The current voltage reading.</p> |SNMP |zyxel.3520_28.volt[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL MGS3520-28x: Port {#SNMPINDEX}: Speed Duplex |<p>MIB: ZYXEL-PORT-MIB</p><p>Select The speed and the duplex mode of the Ethernet connection on this port. Selecting Auto</p><p>(auto-negotiation) allows one port to negotiate with a peer port automatically to obtain the</p><p>connection speed and duplex mode that both ends support. When auto-negotiation is turned on,</p><p>a port on the Switch negotiates with the peer automatically to determine the connection speed</p><p>and duplex mode. If the peer port does not support auto-negotiation or turns off this feature,</p><p>the Switch determines the connection speed by detecting the signal on the cable and using half</p><p>duplex mode. Thus requiring you to make sure that the settings of the peer port are the same in</p><p>order to connect.</p> |SNMP |zyxel.3520_28.net.if.speed_duplex[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL MGS3520-28x: Port {#SNMPINDEX}: Interface description |<p>MIB: ZYXEL-PORT-MIB</p><p>Descriptive name that identifies this port.</p> |SNMP |zyxel.3520_28.net.if.name[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL MGS3520-28x: Port {#SNMPINDEX}: Link type |<p>MIB: ZYXEL-PORT-MIB</p><p>The entry shows the linkUp cable type (copper, fiber, xfp or cx4) for the combo ports.</p> |SNMP |zyxel.3520_28.net.if.link_type[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL MGS3520-28x: Port {#SNMPINDEX}: Interface name |<p>MIB: IF-MIB</p><p>A textual string containing information about the interface</p> |SNMP |zyxel.3520_28.net.if.descr[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL MGS3520-28x: Port {#SNMPINDEX}: Operational status |<p>MIB: IF-MIB</p><p>The current operational state of the interface.</p><p>The testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.3520_28.net.if.operstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL MGS3520-28x: Port {#SNMPINDEX}: Administrative status |<p>MIB: IF-MIB</p><p>The desired state of the interface.  The</p><p>testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.3520_28.net.if.adminstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL MGS3520-28x: Port {#SNMPINDEX}: Incoming traffic |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface,</p><p>including framing characters.</p> |SNMP |zyxel.3520_28.net.if.in.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL MGS3520-28x: Port {#SNMPINDEX}: Incoming unicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were not addressed to a multicast</p><p>or broadcast address at this sub-layer</p> |SNMP |zyxel.3520_28.net.if.in.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL MGS3520-28x: Port {#SNMPINDEX}: Incoming multicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a multicast</p><p>address at this sub-layer.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.3520_28.net.if.in.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL MGS3520-28x: Port {#SNMPINDEX}: Incoming broadcast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a broadcast</p><p>address at this sub-layer.</p> |SNMP |zyxel.3520_28.net.if.in.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL MGS3520-28x: Port {#SNMPINDEX}: Outgoing traffic |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the</p><p>interface, including framing characters.  This object is a</p><p>64-bit version of ifOutOctets.</p> |SNMP |zyxel.3520_28.net.if.out.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL MGS3520-28x: Port {#SNMPINDEX}: Outgoing unicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were not addressed to a</p><p>multicast or broadcast address at this sub-layer, including</p><p>those that were discarded or not sent.</p> |SNMP |zyxel.3520_28.net.if.out.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL MGS3520-28x: Port {#SNMPINDEX}: Outgoing multicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>multicast address at this sub-layer, including those that</p><p>were discarded or not sent.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.3520_28.net.if.out.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL MGS3520-28x: Port {#SNMPINDEX}: Outgoing broadcast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>broadcast address at this sub-layer, including those that</p><p>were discarded or not sent.</p> |SNMP |zyxel.3520_28.net.if.out.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL MGS3520-28x: Port {#SNMPINDEX}: Link speed |<p>MIB: IF-MIB</p><p>An estimate of the interface's current bandwidth in bits per second</p> |SNMP |zyxel.3520_28.net.if.highspeed[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1000000`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL MGS3520-28x: Port {#SNMPINDEX}: Incoming utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.3520_28.net.if.in.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(//zyxel.3520_28.net.if.in.traffic[{#SNMPINDEX}]) * (last(//zyxel.3520_28.net.if.highspeed[{#SNMPINDEX}]) <> 0) / ( last(//zyxel.3520_28.net.if.highspeed[{#SNMPINDEX}]) + (last(//zyxel.3520_28.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100` |
+|Network interfaces |ZYXEL MGS3520-28x: Port {#SNMPINDEX}: Outgoing utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.3520_28.net.if.out.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(//zyxel.3520_28.net.if.out.traffic[{#SNMPINDEX}]) * (last(//zyxel.3520_28.net.if.highspeed[{#SNMPINDEX}]) <> 0) / ( last(//zyxel.3520_28.net.if.highspeed[{#SNMPINDEX}]) + (last(//zyxel.3520_28.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100` |
+|Network interfaces |ZYXEL MGS3520-28x: SFP {#SNMPINDEX}: Status |<p>MIB: ZYXEL-TRANSCEIVER-MIB</p><p>Transceiver module type.</p> |SNMP |zyxel.3520_28.sfp.status[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL MGS3520-28x: SFP {#SNMPINDEX}: Vendor |<p>MIB: ZYXEL-TRANSCEIVER-MIB</p><p>Transceiver module vendor name.</p> |SNMP |zyxel.3520_28.sfp.vendor[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL MGS3520-28x: SFP {#SNMPINDEX}: Part number |<p>MIB: ZYXEL-TRANSCEIVER-MIB</p><p>Part number provided by transceiver module vendor.</p> |SNMP |zyxel.3520_28.sfp.part[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL MGS3520-28x: SFP {#SNMPINDEX}: Serial number |<p>MIB: ZYXEL-TRANSCEIVER-MIB</p><p>Serial number provided by transceiver module vendor.</p> |SNMP |zyxel.3520_28.sfp.serialnumber[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL MGS3520-28x: SFP {#SNMPINDEX}: Revision |<p>MIB: ZYXEL-TRANSCEIVER-MIB</p><p>Revision level for part number provided by transceiver module vendor.</p> |SNMP |zyxel.3520_28.sfp.revision[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL MGS3520-28x: SFP {#SNMPINDEX}: Date code |<p>MIB: ZYXEL-TRANSCEIVER-MIB</p><p>Transceiver module vendor's manufacturing date code.</p> |SNMP |zyxel.3520_28.sfp.datecode[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL MGS3520-28x: SFP {#SNMPINDEX}: Transceiver |<p>MIB: ZYXEL-TRANSCEIVER-MIB</p><p>Transceiver module type names.</p> |SNMP |zyxel.3520_28.sfp.transceiver[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL MGS3520-28x: SFP {#ZYXEL.SFP.PORT}: {#ZYXEL.SFP.DESCRIPTION} |<p>MIB: ZYXEL-TRANSCEIVER-MIB</p><p>Transceiver module DDM data ({#ZYXEL.SFP.DESCRIPTION}).</p> |SNMP |zyxel.3520_28.sfp.ddm[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.01`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Power supply |ZYXEL MGS3520-28x: Nominal "{#ZYXEL.DESCRIPTION}" |<p>MIB: ZYXEL-HW-MONITOR-MIB</p><p>The current voltage reading.</p> |SNMP |zyxel.3520_28.volt[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Status |ZYXEL MGS3520-28x: SNMP agent availability |<p>-</p> |INTERNAL |zabbix[host,snmp,available]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Status |ZYXEL MGS3520-28x: Uptime |<p>MIB: RFC1213-MIB</p><p>The time (in hundredths of a second) since the</p><p>network management portion of the system was last</p><p>re-initialized.</p> |SNMP |zyxel.3520_28.uptime<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.01`</p> |
 |Temperature |ZYXEL MGS3520-28x: Temperature "{#ZYXEL.TEMPDESCRIPTION}" |<p>MIB: ZYXEL-HW-MONITOR-MIB</p><p>The current temperature measured at this sensor</p> |SNMP |zyxel.3520_28.temp[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
@@ -121,7 +121,7 @@ There are no template links in this template.
 
 Please report any issues with the template at https://support.zabbix.com
 
-You can also provide a feedback, discuss the template or ask for help with it at [ZABBIX forums](https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/422668-discussion-thread-for-official-zabbix-templates-for-zyxel).
+You can also provide feedback, discuss the template or ask for help with it at [ZABBIX forums](https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/422668-discussion-thread-for-official-zabbix-templates-for-zyxel).
 
 ## Known Issues
 
diff --git a/templates/net/zyxel_snmp/zyxel_mgs3520-28x_snmp/template_net_zyxel_mgs3520-28x_snmp.yaml b/templates/net/zyxel_snmp/zyxel_mgs3520-28x_snmp/template_net_zyxel_mgs3520-28x_snmp.yaml
index 293e210d1a4..f8cf62ee6f2 100644
--- a/templates/net/zyxel_snmp/zyxel_mgs3520-28x_snmp/template_net_zyxel_mgs3520-28x_snmp.yaml
+++ b/templates/net/zyxel_snmp/zyxel_mgs3520-28x_snmp/template_net_zyxel_mgs3520-28x_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-17T06:34:52Z'
+  date: '2022-01-26T10:43:57Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -29,7 +29,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/422668-discussion-thread-for-official-zabbix-templates-for-zyxel
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: 'Templates/Network devices'
@@ -49,8 +49,8 @@ zabbix_export:
                 - 1h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: network
           triggers:
             -
               uuid: 3bf5d80d383e4e98853caa02063d69c9
@@ -59,6 +59,10 @@ zabbix_export:
               opdata: 'Current state: {ITEM.LASTVALUE1}'
               priority: WARNING
               description: 'SNMP is not available for polling. Please check device connectivity and SNMP settings.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: be1d951beb564638a6102fe4b35fede0
           name: 'ZYXEL MGS3520-28x: Contact'
@@ -82,8 +86,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
         -
           uuid: abdb31aeb0034998b91ab8f9b475409f
           name: 'ZYXEL MGS3520-28x: CPU utilization'
@@ -99,8 +103,8 @@ zabbix_export:
             getting the values.
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
           triggers:
             -
               uuid: 96ed7ee3906541ea9cb2c95cf4da1a62
@@ -109,6 +113,10 @@ zabbix_export:
               opdata: 'Current utilization: {ITEM.LASTVALUE1}'
               priority: WARNING
               description: 'CPU utilization is too high. The system might be slow to respond.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: dd0ab3fa502b43969eec05ffd687450e
           name: 'ZYXEL MGS3520-28x: ZyNOS F/W Version'
@@ -128,8 +136,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
           triggers:
             -
               uuid: 3785991565b948c2a1e1a2a140c42df4
@@ -139,6 +147,10 @@ zabbix_export:
               priority: INFO
               description: 'Firmware version has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: d9923ed59ef14cbebfe2f6d24c0d8414
           name: 'ZYXEL MGS3520-28x: Location'
@@ -161,8 +173,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
         -
           uuid: 65116a646d734290926de9444a58ff2d
           name: 'ZYXEL MGS3520-28x: MAC address'
@@ -188,8 +200,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
         -
           uuid: 89d6942524f84e6d80d02a80be25ce57
           name: 'ZYXEL MGS3520-28x: Memory utilization'
@@ -202,8 +214,8 @@ zabbix_export:
             Show device memory usage in %.
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: 1a999dff1dd9481083681741e71aba76
@@ -211,6 +223,13 @@ zabbix_export:
               name: 'ZYXEL MGS3520-28x: High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
               priority: AVERAGE
               description: 'The system is running out of free memory.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 2dced10921704f8a9ccaabb2f951af15
           name: 'ZYXEL MGS3520-28x: Hardware model name'
@@ -237,8 +256,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
           triggers:
             -
               uuid: d72bc70a67014d818d593d6c484fc9ee
@@ -246,6 +265,10 @@ zabbix_export:
               name: 'ZYXEL MGS3520-28x: Template does not match hardware'
               priority: INFO
               description: 'This template is for Zyxel MGS3520-28x series, but connected to {ITEM.VALUE}'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: bccc98beb7ea45d6a7463de339e8877e
           name: 'ZYXEL MGS3520-28x: Host name'
@@ -269,8 +292,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
         -
           uuid: 095d82b3c92340debb324844a6c7f8a8
           name: 'ZYXEL MGS3520-28x: Hardware serial number'
@@ -292,8 +315,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
           triggers:
             -
               uuid: e953886c5a464fc18bb1e221d801901c
@@ -302,6 +325,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 78959009721a453c8b8a2c49eb26c90c
           name: 'ZYXEL MGS3520-28x: Uptime'
@@ -324,8 +351,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 308761b6dffb44c7b827f6ca76312233
@@ -334,6 +361,10 @@ zabbix_export:
               priority: INFO
               description: 'Uptime is less than 10 minutes'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
       discovery_rules:
         -
           uuid: e56b6958ca184f549d86502ad9aa10bc
@@ -362,8 +393,11 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: Fans
+                  tag: component
+                  value: fan
+                -
+                  tag: component
+                  value: sensor
               trigger_prototypes:
                 -
                   uuid: 9eedeb7aaba943c0947896cd50b39c7f
@@ -372,6 +406,10 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the fan unit'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
           graph_prototypes:
             -
               uuid: 8599554de97e46e2bb7d3575d97f9453
@@ -432,8 +470,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: de6bab43bf544489976261919ae52e98
               name: 'ZYXEL MGS3520-28x: Port {#SNMPINDEX}: Interface name'
@@ -453,8 +497,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 01f3cc6551bb4703b199e6c996ad48ce
               name: 'ZYXEL MGS3520-28x: Port {#SNMPINDEX}: Link speed'
@@ -477,8 +527,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 68b987f900c0467ea77a8c8eb661f6d0
               name: 'ZYXEL MGS3520-28x: Port {#SNMPINDEX}: Incoming broadcast packages'
@@ -499,8 +555,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: ddcef9809ee34de5bec1acbdc8abc162
               name: 'ZYXEL MGS3520-28x: Port {#SNMPINDEX}: Incoming multicast packages'
@@ -522,8 +584,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: e8c2a3a8ba654311bc90901502983b7a
               name: 'ZYXEL MGS3520-28x: Port {#SNMPINDEX}: Incoming traffic'
@@ -547,8 +615,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 003eb52b5fe44f509b3c04eef9cc2aa7
               name: 'ZYXEL MGS3520-28x: Port {#SNMPINDEX}: Incoming unicast packages'
@@ -569,8 +643,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 8e060cde0fae44d792080fbc7da5a2a1
               name: 'ZYXEL MGS3520-28x: Port {#SNMPINDEX}: Incoming utilization'
@@ -594,8 +674,14 @@ zabbix_export:
                     - 'return +parseFloat(value).toFixed(0);'
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 15a2c17e0bba4f0d824790c3caa9840f
               name: 'ZYXEL MGS3520-28x: Port {#SNMPINDEX}: Link type'
@@ -615,8 +701,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: f42c5604726d4d21a840418e5668287c
               name: 'ZYXEL MGS3520-28x: Port {#SNMPINDEX}: Interface description'
@@ -636,8 +728,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: cfd32eee855647b79c95d6f151f13407
               name: 'ZYXEL MGS3520-28x: Port {#SNMPINDEX}: Operational status'
@@ -659,8 +757,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: abb9d47ee9624d6f9805e6eedd5532c5
@@ -677,6 +781,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 26f87786719c4192949536c74c146b4d
               name: 'ZYXEL MGS3520-28x: Port {#SNMPINDEX}: Outgoing broadcast packages'
@@ -698,8 +806,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 4227a6eb8cce4dd8ab582ffce2788e6e
               name: 'ZYXEL MGS3520-28x: Port {#SNMPINDEX}: Outgoing multicast packages'
@@ -722,8 +836,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 9a7eb0b7569d4111a33d84d03b5018e4
               name: 'ZYXEL MGS3520-28x: Port {#SNMPINDEX}: Outgoing traffic'
@@ -748,8 +868,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 768be526caa345b2b23996016a19e217
               name: 'ZYXEL MGS3520-28x: Port {#SNMPINDEX}: Outgoing unicast packages'
@@ -771,8 +897,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: e2b22f4c39974628a4476120b310a6fb
               name: 'ZYXEL MGS3520-28x: Port {#SNMPINDEX}: Outgoing utilization'
@@ -796,8 +928,14 @@ zabbix_export:
                     - 'return +parseFloat(value).toFixed(0);'
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 285f30d057f8438ab0d94367bcd6bdfc
               name: 'ZYXEL MGS3520-28x: Port {#SNMPINDEX}: Speed Duplex'
@@ -824,8 +962,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           graph_prototypes:
             -
               uuid: a7a2aec27f0045eba26e86e8cb08853a
@@ -961,8 +1105,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#ZYXEL.SFP.PORT}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 27cd25ea30fa4f1c9b7b431218241d0c
@@ -970,12 +1120,20 @@ zabbix_export:
                   name: 'ZYXEL MGS3520-28x: SFP {#ZYXEL.SFP.PORT}: High {#ZYXEL.SFP.DESCRIPTION} (over {#ZYXEL.SFP.WARN.MAX}{#ZYXEL.SFP.UNIT})'
                   priority: WARNING
                   description: 'The upper threshold value of the parameter is exceeded'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: 1188909e81c14c23aa9eefbb25a4c367
                   expression: 'last(/ZYXEL MGS3520-28x SNMP/zyxel.3520_28.sfp.ddm[{#SNMPINDEX}]) < {#ZYXEL.SFP.WARN.MIN}'
                   name: 'ZYXEL MGS3520-28x: SFP {#ZYXEL.SFP.PORT}: Low {#ZYXEL.SFP.DESCRIPTION} (less than {#ZYXEL.SFP.WARN.MIN}{#ZYXEL.SFP.UNIT})'
                   priority: WARNING
                   description: 'The parameter values are less than the lower threshold'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
           graph_prototypes:
             -
               uuid: 5d6e873606684351a68d649a8f7cd5d4
@@ -1049,8 +1207,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 743a5eaf2c1049d4bf517c7e6f1f350d
               name: 'ZYXEL MGS3520-28x: SFP {#SNMPINDEX}: Part number'
@@ -1071,8 +1235,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: e40f07be73ca4e15acc109f8565f491b
               name: 'ZYXEL MGS3520-28x: SFP {#SNMPINDEX}: Revision'
@@ -1093,8 +1263,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 42db7a2affe54f059015adeae188efea
               name: 'ZYXEL MGS3520-28x: SFP {#SNMPINDEX}: Serial number'
@@ -1115,8 +1291,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: b9c3894fed8140c684be7c1fe2bbca8d
@@ -1125,6 +1307,10 @@ zabbix_export:
                   priority: INFO
                   description: 'SFP {#SNMPINDEX} serial number has changed. Ack to close'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 8ff52d1298f74fa0a211c80373c25f9b
               name: 'ZYXEL MGS3520-28x: SFP {#SNMPINDEX}: Status'
@@ -1145,8 +1331,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: b11f1d31e3a04b39b6e9ec40a800a7d5
               name: 'ZYXEL MGS3520-28x: SFP {#SNMPINDEX}: Transceiver'
@@ -1167,8 +1359,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 2656c166a30d4ee19465c8e9b2986a10
               name: 'ZYXEL MGS3520-28x: SFP {#SNMPINDEX}: Vendor'
@@ -1189,8 +1387,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
         -
           uuid: 0fa2bd401cc14847a8fd366b895a6a51
           name: 'Temperature discovery'
@@ -1218,8 +1422,11 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: sensor
+                -
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: c2d4142fb8934eb7b66f5a5e4fa04398
@@ -1228,6 +1435,10 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the temperature'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
           graph_prototypes:
             -
               uuid: 96fcc6df9a324347a550dd0df84ac15a
@@ -1270,8 +1481,11 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Power supply'
+                  tag: component
+                  value: sensor
+                -
+                  tag: component
+                  value: voltage
               trigger_prototypes:
                 -
                   uuid: 22b6f2f48eae4167b31c8fe3ccbc138a
@@ -1280,6 +1494,10 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the power supply'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
           graph_prototypes:
             -
               uuid: 74f0c4aba0db42869c1797c0631b7d03
@@ -1302,6 +1520,22 @@ zabbix_export:
                   outArr.push(item)
                   });
                   return JSON.stringify(outArr);
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: mgs3520-28
+        -
+          tag: target
+          value: mgs3520-28f
+        -
+          tag: target
+          value: switch
+        -
+          tag: target
+          value: zyxel
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/net/zyxel_snmp/zyxel_xgs-4728f_snmp/README.md b/templates/net/zyxel_snmp/zyxel_xgs-4728f_snmp/README.md
index 15216804d0f..88a766c4bda 100644
--- a/templates/net/zyxel_snmp/zyxel_xgs-4728f_snmp/README.md
+++ b/templates/net/zyxel_snmp/zyxel_xgs-4728f_snmp/README.md
@@ -47,12 +47,12 @@ There are no template links in this template.
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
 |Fan discovery |<p>An entry in fanRpmTable.</p> |SNMP |zyxel.4728f.fan.discovery |
-|Temperature discovery |<p>An entry in tempTable.</p><p>Index of temperature unit. 1:MAC, 2:CPU, 3:PHY</p> |SNMP |zyxel.4728f.temp.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
-|Voltage discovery |<p>An entry in voltageTable.</p> |SNMP |zyxel.4728f.volt.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
 |Interface discovery |<p>-</p> |SNMP |zyxel.4728f.net.if.discovery<p>**Filter**:</p>AND <p>- {#ZYXEL.IF.NAME} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.NAME.MATCHES}`</p><p>- {#ZYXEL.IF.NAME} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.NAME.NOT_MATCHES}`</p><p>- {#ZYXEL.IF.LINKUPTYPE} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.MATCHES}`</p><p>- {#ZYXEL.IF.LINKUPTYPE} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.LINKUPTYPE.NOT_MATCHES}`</p><p>**Overrides:**</p><p>Don't create triggers for matching interface<br> - {#ZYXEL.IF.NAME} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}`<br>  - TRIGGER_PROTOTYPE REGEXP `.*` - NO_DISCOVER</p> |
-|SFP without DDM discovery |<p>SFP module discovery.</p> |SNMP |zyxel.4728f.sfp.discovery<p>**Filter**:</p>AND <p>- {#ZYXEL.SFP.STATUS} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFP.STATUS.MATCHES}`</p><p>- {#ZYXEL.SFP.STATUS} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFP.STATUS.NOT_MATCHES}`</p> |
-|SFP with DDM discovery |<p>SFP DDM module discovery.</p> |SNMP |zyxel.4728f.sfp.ddm.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>**Filter**:</p>AND <p>- {#ZYXEL.SFP.DESCRIPTION} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFPDDM.DESC.MATCHES}`</p><p>- {#ZYXEL.SFP.DESCRIPTION} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFPDDM.DESC.NOT_MATCHES}`</p> |
 |Memory pool discovery |<p>-</p> |SNMP |zyxel.4728f.memory.discovery |
+|SFP with DDM discovery |<p>SFP DDM module discovery.</p> |SNMP |zyxel.4728f.sfp.ddm.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>**Filter**:</p>AND <p>- {#ZYXEL.SFP.DESCRIPTION} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFPDDM.DESC.MATCHES}`</p><p>- {#ZYXEL.SFP.DESCRIPTION} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFPDDM.DESC.NOT_MATCHES}`</p> |
+|SFP without DDM discovery |<p>SFP module discovery.</p> |SNMP |zyxel.4728f.sfp.discovery<p>**Filter**:</p>AND <p>- {#ZYXEL.SFP.STATUS} MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFP.STATUS.MATCHES}`</p><p>- {#ZYXEL.SFP.STATUS} NOT_MATCHES_REGEX `{$ZYXEL.LLD.FILTER.SFP.STATUS.NOT_MATCHES}`</p> |
+|Temperature discovery |<p>An entry in tempTable.</p><p>Index of temperature unit. 1:MAC, 2:CPU, 3:PHY</p> |SNMP |zyxel.4728f.temp.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
+|Voltage discovery |<p>An entry in voltageTable.</p> |SNMP |zyxel.4728f.volt.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
 
 ## Items collected
 
@@ -68,32 +68,32 @@ There are no template links in this template.
 |Inventory |ZYXEL XGS-4728F: ZyNOS F/W Version |<p>MIB: ZYXEL-XGS4728F-MIB</p> |SNMP |zyxel.4728f.fwversion<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
 |Inventory |ZYXEL XGS-4728F: Hardware serial number |<p>MIB: ZYXEL-XGS4728F-MIB</p><p>Serial number</p> |SNMP |zyxel.4728f.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Memory |ZYXEL XGS-4728F: Memory "{#ZYXEL.MEMORY.NAME}" utilization |<p>MIB: ZYXEL-XGS4728F-MIB</p><p>Utilization of memory pool in %.</p> |SNMP |zyxel.4728f.memory[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL XGS-4728F: Port {#SNMPINDEX}: Speed Duplex |<p>MIB:  ZYXEL-XGS4728F-MIB</p><p>Transmission mode</p> |SNMP |zyxel.4728f.net.if.speed_duplex[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL XGS-4728F: Port {#SNMPINDEX}: Interface description |<p>MIB:  ZYXEL-XGS4728F-MIB</p><p>A textual string containing information about the interface</p> |SNMP |zyxel.4728f.net.if.name[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL XGS-4728F: Port {#SNMPINDEX}: Link type |<p>MIB:  ZYXEL-XGS4728F-MIB</p><p>Physical connection type</p> |SNMP |zyxel.4728f.net.if.link_type[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL XGS-4728F: Port {#SNMPINDEX}: Interface name |<p>MIB: IF-MIB</p><p>A textual string containing information about the interface</p> |SNMP |zyxel.4728f.net.if.descr[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL XGS-4728F: Port {#SNMPINDEX}: Operational status |<p>MIB: IF-MIB</p><p>The current operational state of the interface.</p><p>The testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.4728f.net.if.operstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL XGS-4728F: Port {#SNMPINDEX}: Administrative status |<p>MIB: IF-MIB</p><p>The desired state of the interface.  The</p><p>testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.4728f.net.if.adminstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL XGS-4728F: Port {#SNMPINDEX}: Incoming traffic |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface,</p><p>including framing characters.</p> |SNMP |zyxel.4728f.net.if.in.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL XGS-4728F: Port {#SNMPINDEX}: Incoming unicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were not addressed to a multicast</p><p>or broadcast address at this sub-layer</p> |SNMP |zyxel.4728f.net.if.in.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL XGS-4728F: Port {#SNMPINDEX}: Incoming multicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a multicast</p><p>address at this sub-layer.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.4728f.net.if.in.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL XGS-4728F: Port {#SNMPINDEX}: Incoming broadcast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a broadcast</p><p>address at this sub-layer.</p> |SNMP |zyxel.4728f.net.if.in.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL XGS-4728F: Port {#SNMPINDEX}: Outgoing traffic |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the</p><p>interface, including framing characters.  This object is a</p><p>64-bit version of ifOutOctets.</p> |SNMP |zyxel.4728f.net.if.out.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL XGS-4728F: Port {#SNMPINDEX}: Outgoing unicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were not addressed to a</p><p>multicast or broadcast address at this sub-layer, including</p><p>those that were discarded or not sent.</p> |SNMP |zyxel.4728f.net.if.out.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL XGS-4728F: Port {#SNMPINDEX}: Outgoing multicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>multicast address at this sub-layer, including those that</p><p>were discarded or not sent.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.4728f.net.if.out.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL XGS-4728F: Port {#SNMPINDEX}: Outgoing broadcast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>broadcast address at this sub-layer, including those that</p><p>were discarded or not sent.</p> |SNMP |zyxel.4728f.net.if.out.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |ZYXEL XGS-4728F: Port {#SNMPINDEX}: Link speed |<p>MIB: IF-MIB</p><p>An estimate of the interface's current bandwidth in bits per second</p> |SNMP |zyxel.4728f.net.if.highspeed[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1000000`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Network_interfaces |ZYXEL XGS-4728F: Port {#SNMPINDEX}: Incoming utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.4728f.net.if.in.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(//zyxel.4728f.net.if.in.traffic[{#SNMPINDEX}]) * (last(//zyxel.4728f.net.if.highspeed[{#SNMPINDEX}]) <> 0) / ( last(//zyxel.4728f.net.if.highspeed[{#SNMPINDEX}]) + (last(//zyxel.4728f.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100` |
-|Network_interfaces |ZYXEL XGS-4728F: Port {#SNMPINDEX}: Outgoing utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.4728f.net.if.out.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(//zyxel.4728f.net.if.out.traffic[{#SNMPINDEX}]) * (last(//zyxel.4728f.net.if.highspeed[{#SNMPINDEX}]) <> 0) / ( last(//zyxel.4728f.net.if.highspeed[{#SNMPINDEX}]) + (last(//zyxel.4728f.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100` |
-|Network_interfaces |ZYXEL XGS-4728F: SFP {#SNMPINDEX}: Status |<p>MIB: ZYXEL-XGS4728F-MIB</p><p>Transceiver module status.</p> |SNMP |zyxel.4728f.sfp.status[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL XGS-4728F: SFP {#SNMPINDEX}: Vendor |<p>MIB: ZYXEL-XGS4728F-MIB</p><p>Transceiver module vendor name.</p> |SNMP |zyxel.4728f.sfp.vendor[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL XGS-4728F: SFP {#SNMPINDEX}: Part number |<p>MIB: ZYXEL-XGS4728F-MIB</p><p>Part number provided by transceiver module vendor.</p> |SNMP |zyxel.4728f.sfp.part[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL XGS-4728F: SFP {#SNMPINDEX}: Serial number |<p>MIB: ZYXEL-XGS4728F-MIB</p><p>Serial number provided by transceiver module vendor.</p> |SNMP |zyxel.4728f.sfp.serialnumber[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL XGS-4728F: SFP {#SNMPINDEX}: Revision |<p>MIB: ZYXEL-XGS4728F-MIB</p><p>Revision level for part number provided by transceiver module vendor.</p> |SNMP |zyxel.4728f.sfp.revision[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL XGS-4728F: SFP {#SNMPINDEX}: Date code |<p>MIB: ZYXEL-XGS4728F-MIB</p><p>Transceiver module vendor's manufacturing date code.</p> |SNMP |zyxel.4728f.sfp.datecode[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL XGS-4728F: SFP {#SNMPINDEX}: Transceiver |<p>MIB: ZYXEL-XGS4728F-MIB</p><p>Transceiver module type names.</p> |SNMP |zyxel.4728f.sfp.transceiver[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Network_interfaces |ZYXEL XGS-4728F: SFP {#ZYXEL.SFP.PORT}: {#ZYXEL.SFP.DESCRIPTION} |<p>MIB: ZYXEL-XGS4728F-MIB</p><p>Transceiver module DDM data ({#ZYXEL.SFP.DESCRIPTION}).</p> |SNMP |zyxel.4728f.sfp.ddm[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.01`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Power_supply |ZYXEL XGS-4728F: Nominal "{#ZYXEL.VOLT.NOMINAL}" |<p>MIB: ZYXEL-XGS4728F-MIB</p><p>The current voltage reading.</p> |SNMP |zyxel.4728f.volt[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL XGS-4728F: Port {#SNMPINDEX}: Speed Duplex |<p>MIB:  ZYXEL-XGS4728F-MIB</p><p>Transmission mode</p> |SNMP |zyxel.4728f.net.if.speed_duplex[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL XGS-4728F: Port {#SNMPINDEX}: Interface description |<p>MIB:  ZYXEL-XGS4728F-MIB</p><p>A textual string containing information about the interface</p> |SNMP |zyxel.4728f.net.if.name[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL XGS-4728F: Port {#SNMPINDEX}: Link type |<p>MIB:  ZYXEL-XGS4728F-MIB</p><p>Physical connection type</p> |SNMP |zyxel.4728f.net.if.link_type[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL XGS-4728F: Port {#SNMPINDEX}: Interface name |<p>MIB: IF-MIB</p><p>A textual string containing information about the interface</p> |SNMP |zyxel.4728f.net.if.descr[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL XGS-4728F: Port {#SNMPINDEX}: Operational status |<p>MIB: IF-MIB</p><p>The current operational state of the interface.</p><p>The testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.4728f.net.if.operstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL XGS-4728F: Port {#SNMPINDEX}: Administrative status |<p>MIB: IF-MIB</p><p>The desired state of the interface.  The</p><p>testing(3) state indicates that no operational</p><p>packets can be passed.</p> |SNMP |zyxel.4728f.net.if.adminstatus[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL XGS-4728F: Port {#SNMPINDEX}: Incoming traffic |<p>MIB: IF-MIB</p><p>The total number of octets received on the interface,</p><p>including framing characters.</p> |SNMP |zyxel.4728f.net.if.in.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL XGS-4728F: Port {#SNMPINDEX}: Incoming unicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were not addressed to a multicast</p><p>or broadcast address at this sub-layer</p> |SNMP |zyxel.4728f.net.if.in.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL XGS-4728F: Port {#SNMPINDEX}: Incoming multicast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a multicast</p><p>address at this sub-layer.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.4728f.net.if.in.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL XGS-4728F: Port {#SNMPINDEX}: Incoming broadcast packages |<p>MIB: IF-MIB</p><p>The number of packets, delivered by this sub-layer to a</p><p>higher (sub-)layer, which were addressed to a broadcast</p><p>address at this sub-layer.</p> |SNMP |zyxel.4728f.net.if.in.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL XGS-4728F: Port {#SNMPINDEX}: Outgoing traffic |<p>MIB: IF-MIB</p><p>The total number of octets transmitted out of the</p><p>interface, including framing characters.  This object is a</p><p>64-bit version of ifOutOctets.</p> |SNMP |zyxel.4728f.net.if.out.traffic[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `8`</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL XGS-4728F: Port {#SNMPINDEX}: Outgoing unicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were not addressed to a</p><p>multicast or broadcast address at this sub-layer, including</p><p>those that were discarded or not sent.</p> |SNMP |zyxel.4728f.net.if.out.ucastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL XGS-4728F: Port {#SNMPINDEX}: Outgoing multicast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>multicast address at this sub-layer, including those that</p><p>were discarded or not sent.  For a MAC layer protocol, this</p><p>includes both Group and Functional addresses.</p> |SNMP |zyxel.4728f.net.if.out.multicastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL XGS-4728F: Port {#SNMPINDEX}: Outgoing broadcast packages |<p>MIB: IF-MIB</p><p>The total number of packets that higher-level protocols</p><p>requested be transmitted, and which were addressed to a</p><p>broadcast address at this sub-layer, including those that</p><p>were discarded or not sent.</p> |SNMP |zyxel.4728f.net.if.out.broadcastpkts[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |ZYXEL XGS-4728F: Port {#SNMPINDEX}: Link speed |<p>MIB: IF-MIB</p><p>An estimate of the interface's current bandwidth in bits per second</p> |SNMP |zyxel.4728f.net.if.highspeed[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1000000`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Network interfaces |ZYXEL XGS-4728F: Port {#SNMPINDEX}: Incoming utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.4728f.net.if.in.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(//zyxel.4728f.net.if.in.traffic[{#SNMPINDEX}]) * (last(//zyxel.4728f.net.if.highspeed[{#SNMPINDEX}]) <> 0) / ( last(//zyxel.4728f.net.if.highspeed[{#SNMPINDEX}]) + (last(//zyxel.4728f.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100` |
+|Network interfaces |ZYXEL XGS-4728F: Port {#SNMPINDEX}: Outgoing utilization |<p>Interface utilization percentage</p> |CALCULATED |zyxel.4728f.net.if.out.util[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- IN_RANGE: `0 100`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- JAVASCRIPT: `return +parseFloat(value).toFixed(0); `</p><p>**Expression**:</p>`last(//zyxel.4728f.net.if.out.traffic[{#SNMPINDEX}]) * (last(//zyxel.4728f.net.if.highspeed[{#SNMPINDEX}]) <> 0) / ( last(//zyxel.4728f.net.if.highspeed[{#SNMPINDEX}]) + (last(//zyxel.4728f.net.if.highspeed[{#SNMPINDEX}]) = 0) ) * 100` |
+|Network interfaces |ZYXEL XGS-4728F: SFP {#SNMPINDEX}: Status |<p>MIB: ZYXEL-XGS4728F-MIB</p><p>Transceiver module status.</p> |SNMP |zyxel.4728f.sfp.status[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL XGS-4728F: SFP {#SNMPINDEX}: Vendor |<p>MIB: ZYXEL-XGS4728F-MIB</p><p>Transceiver module vendor name.</p> |SNMP |zyxel.4728f.sfp.vendor[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL XGS-4728F: SFP {#SNMPINDEX}: Part number |<p>MIB: ZYXEL-XGS4728F-MIB</p><p>Part number provided by transceiver module vendor.</p> |SNMP |zyxel.4728f.sfp.part[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL XGS-4728F: SFP {#SNMPINDEX}: Serial number |<p>MIB: ZYXEL-XGS4728F-MIB</p><p>Serial number provided by transceiver module vendor.</p> |SNMP |zyxel.4728f.sfp.serialnumber[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL XGS-4728F: SFP {#SNMPINDEX}: Revision |<p>MIB: ZYXEL-XGS4728F-MIB</p><p>Revision level for part number provided by transceiver module vendor.</p> |SNMP |zyxel.4728f.sfp.revision[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL XGS-4728F: SFP {#SNMPINDEX}: Date code |<p>MIB: ZYXEL-XGS4728F-MIB</p><p>Transceiver module vendor's manufacturing date code.</p> |SNMP |zyxel.4728f.sfp.datecode[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL XGS-4728F: SFP {#SNMPINDEX}: Transceiver |<p>MIB: ZYXEL-XGS4728F-MIB</p><p>Transceiver module type names.</p> |SNMP |zyxel.4728f.sfp.transceiver[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Network interfaces |ZYXEL XGS-4728F: SFP {#ZYXEL.SFP.PORT}: {#ZYXEL.SFP.DESCRIPTION} |<p>MIB: ZYXEL-XGS4728F-MIB</p><p>Transceiver module DDM data ({#ZYXEL.SFP.DESCRIPTION}).</p> |SNMP |zyxel.4728f.sfp.ddm[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.01`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Power supply |ZYXEL XGS-4728F: Nominal "{#ZYXEL.VOLT.NOMINAL}" |<p>MIB: ZYXEL-XGS4728F-MIB</p><p>The current voltage reading.</p> |SNMP |zyxel.4728f.volt[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.001`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Status |ZYXEL XGS-4728F: SNMP agent availability |<p>-</p> |INTERNAL |zabbix[host,snmp,available]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
 |Status |ZYXEL XGS-4728F: Uptime |<p>MIB: RFC1213-MIB</p><p>The time (in hundredths of a second) since the</p><p>network management portion of the system was last</p><p>re-initialized.</p> |SNMP |zyxel.4728f.uptime<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.01`</p> |
 |Temperature |ZYXEL XGS-4728F: Temperature "{#ZYXEL.TEMP.ID}" |<p>MIB: ZYXEL-XGS4728F-MIB</p><p>The current temperature measured at this sensor</p> |SNMP |zyxel.4728f.temp[{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
@@ -121,7 +121,7 @@ There are no template links in this template.
 
 Please report any issues with the template at https://support.zabbix.com
 
-You can also provide a feedback, discuss the template or ask for help with it at [ZABBIX forums](https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/422668-discussion-thread-for-official-zabbix-templates-for-zyxel).
+You can also provide feedback, discuss the template or ask for help with it at [ZABBIX forums](https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/422668-discussion-thread-for-official-zabbix-templates-for-zyxel).
 
 ## Known Issues
 
diff --git a/templates/net/zyxel_snmp/zyxel_xgs-4728f_snmp/template_net_zyxel_xgs-4728f_snmp.yaml b/templates/net/zyxel_snmp/zyxel_xgs-4728f_snmp/template_net_zyxel_xgs-4728f_snmp.yaml
index 22c803ff7f1..34cba19ead5 100644
--- a/templates/net/zyxel_snmp/zyxel_xgs-4728f_snmp/template_net_zyxel_xgs-4728f_snmp.yaml
+++ b/templates/net/zyxel_snmp/zyxel_xgs-4728f_snmp/template_net_zyxel_xgs-4728f_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-17T06:34:56Z'
+  date: '2022-01-26T09:46:03Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -27,7 +27,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/422668-discussion-thread-for-official-zabbix-templates-for-zyxel
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: 'Templates/Network devices'
@@ -47,8 +47,8 @@ zabbix_export:
                 - 1h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: network
           triggers:
             -
               uuid: fd9a321842544253896e5a4c1a58ced3
@@ -57,6 +57,10 @@ zabbix_export:
               opdata: 'Current state: {ITEM.LASTVALUE1}'
               priority: WARNING
               description: 'SNMP is not available for polling. Please check device connectivity and SNMP settings.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 23ae05ce4d5c4022a716ed9e8e701ae9
           name: 'ZYXEL XGS-4728F: Contact'
@@ -80,8 +84,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
         -
           uuid: 1cccb7e7616944aa8747508e96f54968
           name: 'ZYXEL XGS-4728F: CPU utilization'
@@ -97,8 +101,8 @@ zabbix_export:
             getting the values.
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
           triggers:
             -
               uuid: 20f368f955f74fc9b8380b1bbff7e057
@@ -107,6 +111,10 @@ zabbix_export:
               opdata: 'Current utilization: {ITEM.LASTVALUE1}'
               priority: WARNING
               description: 'CPU utilization is too high. The system might be slow to respond.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 222a051f0b84433faa6f29237b6d1552
           name: 'ZYXEL XGS-4728F: ZyNOS F/W Version'
@@ -139,8 +147,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
           triggers:
             -
               uuid: 5da304609e8c45d980c46579f6848f0a
@@ -150,6 +158,10 @@ zabbix_export:
               priority: INFO
               description: 'Firmware version has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: cc5065f635bc486cb90898f842fa8a61
           name: 'ZYXEL XGS-4728F: Location'
@@ -172,8 +184,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
         -
           uuid: 9a646e8e82c844c08754c7e72e161712
           name: 'ZYXEL XGS-4728F: MAC address'
@@ -199,8 +211,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
         -
           uuid: a152c262c465441da0f1924bc7614a23
           name: 'ZYXEL XGS-4728F: Hardware model name'
@@ -227,8 +239,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
           triggers:
             -
               uuid: 0329f3f5aa6a4315a4f3611ad662103e
@@ -236,6 +248,10 @@ zabbix_export:
               name: 'ZYXEL XGS-4728F: Template does not match hardware'
               priority: INFO
               description: 'This template is for Zyxel XGS-4728F, but connected to {ITEM.VALUE}'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 49e365a43809409f8d4636f88e4d64a9
           name: 'ZYXEL XGS-4728F: Host name'
@@ -259,8 +275,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
         -
           uuid: 79c80ac11d854edea93a598c4b28ffc0
           name: 'ZYXEL XGS-4728F: Hardware serial number'
@@ -282,8 +298,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: inventory
           triggers:
             -
               uuid: 4df7c31c3079411baabd4ae66e580652
@@ -292,6 +308,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: b3302cbfbae64d55a638240ffb368b9c
           name: 'ZYXEL XGS-4728F: Uptime'
@@ -314,8 +334,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 36b9a7d3d3fb45f782a5ea05de6816f9
@@ -324,6 +344,10 @@ zabbix_export:
               priority: INFO
               description: 'Uptime is less than 10 minutes'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
       discovery_rules:
         -
           uuid: bc0d797343b240bdbd5765dc2e7821fd
@@ -352,8 +376,11 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: Fans
+                  tag: component
+                  value: fan
+                -
+                  tag: component
+                  value: sensor
               trigger_prototypes:
                 -
                   uuid: 012219b8b16941b59d1f9a3f685e9f38
@@ -362,6 +389,10 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the fan unit'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
           graph_prototypes:
             -
               uuid: 96aed516a0254866b0d0b43095b8a5b7
@@ -398,8 +429,8 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: Memory
+                  tag: component
+                  value: memory
               trigger_prototypes:
                 -
                   uuid: 90b328c3b56c417eb938091338bd07fc
@@ -407,6 +438,10 @@ zabbix_export:
                   name: 'ZYXEL XGS-4728F: High memory utilization in "{#ZYXEL.MEMORY.NAME}" pool (>{$MEMORY.UTIL.MAX}% for 5m)'
                   priority: AVERAGE
                   description: 'The system is running out of free memory.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 75a0f2676e134b6e8ab9e8c11ac17d57
           name: 'Interface discovery'
@@ -457,8 +492,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: dbc94a6eabd64eefbe97f57f8831e834
               name: 'ZYXEL XGS-4728F: Port {#SNMPINDEX}: Interface name'
@@ -478,8 +519,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 840096d5a418425c851ea7d236b7e34e
               name: 'ZYXEL XGS-4728F: Port {#SNMPINDEX}: Link speed'
@@ -502,8 +549,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 0105dea3226d46f8868aa07aa3f416a2
               name: 'ZYXEL XGS-4728F: Port {#SNMPINDEX}: Incoming broadcast packages'
@@ -524,8 +577,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: de7b202e7240422dbdbc40e78689e6fe
               name: 'ZYXEL XGS-4728F: Port {#SNMPINDEX}: Incoming multicast packages'
@@ -547,8 +606,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 075b04bdaff54a2cafc1b177e59df3be
               name: 'ZYXEL XGS-4728F: Port {#SNMPINDEX}: Incoming traffic'
@@ -572,8 +637,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: c2a8e3985ed1414789b1bfe226de6d37
               name: 'ZYXEL XGS-4728F: Port {#SNMPINDEX}: Incoming unicast packages'
@@ -594,8 +665,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 72f7ee1e5099452aa4804d988adfb7a5
               name: 'ZYXEL XGS-4728F: Port {#SNMPINDEX}: Incoming utilization'
@@ -619,8 +696,14 @@ zabbix_export:
                     - 'return +parseFloat(value).toFixed(0);'
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: db488317d10e43eea21ecaa74d7a58dc
               name: 'ZYXEL XGS-4728F: Port {#SNMPINDEX}: Link type'
@@ -640,8 +723,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 8877747043f94216b92ef7f097925d8e
               name: 'ZYXEL XGS-4728F: Port {#SNMPINDEX}: Interface description'
@@ -661,8 +750,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: b091be1b0a8f415b82d73b3537cf6187
               name: 'ZYXEL XGS-4728F: Port {#SNMPINDEX}: Operational status'
@@ -684,8 +779,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 3f3ce5111d47490382cb0c18e2d36f77
@@ -702,6 +803,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: ad7378144b254962aad0a73fb151e097
               name: 'ZYXEL XGS-4728F: Port {#SNMPINDEX}: Outgoing broadcast packages'
@@ -723,8 +828,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 67b776b7f51e4b24bad3b616979d7f98
               name: 'ZYXEL XGS-4728F: Port {#SNMPINDEX}: Outgoing multicast packages'
@@ -747,8 +858,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 4afef8d3601646f1bfc81090b090c11c
               name: 'ZYXEL XGS-4728F: Port {#SNMPINDEX}: Outgoing traffic'
@@ -773,8 +890,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: ba1b314aacd0449fa0c9730fdb8ee3f9
               name: 'ZYXEL XGS-4728F: Port {#SNMPINDEX}: Outgoing unicast packages'
@@ -796,8 +919,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 7941df5f5b884b33bcda9951e4b0158d
               name: 'ZYXEL XGS-4728F: Port {#SNMPINDEX}: Outgoing utilization'
@@ -821,8 +950,14 @@ zabbix_export:
                     - 'return +parseFloat(value).toFixed(0);'
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: f56f1c0cf5d34435895ea489eb71b84a
               name: 'ZYXEL XGS-4728F: Port {#SNMPINDEX}: Speed Duplex'
@@ -842,8 +977,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           graph_prototypes:
             -
               uuid: 18c2bd830caa49308459d64ef85cfc71
@@ -979,8 +1120,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#ZYXEL.SFP.PORT}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 409c52cfed074352810bacfd52aa89f0
@@ -988,12 +1135,20 @@ zabbix_export:
                   name: 'ZYXEL XGS-4728F: SFP {#ZYXEL.SFP.PORT}: High {#ZYXEL.SFP.DESCRIPTION} (over {#ZYXEL.SFP.WARN.MAX}{#ZYXEL.SFP.UNIT})'
                   priority: WARNING
                   description: 'The upper threshold value of the parameter is exceeded'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: a2c40df40a334f6da00a438eb70f8374
                   expression: 'last(/ZYXEL XGS-4728F SNMP/zyxel.4728f.sfp.ddm[{#SNMPINDEX}]) < {#ZYXEL.SFP.WARN.MIN}'
                   name: 'ZYXEL XGS-4728F: SFP {#ZYXEL.SFP.PORT}: Low {#ZYXEL.SFP.DESCRIPTION} (less than {#ZYXEL.SFP.WARN.MIN}{#ZYXEL.SFP.UNIT})'
                   priority: WARNING
                   description: 'The parameter values are less than the lower threshold'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
           graph_prototypes:
             -
               uuid: 109ff7d258524b82bdbf4662e612795b
@@ -1067,8 +1222,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: c585762763604f83a9d14b7df21188ee
               name: 'ZYXEL XGS-4728F: SFP {#SNMPINDEX}: Part number'
@@ -1089,8 +1250,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 33395170c38043828cedbfbedea959cc
               name: 'ZYXEL XGS-4728F: SFP {#SNMPINDEX}: Revision'
@@ -1111,8 +1278,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 175f4200563549a0ae1ebaed18eeb636
               name: 'ZYXEL XGS-4728F: SFP {#SNMPINDEX}: Serial number'
@@ -1133,8 +1306,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 632be557ffed439e98425eaa59361e50
@@ -1143,6 +1322,10 @@ zabbix_export:
                   priority: INFO
                   description: 'SFP {#SNMPINDEX} serial number has changed. Ack to close'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 5d3d0c6135924b2088b2f97d30a743cb
               name: 'ZYXEL XGS-4728F: SFP {#SNMPINDEX}: Status'
@@ -1163,8 +1346,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: b16f7fe769a74ea99aafaa60a97d286c
               name: 'ZYXEL XGS-4728F: SFP {#SNMPINDEX}: Transceiver'
@@ -1185,8 +1374,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 5abb9b467e934873808b4b49bdd74f5f
               name: 'ZYXEL XGS-4728F: SFP {#SNMPINDEX}: Vendor'
@@ -1207,8 +1402,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Port {#SNMPINDEX}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
         -
           uuid: fa0881c21d834db1b421ae727254bff9
           name: 'Temperature discovery'
@@ -1238,8 +1439,11 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: sensor
+                -
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 6181f094ae4c4cf4ae4b2e198e2f9b6e
@@ -1248,6 +1452,10 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the temperature'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
           graph_prototypes:
             -
               uuid: 1068300241bb430b8c51048303922e55
@@ -1303,8 +1511,11 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Power supply'
+                  tag: component
+                  value: sensor
+                -
+                  tag: component
+                  value: voltage
               trigger_prototypes:
                 -
                   uuid: 631202a132dc44afa90b0537f9957ee1
@@ -1313,6 +1524,10 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the power supply'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
           graph_prototypes:
             -
               uuid: 560c37d174e741a6a2590d17574123ed
@@ -1336,6 +1551,19 @@ zabbix_export:
                   outArr.push(item)
                   });
                   return JSON.stringify(outArr);
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: switch
+        -
+          tag: target
+          value: xgs-4728f
+        -
+          tag: target
+          value: zyxel
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/os/aix/template_os_aix.yaml b/templates/os/aix/template_os_aix.yaml
index d0814571df7..2c6ff6ba2b2 100644
--- a/templates/os/aix/template_os_aix.yaml
+++ b/templates/os/aix/template_os_aix.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:36:31Z'
+  date: '2022-01-26T10:42:28Z'
   groups:
     -
       uuid: 846977d1dfed4968bc5f8bdb363285bc
@@ -35,8 +35,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: 'Monitoring agent'
+              tag: component
+              value: system
         -
           uuid: 05849e0fb6504d339f2aebe159427bec
           name: 'Zabbix agent ping'
@@ -47,8 +47,8 @@ zabbix_export:
             name: 'Zabbix agent ping status'
           tags:
             -
-              tag: Application
-              value: 'Monitoring agent'
+              tag: component
+              value: system
         -
           uuid: fe4731720ba64eebbf125929e499209b
           name: 'Version of Zabbix agent running'
@@ -64,8 +64,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: 'Monitoring agent'
+              tag: component
+              value: application
         -
           uuid: 2c2d08ab5833493ba45ebfe5154f04c1
           name: 'Number of running processes'
@@ -74,14 +74,21 @@ zabbix_export:
           description: 'Number of processes in running state.'
           tags:
             -
-              tag: Application
-              value: Processes
+              tag: component
+              value: os
+            -
+              tag: component
+              value: processes
           triggers:
             -
               uuid: 458180bc0f14468386429964f877cce7
               expression: 'avg(/AIX by Zabbix agent/proc.num[,,run],5m)>30'
               name: 'Too many processes running'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 7c64480f840a4778bde5278e1c0a083f
           name: 'Number of processes'
@@ -90,14 +97,21 @@ zabbix_export:
           description: 'Total number of processes in any state.'
           tags:
             -
-              tag: Application
-              value: Processes
+              tag: component
+              value: os
+            -
+              tag: component
+              value: processes
           triggers:
             -
               uuid: 874ef8fe4a6445ff971800d2d9a50541
               expression: 'avg(/AIX by Zabbix agent/proc.num[],5m)>300'
               name: 'Too many processes'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 4a15778222a24f129b8ae7c240a32ded
           name: 'Interrupts per second'
@@ -111,11 +125,8 @@ zabbix_export:
                 - ''
           tags:
             -
-              tag: Application
-              value: CPU
-            -
-              tag: Application
-              value: Performance
+              tag: component
+              value: cpu
         -
           uuid: 4f8665f48aff4fa39e85639fed7b71c5
           name: 'Processor load (1 min average per core)'
@@ -125,17 +136,18 @@ zabbix_export:
           description: 'The processor load is calculated as system CPU load divided by number of CPU cores.'
           tags:
             -
-              tag: Application
-              value: CPU
-            -
-              tag: Application
-              value: Performance
+              tag: component
+              value: cpu
           triggers:
             -
               uuid: fdbedf15fe474fd18c045c62cf8cc7d6
               expression: 'avg(/AIX by Zabbix agent/system.cpu.load[percpu,avg1],5m)>5'
               name: 'Processor load is too high'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 6fa2275f1f83456abfe786c8565c7a2d
           name: 'Processor load (5 min average per core)'
@@ -145,11 +157,8 @@ zabbix_export:
           description: 'The processor load is calculated as system CPU load divided by number of CPU cores.'
           tags:
             -
-              tag: Application
-              value: CPU
-            -
-              tag: Application
-              value: Performance
+              tag: component
+              value: cpu
         -
           uuid: 02210ac2faaa4f7bb74e995726706abc
           name: 'Processor load (15 min average per core)'
@@ -159,11 +168,8 @@ zabbix_export:
           description: 'The processor load is calculated as system CPU load divided by number of CPU cores.'
           tags:
             -
-              tag: Application
-              value: CPU
-            -
-              tag: Application
-              value: Performance
+              tag: component
+              value: cpu
         -
           uuid: 1ad486947da9428abdebcecb83ca3d8b
           name: 'Context switches per second'
@@ -177,11 +183,8 @@ zabbix_export:
                 - ''
           tags:
             -
-              tag: Application
-              value: CPU
-            -
-              tag: Application
-              value: Performance
+              tag: component
+              value: cpu
         -
           uuid: f4d10d49fa3c4dababf03d2cb80f044c
           name: 'Host name'
@@ -199,17 +202,18 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: General
-            -
-              tag: Application
-              value: OS
+              tag: component
+              value: os
           triggers:
             -
               uuid: d1e70b7f465447a3ab575b3fd28755a1
               expression: 'last(/AIX by Zabbix agent/system.hostname,#1)<>last(/AIX by Zabbix agent/system.hostname,#2)'
               name: 'Hostname was changed'
               priority: INFO
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: aebc5bb0264a4f55985c96445964dfc4
           name: 'Host local time'
@@ -218,11 +222,8 @@ zabbix_export:
           units: unixtime
           tags:
             -
-              tag: Application
-              value: General
-            -
-              tag: Application
-              value: OS
+              tag: component
+              value: os
         -
           uuid: 081f8986446d43e7a3b72f7084576600
           name: 'CPU available physical processors in the shared pool'
@@ -232,14 +233,8 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: CPU
-            -
-              tag: Application
-              value: 'Logical partitions'
-            -
-              tag: Application
-              value: Performance
+              tag: component
+              value: cpu
         -
           uuid: 6a97d56a6c2e45e1b10b97e2395ff30d
           name: 'CPU entitled capacity consumed'
@@ -248,14 +243,8 @@ zabbix_export:
           value_type: FLOAT
           tags:
             -
-              tag: Application
-              value: CPU
-            -
-              tag: Application
-              value: 'Logical partitions'
-            -
-              tag: Application
-              value: Performance
+              tag: component
+              value: cpu
         -
           uuid: 142f33d7b2c3469c9664fedf4f053616
           name: 'CPU idle time'
@@ -265,11 +254,8 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: CPU
-            -
-              tag: Application
-              value: Performance
+              tag: component
+              value: cpu
         -
           uuid: 752c952fb18e4a0e8e5e3415b107b9f1
           name: 'CPU logical processor utilization'
@@ -279,14 +265,8 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: CPU
-            -
-              tag: Application
-              value: 'Logical partitions'
-            -
-              tag: Application
-              value: Performance
+              tag: component
+              value: cpu
         -
           uuid: 748f1316a33b48658b11dca8f45cfcce
           name: 'CPU number of physical processors consumed'
@@ -295,14 +275,8 @@ zabbix_export:
           value_type: FLOAT
           tags:
             -
-              tag: Application
-              value: CPU
-            -
-              tag: Application
-              value: 'Logical partitions'
-            -
-              tag: Application
-              value: Performance
+              tag: component
+              value: cpu
         -
           uuid: 2647132edb6647ca9ef43a00ca09ecbd
           name: 'CPU system time'
@@ -312,11 +286,8 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: CPU
-            -
-              tag: Application
-              value: Performance
+              tag: component
+              value: cpu
         -
           uuid: e990898ddbb74c7b9a8c1c67cb9544cf
           name: 'CPU user time'
@@ -326,11 +297,8 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: CPU
-            -
-              tag: Application
-              value: Performance
+              tag: component
+              value: cpu
         -
           uuid: 2cd7a00570ad487d9cdf39fd198b2c0b
           name: 'CPU iowait time'
@@ -340,11 +308,8 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: CPU
-            -
-              tag: Application
-              value: Performance
+              tag: component
+              value: cpu
           triggers:
             -
               uuid: c030cc99975d4fe3911789e58bbd5050
@@ -352,6 +317,10 @@ zabbix_export:
               name: 'Disk I/O is overloaded'
               priority: WARNING
               description: 'OS spends significant time waiting for I/O (input/output) operations. It could be indicator of performance issues with storage system.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 6748e4c87589472ca1474f3c7b729e0c
           name: 'Amount of data transferred'
@@ -361,11 +330,8 @@ zabbix_export:
           units: B
           tags:
             -
-              tag: Application
-              value: Filesystems
-            -
-              tag: Application
-              value: Performance
+              tag: component
+              value: storage
         -
           uuid: bf0180d8f109451db616749990a113a6
           name: 'Number of transfers'
@@ -374,11 +340,8 @@ zabbix_export:
           value_type: FLOAT
           tags:
             -
-              tag: Application
-              value: Filesystems
-            -
-              tag: Application
-              value: Performance
+              tag: component
+              value: storage
         -
           uuid: 3e1af0261f6a421d8ca554f8eb222716
           name: 'Processor units is entitled to receive'
@@ -388,11 +351,8 @@ zabbix_export:
           value_type: FLOAT
           tags:
             -
-              tag: Application
-              value: CPU
-            -
-              tag: Application
-              value: 'Logical partitions'
+              tag: component
+              value: cpu
         -
           uuid: 0fe71698a3c74c93a8cb3a937dc7226c
           name: 'Kernel thread context switches'
@@ -401,11 +361,8 @@ zabbix_export:
           value_type: FLOAT
           tags:
             -
-              tag: Application
-              value: CPU
-            -
-              tag: Application
-              value: Performance
+              tag: component
+              value: cpu
         -
           uuid: a1e13d2dbd8b4086974ea32a2cd743b1
           name: 'Device interrupts'
@@ -414,11 +371,8 @@ zabbix_export:
           value_type: FLOAT
           tags:
             -
-              tag: Application
-              value: CPU
-            -
-              tag: Application
-              value: Performance
+              tag: component
+              value: cpu
         -
           uuid: 883c7a12b1d54f4d8189ca0d9cc43102
           name: 'System calls'
@@ -427,11 +381,8 @@ zabbix_export:
           value_type: FLOAT
           tags:
             -
-              tag: Application
-              value: CPU
-            -
-              tag: Application
-              value: Performance
+              tag: component
+              value: cpu
         -
           uuid: f027ed1c43464d4ab9a13d4b9f647e7e
           name: 'Length of the swap queue'
@@ -440,11 +391,8 @@ zabbix_export:
           value_type: FLOAT
           tags:
             -
-              tag: Application
-              value: Memory
-            -
-              tag: Application
-              value: Performance
+              tag: component
+              value: memory
         -
           uuid: 6795c2b6914d4303bf30c71c7405ff7d
           name: 'Length of the run queue'
@@ -453,11 +401,8 @@ zabbix_export:
           value_type: FLOAT
           tags:
             -
-              tag: Application
-              value: CPU
-            -
-              tag: Application
-              value: Performance
+              tag: component
+              value: cpu
         -
           uuid: 12142f133863448c9c937c671e183bbb
           name: 'Active virtual pages'
@@ -465,8 +410,8 @@ zabbix_export:
           history: 1w
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 3b4a5ff768654ff5a87b955684a0d7b5
           name: 'Free real memory'
@@ -474,8 +419,8 @@ zabbix_export:
           history: 1w
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: bf890bf5cd1748a5af9528a111ba43c4
           name: 'File page-ins per second'
@@ -484,8 +429,8 @@ zabbix_export:
           value_type: FLOAT
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 19c4f7132b6c46aa9522bd46da3e8f03
           name: 'File page-outs per second'
@@ -494,8 +439,8 @@ zabbix_export:
           value_type: FLOAT
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 9ff3f7faa76c414aae7c5babb91fe065
           name: 'Pages freed (page replacement)'
@@ -504,8 +449,8 @@ zabbix_export:
           value_type: FLOAT
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 6009d8a0fc2f486db979b226eb975e78
           name: 'Pages paged in from paging space'
@@ -514,8 +459,8 @@ zabbix_export:
           value_type: FLOAT
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 26fb1471e08c4c46800e4887d8bccd80
           name: 'Pages paged out to paging space'
@@ -524,8 +469,8 @@ zabbix_export:
           value_type: FLOAT
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 83b1456726d448d6a756e03c0ec02342
           name: 'Pages scanned by page-replacement algorithm'
@@ -534,8 +479,8 @@ zabbix_export:
           value_type: FLOAT
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: d0ef675d313849269890d06c7e003c9e
           name: 'System information'
@@ -553,17 +498,18 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: General
-            -
-              tag: Application
-              value: OS
+              tag: component
+              value: os
           triggers:
             -
               uuid: 3a736e64211744aea480a60b2c48a036
               expression: 'last(/AIX by Zabbix agent/system.uname,#1)<>last(/AIX by Zabbix agent/system.uname,#2)'
               name: 'Host information was changed'
               priority: INFO
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 2e0ff86c992c4a098af8cb1bee0f0001
           name: 'System uptime'
@@ -573,17 +519,18 @@ zabbix_export:
           units: uptime
           tags:
             -
-              tag: Application
-              value: General
-            -
-              tag: Application
-              value: OS
+              tag: component
+              value: os
           triggers:
             -
               uuid: 03a2cd88b6a64d3ea4c9bb2abbc4ae2d
               expression: 'change(/AIX by Zabbix agent/system.uptime)<0'
               name: 'Server has just been restarted'
               priority: INFO
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 980a59760ef9481298ed35322841f939
           name: 'Number of logged in users'
@@ -592,11 +539,8 @@ zabbix_export:
           description: 'Number of users who are currently logged in.'
           tags:
             -
-              tag: Application
-              value: OS
-            -
-              tag: Application
-              value: Security
+              tag: component
+              value: os
         -
           uuid: 4771d6d33c2247d6843198152a7065a8
           name: 'Checksum of /etc/passwd'
@@ -605,14 +549,18 @@ zabbix_export:
           history: 1w
           tags:
             -
-              tag: Application
-              value: Security
+              tag: component
+              value: security
           triggers:
             -
               uuid: c75ee957fd6c43b2aba9919d5e1af4a1
               expression: 'last(/AIX by Zabbix agent/vfs.file.cksum[/etc/passwd,sha256],#1)<>last(/AIX by Zabbix agent/vfs.file.cksum[/etc/passwd,sha256],#2)'
               name: '/etc/passwd has been changed'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: security
         -
           uuid: 6d4d9deab17b42f4a953c5210acac6f1
           name: 'Available memory'
@@ -622,14 +570,21 @@ zabbix_export:
           description: 'Available memory is defined as free+cached+buffers memory.'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: 80b6406fb8474fa9801e9dffb2ccd368
               expression: 'last(/AIX by Zabbix agent/vm.memory.size[available])<20M'
               name: 'Lack of available memory on server'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 57d30ccd5db64dc8b9498a36efe768e9
           name: 'Total memory'
@@ -639,8 +594,8 @@ zabbix_export:
           units: B
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 304a3e9bb7594c83b027a32c34aeab28
           name: 'Zabbix agent availability'
@@ -652,8 +607,8 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: f0b9ecafede8476b94fd8dcab74cea87
@@ -662,6 +617,10 @@ zabbix_export:
               priority: AVERAGE
               description: 'For passive only agents, host availability is used with {$AGENT.TIMEOUT} as time threshold.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: 409cce8967b4494bbcc5193a26c69b06
@@ -693,8 +652,11 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Network interfaces'
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: 0704fb302aa94f73bedade3a998a0fa3
               name: 'Interface {#IFNAME}: Outgoing network traffic'
@@ -712,8 +674,11 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Network interfaces'
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
           graph_prototypes:
             -
               uuid: 366a988491344fd487561d02ed499fe0
@@ -752,14 +717,24 @@ zabbix_export:
               units: '%'
               tags:
                 -
-                  tag: Application
-                  value: Filesystems
+                  tag: component
+                  value: filesystem
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
               trigger_prototypes:
                 -
                   uuid: 6ce467d05e8745409a177799bed34bb3
                   expression: 'last(/AIX by Zabbix agent/vfs.fs.inode[{#FSNAME},pfree])<20'
                   name: '{#FSNAME}: Free inodes is less than 20%'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 13e212598f744a7fa535c23731190c61
               name: '{#FSNAME}: Free disk space'
@@ -768,8 +743,11 @@ zabbix_export:
               units: B
               tags:
                 -
-                  tag: Application
-                  value: Filesystems
+                  tag: component
+                  value: filesystem
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 428b0314dd574df1970dd2cae7e8889b
               name: '{#FSNAME}: Free disk space, %'
@@ -779,14 +757,24 @@ zabbix_export:
               units: '%'
               tags:
                 -
-                  tag: Application
-                  value: Filesystems
+                  tag: component
+                  value: filesystem
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
               trigger_prototypes:
                 -
                   uuid: 74a1fc62bfe24b7eabe4e244c70dc384
                   expression: 'last(/AIX by Zabbix agent/vfs.fs.size[{#FSNAME},pfree])<20'
                   name: '{#FSNAME}: Free disk space is less than 20%'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 6f6c92bc72014612b2efb92d12d8c425
               name: '{#FSNAME}: Total disk space'
@@ -796,8 +784,11 @@ zabbix_export:
               units: B
               tags:
                 -
-                  tag: Application
-                  value: Filesystems
+                  tag: component
+                  value: filesystem
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 915e72271f134684b2d10d05d4035962
               name: '{#FSNAME}: Used disk space'
@@ -806,8 +797,11 @@ zabbix_export:
               units: B
               tags:
                 -
-                  tag: Application
-                  value: Filesystems
+                  tag: component
+                  value: filesystem
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
           graph_prototypes:
             -
               uuid: 460b553fcd924b6abbde0b00a5525445
@@ -824,6 +818,13 @@ zabbix_export:
                   item:
                     host: 'AIX by Zabbix agent'
                     key: 'vfs.fs.size[{#FSNAME},free]'
+      tags:
+        -
+          tag: class
+          value: os
+        -
+          tag: target
+          value: aix
       macros:
         -
           macro: '{$AGENT.TIMEOUT}'
diff --git a/templates/os/freebsd/template_os_freebsd.yaml b/templates/os/freebsd/template_os_freebsd.yaml
index 8ab5a0726d3..310ee6553f6 100644
--- a/templates/os/freebsd/template_os_freebsd.yaml
+++ b/templates/os/freebsd/template_os_freebsd.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:36:35Z'
+  date: '2022-01-26T10:40:57Z'
   groups:
     -
       uuid: 846977d1dfed4968bc5f8bdb363285bc
@@ -35,8 +35,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: 'Monitoring agent'
+              tag: component
+              value: system
         -
           uuid: da59d099f7614653b37b8eaaa518ebd2
           name: 'Zabbix agent ping'
@@ -47,8 +47,8 @@ zabbix_export:
             name: 'Zabbix agent ping status'
           tags:
             -
-              tag: Application
-              value: 'Monitoring agent'
+              tag: component
+              value: system
         -
           uuid: e2b84269401e41acb973bc29666b9e7a
           name: 'Version of Zabbix agent running'
@@ -64,8 +64,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: 'Monitoring agent'
+              tag: component
+              value: application
         -
           uuid: d1b2d3cc2b7e44af8f9bfee11e04bf21
           name: 'Maximum number of opened files'
@@ -75,14 +75,21 @@ zabbix_export:
           description: 'It could be increased by using sysctrl utility or modifying file /etc/sysctl.conf.'
           tags:
             -
-              tag: Application
-              value: OS
+              tag: component
+              value: os
           triggers:
             -
               uuid: 00f035b7890d4227a84a942ba5730df3
               expression: 'last(/FreeBSD by Zabbix agent/kernel.maxfiles)<1024'
               name: 'Configured max number of opened files is too low on {HOST.NAME}'
               priority: INFO
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 58244a8e72694ffcbba5a78a910ae818
           name: 'Maximum number of processes'
@@ -92,14 +99,24 @@ zabbix_export:
           description: 'It could be increased by using sysctrl utility or modifying file /etc/sysctl.conf.'
           tags:
             -
-              tag: Application
-              value: OS
+              tag: component
+              value: os
+            -
+              tag: component
+              value: processes
           triggers:
             -
               uuid: 0d2417112c1e4ef38a4b763872cbb18b
               expression: 'last(/FreeBSD by Zabbix agent/kernel.maxproc)<256'
               name: 'Configured max number of processes is too low on {HOST.NAME}'
               priority: INFO
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 448c6de07b244281a4b1defe2e811773
           name: 'Number of running processes'
@@ -108,14 +125,24 @@ zabbix_export:
           description: 'Number of processes in running state.'
           tags:
             -
-              tag: Application
-              value: Processes
+              tag: component
+              value: os
+            -
+              tag: component
+              value: processes
           triggers:
             -
               uuid: 837fdc71174246d987a6f7f277d65f6c
               expression: 'avg(/FreeBSD by Zabbix agent/proc.num[,,run],5m)>30'
               name: 'Too many processes running on {HOST.NAME}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 5fd5b351d8214eac8f4f4649594c27eb
           name: 'Number of processes'
@@ -124,14 +151,24 @@ zabbix_export:
           description: 'Total number of processes in any state.'
           tags:
             -
-              tag: Application
-              value: Processes
+              tag: component
+              value: os
+            -
+              tag: component
+              value: processes
           triggers:
             -
               uuid: 0d5ac85120734fa98d3eef01b6f4033b
               expression: 'avg(/FreeBSD by Zabbix agent/proc.num[],5m)>300'
               name: 'Too many processes on {HOST.NAME}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 4a533b30c43e42fb8c9eabada0817186
           name: 'Host boot time'
@@ -141,11 +178,8 @@ zabbix_export:
           units: unixtime
           tags:
             -
-              tag: Application
-              value: General
-            -
-              tag: Application
-              value: OS
+              tag: component
+              value: os
         -
           uuid: db555e8318cf4e7aa7beb85aa0250697
           name: 'Interrupts per second'
@@ -159,11 +193,8 @@ zabbix_export:
                 - ''
           tags:
             -
-              tag: Application
-              value: CPU
-            -
-              tag: Application
-              value: Performance
+              tag: component
+              value: cpu
         -
           uuid: 2336b2ec03a846f3bed1e64384b2532e
           name: 'Processor load (1 min average per core)'
@@ -173,17 +204,21 @@ zabbix_export:
           description: 'The processor load is calculated as system CPU load divided by number of CPU cores.'
           tags:
             -
-              tag: Application
-              value: CPU
-            -
-              tag: Application
-              value: Performance
+              tag: component
+              value: cpu
           triggers:
             -
               uuid: 8c339065ecc54b7d8c2e4405f2149f27
               expression: 'avg(/FreeBSD by Zabbix agent/system.cpu.load[percpu,avg1],5m)>5'
               name: 'Processor load is too high on {HOST.NAME}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: de68f40fc96648c0925c1f6a4ca6776e
           name: 'Processor load (5 min average per core)'
@@ -193,11 +228,8 @@ zabbix_export:
           description: 'The processor load is calculated as system CPU load divided by number of CPU cores.'
           tags:
             -
-              tag: Application
-              value: CPU
-            -
-              tag: Application
-              value: Performance
+              tag: component
+              value: cpu
         -
           uuid: ad9ebf859f7346ca885c1edcb7333d78
           name: 'Processor load (15 min average per core)'
@@ -207,11 +239,8 @@ zabbix_export:
           description: 'The processor load is calculated as system CPU load divided by number of CPU cores.'
           tags:
             -
-              tag: Application
-              value: CPU
-            -
-              tag: Application
-              value: Performance
+              tag: component
+              value: cpu
         -
           uuid: 0a140185a5114dd29451bfac68abdde5
           name: 'Context switches per second'
@@ -225,11 +254,8 @@ zabbix_export:
                 - ''
           tags:
             -
-              tag: Application
-              value: CPU
-            -
-              tag: Application
-              value: Performance
+              tag: component
+              value: cpu
         -
           uuid: 7612803821c845889bda84b7f1ac9ae5
           name: 'CPU idle time'
@@ -240,11 +266,8 @@ zabbix_export:
           description: 'The time the CPU has spent doing nothing.'
           tags:
             -
-              tag: Application
-              value: CPU
-            -
-              tag: Application
-              value: Performance
+              tag: component
+              value: cpu
         -
           uuid: f2acc3cd432546e5a223095a0ea2f096
           name: 'CPU interrupt time'
@@ -255,11 +278,8 @@ zabbix_export:
           description: 'The amount of time the CPU has been servicing hardware interrupts.'
           tags:
             -
-              tag: Application
-              value: CPU
-            -
-              tag: Application
-              value: Performance
+              tag: component
+              value: cpu
         -
           uuid: efa92492bec0437ba74f47d694500cab
           name: 'CPU nice time'
@@ -270,11 +290,8 @@ zabbix_export:
           description: 'The time the CPU has spent running users'' processes that have been niced.'
           tags:
             -
-              tag: Application
-              value: CPU
-            -
-              tag: Application
-              value: Performance
+              tag: component
+              value: cpu
         -
           uuid: c9479b02b04141128b1ce7c8f3726c09
           name: 'CPU system time'
@@ -285,11 +302,8 @@ zabbix_export:
           description: 'The time the CPU has spent running the kernel and its processes.'
           tags:
             -
-              tag: Application
-              value: CPU
-            -
-              tag: Application
-              value: Performance
+              tag: component
+              value: cpu
         -
           uuid: 1f3bc82009e04b59845a0e15004637ad
           name: 'CPU user time'
@@ -300,11 +314,8 @@ zabbix_export:
           description: 'The time the CPU has spent running users'' processes that are not niced.'
           tags:
             -
-              tag: Application
-              value: CPU
-            -
-              tag: Application
-              value: Performance
+              tag: component
+              value: cpu
         -
           uuid: c17d001bd20a4732b8ef487366c6aa42
           name: 'Host name'
@@ -322,17 +333,18 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: General
-            -
-              tag: Application
-              value: OS
+              tag: component
+              value: os
           triggers:
             -
               uuid: f48fb8ce1229492dae62de362c8c9539
               expression: 'last(/FreeBSD by Zabbix agent/system.hostname,#1)<>last(/FreeBSD by Zabbix agent/system.hostname,#2)'
               name: 'Hostname was changed on {HOST.NAME}'
               priority: INFO
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 4095ed7d606a47439294097a98af2c4f
           name: 'Host local time'
@@ -341,11 +353,8 @@ zabbix_export:
           units: unixtime
           tags:
             -
-              tag: Application
-              value: General
-            -
-              tag: Application
-              value: OS
+              tag: component
+              value: os
         -
           uuid: 63fc1259011f4250901889979cdf472c
           name: 'Free swap space'
@@ -354,8 +363,8 @@ zabbix_export:
           units: B
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 187d11e610b94b468d18b88ca38f2c32
           name: 'Free swap space in %'
@@ -365,8 +374,8 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: a125b6786d55426eb19afe284cee1f76
@@ -374,6 +383,13 @@ zabbix_export:
               name: 'Lack of free swap space on {HOST.NAME}'
               priority: WARNING
               description: 'It probably means that the systems requires more physical memory.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 9647b0b857074c4b9c14f15bb04af096
           name: 'Total swap space'
@@ -383,8 +399,8 @@ zabbix_export:
           units: B
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 4523ae069e0b4e16bcb5182c6dbf63f2
           name: 'System information'
@@ -402,17 +418,18 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: General
-            -
-              tag: Application
-              value: OS
+              tag: component
+              value: os
           triggers:
             -
               uuid: ea2f9c186798420da781bd835fa0eaed
               expression: 'last(/FreeBSD by Zabbix agent/system.uname,#1)<>last(/FreeBSD by Zabbix agent/system.uname,#2)'
               name: 'Host information was changed on {HOST.NAME}'
               priority: INFO
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: a49b956d592c4e2ba41caac3671e009f
           name: 'System uptime'
@@ -422,17 +439,18 @@ zabbix_export:
           units: uptime
           tags:
             -
-              tag: Application
-              value: General
-            -
-              tag: Application
-              value: OS
+              tag: component
+              value: os
           triggers:
             -
               uuid: 809e57eb897b43fb8538e76ec7dd6602
               expression: 'change(/FreeBSD by Zabbix agent/system.uptime)<0'
               name: '{HOST.NAME} has just been restarted'
               priority: INFO
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: fec3e877764e4bfd98e77da9d8c73606
           name: 'Number of logged in users'
@@ -441,11 +459,8 @@ zabbix_export:
           description: 'Number of users who are currently logged in.'
           tags:
             -
-              tag: Application
-              value: OS
-            -
-              tag: Application
-              value: Security
+              tag: component
+              value: os
         -
           uuid: 2bb327cd5f8c49d9b680142825b9c030
           name: 'Checksum of /etc/passwd'
@@ -454,14 +469,18 @@ zabbix_export:
           history: 1w
           tags:
             -
-              tag: Application
-              value: Security
+              tag: component
+              value: security
           triggers:
             -
               uuid: 27b4e5de411949a4befa7171a2af6441
               expression: 'last(/FreeBSD by Zabbix agent/vfs.file.cksum[/etc/passwd,sha256],#1)<>last(/FreeBSD by Zabbix agent/vfs.file.cksum[/etc/passwd,sha256],#2)'
               name: '/etc/passwd has been changed on {HOST.NAME}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: security
         -
           uuid: 561c7a383b944bca9ec5f7c44e322fed
           name: 'Available memory'
@@ -471,14 +490,21 @@ zabbix_export:
           description: 'Available memory is defined as free+cached+buffers memory.'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: f8fcce1904ab46088fa80433b85f2e83
               expression: 'last(/FreeBSD by Zabbix agent/vm.memory.size[available])<20M'
               name: 'Lack of available memory on server {HOST.NAME}'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: ffa54e82b7914672a3f7134134ac2638
           name: 'Total memory'
@@ -488,8 +514,8 @@ zabbix_export:
           units: B
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: cbfaa94dc7bc4606a792aaf357054075
           name: 'Zabbix agent availability'
@@ -501,8 +527,8 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: fd9d36aaedff45f59017b1e714a5db69
@@ -511,6 +537,10 @@ zabbix_export:
               priority: AVERAGE
               description: 'For passive only agents, host availability is used with {$AGENT.TIMEOUT} as time threshold.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: cac3466488a544198f766d1152878456
@@ -542,8 +572,11 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Network interfaces'
+                  tag: component
+                  value: interface
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: ac93068d05084aa0a32a1bee78df3bd8
               name: 'Network interfaces: Outgoing network traffic on {#IFNAME}'
@@ -561,8 +594,11 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Network interfaces'
+                  tag: component
+                  value: interface
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
           graph_prototypes:
             -
               uuid: 1f52d0c9ee934eb3a5198ab53fdf4679
@@ -604,14 +640,24 @@ zabbix_export:
               units: '%'
               tags:
                 -
-                  tag: Application
-                  value: Filesystems
+                  tag: component
+                  value: filesystem
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
               trigger_prototypes:
                 -
                   uuid: 2b87c38f49b146f1b801319d03a19dc3
                   expression: 'last(/FreeBSD by Zabbix agent/vfs.fs.inode[{#FSNAME},pfree])<20'
                   name: 'Filesystems: Free inodes is less than 20% on volume {#FSNAME}'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 2ed6230d292a4037b67fe549c719e7ee
               name: 'Filesystems: Free disk space on {#FSNAME}'
@@ -620,8 +666,11 @@ zabbix_export:
               units: B
               tags:
                 -
-                  tag: Application
-                  value: Filesystems
+                  tag: component
+                  value: filesystem
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: aa0dd0eb957a4485b1a62f715381019a
               name: 'Filesystems: Free disk space on {#FSNAME} (percentage)'
@@ -631,14 +680,24 @@ zabbix_export:
               units: '%'
               tags:
                 -
-                  tag: Application
-                  value: Filesystems
+                  tag: component
+                  value: filesystem
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
               trigger_prototypes:
                 -
                   uuid: 01ea8e7f30564586af3b48adb3c930c1
                   expression: 'last(/FreeBSD by Zabbix agent/vfs.fs.size[{#FSNAME},pfree])<20'
                   name: 'Filesystems: Free disk space is less than 20% on volume {#FSNAME}'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 6daede58ae8f4e42a4aa2539a552ab08
               name: 'Filesystems: Total disk space on {#FSNAME}'
@@ -648,8 +707,11 @@ zabbix_export:
               units: B
               tags:
                 -
-                  tag: Application
-                  value: Filesystems
+                  tag: component
+                  value: filesystem
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 6efb08c26e1b439181a17d462ec1dab8
               name: 'Filesystems: Used disk space on {#FSNAME}'
@@ -658,8 +720,11 @@ zabbix_export:
               units: B
               tags:
                 -
-                  tag: Application
-                  value: Filesystems
+                  tag: component
+                  value: filesystem
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
           graph_prototypes:
             -
               uuid: 5f8ff96d3ea744bba849c9dc1464632f
@@ -683,6 +748,13 @@ zabbix_export:
                   item:
                     host: 'FreeBSD by Zabbix agent'
                     key: 'vfs.fs.size[{#FSNAME},free]'
+      tags:
+        -
+          tag: class
+          value: os
+        -
+          tag: target
+          value: freebsd
       macros:
         -
           macro: '{$AGENT.TIMEOUT}'
diff --git a/templates/os/hp-ux/template_os_hp-ux.yaml b/templates/os/hp-ux/template_os_hp-ux.yaml
index d9e266c072d..038c618cfbc 100644
--- a/templates/os/hp-ux/template_os_hp-ux.yaml
+++ b/templates/os/hp-ux/template_os_hp-ux.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:36:40Z'
+  date: '2022-01-26T10:40:47Z'
   groups:
     -
       uuid: 846977d1dfed4968bc5f8bdb363285bc
@@ -11,7 +11,7 @@ zabbix_export:
       template: 'HP-UX by Zabbix agent'
       name: 'HP-UX by Zabbix agent'
       description: |
-        Official HP-UX template. Requires agent of Zabbix 4.0.0 or newer.
+        Official HP-UX template. Requires agent of Zabbix 4.0.0 or newer.+
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/
         
@@ -35,8 +35,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: 'Monitoring agent'
+              tag: component
+              value: system
         -
           uuid: 98507eac4f70420698dc234c2a6e3198
           name: 'Zabbix agent ping'
@@ -47,8 +47,8 @@ zabbix_export:
             name: 'Zabbix agent ping status'
           tags:
             -
-              tag: Application
-              value: 'Monitoring agent'
+              tag: component
+              value: system
         -
           uuid: 3f456ce86b284b089f545d8c72c64405
           name: 'Version of Zabbix agent running'
@@ -64,8 +64,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: 'Monitoring agent'
+              tag: component
+              value: application
         -
           uuid: bcba4702a58d48339c6e7e49dea574c4
           name: 'Processor load (1 min average per core)'
@@ -75,17 +75,21 @@ zabbix_export:
           description: 'The processor load is calculated as system CPU load divided by number of CPU cores.'
           tags:
             -
-              tag: Application
-              value: CPU
-            -
-              tag: Application
-              value: Performance
+              tag: component
+              value: cpu
           triggers:
             -
               uuid: 6721e8fbe5ee45aa9d06b698210a268a
               expression: 'avg(/HP-UX by Zabbix agent/system.cpu.load[percpu,avg1],5m)>5'
               name: 'Processor load is too high'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 60057d54b81342f4aaa0103a278bf7b6
           name: 'Processor load (5 min average per core)'
@@ -95,11 +99,8 @@ zabbix_export:
           description: 'The processor load is calculated as system CPU load divided by number of CPU cores.'
           tags:
             -
-              tag: Application
-              value: CPU
-            -
-              tag: Application
-              value: Performance
+              tag: component
+              value: cpu
         -
           uuid: 296dbd5148184004b26ac50ae5e6893b
           name: 'Processor load (15 min average per core)'
@@ -109,11 +110,8 @@ zabbix_export:
           description: 'The processor load is calculated as system CPU load divided by number of CPU cores.'
           tags:
             -
-              tag: Application
-              value: CPU
-            -
-              tag: Application
-              value: Performance
+              tag: component
+              value: cpu
         -
           uuid: 2b82ccaf9eb1424593e2738a5512e182
           name: 'CPU idle time'
@@ -124,11 +122,8 @@ zabbix_export:
           description: 'The time the CPU has spent doing nothing.'
           tags:
             -
-              tag: Application
-              value: CPU
-            -
-              tag: Application
-              value: Performance
+              tag: component
+              value: cpu
         -
           uuid: 8665bd2dc84e46daa081a379548b0603
           name: 'CPU nice time'
@@ -139,11 +134,8 @@ zabbix_export:
           description: 'The time the CPU has spent running users'' processes that have been niced.'
           tags:
             -
-              tag: Application
-              value: CPU
-            -
-              tag: Application
-              value: Performance
+              tag: component
+              value: cpu
         -
           uuid: 8419321f4744476ea27b7d1acddcd365
           name: 'CPU system time'
@@ -154,11 +146,8 @@ zabbix_export:
           description: 'The time the CPU has spent running the kernel and its processes.'
           tags:
             -
-              tag: Application
-              value: CPU
-            -
-              tag: Application
-              value: Performance
+              tag: component
+              value: cpu
         -
           uuid: 611c9a3c70aa4455b6ec7bebe64b5316
           name: 'CPU user time'
@@ -169,11 +158,8 @@ zabbix_export:
           description: 'The time the CPU has spent running users'' processes that are not niced.'
           tags:
             -
-              tag: Application
-              value: CPU
-            -
-              tag: Application
-              value: Performance
+              tag: component
+              value: cpu
         -
           uuid: 6e3b32f3f92543759ef2f30834899ba0
           name: 'Host name'
@@ -191,17 +177,18 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: General
-            -
-              tag: Application
-              value: OS
+              tag: component
+              value: os
           triggers:
             -
               uuid: 07215ae05345423d8625962b85d9d4ec
               expression: 'last(/HP-UX by Zabbix agent/system.hostname,#1)<>last(/HP-UX by Zabbix agent/system.hostname,#2)'
               name: 'Hostname was changed'
               priority: INFO
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 16c6c420c710498083355361b104f7a2
           name: 'Host local time'
@@ -210,11 +197,8 @@ zabbix_export:
           units: unixtime
           tags:
             -
-              tag: Application
-              value: General
-            -
-              tag: Application
-              value: OS
+              tag: component
+              value: os
         -
           uuid: b66598337e0e4990a2776d2a42020e72
           name: 'System information'
@@ -232,17 +216,18 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: General
-            -
-              tag: Application
-              value: OS
+              tag: component
+              value: os
           triggers:
             -
               uuid: 34f76014b2d3434a8d1f1f0657b5605f
               expression: 'last(/HP-UX by Zabbix agent/system.uname,#1)<>last(/HP-UX by Zabbix agent/system.uname,#2)'
               name: 'Host information was changed'
               priority: INFO
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: bb698e97aa1b45ebadcb48da729b8e64
           name: 'Number of logged in users'
@@ -251,11 +236,8 @@ zabbix_export:
           description: 'Number of users who are currently logged in.'
           tags:
             -
-              tag: Application
-              value: OS
-            -
-              tag: Application
-              value: Security
+              tag: component
+              value: os
         -
           uuid: 4e11e7c5d43a4566989b39dbc0c23266
           name: 'Checksum of /etc/passwd'
@@ -264,14 +246,18 @@ zabbix_export:
           history: 1w
           tags:
             -
-              tag: Application
-              value: Security
+              tag: component
+              value: security
           triggers:
             -
               uuid: f65c254d50e2454d9840784ff979f5d3
               expression: 'last(/HP-UX by Zabbix agent/vfs.file.cksum[/etc/passwd,sha256],#1)<>last(/HP-UX by Zabbix agent/vfs.file.cksum[/etc/passwd,sha256],#2)'
               name: '/etc/passwd has been changed'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: security
         -
           uuid: 767abadfa8be4bccb2c4c5a1d532ba87
           name: 'Available memory'
@@ -281,14 +267,21 @@ zabbix_export:
           description: 'Available memory is defined as free+cached+buffers memory.'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: 005730efb6a94c4a83c4265f42aa8dff
               expression: 'last(/HP-UX by Zabbix agent/vm.memory.size[available])<20M'
               name: 'Lack of available memory on server'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 6da082e7f822465592f66e2bd0a46947
           name: 'Total memory'
@@ -298,8 +291,8 @@ zabbix_export:
           units: B
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 5b0a1ce4ca4a441484eea38724eaf24d
           name: 'Zabbix agent availability'
@@ -311,8 +304,8 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: ce008290ad6341b98386adf9ea5c315b
@@ -321,6 +314,10 @@ zabbix_export:
               priority: AVERAGE
               description: 'For passive only agents, host availability is used with {$AGENT.TIMEOUT} as time threshold.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: 83058e954f1d497d8c33c82c771d2250
@@ -352,8 +349,11 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Network interfaces'
+                  tag: component
+                  value: interface
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: 4de64b1ecae344afa12f892937caa04e
               name: 'Interface {#IFNAME}: Outgoing network traffic'
@@ -371,8 +371,11 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Network interfaces'
+                  tag: component
+                  value: interface
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
           graph_prototypes:
             -
               uuid: dec3568ab5e7457da4a81d32a8ba2b72
@@ -411,14 +414,24 @@ zabbix_export:
               units: '%'
               tags:
                 -
-                  tag: Application
-                  value: Filesystems
+                  tag: component
+                  value: filesystem
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
               trigger_prototypes:
                 -
                   uuid: 9d7587a6cae149d69e90cdefa024d254
                   expression: 'last(/HP-UX by Zabbix agent/vfs.fs.inode[{#FSNAME},pfree])<20'
                   name: '{#FSNAME}: Free inodes is less than 20%'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 75efb4ab311848ec9bbb03cf05efef8b
               name: '{#FSNAME}: Free disk space'
@@ -427,8 +440,11 @@ zabbix_export:
               units: B
               tags:
                 -
-                  tag: Application
-                  value: Filesystems
+                  tag: component
+                  value: filesystem
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 707d7dfb2dc243d49e4623f1d043a5b7
               name: '{#FSNAME}: Free disk space, %'
@@ -438,14 +454,24 @@ zabbix_export:
               units: '%'
               tags:
                 -
-                  tag: Application
-                  value: Filesystems
+                  tag: component
+                  value: filesystem
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
               trigger_prototypes:
                 -
                   uuid: 07153df58e1a4a2bad7bf27a1ddf24a0
                   expression: 'last(/HP-UX by Zabbix agent/vfs.fs.size[{#FSNAME},pfree])<20'
                   name: '{#FSNAME}: Free disk space is less than 20%'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 3d75a99c05bf41a2b63ce2b0caf4a6cc
               name: '{#FSNAME}: Total disk space'
@@ -455,8 +481,11 @@ zabbix_export:
               units: B
               tags:
                 -
-                  tag: Application
-                  value: Filesystems
+                  tag: component
+                  value: filesystem
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 0aa8dd5bbaea4f35808ef735f0cec18d
               name: '{#FSNAME}: Used disk space'
@@ -465,8 +494,11 @@ zabbix_export:
               units: B
               tags:
                 -
-                  tag: Application
-                  value: Filesystems
+                  tag: component
+                  value: filesystem
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
           graph_prototypes:
             -
               uuid: 92f6b017c10640b6bfe7cd68a949d2d5
@@ -483,6 +515,13 @@ zabbix_export:
                   item:
                     host: 'HP-UX by Zabbix agent'
                     key: 'vfs.fs.size[{#FSNAME},free]'
+      tags:
+        -
+          tag: class
+          value: os
+        -
+          tag: target
+          value: hp-ux
       macros:
         -
           macro: '{$AGENT.TIMEOUT}'
diff --git a/templates/os/linux/README.md b/templates/os/linux/README.md
index 2981c41fb32..f136faf34f1 100644
--- a/templates/os/linux/README.md
+++ b/templates/os/linux/README.md
@@ -53,7 +53,7 @@ There are no template links in this template.
 
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
-|Load average is too high (per CPU load over {$LOAD_AVG_PER_CPU.MAX.WARN} for 5m) |<p>Per CPU load average is too high. Your system may be slow to respond.</p> |`min(/Linux CPU by Zabbix agent/system.cpu.load[all,avg1],5m)/last(/Linux CPU by Zabbix agent/system.cpu.num)>{$LOAD_AVG_PER_CPU.MAX.WARN} and last(/Linux CPU by Zabbix agent/system.cpu.load[all,avg5])>0 and last(/Linux CPU by Zabbix agent/system.cpu.load[all,avg15])>0 ` |AVERAGE | |
+|Load average is too high (per CPU load over {$LOAD_AVG_PER_CPU.MAX.WARN} for 5m) |<p>Per CPU load average is too high. Your system may be slow to respond.</p> |`min(/Linux CPU by Zabbix agent/system.cpu.load[all,avg1],5m)/last(/Linux CPU by Zabbix agent/system.cpu.num)>{$LOAD_AVG_PER_CPU.MAX.WARN} and last(/Linux CPU by Zabbix agent/system.cpu.load[all,avg5])>0 and last(/Linux CPU by Zabbix agent/system.cpu.load[all,avg15])>0` |AVERAGE | |
 |High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/Linux CPU by Zabbix agent/system.cpu.util,5m)>{$CPU.UTIL.CRIT}` |WARNING |<p>**Depends on**:</p><p>- Load average is too high (per CPU load over {$LOAD_AVG_PER_CPU.MAX.WARN} for 5m)</p> |
 
 ## Feedback
@@ -165,8 +165,8 @@ There are no template links in this template.
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
 |High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/Linux memory by Zabbix agent/vm.memory.utilization,5m)>{$MEMORY.UTIL.MAX}` |AVERAGE |<p>**Depends on**:</p><p>- Lack of available memory (<{$MEMORY.AVAILABLE.MIN} of {ITEM.VALUE2})</p> |
-|Lack of available memory (<{$MEMORY.AVAILABLE.MIN} of {ITEM.VALUE2}) |<p>-</p> |`min(/Linux memory by Zabbix agent/vm.memory.size[available],5m)<{$MEMORY.AVAILABLE.MIN} and last(/Linux memory by Zabbix agent/vm.memory.size[total])>0` |AVERAGE | |
-|High swap space usage (less than {$SWAP.PFREE.MIN.WARN}% free) |<p>This trigger is ignored, if there is no swap configured</p> |`min(/Linux memory by Zabbix agent/system.swap.size[,pfree],5m)<{$SWAP.PFREE.MIN.WARN} and last(/Linux memory by Zabbix agent/system.swap.size[,total])>0` |WARNING |<p>**Depends on**:</p><p>- High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)</p><p>- Lack of available memory (<{$MEMORY.AVAILABLE.MIN} of {ITEM.VALUE2})</p> |
+|Lack of available memory (<{$MEMORY.AVAILABLE.MIN} of {ITEM.VALUE2}) |<p>-</p> |`max(/Linux memory by Zabbix agent/vm.memory.size[available],5m)<{$MEMORY.AVAILABLE.MIN} and last(/Linux memory by Zabbix agent/vm.memory.size[total])>0` |AVERAGE | |
+|High swap space usage (less than {$SWAP.PFREE.MIN.WARN}% free) |<p>This trigger is ignored, if there is no swap configured</p> |`max(/Linux memory by Zabbix agent/system.swap.size[,pfree],5m)<{$SWAP.PFREE.MIN.WARN} and last(/Linux memory by Zabbix agent/system.swap.size[,total])>0` |WARNING |<p>**Depends on**:</p><p>- High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)</p><p>- Lack of available memory (<{$MEMORY.AVAILABLE.MIN} of {ITEM.VALUE2})</p> |
 
 ## Feedback
 
@@ -485,7 +485,7 @@ There are no template links in this template.
 
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
-|Load average is too high (per CPU load over {$LOAD_AVG_PER_CPU.MAX.WARN} for 5m) |<p>Per CPU load average is too high. Your system may be slow to respond.</p> |`min(/Linux by Zabbix agent/system.cpu.load[all,avg1],5m)/last(/Linux by Zabbix agent/system.cpu.num)>{$LOAD_AVG_PER_CPU.MAX.WARN} and last(/Linux by Zabbix agent/system.cpu.load[all,avg5])>0 and last(/Linux by Zabbix agent/system.cpu.load[all,avg15])>0 ` |AVERAGE | |
+|Load average is too high (per CPU load over {$LOAD_AVG_PER_CPU.MAX.WARN} for 5m) |<p>Per CPU load average is too high. Your system may be slow to respond.</p> |`min(/Linux by Zabbix agent/system.cpu.load[all,avg1],5m)/last(/Linux by Zabbix agent/system.cpu.num)>{$LOAD_AVG_PER_CPU.MAX.WARN} and last(/Linux by Zabbix agent/system.cpu.load[all,avg5])>0 and last(/Linux by Zabbix agent/system.cpu.load[all,avg15])>0` |AVERAGE | |
 |High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/Linux by Zabbix agent/system.cpu.util,5m)>{$CPU.UTIL.CRIT}` |WARNING |<p>**Depends on**:</p><p>- Load average is too high (per CPU load over {$LOAD_AVG_PER_CPU.MAX.WARN} for 5m)</p> |
 |{#FSNAME}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"{#FSNAME}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"{#FSNAME}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/Linux by Zabbix agent/vfs.fs.size[{#FSNAME},pused])>{$VFS.FS.PUSED.MAX.CRIT:"{#FSNAME}"} and ((last(/Linux by Zabbix agent/vfs.fs.size[{#FSNAME},total])-last(/Linux by Zabbix agent/vfs.fs.size[{#FSNAME},used]))<5G or timeleft(/Linux by Zabbix agent/vfs.fs.size[{#FSNAME},pused],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
 |{#FSNAME}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"{#FSNAME}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"{#FSNAME}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/Linux by Zabbix agent/vfs.fs.size[{#FSNAME},pused])>{$VFS.FS.PUSED.MAX.WARN:"{#FSNAME}"} and ((last(/Linux by Zabbix agent/vfs.fs.size[{#FSNAME},total])-last(/Linux by Zabbix agent/vfs.fs.size[{#FSNAME},used]))<10G or timeleft(/Linux by Zabbix agent/vfs.fs.size[{#FSNAME},pused],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- {#FSNAME}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"{#FSNAME}"}%)</p> |
@@ -498,8 +498,8 @@ There are no template links in this template.
 |Getting closer to process limit (over 80% used) |<p>-</p> |`last(/Linux by Zabbix agent/proc.num)/last(/Linux by Zabbix agent/kernel.maxproc)*100>80` |WARNING | |
 |Operating system description has changed |<p>Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.</p> |`last(/Linux by Zabbix agent/system.sw.os,#1)<>last(/Linux by Zabbix agent/system.sw.os,#2) and length(last(/Linux by Zabbix agent/system.sw.os))>0` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- System name has changed (new name: {ITEM.VALUE})</p> |
 |High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/Linux by Zabbix agent/vm.memory.utilization,5m)>{$MEMORY.UTIL.MAX}` |AVERAGE |<p>**Depends on**:</p><p>- Lack of available memory (<{$MEMORY.AVAILABLE.MIN} of {ITEM.VALUE2})</p> |
-|Lack of available memory (<{$MEMORY.AVAILABLE.MIN} of {ITEM.VALUE2}) |<p>-</p> |`min(/Linux by Zabbix agent/vm.memory.size[available],5m)<{$MEMORY.AVAILABLE.MIN} and last(/Linux by Zabbix agent/vm.memory.size[total])>0` |AVERAGE | |
-|High swap space usage (less than {$SWAP.PFREE.MIN.WARN}% free) |<p>This trigger is ignored, if there is no swap configured</p> |`min(/Linux by Zabbix agent/system.swap.size[,pfree],5m)<{$SWAP.PFREE.MIN.WARN} and last(/Linux by Zabbix agent/system.swap.size[,total])>0` |WARNING |<p>**Depends on**:</p><p>- High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)</p><p>- Lack of available memory (<{$MEMORY.AVAILABLE.MIN} of {ITEM.VALUE2})</p> |
+|Lack of available memory (<{$MEMORY.AVAILABLE.MIN} of {ITEM.VALUE2}) |<p>-</p> |`max(/Linux by Zabbix agent/vm.memory.size[available],5m)<{$MEMORY.AVAILABLE.MIN} and last(/Linux by Zabbix agent/vm.memory.size[total])>0` |AVERAGE | |
+|High swap space usage (less than {$SWAP.PFREE.MIN.WARN}% free) |<p>This trigger is ignored, if there is no swap configured</p> |`max(/Linux by Zabbix agent/system.swap.size[,pfree],5m)<{$SWAP.PFREE.MIN.WARN} and last(/Linux by Zabbix agent/system.swap.size[,total])>0` |WARNING |<p>**Depends on**:</p><p>- High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)</p><p>- Lack of available memory (<{$MEMORY.AVAILABLE.MIN} of {ITEM.VALUE2})</p> |
 |Interface {#IFNAME}: High error rate (>{$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) |<p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p> |`min(/Linux by Zabbix agent/net.if.in["{#IFNAME}",errors],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"} or min(/Linux by Zabbix agent/net.if.out["{#IFNAME}",errors],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`max(/Linux by Zabbix agent/net.if.in["{#IFNAME}",errors],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8 and max(/Linux by Zabbix agent/net.if.out["{#IFNAME}",errors],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}: Link down</p> |
 |Interface {#IFNAME}: Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p><p>3. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{$IFCONTROL:"{#IFNAME}"}=1 and last(/Linux by Zabbix agent/vfs.file.contents["/sys/class/net/{#IFNAME}/operstate"])=2 and (last(/Linux by Zabbix agent/vfs.file.contents["/sys/class/net/{#IFNAME}/operstate"],#1)<>last(/Linux by Zabbix agent/vfs.file.contents["/sys/class/net/{#IFNAME}/operstate"],#2))`<p>Recovery expression:</p>`last(/Linux by Zabbix agent/vfs.file.contents["/sys/class/net/{#IFNAME}/operstate"])<>2 or {$IFCONTROL:"{#IFNAME}"}=0` |AVERAGE |<p>Manual close: YES</p> |
 |Interface {#IFNAME}: Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/Linux by Zabbix agent/vfs.file.contents["/sys/class/net/{#IFNAME}/type"])<0 and last(/Linux by Zabbix agent/vfs.file.contents["/sys/class/net/{#IFNAME}/type"])>0 and (last(/Linux by Zabbix agent/vfs.file.contents["/sys/class/net/{#IFNAME}/type"])=6 or last(/Linux by Zabbix agent/vfs.file.contents["/sys/class/net/{#IFNAME}/type"])=1) and (last(/Linux by Zabbix agent/vfs.file.contents["/sys/class/net/{#IFNAME}/operstate"])<>2) `<p>Recovery expression:</p>`(change(/Linux by Zabbix agent/vfs.file.contents["/sys/class/net/{#IFNAME}/type"])>0 and last(/Linux by Zabbix agent/vfs.file.contents["/sys/class/net/{#IFNAME}/type"],#2)>0) or (last(/Linux by Zabbix agent/vfs.file.contents["/sys/class/net/{#IFNAME}/operstate"])=2) ` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}: Link down</p> |
diff --git a/templates/os/linux/template_os_linux.yaml b/templates/os/linux/template_os_linux.yaml
index 2dc79439bc9..fe537d50325 100644
--- a/templates/os/linux/template_os_linux.yaml
+++ b/templates/os/linux/template_os_linux.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:36:45Z'
+  date: '2022-01-26T10:41:33Z'
   groups:
     -
       uuid: 57b7ae836ca64446ba2c296389c009b7
@@ -66,8 +66,11 @@ zabbix_export:
                 key: 'vfs.file.contents[/sys/block/{#DEVNAME}/stat]'
               tags:
                 -
-                  tag: Application
-                  value: 'Disk {#DEVNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: disk
+                  value: '{#DEVNAME}'
             -
               uuid: 92de75ec84994081831753c64c234b41
               name: '{#DEVNAME}: Disk read request avg waiting time (r_await)'
@@ -80,8 +83,11 @@ zabbix_export:
               description: 'This formula contains two boolean expressions that evaluates to 1 or 0 in order to set calculated metric to zero and to avoid division by zero exception.'
               tags:
                 -
-                  tag: Application
-                  value: 'Disk {#DEVNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: disk
+                  value: '{#DEVNAME}'
             -
               uuid: 8a00f63fdfc844d88941795ff0ca1e8b
               name: '{#DEVNAME}: Disk read rate'
@@ -105,8 +111,11 @@ zabbix_export:
                 key: 'vfs.file.contents[/sys/block/{#DEVNAME}/stat]'
               tags:
                 -
-                  tag: Application
-                  value: 'Disk {#DEVNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: disk
+                  value: '{#DEVNAME}'
             -
               uuid: 9f1253dfd045447fbe4769e00fdf4fc7
               name: '{#DEVNAME}: Disk read time (rate)'
@@ -133,8 +142,11 @@ zabbix_export:
                 key: 'vfs.file.contents[/sys/block/{#DEVNAME}/stat]'
               tags:
                 -
-                  tag: Application
-                  value: 'Zabbix raw items'
+                  tag: component
+                  value: storage
+                -
+                  tag: disk
+                  value: '{#DEVNAME}'
             -
               uuid: 00942e8bc61b423d84479cfc37b3f184
               name: '{#DEVNAME}: Disk utilization'
@@ -162,8 +174,11 @@ zabbix_export:
                 key: 'vfs.file.contents[/sys/block/{#DEVNAME}/stat]'
               tags:
                 -
-                  tag: Application
-                  value: 'Disk {#DEVNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: disk
+                  value: '{#DEVNAME}'
             -
               uuid: 0edcba521a6348629740e5b80034cb28
               name: '{#DEVNAME}: Disk write request avg waiting time (w_await)'
@@ -176,8 +191,11 @@ zabbix_export:
               description: 'This formula contains two boolean expressions that evaluates to 1 or 0 in order to set calculated metric to zero and to avoid division by zero exception.'
               tags:
                 -
-                  tag: Application
-                  value: 'Disk {#DEVNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: disk
+                  value: '{#DEVNAME}'
             -
               uuid: c9dcb1acf07441d2b6ea9eb520c96aff
               name: '{#DEVNAME}: Disk write rate'
@@ -201,8 +219,11 @@ zabbix_export:
                 key: 'vfs.file.contents[/sys/block/{#DEVNAME}/stat]'
               tags:
                 -
-                  tag: Application
-                  value: 'Disk {#DEVNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: disk
+                  value: '{#DEVNAME}'
             -
               uuid: 30c2ee8fd86a4d369d4fc0b2c713dec2
               name: '{#DEVNAME}: Disk write time (rate)'
@@ -229,8 +250,11 @@ zabbix_export:
                 key: 'vfs.file.contents[/sys/block/{#DEVNAME}/stat]'
               tags:
                 -
-                  tag: Application
-                  value: 'Zabbix raw items'
+                  tag: component
+                  value: storage
+                -
+                  tag: disk
+                  value: '{#DEVNAME}'
             -
               uuid: e25a03160e3243b5a33dfd834055b6e4
               name: '{#DEVNAME}: Get stats'
@@ -246,8 +270,8 @@ zabbix_export:
                     - 'return JSON.stringify(value.trim().split(/ +/));'
               tags:
                 -
-                  tag: Application
-                  value: 'Zabbix raw items'
+                  tag: component
+                  value: raw
           trigger_prototypes:
             -
               uuid: 3ac02c78c65f49bdae63669652236b7b
@@ -256,6 +280,10 @@ zabbix_export:
               priority: WARNING
               description: 'This trigger might indicate disk {#DEVNAME} saturation.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: 96ca565847ac46ffb7456fbfa4513922
@@ -361,8 +389,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: 'Monitoring agent'
+              tag: component
+              value: system
         -
           uuid: f94f9f4699e94c369e6c98b2a2f485ce
           name: 'Zabbix agent ping'
@@ -373,8 +401,8 @@ zabbix_export:
             name: 'Zabbix agent ping status'
           tags:
             -
-              tag: Application
-              value: 'Monitoring agent'
+              tag: component
+              value: system
         -
           uuid: 27c42cf180b44632b5d9b8b5788165b3
           name: 'Version of Zabbix agent running'
@@ -390,8 +418,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: 'Monitoring agent'
+              tag: component
+              value: application
         -
           uuid: ef386d03ff2c42ffa236acd5215ad547
           name: 'Maximum number of open file descriptors'
@@ -406,14 +434,18 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: b9bdcf42f54a409a9a9a616dbd0eaed2
               expression: 'last(/Linux by Zabbix agent/kernel.maxfiles)<{$KERNEL.MAXFILES.MIN}'
               name: 'Configured max number of open filedescriptors is too low (< {$KERNEL.MAXFILES.MIN})'
               priority: INFO
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 678d70c041954ac8982fb5118b49f6e7
           name: 'Maximum number of processes'
@@ -428,8 +460,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 8cf253ca3eea4109a90443f9cb76fc5c
@@ -440,6 +472,10 @@ zabbix_export:
                 -
                   name: 'Getting closer to process limit (over 80% used)'
                   expression: 'last(/Linux by Zabbix agent/proc.num)/last(/Linux by Zabbix agent/kernel.maxproc)*100>80'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: ab7d0471092544a6a950184d1bac906d
           name: 'Number of processes'
@@ -447,8 +483,8 @@ zabbix_export:
           history: 7d
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: b2637293884d40108f41b11767dd5be0
           name: 'Number of running processes'
@@ -456,8 +492,8 @@ zabbix_export:
           history: 7d
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 27cb0f66bb624146acfdd81b58f108a3
           name: 'System boot time'
@@ -472,8 +508,8 @@ zabbix_export:
                 - 1h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 5d186a46867b4eaaafd6396d3239dd3b
           name: 'Interrupts per second'
@@ -487,8 +523,8 @@ zabbix_export:
                 - ''
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: 48528aa936a04c8189375a6eae4033da
           name: 'Load average (1m avg)'
@@ -497,8 +533,8 @@ zabbix_export:
           value_type: FLOAT
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: 953beb580df8418cb88b667b9dd37259
           name: 'Load average (5m avg)'
@@ -507,8 +543,8 @@ zabbix_export:
           value_type: FLOAT
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: 5716000e38e24dae8ead4ed98ede024b
           name: 'Load average (15m avg)'
@@ -517,8 +553,8 @@ zabbix_export:
           value_type: FLOAT
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: f72e115544eb4079b09fec8c3539241c
           name: 'Number of CPUs'
@@ -531,8 +567,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: 73e85aa10a704fc7950d2d077f0c54ee
           name: 'Context switches per second'
@@ -546,8 +582,8 @@ zabbix_export:
                 - ''
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: ca4235ec7607469cb0124a6253d3c489
           name: 'CPU utilization'
@@ -569,8 +605,8 @@ zabbix_export:
             key: 'system.cpu.util[,idle]'
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
           triggers:
             -
               uuid: b4e904559b694df0ad45bcce7930c3a6
@@ -586,6 +622,10 @@ zabbix_export:
                     min(/Linux by Zabbix agent/system.cpu.load[all,avg1],5m)/last(/Linux by Zabbix agent/system.cpu.num)>{$LOAD_AVG_PER_CPU.MAX.WARN}
                     and last(/Linux by Zabbix agent/system.cpu.load[all,avg5])>0
                     and last(/Linux by Zabbix agent/system.cpu.load[all,avg15])>0
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 69b187838fb74f319e47c2ff4f99ef54
           name: 'CPU guest time'
@@ -596,8 +636,8 @@ zabbix_export:
           description: 'Guest  time (time  spent  running  a  virtual  CPU  for  a  guest  operating  system)'
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: a2b07497f2f343a99d26ad77e65bb54f
           name: 'CPU guest nice time'
@@ -608,8 +648,8 @@ zabbix_export:
           description: 'Time spent running a niced guest (virtual CPU for guest operating systems under the control of the Linux kernel)'
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: 7aad6d159baa4a24901847144f0d231b
           name: 'CPU idle time'
@@ -620,8 +660,8 @@ zabbix_export:
           description: 'The time the CPU has spent doing nothing.'
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: cc4bc7693ae84f9bb18cee38d0814195
           name: 'CPU interrupt time'
@@ -632,8 +672,8 @@ zabbix_export:
           description: 'The amount of time the CPU has been servicing hardware interrupts.'
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: 5df67d9162cc437585990cc8708be894
           name: 'CPU iowait time'
@@ -644,8 +684,8 @@ zabbix_export:
           description: 'Amount of time the CPU has been waiting for I/O to complete.'
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: 8ee6e54c86ba44ab88bb9e83c632c1ed
           name: 'CPU nice time'
@@ -656,8 +696,8 @@ zabbix_export:
           description: 'The time the CPU has spent running users'' processes that have been niced.'
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: a949a36004a449c58bef0cdc9d3fafd6
           name: 'CPU softirq time'
@@ -668,8 +708,8 @@ zabbix_export:
           description: 'The amount of time the CPU has been servicing software interrupts.'
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: 3161dbd18e874e69b729c8e903cf7390
           name: 'CPU steal time'
@@ -680,8 +720,8 @@ zabbix_export:
           description: 'The amount of CPU ''stolen'' from this virtual machine by the hypervisor for other tasks (such as running another virtual machine).'
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: d93097ed5ce74d35b6041ef2b5ba18e8
           name: 'CPU system time'
@@ -692,8 +732,8 @@ zabbix_export:
           description: 'The time the CPU has spent running the kernel and its processes.'
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: 57f9e2e34fab41e18e2bc93e786c92c6
           name: 'CPU user time'
@@ -704,8 +744,8 @@ zabbix_export:
           description: 'The time the CPU has spent running users'' processes that are not niced.'
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: 207341f390134e37ad431e2823666eb9
           name: 'System name'
@@ -723,8 +763,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 371a12f95a26438d8da659c84364631b
@@ -733,6 +773,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: 6072902361404672a444841c786875e6
           name: 'System local time'
@@ -742,8 +789,8 @@ zabbix_export:
           description: 'System local time of the host.'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: fb77b6ac381c4b5289584bd91e7da7d5
@@ -752,6 +799,13 @@ zabbix_export:
               priority: WARNING
               description: 'The host system time is different from the Zabbix server time.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: fd21580a151246b0a340bf924c326aa8
           name: 'Operating system architecture'
@@ -768,8 +822,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: os
         -
           uuid: 5e4c3d14634843e9b7b182e8fc08efbe
           name: 'Operating system'
@@ -786,8 +840,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: os
           triggers:
             -
               uuid: b1998f98c06b49dd8d71e1c6df409371
@@ -800,6 +854,10 @@ zabbix_export:
                 -
                   name: 'System name has changed (new name: {ITEM.VALUE})'
                   expression: 'last(/Linux by Zabbix agent/system.hostname,#1)<>last(/Linux by Zabbix agent/system.hostname,#2) and length(last(/Linux by Zabbix agent/system.hostname))>0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 58818005e76d46dda14d6592f601ab00
           name: 'Software installed'
@@ -815,8 +873,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: os
         -
           uuid: 160b82c121b147cbbf18c34dbb01d3ce
           name: 'Free swap space'
@@ -826,8 +884,11 @@ zabbix_export:
           description: 'The free space of swap volume/file in bytes.'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
+            -
+              tag: component
+              value: storage
         -
           uuid: ca423242172f4b20ba47c26f4a61aee7
           name: 'Free swap space in %'
@@ -838,8 +899,11 @@ zabbix_export:
           description: 'The free space of swap volume/file in percent.'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
+            -
+              tag: component
+              value: storage
         -
           uuid: 102c81b5523c4be0b4beae3cb88ebde1
           name: 'Total swap space'
@@ -849,8 +913,11 @@ zabbix_export:
           description: 'The total space of swap volume/file in bytes.'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
+            -
+              tag: component
+              value: storage
         -
           uuid: fc6898682f904c57ba28bcb3748b237f
           name: 'System description'
@@ -867,8 +934,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 8537f6c6ac6b438c80caf227946df891
           name: 'System uptime'
@@ -880,8 +947,8 @@ zabbix_export:
           description: 'System uptime in ''N days, hh:mm:ss'' format.'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 1dbab80d7b6847e5b5a676cffba0fd1d
@@ -890,6 +957,10 @@ zabbix_export:
               priority: WARNING
               description: 'The host uptime is less than 10 minutes'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 88056b3d2e424d5aba7cabcd4b043c9e
           name: 'Number of logged in users'
@@ -898,8 +969,8 @@ zabbix_export:
           description: 'Number of users who are currently logged in.'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: environment
         -
           uuid: 3b93d3590df24a46b29f6eb06f5e2446
           name: 'Checksum of /etc/passwd'
@@ -915,8 +986,8 @@ zabbix_export:
                 - 1h
           tags:
             -
-              tag: Application
-              value: Security
+              tag: component
+              value: environment
           triggers:
             -
               uuid: 3a764881727b4e7eb01e137ccfc968a2
@@ -931,6 +1002,10 @@ zabbix_export:
                 -
                   name: 'System name has changed (new name: {ITEM.VALUE})'
                   expression: 'last(/Linux by Zabbix agent/system.hostname,#1)<>last(/Linux by Zabbix agent/system.hostname,#2) and length(last(/Linux by Zabbix agent/system.hostname))>0'
+              tags:
+                -
+                  tag: scope
+                  value: security
         -
           uuid: e811e6e2ae84461294e121f12e767b40
           name: 'Available memory'
@@ -940,8 +1015,8 @@ zabbix_export:
           description: 'Available memory, in Linux, available = free + buffers + cache. On other platforms calculation may vary. See also Appendixes in Zabbix Documentation about parameters of the vm.memory.size item.'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 20779a4c43374e5f9bea2584e93b85ef
           name: 'Available memory in %'
@@ -952,8 +1027,8 @@ zabbix_export:
           description: 'Available memory as percentage of total. See also Appendixes in Zabbix Documentation about parameters of the vm.memory.size item.'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: d5c3541a7c0949ce812df1beb0732941
           name: 'Total memory'
@@ -963,8 +1038,8 @@ zabbix_export:
           description: 'Total memory in Bytes'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 403cebed115441369e94d35d070ca7b8
           name: 'Memory utilization'
@@ -984,8 +1059,8 @@ zabbix_export:
             key: 'vm.memory.size[pavailable]'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: cfd395b1cde74ef18a5e5f840bd5142a
@@ -996,7 +1071,14 @@ zabbix_export:
               dependencies:
                 -
                   name: 'Lack of available memory (<{$MEMORY.AVAILABLE.MIN} of {ITEM.VALUE2})'
-                  expression: 'min(/Linux by Zabbix agent/vm.memory.size[available],5m)<{$MEMORY.AVAILABLE.MIN} and last(/Linux by Zabbix agent/vm.memory.size[total])>0'
+                  expression: 'max(/Linux by Zabbix agent/vm.memory.size[available],5m)<{$MEMORY.AVAILABLE.MIN} and last(/Linux by Zabbix agent/vm.memory.size[total])>0'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: ca48c53be1bf46ae9dd2707158a55139
           name: 'Zabbix agent availability'
@@ -1008,8 +1090,8 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 93594214371b4dc88b41663cad8537f0
@@ -1018,6 +1100,10 @@ zabbix_export:
               priority: AVERAGE
               description: 'For passive only agents, host availability is used with {$AGENT.TIMEOUT} as time threshold.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: acfdea9c46ef48c68e6636f43b8f96a2
@@ -1051,8 +1137,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: ed79960ca91f4e2ca45fed014a02c50b
               name: 'Interface {#IFNAME}: Inbound packets with errors'
@@ -1066,8 +1158,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: c9941a1f8d904309b581cae5ccc1660c
               name: 'Interface {#IFNAME}: Bits received'
@@ -1086,8 +1184,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 0795a375a41d46a2b5c89547061cec8e
               name: 'Interface {#IFNAME}: Outbound packets discarded'
@@ -1101,8 +1205,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: f8e8bbc069414e928a5da9817f4599a5
               name: 'Interface {#IFNAME}: Outbound packets with errors'
@@ -1116,8 +1226,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 82897d99b0114c67b0f5b449c768c8e7
               name: 'Interface {#IFNAME}: Bits sent'
@@ -1136,8 +1252,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 3efd24ad36b04eb995cfeab82721c2fe
               name: 'Interface {#IFNAME}: Operational status'
@@ -1180,8 +1302,14 @@ zabbix_export:
                       return newvalue;
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 4d7f18ca132340b885c0692464dc429f
@@ -1199,6 +1327,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: d537e74070c74e4385ad241e8514dd3a
               name: 'Interface {#IFNAME}: Interface type'
@@ -1219,8 +1351,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           trigger_prototypes:
             -
               uuid: 2ffdc1d5a318492bb497facd263843bd
@@ -1245,6 +1383,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}: Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Linux by Zabbix agent/vfs.file.contents["/sys/class/net/{#IFNAME}/operstate"])=2 and (last(/Linux by Zabbix agent/vfs.file.contents["/sys/class/net/{#IFNAME}/operstate"],#1)<>last(/Linux by Zabbix agent/vfs.file.contents["/sys/class/net/{#IFNAME}/operstate"],#2))'
                   recovery_expression: 'last(/Linux by Zabbix agent/vfs.file.contents["/sys/class/net/{#IFNAME}/operstate"])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: ad50aecf8e7746b2a85f24507f1d511d
               expression: |
@@ -1264,6 +1406,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}: Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Linux by Zabbix agent/vfs.file.contents["/sys/class/net/{#IFNAME}/operstate"])=2 and (last(/Linux by Zabbix agent/vfs.file.contents["/sys/class/net/{#IFNAME}/operstate"],#1)<>last(/Linux by Zabbix agent/vfs.file.contents["/sys/class/net/{#IFNAME}/operstate"],#2))'
                   recovery_expression: 'last(/Linux by Zabbix agent/vfs.file.contents["/sys/class/net/{#IFNAME}/operstate"])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: 50ced0f22d9d478eb4b639ef64e242ab
@@ -1358,8 +1507,11 @@ zabbix_export:
                 key: 'vfs.file.contents[/sys/block/{#DEVNAME}/stat]'
               tags:
                 -
-                  tag: Application
-                  value: 'Disk {#DEVNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: disk
+                  value: '{#DEVNAME}'
             -
               uuid: 9600208af80e4a6abe55bb5a2240ea8e
               name: '{#DEVNAME}: Disk read request avg waiting time (r_await)'
@@ -1372,8 +1524,11 @@ zabbix_export:
               description: 'This formula contains two boolean expressions that evaluates to 1 or 0 in order to set calculated metric to zero and to avoid division by zero exception.'
               tags:
                 -
-                  tag: Application
-                  value: 'Disk {#DEVNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: disk
+                  value: '{#DEVNAME}'
             -
               uuid: f4b982d8e7ee47adb34d74d817db43a6
               name: '{#DEVNAME}: Disk read rate'
@@ -1397,8 +1552,11 @@ zabbix_export:
                 key: 'vfs.file.contents[/sys/block/{#DEVNAME}/stat]'
               tags:
                 -
-                  tag: Application
-                  value: 'Disk {#DEVNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: disk
+                  value: '{#DEVNAME}'
             -
               uuid: 877a3e892d9e489f98f2f16ea05bfdc2
               name: '{#DEVNAME}: Disk read time (rate)'
@@ -1425,8 +1583,11 @@ zabbix_export:
                 key: 'vfs.file.contents[/sys/block/{#DEVNAME}/stat]'
               tags:
                 -
-                  tag: Application
-                  value: 'Zabbix raw items'
+                  tag: component
+                  value: storage
+                -
+                  tag: disk
+                  value: '{#DEVNAME}'
             -
               uuid: 4a3ee3166ee748e1855a2b02d44e9d62
               name: '{#DEVNAME}: Disk utilization'
@@ -1454,8 +1615,11 @@ zabbix_export:
                 key: 'vfs.file.contents[/sys/block/{#DEVNAME}/stat]'
               tags:
                 -
-                  tag: Application
-                  value: 'Disk {#DEVNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: disk
+                  value: '{#DEVNAME}'
             -
               uuid: 5907708cf4854d48ae3ebf8f0bc41eef
               name: '{#DEVNAME}: Disk write request avg waiting time (w_await)'
@@ -1468,8 +1632,11 @@ zabbix_export:
               description: 'This formula contains two boolean expressions that evaluates to 1 or 0 in order to set calculated metric to zero and to avoid division by zero exception.'
               tags:
                 -
-                  tag: Application
-                  value: 'Disk {#DEVNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: disk
+                  value: '{#DEVNAME}'
             -
               uuid: c4eb904dfddd4b0f8cdee4b2c477e213
               name: '{#DEVNAME}: Disk write rate'
@@ -1493,8 +1660,11 @@ zabbix_export:
                 key: 'vfs.file.contents[/sys/block/{#DEVNAME}/stat]'
               tags:
                 -
-                  tag: Application
-                  value: 'Disk {#DEVNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: disk
+                  value: '{#DEVNAME}'
             -
               uuid: e828495863304b219e24965f7b91e963
               name: '{#DEVNAME}: Disk write time (rate)'
@@ -1521,8 +1691,11 @@ zabbix_export:
                 key: 'vfs.file.contents[/sys/block/{#DEVNAME}/stat]'
               tags:
                 -
-                  tag: Application
-                  value: 'Zabbix raw items'
+                  tag: component
+                  value: storage
+                -
+                  tag: disk
+                  value: '{#DEVNAME}'
             -
               uuid: 8309fd01a5864ad68866717d0fe67080
               name: '{#DEVNAME}: Get stats'
@@ -1538,8 +1711,8 @@ zabbix_export:
                     - 'return JSON.stringify(value.trim().split(/ +/));'
               tags:
                 -
-                  tag: Application
-                  value: 'Zabbix raw items'
+                  tag: component
+                  value: raw
           trigger_prototypes:
             -
               uuid: eb6230f786d04b658ce62c30a9309a34
@@ -1548,6 +1721,10 @@ zabbix_export:
               priority: WARNING
               description: 'This trigger might indicate disk {#DEVNAME} saturation.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: 5e9b35b27b90489390d397758fbfdf64
@@ -1640,8 +1817,11 @@ zabbix_export:
               units: '%'
               tags:
                 -
-                  tag: Application
-                  value: 'Filesystem {#FSNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
               trigger_prototypes:
                 -
                   uuid: 115b2d37807f476faf6d02ef406acabd
@@ -1652,6 +1832,13 @@ zabbix_export:
                   description: |
                     It may become impossible to write to disk if there are no index nodes left.
                     As symptoms, 'No space left on device' or 'Disk is full' errors may be seen even though free space is available.
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: ea012c7295344ffe8c66f7ea54d81042
                   expression: 'min(/Linux by Zabbix agent/vfs.fs.inode[{#FSNAME},pfree],5m)<{$VFS.FS.INODE.PFREE.MIN.WARN:"{#FSNAME}"}'
@@ -1665,6 +1852,13 @@ zabbix_export:
                     -
                       name: '{#FSNAME}: Running out of free inodes (free < {$VFS.FS.INODE.PFREE.MIN.CRIT:"{#FSNAME}"}%)'
                       expression: 'min(/Linux by Zabbix agent/vfs.fs.inode[{#FSNAME},pfree],5m)<{$VFS.FS.INODE.PFREE.MIN.CRIT:"{#FSNAME}"}'
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 61ffe6fcb9d94199aaeb5d568ab74a27
               name: '{#FSNAME}: Space utilization'
@@ -1675,8 +1869,11 @@ zabbix_export:
               description: 'Space utilization in % for {#FSNAME}'
               tags:
                 -
-                  tag: Application
-                  value: 'Filesystem {#FSNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: a6d90e0bc5ef4fb7acee8682687c485f
               name: '{#FSNAME}: Total space'
@@ -1686,8 +1883,11 @@ zabbix_export:
               description: 'Total space in Bytes'
               tags:
                 -
-                  tag: Application
-                  value: 'Filesystem {#FSNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: efee06a191aa4e5c8faa2762988b6955
               name: '{#FSNAME}: Used space'
@@ -1697,8 +1897,11 @@ zabbix_export:
               description: 'Used storage in Bytes'
               tags:
                 -
-                  tag: Application
-                  value: 'Filesystem {#FSNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
           trigger_prototypes:
             -
               uuid: 9abccdfff8be4e14967ac917ca09afe1
@@ -1714,6 +1917,13 @@ zabbix_export:
                  - The disk free space is less than 5G.
                  - The disk will be full in less than 24 hours.
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
             -
               uuid: d6d348ea500c428da6ba718816c4b048
               expression: |
@@ -1734,6 +1944,13 @@ zabbix_export:
                   expression: |
                     last(/Linux by Zabbix agent/vfs.fs.size[{#FSNAME},pused])>{$VFS.FS.PUSED.MAX.CRIT:"{#FSNAME}"} and
                     ((last(/Linux by Zabbix agent/vfs.fs.size[{#FSNAME},total])-last(/Linux by Zabbix agent/vfs.fs.size[{#FSNAME},used]))<5G or timeleft(/Linux by Zabbix agent/vfs.fs.size[{#FSNAME},pused],1h,100)<1d)
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
           graph_prototypes:
             -
               uuid: 1e0889c551584013acbb97c84ae89d1c
@@ -1757,6 +1974,13 @@ zabbix_export:
                   item:
                     host: 'Linux by Zabbix agent'
                     key: 'vfs.fs.size[{#FSNAME},used]'
+      tags:
+        -
+          tag: class
+          value: os
+        -
+          tag: target
+          value: linux
       macros:
         -
           macro: '{$AGENT.TIMEOUT}'
@@ -2330,8 +2554,8 @@ zabbix_export:
                 - ''
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: 9c7bd054537a449c84959c68850a232b
           name: 'Load average (1m avg)'
@@ -2340,8 +2564,8 @@ zabbix_export:
           value_type: FLOAT
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: dd912665ba1c4934af0bf3cb22cb925c
           name: 'Load average (5m avg)'
@@ -2350,8 +2574,8 @@ zabbix_export:
           value_type: FLOAT
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: 9298150efe98434694bc3ef940e4da3f
           name: 'Load average (15m avg)'
@@ -2360,8 +2584,8 @@ zabbix_export:
           value_type: FLOAT
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: a735c884e70349f78c66233047f7afe6
           name: 'Number of CPUs'
@@ -2374,8 +2598,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: f3ec31faa3ca4be6a176bc47679d18f7
           name: 'Context switches per second'
@@ -2389,8 +2613,8 @@ zabbix_export:
                 - ''
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: 57074f87ab8e410ea6b0cb4708ab627e
           name: 'CPU utilization'
@@ -2412,8 +2636,8 @@ zabbix_export:
             key: 'system.cpu.util[,idle]'
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
           triggers:
             -
               uuid: d6099dae0c3a4252ab2af61104768170
@@ -2429,6 +2653,10 @@ zabbix_export:
                     min(/Linux CPU by Zabbix agent/system.cpu.load[all,avg1],5m)/last(/Linux CPU by Zabbix agent/system.cpu.num)>{$LOAD_AVG_PER_CPU.MAX.WARN}
                     and last(/Linux CPU by Zabbix agent/system.cpu.load[all,avg5])>0
                     and last(/Linux CPU by Zabbix agent/system.cpu.load[all,avg15])>0
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 8778c8da3e45497584428b512f278fb9
           name: 'CPU guest time'
@@ -2439,8 +2667,8 @@ zabbix_export:
           description: 'Guest  time (time  spent  running  a  virtual  CPU  for  a  guest  operating  system)'
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: 61e4250a2b0341f684ebc8adb568822f
           name: 'CPU guest nice time'
@@ -2451,8 +2679,8 @@ zabbix_export:
           description: 'Time spent running a niced guest (virtual CPU for guest operating systems under the control of the Linux kernel)'
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: 5cb0b9e7dacf4507bd0007e923f8a970
           name: 'CPU idle time'
@@ -2463,8 +2691,8 @@ zabbix_export:
           description: 'The time the CPU has spent doing nothing.'
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: 9e9fac69e7b646e2946987bdb3f36103
           name: 'CPU interrupt time'
@@ -2475,8 +2703,8 @@ zabbix_export:
           description: 'The amount of time the CPU has been servicing hardware interrupts.'
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: c078212326f04fd8878eee4b63e3ef7e
           name: 'CPU iowait time'
@@ -2487,8 +2715,8 @@ zabbix_export:
           description: 'Amount of time the CPU has been waiting for I/O to complete.'
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: ca4c30b1c8a24edea59f6a2d76158f5f
           name: 'CPU nice time'
@@ -2499,8 +2727,8 @@ zabbix_export:
           description: 'The time the CPU has spent running users'' processes that have been niced.'
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: 6eab3a98207a4aa397083de9773560d2
           name: 'CPU softirq time'
@@ -2511,8 +2739,8 @@ zabbix_export:
           description: 'The amount of time the CPU has been servicing software interrupts.'
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: d540fcdaaebc47dbbc52f6b92331ae61
           name: 'CPU steal time'
@@ -2523,8 +2751,8 @@ zabbix_export:
           description: 'The amount of CPU ''stolen'' from this virtual machine by the hypervisor for other tasks (such as running another virtual machine).'
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: a0e8576ca7cd47a8adf72bfcde1065be
           name: 'CPU system time'
@@ -2535,8 +2763,8 @@ zabbix_export:
           description: 'The time the CPU has spent running the kernel and its processes.'
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: 3e37c91b2d304a5583f0578b99ec8eec
           name: 'CPU user time'
@@ -2547,8 +2775,8 @@ zabbix_export:
           description: 'The time the CPU has spent running users'' processes that are not niced.'
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
@@ -2603,8 +2831,11 @@ zabbix_export:
               units: '%'
               tags:
                 -
-                  tag: Application
-                  value: 'Filesystem {#FSNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
               trigger_prototypes:
                 -
                   uuid: 26adf86d6dd741b48007577091d5902c
@@ -2615,6 +2846,13 @@ zabbix_export:
                   description: |
                     It may become impossible to write to disk if there are no index nodes left.
                     As symptoms, 'No space left on device' or 'Disk is full' errors may be seen even though free space is available.
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 756b0126cc004f8d97f10384a4dc8587
                   expression: 'min(/Linux filesystems by Zabbix agent/vfs.fs.inode[{#FSNAME},pfree],5m)<{$VFS.FS.INODE.PFREE.MIN.WARN:"{#FSNAME}"}'
@@ -2628,6 +2866,13 @@ zabbix_export:
                     -
                       name: '{#FSNAME}: Running out of free inodes (free < {$VFS.FS.INODE.PFREE.MIN.CRIT:"{#FSNAME}"}%)'
                       expression: 'min(/Linux filesystems by Zabbix agent/vfs.fs.inode[{#FSNAME},pfree],5m)<{$VFS.FS.INODE.PFREE.MIN.CRIT:"{#FSNAME}"}'
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: a39947b5a940441a961f685b430cd7e9
               name: '{#FSNAME}: Space utilization'
@@ -2638,8 +2883,11 @@ zabbix_export:
               description: 'Space utilization in % for {#FSNAME}'
               tags:
                 -
-                  tag: Application
-                  value: 'Filesystem {#FSNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: e6ce1925a65d4b1fa954ac55fcd39b04
               name: '{#FSNAME}: Total space'
@@ -2649,8 +2897,11 @@ zabbix_export:
               description: 'Total space in Bytes'
               tags:
                 -
-                  tag: Application
-                  value: 'Filesystem {#FSNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 74c773bffa8e41f2a3cd7abf0b710fcf
               name: '{#FSNAME}: Used space'
@@ -2660,8 +2911,11 @@ zabbix_export:
               description: 'Used storage in Bytes'
               tags:
                 -
-                  tag: Application
-                  value: 'Filesystem {#FSNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
           trigger_prototypes:
             -
               uuid: fb410c10bd59476dbe58e1ee179cd25f
@@ -2677,6 +2931,13 @@ zabbix_export:
                  - The disk free space is less than 5G.
                  - The disk will be full in less than 24 hours.
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
             -
               uuid: d66583735eb04973ac30d923533c4b0f
               expression: |
@@ -2697,6 +2958,13 @@ zabbix_export:
                   expression: |
                     last(/Linux filesystems by Zabbix agent/vfs.fs.size[{#FSNAME},pused])>{$VFS.FS.PUSED.MAX.CRIT:"{#FSNAME}"} and
                     ((last(/Linux filesystems by Zabbix agent/vfs.fs.size[{#FSNAME},total])-last(/Linux filesystems by Zabbix agent/vfs.fs.size[{#FSNAME},used]))<5G or timeleft(/Linux filesystems by Zabbix agent/vfs.fs.size[{#FSNAME},pused],1h,100)<1d)
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
           graph_prototypes:
             -
               uuid: 3ccd5c1a0e15489c9b57030ee634b8e3
@@ -2772,14 +3040,18 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: abf2e035f1e54971a0795152f922271b
               expression: 'last(/Linux generic by Zabbix agent/kernel.maxfiles)<{$KERNEL.MAXFILES.MIN}'
               name: 'Configured max number of open filedescriptors is too low (< {$KERNEL.MAXFILES.MIN})'
               priority: INFO
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: a82525acd1bd4039860ad2d750476760
           name: 'Maximum number of processes'
@@ -2794,8 +3066,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 079c2be2b0a44965a8e83cedba222b8d
@@ -2806,6 +3078,10 @@ zabbix_export:
                 -
                   name: 'Getting closer to process limit (over 80% used)'
                   expression: 'last(/Linux generic by Zabbix agent/proc.num)/last(/Linux generic by Zabbix agent/kernel.maxproc)*100>80'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 0207b131fa26435ba6b5979c46719bc8
           name: 'Number of processes'
@@ -2813,8 +3089,8 @@ zabbix_export:
           history: 7d
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: fa98827fe6474bf692d6aba3273836f7
           name: 'Number of running processes'
@@ -2822,8 +3098,8 @@ zabbix_export:
           history: 7d
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 48c251895f234f4595c4133015c27a18
           name: 'System boot time'
@@ -2838,8 +3114,8 @@ zabbix_export:
                 - 1h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: f744b8e0be46431e8088803b3a1b210d
           name: 'System name'
@@ -2857,8 +3133,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: eda29f0c8c55495ab93820caa26338bf
@@ -2867,6 +3143,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: ac41daaa287944f3b0429c6fb2bca09c
           name: 'System local time'
@@ -2876,8 +3159,8 @@ zabbix_export:
           description: 'System local time of the host.'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: cffb7209ce2a45bd868ac41c0680be56
@@ -2886,6 +3169,13 @@ zabbix_export:
               priority: WARNING
               description: 'The host system time is different from the Zabbix server time.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 2e6e1ac8eb724a47b6c50b6c352ee3f7
           name: 'Operating system architecture'
@@ -2902,8 +3192,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: os
         -
           uuid: a40ad2e2bda3453b873d634e6a003dc2
           name: 'Operating system'
@@ -2920,8 +3210,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: os
           triggers:
             -
               uuid: 2f043de71d2940d184aa02200e33c28a
@@ -2934,6 +3224,10 @@ zabbix_export:
                 -
                   name: 'System name has changed (new name: {ITEM.VALUE})'
                   expression: 'last(/Linux generic by Zabbix agent/system.hostname,#1)<>last(/Linux generic by Zabbix agent/system.hostname,#2) and length(last(/Linux generic by Zabbix agent/system.hostname))>0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 1097f843e7324a1fa0508544ddddd556
           name: 'Software installed'
@@ -2949,8 +3243,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: os
         -
           uuid: b3a8feced15d4a09a8a2d8d1d8c9a546
           name: 'System description'
@@ -2967,8 +3261,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 0a49428e394c4431bf97aa8787637bff
           name: 'System uptime'
@@ -2980,8 +3274,8 @@ zabbix_export:
           description: 'System uptime in ''N days, hh:mm:ss'' format.'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 2b612f4d65f4444c8a0609362c48463b
@@ -2990,6 +3284,10 @@ zabbix_export:
               priority: WARNING
               description: 'The host uptime is less than 10 minutes'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: c595adf482c04553a2477bc1d929bc8d
           name: 'Number of logged in users'
@@ -2998,8 +3296,8 @@ zabbix_export:
           description: 'Number of users who are currently logged in.'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: environment
         -
           uuid: a10cff7883a4433bb744ebc2264fa13d
           name: 'Checksum of /etc/passwd'
@@ -3015,8 +3313,8 @@ zabbix_export:
                 - 1h
           tags:
             -
-              tag: Application
-              value: Security
+              tag: component
+              value: environment
           triggers:
             -
               uuid: a07bba3d320c4979b68ac0bbfad900dc
@@ -3031,6 +3329,10 @@ zabbix_export:
                 -
                   name: 'System name has changed (new name: {ITEM.VALUE})'
                   expression: 'last(/Linux generic by Zabbix agent/system.hostname,#1)<>last(/Linux generic by Zabbix agent/system.hostname,#2) and length(last(/Linux generic by Zabbix agent/system.hostname))>0'
+              tags:
+                -
+                  tag: scope
+                  value: security
       macros:
         -
           macro: '{$KERNEL.MAXFILES.MIN}'
@@ -3059,8 +3361,11 @@ zabbix_export:
           description: 'The free space of swap volume/file in bytes.'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
+            -
+              tag: component
+              value: storage
         -
           uuid: da85940246a044398668403af8ce0bb6
           name: 'Free swap space in %'
@@ -3071,8 +3376,11 @@ zabbix_export:
           description: 'The free space of swap volume/file in percent.'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
+            -
+              tag: component
+              value: storage
         -
           uuid: 0067f617f90643d8b5721a659992db77
           name: 'Total swap space'
@@ -3082,8 +3390,11 @@ zabbix_export:
           description: 'The total space of swap volume/file in bytes.'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
+            -
+              tag: component
+              value: storage
         -
           uuid: e9aa329aff2c443595cd77443a512a1a
           name: 'Available memory'
@@ -3093,8 +3404,8 @@ zabbix_export:
           description: 'Available memory, in Linux, available = free + buffers + cache. On other platforms calculation may vary. See also Appendixes in Zabbix Documentation about parameters of the vm.memory.size item.'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 20299d21c1ee47a284f54e3b9c8ac919
           name: 'Available memory in %'
@@ -3105,8 +3416,8 @@ zabbix_export:
           description: 'Available memory as percentage of total. See also Appendixes in Zabbix Documentation about parameters of the vm.memory.size item.'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: b2f541b33a32428aa7644825d54f706a
           name: 'Total memory'
@@ -3116,8 +3427,8 @@ zabbix_export:
           description: 'Total memory in Bytes'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: bb852083c6aa43119bfb1d0756d9f1f7
           name: 'Memory utilization'
@@ -3137,8 +3448,8 @@ zabbix_export:
             key: 'vm.memory.size[pavailable]'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: 804010cd02244ec5b47ba77bfa734228
@@ -3149,7 +3460,14 @@ zabbix_export:
               dependencies:
                 -
                   name: 'Lack of available memory (<{$MEMORY.AVAILABLE.MIN} of {ITEM.VALUE2})'
-                  expression: 'min(/Linux memory by Zabbix agent/vm.memory.size[available],5m)<{$MEMORY.AVAILABLE.MIN} and last(/Linux memory by Zabbix agent/vm.memory.size[total])>0'
+                  expression: 'max(/Linux memory by Zabbix agent/vm.memory.size[available],5m)<{$MEMORY.AVAILABLE.MIN} and last(/Linux memory by Zabbix agent/vm.memory.size[total])>0'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
       macros:
         -
           macro: '{$MEMORY.AVAILABLE.MIN}'
@@ -3208,8 +3526,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: f0c78df653744f03aaef06f909525a3d
               name: 'Interface {#IFNAME}: Inbound packets with errors'
@@ -3223,8 +3547,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 544b545925344458ae3895198fa5b00a
               name: 'Interface {#IFNAME}: Bits received'
@@ -3243,8 +3573,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 3502455ff20742439521d5b9d2f015a3
               name: 'Interface {#IFNAME}: Outbound packets discarded'
@@ -3258,8 +3594,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 0044c70afff64bf99ecec9173ef7a0f8
               name: 'Interface {#IFNAME}: Outbound packets with errors'
@@ -3273,8 +3615,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: efa9c1b34b86486c9260730316c7a67c
               name: 'Interface {#IFNAME}: Bits sent'
@@ -3293,8 +3641,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: f9d88bf4e5b245ed80870b50506e7db3
               name: 'Interface {#IFNAME}: Operational status'
@@ -3337,8 +3691,14 @@ zabbix_export:
                       return newvalue;
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 4b06b63814d34a90abe971abcd97cf83
@@ -3356,6 +3716,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 09bb129b088d493990bb4fa381eacad8
               name: 'Interface {#IFNAME}: Interface type'
@@ -3376,8 +3740,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           trigger_prototypes:
             -
               uuid: 42ba7cc36b734d4a933ed4f7ceb8f3a4
@@ -3402,6 +3772,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}: Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Linux network interfaces by Zabbix agent/vfs.file.contents["/sys/class/net/{#IFNAME}/operstate"])=2 and (last(/Linux network interfaces by Zabbix agent/vfs.file.contents["/sys/class/net/{#IFNAME}/operstate"],#1)<>last(/Linux network interfaces by Zabbix agent/vfs.file.contents["/sys/class/net/{#IFNAME}/operstate"],#2))'
                   recovery_expression: 'last(/Linux network interfaces by Zabbix agent/vfs.file.contents["/sys/class/net/{#IFNAME}/operstate"])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: b4da7325b41647ab997cf6906a9cba23
               expression: |
@@ -3421,6 +3795,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}: Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Linux network interfaces by Zabbix agent/vfs.file.contents["/sys/class/net/{#IFNAME}/operstate"])=2 and (last(/Linux network interfaces by Zabbix agent/vfs.file.contents["/sys/class/net/{#IFNAME}/operstate"],#1)<>last(/Linux network interfaces by Zabbix agent/vfs.file.contents["/sys/class/net/{#IFNAME}/operstate"],#2))'
                   recovery_expression: 'last(/Linux network interfaces by Zabbix agent/vfs.file.contents["/sys/class/net/{#IFNAME}/operstate"])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: 4b1489e1d06a4443a4f379854936cfee
@@ -3740,15 +4121,23 @@ zabbix_export:
       name: 'Getting closer to process limit (over 80% used)'
       opdata: '{ITEM.LASTVALUE1} active, {ITEM.LASTVALUE2} limit.'
       priority: WARNING
+      tags:
+        -
+          tag: scope
+          value: performance
     -
       uuid: 613c30a98cf044b1b46a3d1d50f90eb8
       expression: 'last(/Linux generic by Zabbix agent/proc.num)/last(/Linux generic by Zabbix agent/kernel.maxproc)*100>80'
       name: 'Getting closer to process limit (over 80% used)'
       opdata: '{ITEM.LASTVALUE1} active, {ITEM.LASTVALUE2} limit.'
       priority: WARNING
+      tags:
+        -
+          tag: scope
+          value: performance
     -
       uuid: f49fc01c5ac945d59455563bdbcc6469
-      expression: 'min(/Linux by Zabbix agent/system.swap.size[,pfree],5m)<{$SWAP.PFREE.MIN.WARN} and last(/Linux by Zabbix agent/system.swap.size[,total])>0'
+      expression: 'max(/Linux by Zabbix agent/system.swap.size[,pfree],5m)<{$SWAP.PFREE.MIN.WARN} and last(/Linux by Zabbix agent/system.swap.size[,total])>0'
       name: 'High swap space usage (less than {$SWAP.PFREE.MIN.WARN}% free)'
       opdata: 'Free: {ITEM.LASTVALUE1}, total: {ITEM.LASTVALUE2}'
       priority: WARNING
@@ -3759,10 +4148,14 @@ zabbix_export:
           expression: 'min(/Linux by Zabbix agent/vm.memory.utilization,5m)>{$MEMORY.UTIL.MAX}'
         -
           name: 'Lack of available memory (<{$MEMORY.AVAILABLE.MIN} of {ITEM.VALUE2})'
-          expression: 'min(/Linux by Zabbix agent/vm.memory.size[available],5m)<{$MEMORY.AVAILABLE.MIN} and last(/Linux by Zabbix agent/vm.memory.size[total])>0'
+          expression: 'max(/Linux by Zabbix agent/vm.memory.size[available],5m)<{$MEMORY.AVAILABLE.MIN} and last(/Linux by Zabbix agent/vm.memory.size[total])>0'
+      tags:
+        -
+          tag: scope
+          value: capacity
     -
       uuid: 6bf4726efad344529d3c8908053c6e6c
-      expression: 'min(/Linux memory by Zabbix agent/system.swap.size[,pfree],5m)<{$SWAP.PFREE.MIN.WARN} and last(/Linux memory by Zabbix agent/system.swap.size[,total])>0'
+      expression: 'max(/Linux memory by Zabbix agent/system.swap.size[,pfree],5m)<{$SWAP.PFREE.MIN.WARN} and last(/Linux memory by Zabbix agent/system.swap.size[,total])>0'
       name: 'High swap space usage (less than {$SWAP.PFREE.MIN.WARN}% free)'
       opdata: 'Free: {ITEM.LASTVALUE1}, total: {ITEM.LASTVALUE2}'
       priority: WARNING
@@ -3773,19 +4166,37 @@ zabbix_export:
           expression: 'min(/Linux memory by Zabbix agent/vm.memory.utilization,5m)>{$MEMORY.UTIL.MAX}'
         -
           name: 'Lack of available memory (<{$MEMORY.AVAILABLE.MIN} of {ITEM.VALUE2})'
-          expression: 'min(/Linux memory by Zabbix agent/vm.memory.size[available],5m)<{$MEMORY.AVAILABLE.MIN} and last(/Linux memory by Zabbix agent/vm.memory.size[total])>0'
+          expression: 'max(/Linux memory by Zabbix agent/vm.memory.size[available],5m)<{$MEMORY.AVAILABLE.MIN} and last(/Linux memory by Zabbix agent/vm.memory.size[total])>0'
+      tags:
+        -
+          tag: scope
+          value: capacity
     -
       uuid: 686470cef97f48f6b017e9fc7a078afe
-      expression: 'min(/Linux by Zabbix agent/vm.memory.size[available],5m)<{$MEMORY.AVAILABLE.MIN} and last(/Linux by Zabbix agent/vm.memory.size[total])>0'
+      expression: 'max(/Linux by Zabbix agent/vm.memory.size[available],5m)<{$MEMORY.AVAILABLE.MIN} and last(/Linux by Zabbix agent/vm.memory.size[total])>0'
       name: 'Lack of available memory (<{$MEMORY.AVAILABLE.MIN} of {ITEM.VALUE2})'
       opdata: 'Available: {ITEM.LASTVALUE1}, total: {ITEM.LASTVALUE2}'
       priority: AVERAGE
+      tags:
+        -
+          tag: scope
+          value: capacity
+        -
+          tag: scope
+          value: performance
     -
       uuid: 3800877e8b474aa2aa83c1ecc0523db6
-      expression: 'min(/Linux memory by Zabbix agent/vm.memory.size[available],5m)<{$MEMORY.AVAILABLE.MIN} and last(/Linux memory by Zabbix agent/vm.memory.size[total])>0'
+      expression: 'max(/Linux memory by Zabbix agent/vm.memory.size[available],5m)<{$MEMORY.AVAILABLE.MIN} and last(/Linux memory by Zabbix agent/vm.memory.size[total])>0'
       name: 'Lack of available memory (<{$MEMORY.AVAILABLE.MIN} of {ITEM.VALUE2})'
       opdata: 'Available: {ITEM.LASTVALUE1}, total: {ITEM.LASTVALUE2}'
       priority: AVERAGE
+      tags:
+        -
+          tag: scope
+          value: capacity
+        -
+          tag: scope
+          value: performance
     -
       uuid: 695f0c352377409d95aca3fe76d1cae2
       expression: |
@@ -3796,6 +4207,13 @@ zabbix_export:
       opdata: 'Load averages(1m 5m 15m): ({ITEM.LASTVALUE1} {ITEM.LASTVALUE3} {ITEM.LASTVALUE4}), # of CPUs: {ITEM.LASTVALUE2}'
       priority: AVERAGE
       description: 'Per CPU load average is too high. Your system may be slow to respond.'
+      tags:
+        -
+          tag: scope
+          value: capacity
+        -
+          tag: scope
+          value: performance
     -
       uuid: 0d6fc27f8a884510b2f31a5a0e653f70
       expression: |
@@ -3806,6 +4224,13 @@ zabbix_export:
       opdata: 'Load averages(1m 5m 15m): ({ITEM.LASTVALUE1} {ITEM.LASTVALUE3} {ITEM.LASTVALUE4}), # of CPUs: {ITEM.LASTVALUE2}'
       priority: AVERAGE
       description: 'Per CPU load average is too high. Your system may be slow to respond.'
+      tags:
+        -
+          tag: scope
+          value: capacity
+        -
+          tag: scope
+          value: performance
   graphs:
     -
       uuid: 7036809e95be49b4959fefe8e89a5e90
@@ -3838,7 +4263,7 @@ zabbix_export:
             host: 'Linux by Zabbix agent'
             key: system.cpu.intr
     -
-      uuid: 345236549e004d4da84b47bc797d248e
+      uuid: f217c30162b24c9190785fad1ec83b73
       name: 'CPU usage'
       type: STACKED
       ymin_type_1: FIXED
@@ -3847,58 +4272,58 @@ zabbix_export:
         -
           color: 1A7C11
           item:
-            host: 'Linux CPU by Zabbix agent'
+            host: 'Linux by Zabbix agent'
             key: 'system.cpu.util[,system]'
         -
           sortorder: '1'
           color: 2774A4
           item:
-            host: 'Linux CPU by Zabbix agent'
+            host: 'Linux by Zabbix agent'
             key: 'system.cpu.util[,user]'
         -
           sortorder: '2'
           color: F63100
           item:
-            host: 'Linux CPU by Zabbix agent'
+            host: 'Linux by Zabbix agent'
             key: 'system.cpu.util[,nice]'
         -
           sortorder: '3'
           color: A54F10
           item:
-            host: 'Linux CPU by Zabbix agent'
+            host: 'Linux by Zabbix agent'
             key: 'system.cpu.util[,iowait]'
         -
           sortorder: '4'
           color: FC6EA3
           item:
-            host: 'Linux CPU by Zabbix agent'
+            host: 'Linux by Zabbix agent'
             key: 'system.cpu.util[,steal]'
         -
           sortorder: '5'
           color: 6C59DC
           item:
-            host: 'Linux CPU by Zabbix agent'
+            host: 'Linux by Zabbix agent'
             key: 'system.cpu.util[,interrupt]'
         -
           sortorder: '6'
           color: AC8C14
           item:
-            host: 'Linux CPU by Zabbix agent'
+            host: 'Linux by Zabbix agent'
             key: 'system.cpu.util[,softirq]'
         -
           sortorder: '7'
           color: 611F27
           item:
-            host: 'Linux CPU by Zabbix agent'
+            host: 'Linux by Zabbix agent'
             key: 'system.cpu.util[,guest]'
         -
           sortorder: '8'
           color: F230E0
           item:
-            host: 'Linux CPU by Zabbix agent'
+            host: 'Linux by Zabbix agent'
             key: 'system.cpu.util[,guest_nice]'
     -
-      uuid: f217c30162b24c9190785fad1ec83b73
+      uuid: 345236549e004d4da84b47bc797d248e
       name: 'CPU usage'
       type: STACKED
       ymin_type_1: FIXED
@@ -3907,58 +4332,58 @@ zabbix_export:
         -
           color: 1A7C11
           item:
-            host: 'Linux by Zabbix agent'
+            host: 'Linux CPU by Zabbix agent'
             key: 'system.cpu.util[,system]'
         -
           sortorder: '1'
           color: 2774A4
           item:
-            host: 'Linux by Zabbix agent'
+            host: 'Linux CPU by Zabbix agent'
             key: 'system.cpu.util[,user]'
         -
           sortorder: '2'
           color: F63100
           item:
-            host: 'Linux by Zabbix agent'
+            host: 'Linux CPU by Zabbix agent'
             key: 'system.cpu.util[,nice]'
         -
           sortorder: '3'
           color: A54F10
           item:
-            host: 'Linux by Zabbix agent'
+            host: 'Linux CPU by Zabbix agent'
             key: 'system.cpu.util[,iowait]'
         -
           sortorder: '4'
           color: FC6EA3
           item:
-            host: 'Linux by Zabbix agent'
+            host: 'Linux CPU by Zabbix agent'
             key: 'system.cpu.util[,steal]'
         -
           sortorder: '5'
           color: 6C59DC
           item:
-            host: 'Linux by Zabbix agent'
+            host: 'Linux CPU by Zabbix agent'
             key: 'system.cpu.util[,interrupt]'
         -
           sortorder: '6'
           color: AC8C14
           item:
-            host: 'Linux by Zabbix agent'
+            host: 'Linux CPU by Zabbix agent'
             key: 'system.cpu.util[,softirq]'
         -
           sortorder: '7'
           color: 611F27
           item:
-            host: 'Linux by Zabbix agent'
+            host: 'Linux CPU by Zabbix agent'
             key: 'system.cpu.util[,guest]'
         -
           sortorder: '8'
           color: F230E0
           item:
-            host: 'Linux by Zabbix agent'
+            host: 'Linux CPU by Zabbix agent'
             key: 'system.cpu.util[,guest_nice]'
     -
-      uuid: 4c14e3706a3c4c48b1fabf7d8d0991a8
+      uuid: 668ae470ea33444bb40e3b83b97659c3
       name: 'CPU utilization'
       ymin_type_1: FIXED
       ymax_type_1: FIXED
@@ -3967,10 +4392,10 @@ zabbix_export:
           drawtype: GRADIENT_LINE
           color: 1A7C11
           item:
-            host: 'Linux CPU by Zabbix agent'
+            host: 'Linux by Zabbix agent'
             key: system.cpu.util
     -
-      uuid: 668ae470ea33444bb40e3b83b97659c3
+      uuid: 4c14e3706a3c4c48b1fabf7d8d0991a8
       name: 'CPU utilization'
       ymin_type_1: FIXED
       ymax_type_1: FIXED
@@ -3979,10 +4404,10 @@ zabbix_export:
           drawtype: GRADIENT_LINE
           color: 1A7C11
           item:
-            host: 'Linux by Zabbix agent'
+            host: 'Linux CPU by Zabbix agent'
             key: system.cpu.util
     -
-      uuid: b089fd66c95b4e8ca923820a13f8dd16
+      uuid: f260a63bc3b04c3b80b47f83bb05ed9c
       name: 'Memory usage'
       ymin_type_1: FIXED
       graph_items:
@@ -3990,17 +4415,17 @@ zabbix_export:
           drawtype: BOLD_LINE
           color: 1A7C11
           item:
-            host: 'Linux memory by Zabbix agent'
+            host: 'Linux by Zabbix agent'
             key: 'vm.memory.size[total]'
         -
           sortorder: '1'
           drawtype: GRADIENT_LINE
           color: 2774A4
           item:
-            host: 'Linux memory by Zabbix agent'
+            host: 'Linux by Zabbix agent'
             key: 'vm.memory.size[available]'
     -
-      uuid: f260a63bc3b04c3b80b47f83bb05ed9c
+      uuid: b089fd66c95b4e8ca923820a13f8dd16
       name: 'Memory usage'
       ymin_type_1: FIXED
       graph_items:
@@ -4008,17 +4433,17 @@ zabbix_export:
           drawtype: BOLD_LINE
           color: 1A7C11
           item:
-            host: 'Linux by Zabbix agent'
+            host: 'Linux memory by Zabbix agent'
             key: 'vm.memory.size[total]'
         -
           sortorder: '1'
           drawtype: GRADIENT_LINE
           color: 2774A4
           item:
-            host: 'Linux by Zabbix agent'
+            host: 'Linux memory by Zabbix agent'
             key: 'vm.memory.size[available]'
     -
-      uuid: 83c385fe3aef4aa9b862ed4718e428d3
+      uuid: bac7a8fb7e014696b54d262bf40e5b12
       name: 'Memory utilization'
       ymin_type_1: FIXED
       ymax_type_1: FIXED
@@ -4027,10 +4452,10 @@ zabbix_export:
           drawtype: GRADIENT_LINE
           color: 1A7C11
           item:
-            host: 'Linux memory by Zabbix agent'
+            host: 'Linux by Zabbix agent'
             key: vm.memory.utilization
     -
-      uuid: bac7a8fb7e014696b54d262bf40e5b12
+      uuid: 83c385fe3aef4aa9b862ed4718e428d3
       name: 'Memory utilization'
       ymin_type_1: FIXED
       ymax_type_1: FIXED
@@ -4039,135 +4464,135 @@ zabbix_export:
           drawtype: GRADIENT_LINE
           color: 1A7C11
           item:
-            host: 'Linux by Zabbix agent'
+            host: 'Linux memory by Zabbix agent'
             key: vm.memory.utilization
     -
-      uuid: 644864fece6e4c0c9484c57e24808691
+      uuid: fa49531c9c3d4087b2205bed6ed0469f
       name: Processes
       graph_items:
         -
           color: 1A7C11
           item:
-            host: 'Linux generic by Zabbix agent'
+            host: 'Linux by Zabbix agent'
             key: proc.num
         -
           sortorder: '1'
           color: 2774A4
           item:
-            host: 'Linux generic by Zabbix agent'
+            host: 'Linux by Zabbix agent'
             key: 'proc.num[,,run]'
         -
           sortorder: '2'
           color: F63100
           item:
-            host: 'Linux generic by Zabbix agent'
+            host: 'Linux by Zabbix agent'
             key: kernel.maxproc
     -
-      uuid: fa49531c9c3d4087b2205bed6ed0469f
+      uuid: 644864fece6e4c0c9484c57e24808691
       name: Processes
       graph_items:
         -
           color: 1A7C11
           item:
-            host: 'Linux by Zabbix agent'
+            host: 'Linux generic by Zabbix agent'
             key: proc.num
         -
           sortorder: '1'
           color: 2774A4
           item:
-            host: 'Linux by Zabbix agent'
+            host: 'Linux generic by Zabbix agent'
             key: 'proc.num[,,run]'
         -
           sortorder: '2'
           color: F63100
           item:
-            host: 'Linux by Zabbix agent'
+            host: 'Linux generic by Zabbix agent'
             key: kernel.maxproc
     -
-      uuid: 71e4089be866400a9f0a520ba271c243
+      uuid: 1ca6e2d883114853bd402110c3fd211e
       name: 'Swap usage'
       graph_items:
         -
           color: 1A7C11
           item:
-            host: 'Linux memory by Zabbix agent'
+            host: 'Linux by Zabbix agent'
             key: 'system.swap.size[,free]'
         -
           sortorder: '1'
           color: 2774A4
           item:
-            host: 'Linux memory by Zabbix agent'
+            host: 'Linux by Zabbix agent'
             key: 'system.swap.size[,total]'
     -
-      uuid: 1ca6e2d883114853bd402110c3fd211e
+      uuid: 71e4089be866400a9f0a520ba271c243
       name: 'Swap usage'
       graph_items:
         -
           color: 1A7C11
           item:
-            host: 'Linux by Zabbix agent'
+            host: 'Linux memory by Zabbix agent'
             key: 'system.swap.size[,free]'
         -
           sortorder: '1'
           color: 2774A4
           item:
-            host: 'Linux by Zabbix agent'
+            host: 'Linux memory by Zabbix agent'
             key: 'system.swap.size[,total]'
     -
-      uuid: 479ffa370eef48caba68f06e63e73344
+      uuid: 1b8cc9470a5040d79090a3e5dfcb0a76
       name: 'System load'
       ymin_type_1: FIXED
       graph_items:
         -
           color: 1A7C11
           item:
-            host: 'Linux CPU by Zabbix agent'
+            host: 'Linux by Zabbix agent'
             key: 'system.cpu.load[all,avg1]'
         -
           sortorder: '1'
           color: 2774A4
           item:
-            host: 'Linux CPU by Zabbix agent'
+            host: 'Linux by Zabbix agent'
             key: 'system.cpu.load[all,avg5]'
         -
           sortorder: '2'
           color: F63100
           item:
-            host: 'Linux CPU by Zabbix agent'
+            host: 'Linux by Zabbix agent'
             key: 'system.cpu.load[all,avg15]'
         -
           sortorder: '3'
           color: A54F10
           yaxisside: RIGHT
           item:
-            host: 'Linux CPU by Zabbix agent'
+            host: 'Linux by Zabbix agent'
             key: system.cpu.num
     -
-      uuid: 1b8cc9470a5040d79090a3e5dfcb0a76
+      uuid: 479ffa370eef48caba68f06e63e73344
       name: 'System load'
       ymin_type_1: FIXED
       graph_items:
         -
           color: 1A7C11
           item:
-            host: 'Linux by Zabbix agent'
+            host: 'Linux CPU by Zabbix agent'
             key: 'system.cpu.load[all,avg1]'
         -
           sortorder: '1'
           color: 2774A4
           item:
-            host: 'Linux by Zabbix agent'
+            host: 'Linux CPU by Zabbix agent'
             key: 'system.cpu.load[all,avg5]'
         -
           sortorder: '2'
           color: F63100
           item:
-            host: 'Linux by Zabbix agent'
+            host: 'Linux CPU by Zabbix agent'
             key: 'system.cpu.load[all,avg15]'
         -
           sortorder: '3'
           color: A54F10
           yaxisside: RIGHT
           item:
-            host: 'Linux by Zabbix agent'
+            host: 'Linux CPU by Zabbix agent'
             key: system.cpu.num
diff --git a/templates/os/linux_active/README.md b/templates/os/linux_active/README.md
index bc53de92cc8..3c800c9436a 100644
--- a/templates/os/linux_active/README.md
+++ b/templates/os/linux_active/README.md
@@ -53,7 +53,7 @@ There are no template links in this template.
 
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
-|Load average is too high (per CPU load over {$LOAD_AVG_PER_CPU.MAX.WARN} for 5m) |<p>Per CPU load average is too high. Your system may be slow to respond.</p> |`min(/Linux CPU by Zabbix agent active/system.cpu.load[all,avg1],5m)/last(/Linux CPU by Zabbix agent active/system.cpu.num)>{$LOAD_AVG_PER_CPU.MAX.WARN} and last(/Linux CPU by Zabbix agent active/system.cpu.load[all,avg5])>0 and last(/Linux CPU by Zabbix agent active/system.cpu.load[all,avg15])>0 ` |AVERAGE | |
+|Load average is too high (per CPU load over {$LOAD_AVG_PER_CPU.MAX.WARN} for 5m) |<p>Per CPU load average is too high. Your system may be slow to respond.</p> |`min(/Linux CPU by Zabbix agent active/system.cpu.load[all,avg1],5m)/last(/Linux CPU by Zabbix agent active/system.cpu.num)>{$LOAD_AVG_PER_CPU.MAX.WARN} and last(/Linux CPU by Zabbix agent active/system.cpu.load[all,avg5])>0 and last(/Linux CPU by Zabbix agent active/system.cpu.load[all,avg15])>0` |AVERAGE | |
 |High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/Linux CPU by Zabbix agent active/system.cpu.util,5m)>{$CPU.UTIL.CRIT}` |WARNING |<p>**Depends on**:</p><p>- Load average is too high (per CPU load over {$LOAD_AVG_PER_CPU.MAX.WARN} for 5m)</p> |
 
 ## Feedback
@@ -165,8 +165,8 @@ There are no template links in this template.
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
 |High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/Linux memory by Zabbix agent active/vm.memory.utilization,5m)>{$MEMORY.UTIL.MAX}` |AVERAGE |<p>**Depends on**:</p><p>- Lack of available memory (<{$MEMORY.AVAILABLE.MIN} of {ITEM.VALUE2})</p> |
-|Lack of available memory (<{$MEMORY.AVAILABLE.MIN} of {ITEM.VALUE2}) |<p>-</p> |`min(/Linux memory by Zabbix agent active/vm.memory.size[available],5m)<{$MEMORY.AVAILABLE.MIN} and last(/Linux memory by Zabbix agent active/vm.memory.size[total])>0` |AVERAGE | |
-|High swap space usage (less than {$SWAP.PFREE.MIN.WARN}% free) |<p>This trigger is ignored, if there is no swap configured</p> |`min(/Linux memory by Zabbix agent active/system.swap.size[,pfree],5m)<{$SWAP.PFREE.MIN.WARN} and last(/Linux memory by Zabbix agent active/system.swap.size[,total])>0` |WARNING |<p>**Depends on**:</p><p>- High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)</p><p>- Lack of available memory (<{$MEMORY.AVAILABLE.MIN} of {ITEM.VALUE2})</p> |
+|Lack of available memory (<{$MEMORY.AVAILABLE.MIN} of {ITEM.VALUE2}) |<p>-</p> |`max(/Linux memory by Zabbix agent active/vm.memory.size[available],5m)<{$MEMORY.AVAILABLE.MIN} and last(/Linux memory by Zabbix agent active/vm.memory.size[total])>0` |AVERAGE | |
+|High swap space usage (less than {$SWAP.PFREE.MIN.WARN}% free) |<p>This trigger is ignored, if there is no swap configured</p> |`max(/Linux memory by Zabbix agent active/system.swap.size[,pfree],5m)<{$SWAP.PFREE.MIN.WARN} and last(/Linux memory by Zabbix agent active/system.swap.size[,total])>0` |WARNING |<p>**Depends on**:</p><p>- High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)</p><p>- Lack of available memory (<{$MEMORY.AVAILABLE.MIN} of {ITEM.VALUE2})</p> |
 
 ## Feedback
 
@@ -484,7 +484,7 @@ There are no template links in this template.
 
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
-|Load average is too high (per CPU load over {$LOAD_AVG_PER_CPU.MAX.WARN} for 5m) |<p>Per CPU load average is too high. Your system may be slow to respond.</p> |`min(/Linux by Zabbix agent active/system.cpu.load[all,avg1],5m)/last(/Linux by Zabbix agent active/system.cpu.num)>{$LOAD_AVG_PER_CPU.MAX.WARN} and last(/Linux by Zabbix agent active/system.cpu.load[all,avg5])>0 and last(/Linux by Zabbix agent active/system.cpu.load[all,avg15])>0 ` |AVERAGE | |
+|Load average is too high (per CPU load over {$LOAD_AVG_PER_CPU.MAX.WARN} for 5m) |<p>Per CPU load average is too high. Your system may be slow to respond.</p> |`min(/Linux by Zabbix agent active/system.cpu.load[all,avg1],5m)/last(/Linux by Zabbix agent active/system.cpu.num)>{$LOAD_AVG_PER_CPU.MAX.WARN} and last(/Linux by Zabbix agent active/system.cpu.load[all,avg5])>0 and last(/Linux by Zabbix agent active/system.cpu.load[all,avg15])>0` |AVERAGE | |
 |High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/Linux by Zabbix agent active/system.cpu.util,5m)>{$CPU.UTIL.CRIT}` |WARNING |<p>**Depends on**:</p><p>- Load average is too high (per CPU load over {$LOAD_AVG_PER_CPU.MAX.WARN} for 5m)</p> |
 |{#FSNAME}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"{#FSNAME}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"{#FSNAME}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/Linux by Zabbix agent active/vfs.fs.size[{#FSNAME},pused])>{$VFS.FS.PUSED.MAX.CRIT:"{#FSNAME}"} and ((last(/Linux by Zabbix agent active/vfs.fs.size[{#FSNAME},total])-last(/Linux by Zabbix agent active/vfs.fs.size[{#FSNAME},used]))<5G or timeleft(/Linux by Zabbix agent active/vfs.fs.size[{#FSNAME},pused],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
 |{#FSNAME}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"{#FSNAME}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"{#FSNAME}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/Linux by Zabbix agent active/vfs.fs.size[{#FSNAME},pused])>{$VFS.FS.PUSED.MAX.WARN:"{#FSNAME}"} and ((last(/Linux by Zabbix agent active/vfs.fs.size[{#FSNAME},total])-last(/Linux by Zabbix agent active/vfs.fs.size[{#FSNAME},used]))<10G or timeleft(/Linux by Zabbix agent active/vfs.fs.size[{#FSNAME},pused],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- {#FSNAME}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"{#FSNAME}"}%)</p> |
@@ -497,8 +497,8 @@ There are no template links in this template.
 |Getting closer to process limit (over 80% used) |<p>-</p> |`last(/Linux by Zabbix agent active/proc.num)/last(/Linux by Zabbix agent active/kernel.maxproc)*100>80` |WARNING | |
 |Operating system description has changed |<p>Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.</p> |`last(/Linux by Zabbix agent active/system.sw.os,#1)<>last(/Linux by Zabbix agent active/system.sw.os,#2) and length(last(/Linux by Zabbix agent active/system.sw.os))>0` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- System name has changed (new name: {ITEM.VALUE})</p> |
 |High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/Linux by Zabbix agent active/vm.memory.utilization,5m)>{$MEMORY.UTIL.MAX}` |AVERAGE |<p>**Depends on**:</p><p>- Lack of available memory (<{$MEMORY.AVAILABLE.MIN} of {ITEM.VALUE2})</p> |
-|Lack of available memory (<{$MEMORY.AVAILABLE.MIN} of {ITEM.VALUE2}) |<p>-</p> |`min(/Linux by Zabbix agent active/vm.memory.size[available],5m)<{$MEMORY.AVAILABLE.MIN} and last(/Linux by Zabbix agent active/vm.memory.size[total])>0` |AVERAGE | |
-|High swap space usage (less than {$SWAP.PFREE.MIN.WARN}% free) |<p>This trigger is ignored, if there is no swap configured</p> |`min(/Linux by Zabbix agent active/system.swap.size[,pfree],5m)<{$SWAP.PFREE.MIN.WARN} and last(/Linux by Zabbix agent active/system.swap.size[,total])>0` |WARNING |<p>**Depends on**:</p><p>- High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)</p><p>- Lack of available memory (<{$MEMORY.AVAILABLE.MIN} of {ITEM.VALUE2})</p> |
+|Lack of available memory (<{$MEMORY.AVAILABLE.MIN} of {ITEM.VALUE2}) |<p>-</p> |`max(/Linux by Zabbix agent active/vm.memory.size[available],5m)<{$MEMORY.AVAILABLE.MIN} and last(/Linux by Zabbix agent active/vm.memory.size[total])>0` |AVERAGE | |
+|High swap space usage (less than {$SWAP.PFREE.MIN.WARN}% free) |<p>This trigger is ignored, if there is no swap configured</p> |`max(/Linux by Zabbix agent active/system.swap.size[,pfree],5m)<{$SWAP.PFREE.MIN.WARN} and last(/Linux by Zabbix agent active/system.swap.size[,total])>0` |WARNING |<p>**Depends on**:</p><p>- High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)</p><p>- Lack of available memory (<{$MEMORY.AVAILABLE.MIN} of {ITEM.VALUE2})</p> |
 |Interface {#IFNAME}: High error rate (>{$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) |<p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p> |`min(/Linux by Zabbix agent active/net.if.in["{#IFNAME}",errors],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"} or min(/Linux by Zabbix agent active/net.if.out["{#IFNAME}",errors],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`max(/Linux by Zabbix agent active/net.if.in["{#IFNAME}",errors],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8 and max(/Linux by Zabbix agent active/net.if.out["{#IFNAME}",errors],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}: Link down</p> |
 |Interface {#IFNAME}: Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p><p>3. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{$IFCONTROL:"{#IFNAME}"}=1 and last(/Linux by Zabbix agent active/vfs.file.contents["/sys/class/net/{#IFNAME}/operstate"])=2 and (last(/Linux by Zabbix agent active/vfs.file.contents["/sys/class/net/{#IFNAME}/operstate"],#1)<>last(/Linux by Zabbix agent active/vfs.file.contents["/sys/class/net/{#IFNAME}/operstate"],#2))`<p>Recovery expression:</p>`last(/Linux by Zabbix agent active/vfs.file.contents["/sys/class/net/{#IFNAME}/operstate"])<>2 or {$IFCONTROL:"{#IFNAME}"}=0` |AVERAGE |<p>Manual close: YES</p> |
 |Interface {#IFNAME}: Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/Linux by Zabbix agent active/vfs.file.contents["/sys/class/net/{#IFNAME}/type"])<0 and last(/Linux by Zabbix agent active/vfs.file.contents["/sys/class/net/{#IFNAME}/type"])>0 and (last(/Linux by Zabbix agent active/vfs.file.contents["/sys/class/net/{#IFNAME}/type"])=6 or last(/Linux by Zabbix agent active/vfs.file.contents["/sys/class/net/{#IFNAME}/type"])=1) and (last(/Linux by Zabbix agent active/vfs.file.contents["/sys/class/net/{#IFNAME}/operstate"])<>2) `<p>Recovery expression:</p>`(change(/Linux by Zabbix agent active/vfs.file.contents["/sys/class/net/{#IFNAME}/type"])>0 and last(/Linux by Zabbix agent active/vfs.file.contents["/sys/class/net/{#IFNAME}/type"],#2)>0) or (last(/Linux by Zabbix agent active/vfs.file.contents["/sys/class/net/{#IFNAME}/operstate"])=2) ` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}: Link down</p> |
diff --git a/templates/os/linux_active/template_os_linux_active.yaml b/templates/os/linux_active/template_os_linux_active.yaml
index 71ec7981a80..9dab586914f 100644
--- a/templates/os/linux_active/template_os_linux_active.yaml
+++ b/templates/os/linux_active/template_os_linux_active.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:36:50Z'
+  date: '2022-01-26T10:41:55Z'
   groups:
     -
       uuid: 57b7ae836ca64446ba2c296389c009b7
@@ -67,8 +67,11 @@ zabbix_export:
                 key: 'vfs.file.contents[/sys/block/{#DEVNAME}/stat]'
               tags:
                 -
-                  tag: Application
-                  value: 'Disk {#DEVNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: disk
+                  value: '{#DEVNAME}'
             -
               uuid: 4263e16baa044186947ad9f4ec12f6b4
               name: '{#DEVNAME}: Disk read request avg waiting time (r_await)'
@@ -81,8 +84,11 @@ zabbix_export:
               description: 'This formula contains two boolean expressions that evaluates to 1 or 0 in order to set calculated metric to zero and to avoid division by zero exception.'
               tags:
                 -
-                  tag: Application
-                  value: 'Disk {#DEVNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: disk
+                  value: '{#DEVNAME}'
             -
               uuid: 7a02e002d83f4e71bdcc031077738f2b
               name: '{#DEVNAME}: Disk read rate'
@@ -106,8 +112,11 @@ zabbix_export:
                 key: 'vfs.file.contents[/sys/block/{#DEVNAME}/stat]'
               tags:
                 -
-                  tag: Application
-                  value: 'Disk {#DEVNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: disk
+                  value: '{#DEVNAME}'
             -
               uuid: ae4ae1c7ef2e434f875c8099ff3b101b
               name: '{#DEVNAME}: Disk read time (rate)'
@@ -134,8 +143,11 @@ zabbix_export:
                 key: 'vfs.file.contents[/sys/block/{#DEVNAME}/stat]'
               tags:
                 -
-                  tag: Application
-                  value: 'Zabbix raw items'
+                  tag: component
+                  value: storage
+                -
+                  tag: disk
+                  value: '{#DEVNAME}'
             -
               uuid: 708baac844f54ca2b91ba8ed9f624459
               name: '{#DEVNAME}: Disk utilization'
@@ -163,8 +175,11 @@ zabbix_export:
                 key: 'vfs.file.contents[/sys/block/{#DEVNAME}/stat]'
               tags:
                 -
-                  tag: Application
-                  value: 'Disk {#DEVNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: disk
+                  value: '{#DEVNAME}'
             -
               uuid: e36cbccc4d9e470f8078bd2e04c5c5da
               name: '{#DEVNAME}: Disk write request avg waiting time (w_await)'
@@ -177,8 +192,11 @@ zabbix_export:
               description: 'This formula contains two boolean expressions that evaluates to 1 or 0 in order to set calculated metric to zero and to avoid division by zero exception.'
               tags:
                 -
-                  tag: Application
-                  value: 'Disk {#DEVNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: disk
+                  value: '{#DEVNAME}'
             -
               uuid: ef9afdff2799455e85a8477a307dd83f
               name: '{#DEVNAME}: Disk write rate'
@@ -202,8 +220,11 @@ zabbix_export:
                 key: 'vfs.file.contents[/sys/block/{#DEVNAME}/stat]'
               tags:
                 -
-                  tag: Application
-                  value: 'Disk {#DEVNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: disk
+                  value: '{#DEVNAME}'
             -
               uuid: 165825d4e5e442ad97d6455a117a7663
               name: '{#DEVNAME}: Disk write time (rate)'
@@ -230,8 +251,11 @@ zabbix_export:
                 key: 'vfs.file.contents[/sys/block/{#DEVNAME}/stat]'
               tags:
                 -
-                  tag: Application
-                  value: 'Zabbix raw items'
+                  tag: component
+                  value: storage
+                -
+                  tag: disk
+                  value: '{#DEVNAME}'
             -
               uuid: ab92fd1578124197ba4dc8af11ebece4
               name: '{#DEVNAME}: Get stats'
@@ -258,6 +282,10 @@ zabbix_export:
               priority: WARNING
               description: 'This trigger might indicate disk {#DEVNAME} saturation.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: 8748136db91b499da7516cb6fde881fb
@@ -364,8 +392,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: 'Monitoring agent'
+              tag: component
+              value: system
         -
           uuid: 7c266646bfa843dabfe4ba5a3fd9026e
           name: 'Zabbix agent ping'
@@ -377,8 +405,8 @@ zabbix_export:
             name: 'Zabbix agent ping status'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: c1b9fdbe6a584d2cb25ff7077c667af1
@@ -387,6 +415,10 @@ zabbix_export:
               priority: AVERAGE
               description: 'For active agents, nodata() with agent.ping is used with {$AGENT.NODATA_TIMEOUT} as time threshold.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 91dbe302bd8e4954b91e9ce3a795b4eb
           name: 'Version of Zabbix agent running'
@@ -403,8 +435,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: 'Monitoring agent'
+              tag: component
+              value: application
         -
           uuid: 66ed2ffc888c40c6b80dcc259c087d08
           name: 'Maximum number of open file descriptors'
@@ -420,14 +452,18 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: a7716b62422243b991a2697752d7cb1f
               expression: 'last(/Linux by Zabbix agent active/kernel.maxfiles)<{$KERNEL.MAXFILES.MIN}'
               name: 'Configured max number of open filedescriptors is too low (< {$KERNEL.MAXFILES.MIN})'
               priority: INFO
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: d60cc4367893424d9671b1f05ba83599
           name: 'Maximum number of processes'
@@ -443,8 +479,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 740ed348fb1d41dca7c410123b668a48
@@ -455,6 +491,10 @@ zabbix_export:
                 -
                   name: 'Getting closer to process limit (over 80% used)'
                   expression: 'last(/Linux by Zabbix agent active/proc.num)/last(/Linux by Zabbix agent active/kernel.maxproc)*100>80'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: ccb6fdbe1267475780e978c0c5de986c
           name: 'Number of processes'
@@ -463,8 +503,8 @@ zabbix_export:
           history: 7d
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 436bf5615731425a97fdcdbaac5f4000
           name: 'Number of running processes'
@@ -473,8 +513,8 @@ zabbix_export:
           history: 7d
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 42bb6cbed08a4884a99328b38e4c1654
           name: 'System boot time'
@@ -490,8 +530,8 @@ zabbix_export:
                 - 1h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 0a2218b9d9124c7284962f84bdefaab8
           name: 'Interrupts per second'
@@ -506,8 +546,8 @@ zabbix_export:
                 - ''
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: c692df07acc44b4ea1f4f88cd4ee64eb
           name: 'Load average (1m avg)'
@@ -517,8 +557,8 @@ zabbix_export:
           value_type: FLOAT
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: 18862acd219e4259a9b9665c32550fa5
           name: 'Load average (5m avg)'
@@ -528,8 +568,8 @@ zabbix_export:
           value_type: FLOAT
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: 61040b6d85df4a2087e562f0216e723d
           name: 'Load average (15m avg)'
@@ -539,8 +579,8 @@ zabbix_export:
           value_type: FLOAT
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: 6e98a6a53c1a44c09b5e3c19971b834c
           name: 'Number of CPUs'
@@ -554,8 +594,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: 47e3a1d3955d4bccb07a0e32f768273d
           name: 'Context switches per second'
@@ -570,8 +610,8 @@ zabbix_export:
                 - ''
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: 9cb786aec7de4f749f33c6e5adfbaf75
           name: 'CPU utilization'
@@ -593,8 +633,8 @@ zabbix_export:
             key: 'system.cpu.util[,idle]'
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
           triggers:
             -
               uuid: e299778a6fcc4805bd5806f3b2ffe1c2
@@ -610,6 +650,10 @@ zabbix_export:
                     min(/Linux by Zabbix agent active/system.cpu.load[all,avg1],5m)/last(/Linux by Zabbix agent active/system.cpu.num)>{$LOAD_AVG_PER_CPU.MAX.WARN}
                     and last(/Linux by Zabbix agent active/system.cpu.load[all,avg5])>0
                     and last(/Linux by Zabbix agent active/system.cpu.load[all,avg15])>0
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 4ef463cc12da45e6b5a97cee93fd5ba0
           name: 'CPU guest time'
@@ -621,8 +665,8 @@ zabbix_export:
           description: 'Guest  time (time  spent  running  a  virtual  CPU  for  a  guest  operating  system)'
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: 0cb7f1c9774241968208724ab56f4d86
           name: 'CPU guest nice time'
@@ -634,8 +678,8 @@ zabbix_export:
           description: 'Time spent running a niced guest (virtual CPU for guest operating systems under the control of the Linux kernel)'
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: 8a20c7edef6d449e8771ff57cebb87d8
           name: 'CPU idle time'
@@ -647,8 +691,8 @@ zabbix_export:
           description: 'The time the CPU has spent doing nothing.'
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: 9329b55874bb4de7a52f941f382ba9ce
           name: 'CPU interrupt time'
@@ -660,8 +704,8 @@ zabbix_export:
           description: 'The amount of time the CPU has been servicing hardware interrupts.'
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: 4859bb1b6e21469a917aa56fbfbe1698
           name: 'CPU iowait time'
@@ -673,8 +717,8 @@ zabbix_export:
           description: 'Amount of time the CPU has been waiting for I/O to complete.'
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: d965fa68eea3454e83179116c5483322
           name: 'CPU nice time'
@@ -686,8 +730,8 @@ zabbix_export:
           description: 'The time the CPU has spent running users'' processes that have been niced.'
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: 2ff77e25f0fe45238c64a6532735cdd5
           name: 'CPU softirq time'
@@ -699,8 +743,8 @@ zabbix_export:
           description: 'The amount of time the CPU has been servicing software interrupts.'
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: 434c154ba392476f9ad8a94968840e19
           name: 'CPU steal time'
@@ -712,8 +756,8 @@ zabbix_export:
           description: 'The amount of CPU ''stolen'' from this virtual machine by the hypervisor for other tasks (such as running another virtual machine).'
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: 75622323ae4447e8a21a04ef191fdc2d
           name: 'CPU system time'
@@ -725,8 +769,8 @@ zabbix_export:
           description: 'The time the CPU has spent running the kernel and its processes.'
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: c74b64926aae4a8e8c2299d8bfe2e188
           name: 'CPU user time'
@@ -738,8 +782,8 @@ zabbix_export:
           description: 'The time the CPU has spent running users'' processes that are not niced.'
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: fdf4eb1b98d04b229a1c9a3c0b5837ba
           name: 'System name'
@@ -758,8 +802,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: c2fc80044fa94f0d97c72bd1d749b731
@@ -768,19 +812,25 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: c8fa467600ab48ce8cec353bab6c3a54
           name: 'System local time'
           type: ZABBIX_ACTIVE
           key: system.localtime
           history: 7d
-          status: DISABLED
           units: unixtime
           description: 'System local time of the host.'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 10f29c3898cf41a0a2551349cd052413
@@ -789,6 +839,13 @@ zabbix_export:
               priority: WARNING
               description: 'The host system time is different from the Zabbix server time.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 627cbcb2432a4aeda6e90363d9b0c1db
           name: 'Operating system architecture'
@@ -806,8 +863,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: os
         -
           uuid: d8c633f2fd1947028079a5939835dcd8
           name: 'Operating system'
@@ -825,8 +882,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: os
           triggers:
             -
               uuid: e27cb7063ca841a2b78aa547ec0d001c
@@ -839,6 +896,10 @@ zabbix_export:
                 -
                   name: 'System name has changed (new name: {ITEM.VALUE})'
                   expression: 'last(/Linux by Zabbix agent active/system.hostname,#1)<>last(/Linux by Zabbix agent active/system.hostname,#2) and length(last(/Linux by Zabbix agent active/system.hostname))>0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 16b1e5ab950040ef8c29139e0649d622
           name: 'Software installed'
@@ -855,8 +916,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: os
         -
           uuid: f08e1de57cbd4b08b9fd3294d0d95906
           name: 'Free swap space'
@@ -867,8 +928,11 @@ zabbix_export:
           description: 'The free space of swap volume/file in bytes.'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
+            -
+              tag: component
+              value: storage
         -
           uuid: 56b8f84d22264b92b70a6ab0c3c70f19
           name: 'Free swap space in %'
@@ -880,8 +944,11 @@ zabbix_export:
           description: 'The free space of swap volume/file in percent.'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
+            -
+              tag: component
+              value: storage
         -
           uuid: 3a9fb924ab1d47168ffcab9d237d808a
           name: 'Total swap space'
@@ -892,8 +959,11 @@ zabbix_export:
           description: 'The total space of swap volume/file in bytes.'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
+            -
+              tag: component
+              value: storage
         -
           uuid: d3d73dcc92b34511971eddf956dc4c0f
           name: 'System description'
@@ -911,8 +981,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 51bdea745e0547ad92a74fefaea54e39
           name: 'System uptime'
@@ -925,8 +995,8 @@ zabbix_export:
           description: 'System uptime in ''N days, hh:mm:ss'' format.'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 64dbab85caf749f59f3da0c374746bc2
@@ -935,6 +1005,10 @@ zabbix_export:
               priority: WARNING
               description: 'The host uptime is less than 10 minutes'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 4ea1cfb5813a422b98caebcd870959ef
           name: 'Number of logged in users'
@@ -944,8 +1018,8 @@ zabbix_export:
           description: 'Number of users who are currently logged in.'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: environment
         -
           uuid: 87f35de24ba74a8d8f70430c8da85261
           name: 'Checksum of /etc/passwd'
@@ -962,8 +1036,8 @@ zabbix_export:
                 - 1h
           tags:
             -
-              tag: Application
-              value: Security
+              tag: component
+              value: environment
           triggers:
             -
               uuid: c5a76894508c4f0e9dcc9f70e6f39f49
@@ -978,6 +1052,10 @@ zabbix_export:
                 -
                   name: 'System name has changed (new name: {ITEM.VALUE})'
                   expression: 'last(/Linux by Zabbix agent active/system.hostname,#1)<>last(/Linux by Zabbix agent active/system.hostname,#2) and length(last(/Linux by Zabbix agent active/system.hostname))>0'
+              tags:
+                -
+                  tag: scope
+                  value: security
         -
           uuid: 5bf94ec3debc459fa3e13449199052ee
           name: 'Available memory'
@@ -988,8 +1066,8 @@ zabbix_export:
           description: 'Available memory, in Linux, available = free + buffers + cache. On other platforms calculation may vary. See also Appendixes in Zabbix Documentation about parameters of the vm.memory.size item.'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 99efd95a41b34457a2ec0d8c96324e7c
           name: 'Available memory in %'
@@ -1001,8 +1079,8 @@ zabbix_export:
           description: 'Available memory as percentage of total. See also Appendixes in Zabbix Documentation about parameters of the vm.memory.size item.'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 013fe8b15c86442eadc10763706ec594
           name: 'Total memory'
@@ -1013,8 +1091,8 @@ zabbix_export:
           description: 'Total memory in Bytes'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 07e60e812d32443ba8e8b0eb27166b98
           name: 'Memory utilization'
@@ -1034,8 +1112,8 @@ zabbix_export:
             key: 'vm.memory.size[pavailable]'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: fb368aa704064a44b9a4ed8c129cf3e8
@@ -1046,7 +1124,14 @@ zabbix_export:
               dependencies:
                 -
                   name: 'Lack of available memory (<{$MEMORY.AVAILABLE.MIN} of {ITEM.VALUE2})'
-                  expression: 'min(/Linux by Zabbix agent active/vm.memory.size[available],5m)<{$MEMORY.AVAILABLE.MIN} and last(/Linux by Zabbix agent active/vm.memory.size[total])>0'
+                  expression: 'max(/Linux by Zabbix agent active/vm.memory.size[available],5m)<{$MEMORY.AVAILABLE.MIN} and last(/Linux by Zabbix agent active/vm.memory.size[total])>0'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
       discovery_rules:
         -
           uuid: 0b47631fb1334f78a7fe5207194a5476
@@ -1082,8 +1167,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: f0eb218780ce44128117d73d65d412a9
               name: 'Interface {#IFNAME}: Inbound packets with errors'
@@ -1098,8 +1189,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 37dd13afa2b84b0e906a80016b9b2bf5
               name: 'Interface {#IFNAME}: Bits received'
@@ -1119,8 +1216,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 12a56bb72eef43648293ce1d6c8f9c42
               name: 'Interface {#IFNAME}: Outbound packets discarded'
@@ -1135,8 +1238,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 90362d020e82429d87b0b1688355831d
               name: 'Interface {#IFNAME}: Outbound packets with errors'
@@ -1151,8 +1260,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 63616a66fb5e4fd7a725c5186b47e516
               name: 'Interface {#IFNAME}: Bits sent'
@@ -1172,8 +1287,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 83b33479fd774915b100b69c527519c8
               name: 'Interface {#IFNAME}: Operational status'
@@ -1217,8 +1338,14 @@ zabbix_export:
                       return newvalue;
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 1b8e42925e1b48969f35d91800fe5229
@@ -1236,6 +1363,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: e675114e23414b9dbc2d19d00f32bc70
               name: 'Interface {#IFNAME}: Interface type'
@@ -1257,8 +1388,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           trigger_prototypes:
             -
               uuid: c0fd4630351f424aa6c8b7f2e85f0f9e
@@ -1283,6 +1420,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}: Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Linux by Zabbix agent active/vfs.file.contents["/sys/class/net/{#IFNAME}/operstate"])=2 and (last(/Linux by Zabbix agent active/vfs.file.contents["/sys/class/net/{#IFNAME}/operstate"],#1)<>last(/Linux by Zabbix agent active/vfs.file.contents["/sys/class/net/{#IFNAME}/operstate"],#2))'
                   recovery_expression: 'last(/Linux by Zabbix agent active/vfs.file.contents["/sys/class/net/{#IFNAME}/operstate"])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 58f4ba4b2795407896752da57462629d
               expression: |
@@ -1302,6 +1443,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}: Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Linux by Zabbix agent active/vfs.file.contents["/sys/class/net/{#IFNAME}/operstate"])=2 and (last(/Linux by Zabbix agent active/vfs.file.contents["/sys/class/net/{#IFNAME}/operstate"],#1)<>last(/Linux by Zabbix agent active/vfs.file.contents["/sys/class/net/{#IFNAME}/operstate"],#2))'
                   recovery_expression: 'last(/Linux by Zabbix agent active/vfs.file.contents["/sys/class/net/{#IFNAME}/operstate"])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: 6e2814a0ef824df7b418bbd86b260181
@@ -1397,8 +1545,11 @@ zabbix_export:
                 key: 'vfs.file.contents[/sys/block/{#DEVNAME}/stat]'
               tags:
                 -
-                  tag: Application
-                  value: 'Disk {#DEVNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: disk
+                  value: '{#DEVNAME}'
             -
               uuid: 1b3559f0d90948f0a72c2fdfdc80930b
               name: '{#DEVNAME}: Disk read request avg waiting time (r_await)'
@@ -1411,8 +1562,11 @@ zabbix_export:
               description: 'This formula contains two boolean expressions that evaluates to 1 or 0 in order to set calculated metric to zero and to avoid division by zero exception.'
               tags:
                 -
-                  tag: Application
-                  value: 'Disk {#DEVNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: disk
+                  value: '{#DEVNAME}'
             -
               uuid: 3bb5f84b2e954c28843fa1fb3898c034
               name: '{#DEVNAME}: Disk read rate'
@@ -1436,8 +1590,11 @@ zabbix_export:
                 key: 'vfs.file.contents[/sys/block/{#DEVNAME}/stat]'
               tags:
                 -
-                  tag: Application
-                  value: 'Disk {#DEVNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: disk
+                  value: '{#DEVNAME}'
             -
               uuid: df02934521b54864b2538b764c5d549b
               name: '{#DEVNAME}: Disk read time (rate)'
@@ -1464,8 +1621,11 @@ zabbix_export:
                 key: 'vfs.file.contents[/sys/block/{#DEVNAME}/stat]'
               tags:
                 -
-                  tag: Application
-                  value: 'Zabbix raw items'
+                  tag: component
+                  value: storage
+                -
+                  tag: disk
+                  value: '{#DEVNAME}'
             -
               uuid: 72546bd5eefb4ac7a0b2992a25e5f0c5
               name: '{#DEVNAME}: Disk utilization'
@@ -1493,8 +1653,11 @@ zabbix_export:
                 key: 'vfs.file.contents[/sys/block/{#DEVNAME}/stat]'
               tags:
                 -
-                  tag: Application
-                  value: 'Disk {#DEVNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: disk
+                  value: '{#DEVNAME}'
             -
               uuid: 8422c37735774134996be62580e7bf0f
               name: '{#DEVNAME}: Disk write request avg waiting time (w_await)'
@@ -1507,8 +1670,11 @@ zabbix_export:
               description: 'This formula contains two boolean expressions that evaluates to 1 or 0 in order to set calculated metric to zero and to avoid division by zero exception.'
               tags:
                 -
-                  tag: Application
-                  value: 'Disk {#DEVNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: disk
+                  value: '{#DEVNAME}'
             -
               uuid: 4ba78909402d4bb8ab32f12c679ea3db
               name: '{#DEVNAME}: Disk write rate'
@@ -1532,8 +1698,11 @@ zabbix_export:
                 key: 'vfs.file.contents[/sys/block/{#DEVNAME}/stat]'
               tags:
                 -
-                  tag: Application
-                  value: 'Disk {#DEVNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: disk
+                  value: '{#DEVNAME}'
             -
               uuid: 7717dd9841004fa08b35b0e9f42bffaf
               name: '{#DEVNAME}: Disk write time (rate)'
@@ -1560,8 +1729,11 @@ zabbix_export:
                 key: 'vfs.file.contents[/sys/block/{#DEVNAME}/stat]'
               tags:
                 -
-                  tag: Application
-                  value: 'Zabbix raw items'
+                  tag: component
+                  value: storage
+                -
+                  tag: disk
+                  value: '{#DEVNAME}'
             -
               uuid: 39877664726f4886aa88f3d1592bbcb1
               name: '{#DEVNAME}: Get stats'
@@ -1588,6 +1760,10 @@ zabbix_export:
               priority: WARNING
               description: 'This trigger might indicate disk {#DEVNAME} saturation.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: feca6a365b8d49d2a66ff4bfac089fc8
@@ -1682,8 +1858,11 @@ zabbix_export:
               units: '%'
               tags:
                 -
-                  tag: Application
-                  value: 'Filesystem {#FSNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
               trigger_prototypes:
                 -
                   uuid: 98e196ffb6f0422baf007fcff5f45b60
@@ -1694,6 +1873,13 @@ zabbix_export:
                   description: |
                     It may become impossible to write to disk if there are no index nodes left.
                     As symptoms, 'No space left on device' or 'Disk is full' errors may be seen even though free space is available.
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: a17e14a65c53447a9ce607799a62e7dd
                   expression: 'min(/Linux by Zabbix agent active/vfs.fs.inode[{#FSNAME},pfree],5m)<{$VFS.FS.INODE.PFREE.MIN.WARN:"{#FSNAME}"}'
@@ -1707,6 +1893,13 @@ zabbix_export:
                     -
                       name: '{#FSNAME}: Running out of free inodes (free < {$VFS.FS.INODE.PFREE.MIN.CRIT:"{#FSNAME}"}%)'
                       expression: 'min(/Linux by Zabbix agent active/vfs.fs.inode[{#FSNAME},pfree],5m)<{$VFS.FS.INODE.PFREE.MIN.CRIT:"{#FSNAME}"}'
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: b33989051217493cb9124302297e409f
               name: '{#FSNAME}: Space utilization'
@@ -1718,8 +1911,11 @@ zabbix_export:
               description: 'Space utilization in % for {#FSNAME}'
               tags:
                 -
-                  tag: Application
-                  value: 'Filesystem {#FSNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 5cee504041e347719b35ee2c5a6056b8
               name: '{#FSNAME}: Total space'
@@ -1730,8 +1926,11 @@ zabbix_export:
               description: 'Total space in Bytes'
               tags:
                 -
-                  tag: Application
-                  value: 'Filesystem {#FSNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: f23970d301be4085ab9038d3078b3871
               name: '{#FSNAME}: Used space'
@@ -1742,8 +1941,11 @@ zabbix_export:
               description: 'Used storage in Bytes'
               tags:
                 -
-                  tag: Application
-                  value: 'Filesystem {#FSNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
           trigger_prototypes:
             -
               uuid: cf4079132a9d4124aa5e29d6839ae35b
@@ -1759,6 +1961,13 @@ zabbix_export:
                  - The disk free space is less than 5G.
                  - The disk will be full in less than 24 hours.
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
             -
               uuid: b56b8cad3bb34fab8132e07a32c432d9
               expression: |
@@ -1779,6 +1988,13 @@ zabbix_export:
                   expression: |
                     last(/Linux by Zabbix agent active/vfs.fs.size[{#FSNAME},pused])>{$VFS.FS.PUSED.MAX.CRIT:"{#FSNAME}"} and
                     ((last(/Linux by Zabbix agent active/vfs.fs.size[{#FSNAME},total])-last(/Linux by Zabbix agent active/vfs.fs.size[{#FSNAME},used]))<5G or timeleft(/Linux by Zabbix agent active/vfs.fs.size[{#FSNAME},pused],1h,100)<1d)
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
           graph_prototypes:
             -
               uuid: 9e2c288e9475446890f7c101214cca8a
@@ -1802,6 +2018,13 @@ zabbix_export:
                   item:
                     host: 'Linux by Zabbix agent active'
                     key: 'vfs.fs.size[{#FSNAME},used]'
+      tags:
+        -
+          tag: class
+          value: os
+        -
+          tag: target
+          value: linux
       macros:
         -
           macro: '{$AGENT.NODATA_TIMEOUT}'
@@ -2376,8 +2599,8 @@ zabbix_export:
                 - ''
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: 028f6c4184fe4827816e47ec9ffded70
           name: 'Load average (1m avg)'
@@ -2387,8 +2610,8 @@ zabbix_export:
           value_type: FLOAT
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: 507ff2791866406caf0a90c698b0b37a
           name: 'Load average (5m avg)'
@@ -2398,8 +2621,8 @@ zabbix_export:
           value_type: FLOAT
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: 9502c5e47bd542ecbb8e2bfbf9020367
           name: 'Load average (15m avg)'
@@ -2409,8 +2632,8 @@ zabbix_export:
           value_type: FLOAT
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: e522484fae9044c5bb364a8be14dfd39
           name: 'Number of CPUs'
@@ -2424,8 +2647,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: 2524a63bea9d44858b4b0a068360a3ad
           name: 'Context switches per second'
@@ -2440,8 +2663,8 @@ zabbix_export:
                 - ''
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: 91e6c4ff36eb4327a126a7f329792048
           name: 'CPU utilization'
@@ -2463,8 +2686,8 @@ zabbix_export:
             key: 'system.cpu.util[,idle]'
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
           triggers:
             -
               uuid: 685db9802cc74b5aab4d9744ca3ee32e
@@ -2480,6 +2703,10 @@ zabbix_export:
                     min(/Linux CPU by Zabbix agent active/system.cpu.load[all,avg1],5m)/last(/Linux CPU by Zabbix agent active/system.cpu.num)>{$LOAD_AVG_PER_CPU.MAX.WARN}
                     and last(/Linux CPU by Zabbix agent active/system.cpu.load[all,avg5])>0
                     and last(/Linux CPU by Zabbix agent active/system.cpu.load[all,avg15])>0
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 113b52c5d0cc4fec815d1a8e76fad4b8
           name: 'CPU guest time'
@@ -2491,8 +2718,8 @@ zabbix_export:
           description: 'Guest  time (time  spent  running  a  virtual  CPU  for  a  guest  operating  system)'
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: b642aa7ed2dc41738a58339898ed6180
           name: 'CPU guest nice time'
@@ -2504,8 +2731,8 @@ zabbix_export:
           description: 'Time spent running a niced guest (virtual CPU for guest operating systems under the control of the Linux kernel)'
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: b2f6d924272d4b84bf26cd497a85d24f
           name: 'CPU idle time'
@@ -2517,8 +2744,8 @@ zabbix_export:
           description: 'The time the CPU has spent doing nothing.'
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: 4eae770bff5f404481f2c57673fc8b3d
           name: 'CPU interrupt time'
@@ -2530,8 +2757,8 @@ zabbix_export:
           description: 'The amount of time the CPU has been servicing hardware interrupts.'
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: e8d5b76517c946b18b7d55c9ff2c23cb
           name: 'CPU iowait time'
@@ -2543,8 +2770,8 @@ zabbix_export:
           description: 'Amount of time the CPU has been waiting for I/O to complete.'
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: f67af9ba78054119806eb8ee6bbe6759
           name: 'CPU nice time'
@@ -2556,8 +2783,8 @@ zabbix_export:
           description: 'The time the CPU has spent running users'' processes that have been niced.'
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: c86a06e45ce449158e90ba1843fa73be
           name: 'CPU softirq time'
@@ -2569,8 +2796,8 @@ zabbix_export:
           description: 'The amount of time the CPU has been servicing software interrupts.'
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: 676c1243ad404ec7b4bbdfcf1a230c8f
           name: 'CPU steal time'
@@ -2582,8 +2809,8 @@ zabbix_export:
           description: 'The amount of CPU ''stolen'' from this virtual machine by the hypervisor for other tasks (such as running another virtual machine).'
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: 768051f0019b4823a34cd1e7c03e507d
           name: 'CPU system time'
@@ -2595,8 +2822,8 @@ zabbix_export:
           description: 'The time the CPU has spent running the kernel and its processes.'
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: 28b99eefcae047fe8dee348ddbb96728
           name: 'CPU user time'
@@ -2608,8 +2835,8 @@ zabbix_export:
           description: 'The time the CPU has spent running users'' processes that are not niced.'
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
@@ -2666,8 +2893,11 @@ zabbix_export:
               units: '%'
               tags:
                 -
-                  tag: Application
-                  value: 'Filesystem {#FSNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
               trigger_prototypes:
                 -
                   uuid: 6785dec80d674c79a6b4c84a04165e25
@@ -2678,6 +2908,13 @@ zabbix_export:
                   description: |
                     It may become impossible to write to disk if there are no index nodes left.
                     As symptoms, 'No space left on device' or 'Disk is full' errors may be seen even though free space is available.
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 8a453a00627c4f1bbf0724dbdf4e760a
                   expression: 'min(/Linux filesystems by Zabbix agent active/vfs.fs.inode[{#FSNAME},pfree],5m)<{$VFS.FS.INODE.PFREE.MIN.WARN:"{#FSNAME}"}'
@@ -2691,6 +2928,13 @@ zabbix_export:
                     -
                       name: '{#FSNAME}: Running out of free inodes (free < {$VFS.FS.INODE.PFREE.MIN.CRIT:"{#FSNAME}"}%)'
                       expression: 'min(/Linux filesystems by Zabbix agent active/vfs.fs.inode[{#FSNAME},pfree],5m)<{$VFS.FS.INODE.PFREE.MIN.CRIT:"{#FSNAME}"}'
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 9f94a00cd29a420185475690d2f049c5
               name: '{#FSNAME}: Space utilization'
@@ -2702,8 +2946,11 @@ zabbix_export:
               description: 'Space utilization in % for {#FSNAME}'
               tags:
                 -
-                  tag: Application
-                  value: 'Filesystem {#FSNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: bba48614f65c468c82a494f3f119a21d
               name: '{#FSNAME}: Total space'
@@ -2714,8 +2961,11 @@ zabbix_export:
               description: 'Total space in Bytes'
               tags:
                 -
-                  tag: Application
-                  value: 'Filesystem {#FSNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 76bbffc4bd4a4ac3b3ff60ff27509372
               name: '{#FSNAME}: Used space'
@@ -2726,8 +2976,11 @@ zabbix_export:
               description: 'Used storage in Bytes'
               tags:
                 -
-                  tag: Application
-                  value: 'Filesystem {#FSNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
           trigger_prototypes:
             -
               uuid: 6f3a431ce1774d7e9cec073197f088ca
@@ -2743,6 +2996,13 @@ zabbix_export:
                  - The disk free space is less than 5G.
                  - The disk will be full in less than 24 hours.
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
             -
               uuid: fd163fa0d1b0419797957d80222218bd
               expression: |
@@ -2763,6 +3023,13 @@ zabbix_export:
                   expression: |
                     last(/Linux filesystems by Zabbix agent active/vfs.fs.size[{#FSNAME},pused])>{$VFS.FS.PUSED.MAX.CRIT:"{#FSNAME}"} and
                     ((last(/Linux filesystems by Zabbix agent active/vfs.fs.size[{#FSNAME},total])-last(/Linux filesystems by Zabbix agent active/vfs.fs.size[{#FSNAME},used]))<5G or timeleft(/Linux filesystems by Zabbix agent active/vfs.fs.size[{#FSNAME},pused],1h,100)<1d)
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
           graph_prototypes:
             -
               uuid: 361d0714ef994ffb8ee037ae7a952fce
@@ -2839,14 +3106,18 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: fd194c5435c74dbdbefb396550497580
               expression: 'last(/Linux generic by Zabbix agent active/kernel.maxfiles)<{$KERNEL.MAXFILES.MIN}'
               name: 'Configured max number of open filedescriptors is too low (< {$KERNEL.MAXFILES.MIN})'
               priority: INFO
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 7778ab98754146ecbfd2735d9c322c97
           name: 'Maximum number of processes'
@@ -2862,8 +3133,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 1ddbc55594d540f7b30239a4e87a3b97
@@ -2874,6 +3145,10 @@ zabbix_export:
                 -
                   name: 'Getting closer to process limit (over 80% used)'
                   expression: 'last(/Linux generic by Zabbix agent active/proc.num)/last(/Linux generic by Zabbix agent active/kernel.maxproc)*100>80'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 64268d5004a64e0ba737dcf4dd213913
           name: 'Number of processes'
@@ -2882,8 +3157,8 @@ zabbix_export:
           history: 7d
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 06e306520579482b8105d7421ad16da1
           name: 'Number of running processes'
@@ -2892,8 +3167,8 @@ zabbix_export:
           history: 7d
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 04989d7ca98246ce93405b25bd86aeda
           name: 'System boot time'
@@ -2909,8 +3184,8 @@ zabbix_export:
                 - 1h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 40de32e4124b456faba499e00b1c7174
           name: 'System name'
@@ -2929,8 +3204,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 071532526e8842f8935bf9373a85b7da
@@ -2939,19 +3214,25 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: 510ed427b1284906824df3123b94a0bc
           name: 'System local time'
           type: ZABBIX_ACTIVE
           key: system.localtime
           history: 7d
-          status: DISABLED
           units: unixtime
           description: 'System local time of the host.'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 350ceb73bee84b21b1f5c559e6697879
@@ -2960,6 +3241,13 @@ zabbix_export:
               priority: WARNING
               description: 'The host system time is different from the Zabbix server time.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 6f37348c05fa409e9189af3731296095
           name: 'Operating system architecture'
@@ -2977,8 +3265,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: os
         -
           uuid: 79d493ae03a64bdab89520c3dde0410c
           name: 'Operating system'
@@ -2996,8 +3284,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: os
           triggers:
             -
               uuid: fc45ac0cfc7641f2a52b95830df3e880
@@ -3010,6 +3298,10 @@ zabbix_export:
                 -
                   name: 'System name has changed (new name: {ITEM.VALUE})'
                   expression: 'last(/Linux generic by Zabbix agent active/system.hostname,#1)<>last(/Linux generic by Zabbix agent active/system.hostname,#2) and length(last(/Linux generic by Zabbix agent active/system.hostname))>0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 42df39b3317a4bd6908686a491fd3d18
           name: 'Software installed'
@@ -3026,8 +3318,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: os
         -
           uuid: d875142b4ea0442db59768be58c9d026
           name: 'System description'
@@ -3045,8 +3337,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 2e5b3c8596df4aaebce704f3904630a7
           name: 'System uptime'
@@ -3059,8 +3351,8 @@ zabbix_export:
           description: 'System uptime in ''N days, hh:mm:ss'' format.'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 7b13d56caa094a8d95c0f4e948078366
@@ -3069,6 +3361,10 @@ zabbix_export:
               priority: WARNING
               description: 'The host uptime is less than 10 minutes'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: a58cfd080cfe44d9ae054754bbc69892
           name: 'Number of logged in users'
@@ -3078,8 +3374,8 @@ zabbix_export:
           description: 'Number of users who are currently logged in.'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: environment
         -
           uuid: 7cb47989debc4deba77394a5320a83e8
           name: 'Checksum of /etc/passwd'
@@ -3096,8 +3392,8 @@ zabbix_export:
                 - 1h
           tags:
             -
-              tag: Application
-              value: Security
+              tag: component
+              value: environment
           triggers:
             -
               uuid: a49d7ca808c345ec8ef516fdc3b0d5ff
@@ -3112,6 +3408,10 @@ zabbix_export:
                 -
                   name: 'System name has changed (new name: {ITEM.VALUE})'
                   expression: 'last(/Linux generic by Zabbix agent active/system.hostname,#1)<>last(/Linux generic by Zabbix agent active/system.hostname,#2) and length(last(/Linux generic by Zabbix agent active/system.hostname))>0'
+              tags:
+                -
+                  tag: scope
+                  value: security
       macros:
         -
           macro: '{$KERNEL.MAXFILES.MIN}'
@@ -3141,8 +3441,11 @@ zabbix_export:
           description: 'The free space of swap volume/file in bytes.'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
+            -
+              tag: component
+              value: storage
         -
           uuid: f3b551caf6b44511a44f5ebb07ba5917
           name: 'Free swap space in %'
@@ -3154,8 +3457,11 @@ zabbix_export:
           description: 'The free space of swap volume/file in percent.'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
+            -
+              tag: component
+              value: storage
         -
           uuid: 0b1a37ddf8db402491ac856980437a45
           name: 'Total swap space'
@@ -3166,8 +3472,11 @@ zabbix_export:
           description: 'The total space of swap volume/file in bytes.'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
+            -
+              tag: component
+              value: storage
         -
           uuid: 156ef93f80d7499198909fc3fbc84672
           name: 'Available memory'
@@ -3178,8 +3487,8 @@ zabbix_export:
           description: 'Available memory, in Linux, available = free + buffers + cache. On other platforms calculation may vary. See also Appendixes in Zabbix Documentation about parameters of the vm.memory.size item.'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 79d2b01adaf14794826f78c860867fc5
           name: 'Available memory in %'
@@ -3191,8 +3500,8 @@ zabbix_export:
           description: 'Available memory as percentage of total. See also Appendixes in Zabbix Documentation about parameters of the vm.memory.size item.'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: e1bc17b4c3d7499b954fe10e5feb35e1
           name: 'Total memory'
@@ -3203,8 +3512,8 @@ zabbix_export:
           description: 'Total memory in Bytes'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: bb6cff2714e94a05a73aea5760e168c6
           name: 'Memory utilization'
@@ -3224,8 +3533,8 @@ zabbix_export:
             key: 'vm.memory.size[pavailable]'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: 11bff052c18b424f9d89b53e0faa2b21
@@ -3236,7 +3545,14 @@ zabbix_export:
               dependencies:
                 -
                   name: 'Lack of available memory (<{$MEMORY.AVAILABLE.MIN} of {ITEM.VALUE2})'
-                  expression: 'min(/Linux memory by Zabbix agent active/vm.memory.size[available],5m)<{$MEMORY.AVAILABLE.MIN} and last(/Linux memory by Zabbix agent active/vm.memory.size[total])>0'
+                  expression: 'max(/Linux memory by Zabbix agent active/vm.memory.size[available],5m)<{$MEMORY.AVAILABLE.MIN} and last(/Linux memory by Zabbix agent active/vm.memory.size[total])>0'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
       macros:
         -
           macro: '{$MEMORY.AVAILABLE.MIN}'
@@ -3297,8 +3613,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 5b771b290bb847be89bd7729709b7277
               name: 'Interface {#IFNAME}: Inbound packets with errors'
@@ -3313,8 +3635,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: bd9652a4c1dd45eaa31807bdf9a84a79
               name: 'Interface {#IFNAME}: Bits received'
@@ -3334,8 +3662,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: f5c36654948041bfb45878117781b02f
               name: 'Interface {#IFNAME}: Outbound packets discarded'
@@ -3350,8 +3684,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: af4d99f8a7604fdfaaa3190469ddf9ec
               name: 'Interface {#IFNAME}: Outbound packets with errors'
@@ -3366,8 +3706,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 9cd8c1068368472383c468145c5aecba
               name: 'Interface {#IFNAME}: Bits sent'
@@ -3387,8 +3733,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: b38858cf52f945599ca475b635aab285
               name: 'Interface {#IFNAME}: Operational status'
@@ -3432,8 +3784,14 @@ zabbix_export:
                       return newvalue;
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: acaf449feee44624995b9c3d0673cedc
@@ -3451,6 +3809,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 1506d09010fc48378b35b434e0eb18c1
               name: 'Interface {#IFNAME}: Interface type'
@@ -3472,8 +3834,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           trigger_prototypes:
             -
               uuid: 6ce7c1f3b54641bb87684f9c5336d1da
@@ -3498,6 +3866,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}: Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Linux network interfaces by Zabbix agent active/vfs.file.contents["/sys/class/net/{#IFNAME}/operstate"])=2 and (last(/Linux network interfaces by Zabbix agent active/vfs.file.contents["/sys/class/net/{#IFNAME}/operstate"],#1)<>last(/Linux network interfaces by Zabbix agent active/vfs.file.contents["/sys/class/net/{#IFNAME}/operstate"],#2))'
                   recovery_expression: 'last(/Linux network interfaces by Zabbix agent active/vfs.file.contents["/sys/class/net/{#IFNAME}/operstate"])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: b0b3cce08e924447845859391bdf9045
               expression: |
@@ -3517,6 +3889,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}: Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Linux network interfaces by Zabbix agent active/vfs.file.contents["/sys/class/net/{#IFNAME}/operstate"])=2 and (last(/Linux network interfaces by Zabbix agent active/vfs.file.contents["/sys/class/net/{#IFNAME}/operstate"],#1)<>last(/Linux network interfaces by Zabbix agent active/vfs.file.contents["/sys/class/net/{#IFNAME}/operstate"],#2))'
                   recovery_expression: 'last(/Linux network interfaces by Zabbix agent active/vfs.file.contents["/sys/class/net/{#IFNAME}/operstate"])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: 97e93dc9e93f4e299dee1d1424180c6a
@@ -3836,15 +4215,23 @@ zabbix_export:
       name: 'Getting closer to process limit (over 80% used)'
       opdata: '{ITEM.LASTVALUE1} active, {ITEM.LASTVALUE2} limit.'
       priority: WARNING
+      tags:
+        -
+          tag: scope
+          value: performance
     -
       uuid: e15f1c71f77b4c86b8ae71469b2f297e
       expression: 'last(/Linux generic by Zabbix agent active/proc.num)/last(/Linux generic by Zabbix agent active/kernel.maxproc)*100>80'
       name: 'Getting closer to process limit (over 80% used)'
       opdata: '{ITEM.LASTVALUE1} active, {ITEM.LASTVALUE2} limit.'
       priority: WARNING
+      tags:
+        -
+          tag: scope
+          value: performance
     -
       uuid: 722692e0703e4609852439a9b751826d
-      expression: 'min(/Linux by Zabbix agent active/system.swap.size[,pfree],5m)<{$SWAP.PFREE.MIN.WARN} and last(/Linux by Zabbix agent active/system.swap.size[,total])>0'
+      expression: 'max(/Linux by Zabbix agent active/system.swap.size[,pfree],5m)<{$SWAP.PFREE.MIN.WARN} and last(/Linux by Zabbix agent active/system.swap.size[,total])>0'
       name: 'High swap space usage (less than {$SWAP.PFREE.MIN.WARN}% free)'
       opdata: 'Free: {ITEM.LASTVALUE1}, total: {ITEM.LASTVALUE2}'
       priority: WARNING
@@ -3855,10 +4242,14 @@ zabbix_export:
           expression: 'min(/Linux by Zabbix agent active/vm.memory.utilization,5m)>{$MEMORY.UTIL.MAX}'
         -
           name: 'Lack of available memory (<{$MEMORY.AVAILABLE.MIN} of {ITEM.VALUE2})'
-          expression: 'min(/Linux by Zabbix agent active/vm.memory.size[available],5m)<{$MEMORY.AVAILABLE.MIN} and last(/Linux by Zabbix agent active/vm.memory.size[total])>0'
+          expression: 'max(/Linux by Zabbix agent active/vm.memory.size[available],5m)<{$MEMORY.AVAILABLE.MIN} and last(/Linux by Zabbix agent active/vm.memory.size[total])>0'
+      tags:
+        -
+          tag: scope
+          value: capacity
     -
       uuid: dea1c2fccd8f4e52bedd85fe23db7228
-      expression: 'min(/Linux memory by Zabbix agent active/system.swap.size[,pfree],5m)<{$SWAP.PFREE.MIN.WARN} and last(/Linux memory by Zabbix agent active/system.swap.size[,total])>0'
+      expression: 'max(/Linux memory by Zabbix agent active/system.swap.size[,pfree],5m)<{$SWAP.PFREE.MIN.WARN} and last(/Linux memory by Zabbix agent active/system.swap.size[,total])>0'
       name: 'High swap space usage (less than {$SWAP.PFREE.MIN.WARN}% free)'
       opdata: 'Free: {ITEM.LASTVALUE1}, total: {ITEM.LASTVALUE2}'
       priority: WARNING
@@ -3869,19 +4260,37 @@ zabbix_export:
           expression: 'min(/Linux memory by Zabbix agent active/vm.memory.utilization,5m)>{$MEMORY.UTIL.MAX}'
         -
           name: 'Lack of available memory (<{$MEMORY.AVAILABLE.MIN} of {ITEM.VALUE2})'
-          expression: 'min(/Linux memory by Zabbix agent active/vm.memory.size[available],5m)<{$MEMORY.AVAILABLE.MIN} and last(/Linux memory by Zabbix agent active/vm.memory.size[total])>0'
+          expression: 'max(/Linux memory by Zabbix agent active/vm.memory.size[available],5m)<{$MEMORY.AVAILABLE.MIN} and last(/Linux memory by Zabbix agent active/vm.memory.size[total])>0'
+      tags:
+        -
+          tag: scope
+          value: capacity
     -
       uuid: b3f51f3c63024d209fd01e17293127a6
-      expression: 'min(/Linux by Zabbix agent active/vm.memory.size[available],5m)<{$MEMORY.AVAILABLE.MIN} and last(/Linux by Zabbix agent active/vm.memory.size[total])>0'
+      expression: 'max(/Linux by Zabbix agent active/vm.memory.size[available],5m)<{$MEMORY.AVAILABLE.MIN} and last(/Linux by Zabbix agent active/vm.memory.size[total])>0'
       name: 'Lack of available memory (<{$MEMORY.AVAILABLE.MIN} of {ITEM.VALUE2})'
       opdata: 'Available: {ITEM.LASTVALUE1}, total: {ITEM.LASTVALUE2}'
       priority: AVERAGE
+      tags:
+        -
+          tag: scope
+          value: capacity
+        -
+          tag: scope
+          value: performance
     -
       uuid: 1ba414b62eef4ca6b198f00a4cdd2bde
-      expression: 'min(/Linux memory by Zabbix agent active/vm.memory.size[available],5m)<{$MEMORY.AVAILABLE.MIN} and last(/Linux memory by Zabbix agent active/vm.memory.size[total])>0'
+      expression: 'max(/Linux memory by Zabbix agent active/vm.memory.size[available],5m)<{$MEMORY.AVAILABLE.MIN} and last(/Linux memory by Zabbix agent active/vm.memory.size[total])>0'
       name: 'Lack of available memory (<{$MEMORY.AVAILABLE.MIN} of {ITEM.VALUE2})'
       opdata: 'Available: {ITEM.LASTVALUE1}, total: {ITEM.LASTVALUE2}'
       priority: AVERAGE
+      tags:
+        -
+          tag: scope
+          value: capacity
+        -
+          tag: scope
+          value: performance
     -
       uuid: 72825a0c706043429ed1ff6656763052
       expression: |
@@ -3892,6 +4301,13 @@ zabbix_export:
       opdata: 'Load averages(1m 5m 15m): ({ITEM.LASTVALUE1} {ITEM.LASTVALUE3} {ITEM.LASTVALUE4}), # of CPUs: {ITEM.LASTVALUE2}'
       priority: AVERAGE
       description: 'Per CPU load average is too high. Your system may be slow to respond.'
+      tags:
+        -
+          tag: scope
+          value: capacity
+        -
+          tag: scope
+          value: performance
     -
       uuid: 813c4c7139a3497dbb6b9b977eb51842
       expression: |
@@ -3902,6 +4318,13 @@ zabbix_export:
       opdata: 'Load averages(1m 5m 15m): ({ITEM.LASTVALUE1} {ITEM.LASTVALUE3} {ITEM.LASTVALUE4}), # of CPUs: {ITEM.LASTVALUE2}'
       priority: AVERAGE
       description: 'Per CPU load average is too high. Your system may be slow to respond.'
+      tags:
+        -
+          tag: scope
+          value: capacity
+        -
+          tag: scope
+          value: performance
   graphs:
     -
       uuid: c82ee8589e5a4aa0b5e2a94293cefada
diff --git a/templates/os/linux_prom/README.md b/templates/os/linux_prom/README.md
index 202b91d88d6..8db4aae54dc 100644
--- a/templates/os/linux_prom/README.md
+++ b/templates/os/linux_prom/README.md
@@ -63,9 +63,9 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|Network interface discovery |<p>Discovery of network interfaces. Requires node_exporter v0.18 and up.</p> |DEPENDENT |net.if.discovery[node_exporter]<p>**Preprocessing**:</p><p>- PROMETHEUS_TO_JSON: `{__name__=~"^node_network_info$"}`</p><p>**Filter**:</p>AND <p>- {#IFNAME} MATCHES_REGEX `{$NET.IF.IFNAME.MATCHES}`</p><p>- {#IFNAME} NOT_MATCHES_REGEX `{$NET.IF.IFNAME.NOT_MATCHES}`</p><p>- {#IFALIAS} MATCHES_REGEX `{$NET.IF.IFALIAS.MATCHES}`</p><p>- {#IFALIAS} NOT_MATCHES_REGEX `{$NET.IF.IFALIAS.NOT_MATCHES}`</p><p>- {#IFOPERSTATUS} MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.MATCHES}`</p><p>- {#IFOPERSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.NOT_MATCHES}`</p> |
-|Mounted filesystem discovery |<p>Discovery of file systems of different types.</p> |DEPENDENT |vfs.fs.discovery[node_exporter]<p>**Preprocessing**:</p><p>- PROMETHEUS_TO_JSON: `{__name__=~"^node_filesystem_size(?:_bytes)?$", mountpoint=~".+"}`</p><p>**Filter**:</p>AND <p>- {#FSTYPE} MATCHES_REGEX `{$VFS.FS.FSTYPE.MATCHES}`</p><p>- {#FSTYPE} NOT_MATCHES_REGEX `{$VFS.FS.FSTYPE.NOT_MATCHES}`</p><p>- {#FSNAME} MATCHES_REGEX `{$VFS.FS.FSNAME.MATCHES}`</p><p>- {#FSNAME} NOT_MATCHES_REGEX `{$VFS.FS.FSNAME.NOT_MATCHES}`</p><p>- {#FSNAME} MATCHES_REGEX `{$VFS.FS.FSDEVICE.MATCHES}`</p><p>- {#FSDEVICE} NOT_MATCHES_REGEX `{$VFS.FS.FSDEVICE.NOT_MATCHES}`</p> |
 |Block devices discovery |<p>-</p> |DEPENDENT |vfs.dev.discovery[node_exporter]<p>**Preprocessing**:</p><p>- PROMETHEUS_TO_JSON: `node_disk_io_now{device=~".+"}`</p><p>**Filter**:</p>AND <p>- {#DEVNAME} MATCHES_REGEX `{$VFS.DEV.DEVNAME.MATCHES}`</p><p>- {#DEVNAME} NOT_MATCHES_REGEX `{$VFS.DEV.DEVNAME.NOT_MATCHES}`</p> |
+|Mounted filesystem discovery |<p>Discovery of file systems of different types.</p> |DEPENDENT |vfs.fs.discovery[node_exporter]<p>**Preprocessing**:</p><p>- PROMETHEUS_TO_JSON: `{__name__=~"^node_filesystem_size(?:_bytes)?$", mountpoint=~".+"}`</p><p>**Filter**:</p>AND <p>- {#FSTYPE} MATCHES_REGEX `{$VFS.FS.FSTYPE.MATCHES}`</p><p>- {#FSTYPE} NOT_MATCHES_REGEX `{$VFS.FS.FSTYPE.NOT_MATCHES}`</p><p>- {#FSNAME} MATCHES_REGEX `{$VFS.FS.FSNAME.MATCHES}`</p><p>- {#FSNAME} NOT_MATCHES_REGEX `{$VFS.FS.FSNAME.NOT_MATCHES}`</p><p>- {#FSNAME} MATCHES_REGEX `{$VFS.FS.FSDEVICE.MATCHES}`</p><p>- {#FSDEVICE} NOT_MATCHES_REGEX `{$VFS.FS.FSDEVICE.NOT_MATCHES}`</p> |
+|Network interface discovery |<p>Discovery of network interfaces. Requires node_exporter v0.18 and up.</p> |DEPENDENT |net.if.discovery[node_exporter]<p>**Preprocessing**:</p><p>- PROMETHEUS_TO_JSON: `{__name__=~"^node_network_info$"}`</p><p>**Filter**:</p>AND <p>- {#IFNAME} MATCHES_REGEX `{$NET.IF.IFNAME.MATCHES}`</p><p>- {#IFNAME} NOT_MATCHES_REGEX `{$NET.IF.IFNAME.NOT_MATCHES}`</p><p>- {#IFALIAS} MATCHES_REGEX `{$NET.IF.IFALIAS.MATCHES}`</p><p>- {#IFALIAS} NOT_MATCHES_REGEX `{$NET.IF.IFALIAS.NOT_MATCHES}`</p><p>- {#IFOPERSTATUS} MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.MATCHES}`</p><p>- {#IFOPERSTATUS} NOT_MATCHES_REGEX `{$NET.IF.IFOPERSTATUS.NOT_MATCHES}`</p> |
 
 ## Items collected
 
@@ -102,16 +102,16 @@ There are no template links in this template.
 |Memory |Total swap space |<p>The total space of swap volume/file in bytes.</p> |DEPENDENT |system.swap.total[node_exporter]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `{__name__=~"node_memory_SwapTotal"}`</p> |
 |Memory |Free swap space |<p>The free space of swap volume/file in bytes.</p> |DEPENDENT |system.swap.free[node_exporter]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `{__name__=~"node_memory_SwapFree"}`</p> |
 |Memory |Free swap space in % |<p>The free space of swap volume/file in percent.</p> |CALCULATED |system.swap.pfree[node_exporter]<p>**Expression**:</p>`last(//system.swap.free[node_exporter])/last(//system.swap.total[node_exporter])*100` |
-|Monitoring_agent |Version of node_exporter running |<p>-</p> |DEPENDENT |agent.version[node_exporter]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `node_exporter_build_info`: `label`: `version`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
-|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Bits received |<p>-</p> |DEPENDENT |net.if.in[node_exporter,"{#IFNAME}"]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `node_network_receive_bytes_total{device="{#IFNAME}"}`</p><p>- CHANGE_PER_SECOND</p><p>- MULTIPLIER: `8`</p> |
-|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Bits sent |<p>-</p> |DEPENDENT |net.if.out[node_exporter,"{#IFNAME}"]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `node_network_transmit_bytes_total{device="{#IFNAME}"}`</p><p>- CHANGE_PER_SECOND</p><p>- MULTIPLIER: `8`</p> |
-|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors |<p>-</p> |DEPENDENT |net.if.out.errors[node_exporter"{#IFNAME}"]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `node_network_transmit_errs_total{device="{#IFNAME}"}`</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors |<p>-</p> |DEPENDENT |net.if.in.errors[node_exporter,"{#IFNAME}"]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `node_network_receive_errs_total{device="{#IFNAME}"}`</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Inbound packets discarded |<p>-</p> |DEPENDENT |net.if.in.discards[node_exporter,"{#IFNAME}"]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `node_network_receive_drop_total{device="{#IFNAME}"}`</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded |<p>-</p> |DEPENDENT |net.if.out.discards[node_exporter,"{#IFNAME}"]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `node_network_transmit_drop_total{device="{#IFNAME}"}`</p><p>- CHANGE_PER_SECOND</p> |
-|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Speed |<p>Sets value to 0 if metric is missing in node_exporter output.</p> |DEPENDENT |net.if.speed[node_exporter,"{#IFNAME}"]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `node_network_speed_bytes{device="{#IFNAME}"}`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- MULTIPLIER: `8`</p> |
-|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Interface type |<p>node_network_protocol_type protocol_type value of /sys/class/net/<iface>.</p> |DEPENDENT |net.if.type[node_exporter,"{#IFNAME}"]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `node_network_protocol_type{device="{#IFNAME}"}`</p> |
-|Network_interfaces |Interface {#IFNAME}({#IFALIAS}): Operational status |<p>Reference: https://www.kernel.org/doc/Documentation/networking/operstates.txt</p> |DEPENDENT |net.if.status[node_exporter,"{#IFNAME}"]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `node_network_info{device="{#IFNAME}"}`: `label`: `operstate`</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
+|Monitoring agent |Version of node_exporter running |<p>-</p> |DEPENDENT |agent.version[node_exporter]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `node_exporter_build_info`: `label`: `version`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Network interfaces |Interface {#IFNAME}({#IFALIAS}): Bits received |<p>-</p> |DEPENDENT |net.if.in[node_exporter,"{#IFNAME}"]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `node_network_receive_bytes_total{device="{#IFNAME}"}`</p><p>- CHANGE_PER_SECOND</p><p>- MULTIPLIER: `8`</p> |
+|Network interfaces |Interface {#IFNAME}({#IFALIAS}): Bits sent |<p>-</p> |DEPENDENT |net.if.out[node_exporter,"{#IFNAME}"]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `node_network_transmit_bytes_total{device="{#IFNAME}"}`</p><p>- CHANGE_PER_SECOND</p><p>- MULTIPLIER: `8`</p> |
+|Network interfaces |Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors |<p>-</p> |DEPENDENT |net.if.out.errors[node_exporter"{#IFNAME}"]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `node_network_transmit_errs_total{device="{#IFNAME}"}`</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors |<p>-</p> |DEPENDENT |net.if.in.errors[node_exporter,"{#IFNAME}"]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `node_network_receive_errs_total{device="{#IFNAME}"}`</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |Interface {#IFNAME}({#IFALIAS}): Inbound packets discarded |<p>-</p> |DEPENDENT |net.if.in.discards[node_exporter,"{#IFNAME}"]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `node_network_receive_drop_total{device="{#IFNAME}"}`</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded |<p>-</p> |DEPENDENT |net.if.out.discards[node_exporter,"{#IFNAME}"]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `node_network_transmit_drop_total{device="{#IFNAME}"}`</p><p>- CHANGE_PER_SECOND</p> |
+|Network interfaces |Interface {#IFNAME}({#IFALIAS}): Speed |<p>Sets value to 0 if metric is missing in node_exporter output.</p> |DEPENDENT |net.if.speed[node_exporter,"{#IFNAME}"]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `node_network_speed_bytes{device="{#IFNAME}"}`</p><p>⛔️ON_FAIL: `CUSTOM_VALUE -> 0`</p><p>- MULTIPLIER: `8`</p> |
+|Network interfaces |Interface {#IFNAME}({#IFALIAS}): Interface type |<p>node_network_protocol_type protocol_type value of /sys/class/net/<iface>.</p> |DEPENDENT |net.if.type[node_exporter,"{#IFNAME}"]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `node_network_protocol_type{device="{#IFNAME}"}`</p> |
+|Network interfaces |Interface {#IFNAME}({#IFALIAS}): Operational status |<p>Reference: https://www.kernel.org/doc/Documentation/networking/operstates.txt</p> |DEPENDENT |net.if.status[node_exporter,"{#IFNAME}"]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `node_network_info{device="{#IFNAME}"}`: `label`: `operstate`</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
 |Status |System uptime |<p>System uptime in 'N days, hh:mm:ss' format.</p> |DEPENDENT |system.uptime[node_exporter]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `{__name__=~"^node_boot_time(?:_seconds)?$"}`</p><p>- JAVASCRIPT: `//use boottime to calculate uptime return (Math.floor(Date.now()/1000)-Number(value)); `</p> |
 |Storage |{#FSNAME}: Free space |<p>-</p> |DEPENDENT |vfs.fs.free[node_exporter,"{#FSNAME}"]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `{__name__=~"^node_filesystem_avail(?:_bytes)?$", mountpoint="{#FSNAME}"}`</p> |
 |Storage |{#FSNAME}: Total space |<p>Total space in Bytes</p> |DEPENDENT |vfs.fs.total[node_exporter,"{#FSNAME}"]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `{__name__=~"^node_filesystem_size(?:_bytes)?$", mountpoint="{#FSNAME}"}`</p> |
@@ -124,15 +124,15 @@ There are no template links in this template.
 |Storage |{#DEVNAME}: Disk write request avg waiting time (w_await) |<p>This formula contains two boolean expressions that evaluates to 1 or 0 in order to set calculated metric to zero and to avoid division by zero exception.</p> |CALCULATED |vfs.dev.write.await[node_exporter,"{#DEVNAME}"]<p>**Expression**:</p>`(last(//vfs.dev.write.time.rate[node_exporter,"{#DEVNAME}"])/(last(//vfs.dev.write.rate[node_exporter,"{#DEVNAME}"])+(last(//vfs.dev.write.rate[node_exporter,"{#DEVNAME}"])=0)))*1000*(last(//vfs.dev.write.rate[node_exporter,"{#DEVNAME}"]) > 0)` |
 |Storage |{#DEVNAME}: Disk average queue size (avgqu-sz) |<p>Current average disk queue, the number of requests outstanding on the disk at the time the performance data is collected.</p> |DEPENDENT |vfs.dev.queue_size[node_exporter,"{#DEVNAME}"]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `node_disk_io_time_weighted_seconds_total{device="{#DEVNAME}"}`</p><p>- CHANGE_PER_SECOND</p> |
 |Storage |{#DEVNAME}: Disk utilization |<p>This item is the percentage of elapsed time that the selected disk drive was busy servicing read or writes requests.</p> |DEPENDENT |vfs.dev.util[node_exporter,"{#DEVNAME}"]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `node_disk_io_time_seconds_total{device="{#DEVNAME}"}`</p><p>- CHANGE_PER_SECOND</p><p>- MULTIPLIER: `100`</p> |
-|Zabbix_raw_items |Get node_exporter metrics |<p>-</p> |HTTP_AGENT |node_exporter.get |
-|Zabbix_raw_items |{#DEVNAME}: Disk read time (rate) |<p>Rate of total read time counter. Used in r_await calculation.</p> |DEPENDENT |vfs.dev.read.time.rate[node_exporter,"{#DEVNAME}"]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `node_disk_read_time_seconds_total{device="{#DEVNAME}"}`</p><p>- CHANGE_PER_SECOND</p> |
-|Zabbix_raw_items |{#DEVNAME}: Disk write time (rate) |<p>Rate of total write time counter. Used in w_await calculation.</p> |DEPENDENT |vfs.dev.write.time.rate[node_exporter,"{#DEVNAME}"]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `node_disk_write_time_seconds_total{device="{#DEVNAME}"}`</p><p>- CHANGE_PER_SECOND</p> |
+|Zabbix raw items |Get node_exporter metrics |<p>-</p> |HTTP_AGENT |node_exporter.get |
+|Zabbix raw items |{#DEVNAME}: Disk read time (rate) |<p>Rate of total read time counter. Used in r_await calculation.</p> |DEPENDENT |vfs.dev.read.time.rate[node_exporter,"{#DEVNAME}"]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `node_disk_read_time_seconds_total{device="{#DEVNAME}"}`</p><p>- CHANGE_PER_SECOND</p> |
+|Zabbix raw items |{#DEVNAME}: Disk write time (rate) |<p>Rate of total write time counter. Used in w_await calculation.</p> |DEPENDENT |vfs.dev.write.time.rate[node_exporter,"{#DEVNAME}"]<p>**Preprocessing**:</p><p>- PROMETHEUS_PATTERN: `node_disk_write_time_seconds_total{device="{#DEVNAME}"}`</p><p>- CHANGE_PER_SECOND</p> |
 
 ## Triggers
 
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
-|Load average is too high (per CPU load over {$LOAD_AVG_PER_CPU.MAX.WARN} for 5m) |<p>Per CPU load average is too high. Your system may be slow to respond.</p> |`min(/Linux by Prom/system.cpu.load.avg1[node_exporter],5m)/last(/Linux by Prom/system.cpu.num[node_exporter])>{$LOAD_AVG_PER_CPU.MAX.WARN} and last(/Linux by Prom/system.cpu.load.avg5[node_exporter])>0 and last(/Linux by Prom/system.cpu.load.avg15[node_exporter])>0 ` |AVERAGE | |
+|Load average is too high (per CPU load over {$LOAD_AVG_PER_CPU.MAX.WARN} for 5m) |<p>Per CPU load average is too high. Your system may be slow to respond.</p> |`min(/Linux by Prom/system.cpu.load.avg1[node_exporter],5m)/last(/Linux by Prom/system.cpu.num[node_exporter])>{$LOAD_AVG_PER_CPU.MAX.WARN} and last(/Linux by Prom/system.cpu.load.avg5[node_exporter])>0 and last(/Linux by Prom/system.cpu.load.avg15[node_exporter])>0` |AVERAGE | |
 |High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/Linux by Prom/system.cpu.util[node_exporter],5m)>{$CPU.UTIL.CRIT}` |WARNING |<p>**Depends on**:</p><p>- Load average is too high (per CPU load over {$LOAD_AVG_PER_CPU.MAX.WARN} for 5m)</p> |
 |System time is out of sync (diff with Zabbix server > {$SYSTEM.FUZZYTIME.MAX}s) |<p>The host system time is different from the Zabbix server time.</p> |`fuzzytime(/Linux by Prom/system.localtime[node_exporter],{$SYSTEM.FUZZYTIME.MAX})=0` |WARNING |<p>Manual close: YES</p> |
 |System name has changed (new name: {ITEM.VALUE}) |<p>System name has changed. Ack to close.</p> |`last(/Linux by Prom/system.name[node_exporter],#1)<>last(/Linux by Prom/system.name[node_exporter],#2) and length(last(/Linux by Prom/system.name[node_exporter]))>0` |INFO |<p>Manual close: YES</p> |
@@ -140,10 +140,10 @@ There are no template links in this template.
 |Running out of file descriptors (less than < 20% free) |<p>-</p> |`last(/Linux by Prom/fd.open[node_exporter])/last(/Linux by Prom/kernel.maxfiles[node_exporter])*100>80` |WARNING | |
 |Operating system description has changed |<p>Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.</p> |`last(/Linux by Prom/system.sw.os[node_exporter],#1)<>last(/Linux by Prom/system.sw.os[node_exporter],#2) and length(last(/Linux by Prom/system.sw.os[node_exporter]))>0` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- System name has changed (new name: {ITEM.VALUE})</p> |
 |High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/Linux by Prom/vm.memory.util[node_exporter],5m)>{$MEMORY.UTIL.MAX}` |AVERAGE |<p>**Depends on**:</p><p>- Lack of available memory (<{$MEMORY.AVAILABLE.MIN} of {ITEM.VALUE2})</p> |
-|Lack of available memory (<{$MEMORY.AVAILABLE.MIN} of {ITEM.VALUE2}) |<p>-</p> |`min(/Linux by Prom/vm.memory.available[node_exporter],5m)<{$MEMORY.AVAILABLE.MIN} and last(/Linux by Prom/vm.memory.total[node_exporter])>0` |AVERAGE | |
-|High swap space usage (less than {$SWAP.PFREE.MIN.WARN}% free) |<p>This trigger is ignored, if there is no swap configured.</p> |`min(/Linux by Prom/system.swap.pfree[node_exporter],5m)<{$SWAP.PFREE.MIN.WARN} and last(/Linux by Prom/system.swap.total[node_exporter])>0` |WARNING |<p>**Depends on**:</p><p>- High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)</p><p>- Lack of available memory (<{$MEMORY.AVAILABLE.MIN} of {ITEM.VALUE2})</p> |
+|Lack of available memory (<{$MEMORY.AVAILABLE.MIN} of {ITEM.VALUE2}) |<p>-</p> |`max(/Linux by Prom/vm.memory.available[node_exporter],5m)<{$MEMORY.AVAILABLE.MIN} and last(/Linux by Prom/vm.memory.total[node_exporter])>0` |AVERAGE | |
+|High swap space usage (less than {$SWAP.PFREE.MIN.WARN}% free) |<p>This trigger is ignored, if there is no swap configured</p> |`max(/Linux by Prom/system.swap.pfree[node_exporter],5m)<{$SWAP.PFREE.MIN.WARN} and last(/Linux by Prom/system.swap.total[node_exporter])>0` |WARNING |<p>**Depends on**:</p><p>- High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)</p><p>- Lack of available memory (<{$MEMORY.AVAILABLE.MIN} of {ITEM.VALUE2})</p> |
 |Interface {#IFNAME}({#IFALIAS}): High bandwidth usage (>{$IF.UTIL.MAX:"{#IFNAME}"}%) |<p>The network interface utilization is close to its estimated maximum bandwidth.</p> |`(avg(/Linux by Prom/net.if.in[node_exporter,"{#IFNAME}"],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/Linux by Prom/net.if.speed[node_exporter,"{#IFNAME}"]) or avg(/Linux by Prom/net.if.out[node_exporter,"{#IFNAME}"],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/Linux by Prom/net.if.speed[node_exporter,"{#IFNAME}"])) and last(/Linux by Prom/net.if.speed[node_exporter,"{#IFNAME}"])>0`<p>Recovery expression:</p>`avg(/Linux by Prom/net.if.in[node_exporter,"{#IFNAME}"],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/Linux by Prom/net.if.speed[node_exporter,"{#IFNAME}"]) and avg(/Linux by Prom/net.if.out[node_exporter,"{#IFNAME}"],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/Linux by Prom/net.if.speed[node_exporter,"{#IFNAME}"])` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
-|Interface {#IFNAME}({#IFALIAS}): High error rate (>{$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) |<p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold.</p> |`min(/Linux by Prom/net.if.in.errors[node_exporter,"{#IFNAME}"],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"} or min(/Linux by Prom/net.if.out.errors[node_exporter"{#IFNAME}"],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`max(/Linux by Prom/net.if.in.errors[node_exporter,"{#IFNAME}"],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8 and max(/Linux by Prom/net.if.out.errors[node_exporter"{#IFNAME}"],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): High error rate (>{$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) |<p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p> |`min(/Linux by Prom/net.if.in.errors[node_exporter,"{#IFNAME}"],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"} or min(/Linux by Prom/net.if.out.errors[node_exporter"{#IFNAME}"],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`max(/Linux by Prom/net.if.in.errors[node_exporter,"{#IFNAME}"],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8 and max(/Linux by Prom/net.if.out.errors[node_exporter"{#IFNAME}"],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/Linux by Prom/net.if.speed[node_exporter,"{#IFNAME}"])<0 and last(/Linux by Prom/net.if.speed[node_exporter,"{#IFNAME}"])>0 and ( last(/Linux by Prom/net.if.type[node_exporter,"{#IFNAME}"])=6 or last(/Linux by Prom/net.if.type[node_exporter,"{#IFNAME}"])=7 or last(/Linux by Prom/net.if.type[node_exporter,"{#IFNAME}"])=11 or last(/Linux by Prom/net.if.type[node_exporter,"{#IFNAME}"])=62 or last(/Linux by Prom/net.if.type[node_exporter,"{#IFNAME}"])=69 or last(/Linux by Prom/net.if.type[node_exporter,"{#IFNAME}"])=117 ) and (last(/Linux by Prom/net.if.status[node_exporter,"{#IFNAME}"])<>2) `<p>Recovery expression:</p>`(change(/Linux by Prom/net.if.speed[node_exporter,"{#IFNAME}"])>0 and last(/Linux by Prom/net.if.speed[node_exporter,"{#IFNAME}"],#2)>0) or (last(/Linux by Prom/net.if.status[node_exporter,"{#IFNAME}"])=2) ` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/Linux by Prom/net.if.type[node_exporter,"{#IFNAME}"])<0 and last(/Linux by Prom/net.if.type[node_exporter,"{#IFNAME}"])>0 and (last(/Linux by Prom/net.if.type[node_exporter,"{#IFNAME}"])=6 or last(/Linux by Prom/net.if.type[node_exporter,"{#IFNAME}"])=1) and (last(/Linux by Prom/net.if.status[node_exporter,"{#IFNAME}"])<>2) `<p>Recovery expression:</p>`(change(/Linux by Prom/net.if.type[node_exporter,"{#IFNAME}"])>0 and last(/Linux by Prom/net.if.type[node_exporter,"{#IFNAME}"],#2)>0) or (last(/Linux by Prom/net.if.status[node_exporter,"{#IFNAME}"])=2) ` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |Interface {#IFNAME}({#IFALIAS}): Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p><p>3. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{$IFCONTROL:"{#IFNAME}"}=1 and last(/Linux by Prom/net.if.status[node_exporter,"{#IFNAME}"])=2 and (last(/Linux by Prom/net.if.status[node_exporter,"{#IFNAME}"],#1)<>last(/Linux by Prom/net.if.status[node_exporter,"{#IFNAME}"],#2))`<p>Recovery expression:</p>`last(/Linux by Prom/net.if.status[node_exporter,"{#IFNAME}"])<>2 or {$IFCONTROL:"{#IFNAME}"}=0` |AVERAGE |<p>Manual close: YES</p> |
@@ -159,7 +159,7 @@ There are no template links in this template.
 
 Please report any issues with the template at https://support.zabbix.com
 
-You can also provide a feedback, discuss the template or ask for help with it at [ZABBIX forums](https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/387225-discussion-thread-for-official-zabbix-template-for-linux).
+You can also provide feedback, discuss the template or ask for help with it at [ZABBIX forums](https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/387225-discussion-thread-for-official-zabbix-template-for-linux).
 
 ## Known Issues
 
diff --git a/templates/os/linux_prom/template_os_linux_prom.yaml b/templates/os/linux_prom/template_os_linux_prom.yaml
index 8a7486df70e..7f6c205eb89 100644
--- a/templates/os/linux_prom/template_os_linux_prom.yaml
+++ b/templates/os/linux_prom/template_os_linux_prom.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-14T17:44:19Z'
+  date: '2022-01-26T10:41:21Z'
   groups:
     -
       uuid: 846977d1dfed4968bc5f8bdb363285bc
@@ -24,7 +24,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/387225-discussion-thread-for-official-zabbix-template-for-linux
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: 'Templates/Operating systems'
@@ -53,8 +53,8 @@ zabbix_export:
             key: node_exporter.get
           tags:
             -
-              tag: Application
-              value: 'Monitoring agent'
+              tag: component
+              value: application
         -
           uuid: d3631bd7effc4cd1bc45c991b3c3038f
           name: 'Number of open file descriptors'
@@ -74,8 +74,8 @@ zabbix_export:
             key: node_exporter.get
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: a8b78e776e1d4011bbcb6dd54e32b40b
           name: 'Maximum number of open file descriptors'
@@ -100,8 +100,8 @@ zabbix_export:
             key: node_exporter.get
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: c0002ad071d7497ab32633c93624e0c2
@@ -112,6 +112,10 @@ zabbix_export:
                 -
                   name: 'Running out of file descriptors (less than < 20% free)'
                   expression: 'last(/Linux by Prom/fd.open[node_exporter])/last(/Linux by Prom/kernel.maxfiles[node_exporter])*100>80'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 8b2fffcba0b24ca8a687361645ffaa1d
           name: 'Get node_exporter metrics'
@@ -123,8 +127,8 @@ zabbix_export:
           url: 'http://{HOST.CONN}:{$NODE_EXPORTER_PORT}/metrics'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
           triggers:
             -
               uuid: e33fafc8476e404aa4150d0d491f4c83
@@ -133,6 +137,10 @@ zabbix_export:
               priority: WARNING
               description: 'Failed to fetch system metrics from node_exporter in time.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 75afcb39d2d7496e9490cd14f1431600
           name: 'System boot time'
@@ -153,8 +161,8 @@ zabbix_export:
             key: node_exporter.get
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: a732c4df8af047fbb874e1fb363b5e9e
           name: 'CPU guest time'
@@ -191,8 +199,8 @@ zabbix_export:
             key: node_exporter.get
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: 759809ee6c9e43cf8ff44f987221a90e
           name: 'CPU guest nice time'
@@ -229,8 +237,8 @@ zabbix_export:
             key: node_exporter.get
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: 7bb99c606c6b497aaef279663b60829b
           name: 'CPU idle time'
@@ -267,8 +275,8 @@ zabbix_export:
             key: node_exporter.get
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: 4d3f64c79c684d55bcde14ca5bf3022a
           name: 'CPU interrupt time'
@@ -305,8 +313,8 @@ zabbix_export:
             key: node_exporter.get
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: 76206cf435fd4a979dbbf74807b532de
           name: 'Interrupts per second'
@@ -330,8 +338,8 @@ zabbix_export:
             key: node_exporter.get
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: 6a727e148a2c4956bcfb6de0a3486c2d
           name: 'CPU iowait time'
@@ -368,8 +376,8 @@ zabbix_export:
             key: node_exporter.get
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: 78fb393fe3d64cd7bf79be5427715add
           name: 'Load average (1m avg)'
@@ -389,8 +397,8 @@ zabbix_export:
             key: node_exporter.get
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: 7fc62b26b9ff43429632f1985dc07851
           name: 'Load average (5m avg)'
@@ -410,8 +418,8 @@ zabbix_export:
             key: node_exporter.get
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: 35fb0319c599403bbea0e616c9066e27
           name: 'Load average (15m avg)'
@@ -431,8 +439,8 @@ zabbix_export:
             key: node_exporter.get
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: 86de794832794f57ba428cca31031005
           name: 'CPU nice time'
@@ -469,8 +477,8 @@ zabbix_export:
             key: node_exporter.get
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: d7db65cfeaac4541bd98d06dc35f89e2
           name: 'Number of CPUs'
@@ -493,8 +501,8 @@ zabbix_export:
             key: node_exporter.get
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: cf3cd5840b91477d8e9254820896b978
           name: 'CPU softirq time'
@@ -531,8 +539,8 @@ zabbix_export:
             key: node_exporter.get
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: 2ee5885c4de646c0926f0c1a48890e68
           name: 'CPU steal time'
@@ -569,8 +577,8 @@ zabbix_export:
             key: node_exporter.get
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: b873e0d178d144fca3597d617fc119e7
           name: 'Context switches per second'
@@ -594,8 +602,8 @@ zabbix_export:
             key: node_exporter.get
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: e296be976c5944b19a7178304ed6140c
           name: 'CPU system time'
@@ -632,8 +640,8 @@ zabbix_export:
             key: node_exporter.get
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: 832698e707d14bad8171ca71a2533350
           name: 'CPU user time'
@@ -670,8 +678,8 @@ zabbix_export:
             key: node_exporter.get
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: 76f60c7e4f1a482198ff4f101020bbcc
           name: 'CPU utilization'
@@ -693,8 +701,8 @@ zabbix_export:
             key: 'system.cpu.idle[node_exporter]'
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
           triggers:
             -
               uuid: 4c924f8243a7431886a2d69368cb7142
@@ -710,6 +718,10 @@ zabbix_export:
                     min(/Linux by Prom/system.cpu.load.avg1[node_exporter],5m)/last(/Linux by Prom/system.cpu.num[node_exporter])>{$LOAD_AVG_PER_CPU.MAX.WARN}
                     and last(/Linux by Prom/system.cpu.load.avg5[node_exporter])>0
                     and last(/Linux by Prom/system.cpu.load.avg15[node_exporter])>0
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: c47995760ef3458eb6237e434ef4eef8
           name: 'System description'
@@ -739,8 +751,8 @@ zabbix_export:
             key: node_exporter.get
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 9fcb3dd70dc244f2b2ff86560b37ec7e
           name: 'System local time'
@@ -762,8 +774,8 @@ zabbix_export:
             key: node_exporter.get
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: e91c10be1c4a4c3fadfe06aec6c1e4e4
@@ -772,6 +784,13 @@ zabbix_export:
               priority: WARNING
               description: 'The host system time is different from the Zabbix server time.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: c70cfa2ad5754089935883c5b3172656
           name: 'System name'
@@ -798,8 +817,8 @@ zabbix_export:
             key: node_exporter.get
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: e827e944568b46e284820630482317bd
@@ -808,6 +827,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: ce4bb6c485cc4b739dce31b631634790
           name: 'Operating system architecture'
@@ -833,8 +859,8 @@ zabbix_export:
             key: node_exporter.get
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: os
         -
           uuid: 11ff4e02245f4c2e9ce00e55c1a77b39
           name: 'Operating system'
@@ -854,8 +880,8 @@ zabbix_export:
             key: 'system.descr[node_exporter]'
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: os
           triggers:
             -
               uuid: 00974d5b128c4b1db64ca100770fb11b
@@ -868,6 +894,10 @@ zabbix_export:
                 -
                   name: 'System name has changed (new name: {ITEM.VALUE})'
                   expression: 'last(/Linux by Prom/system.name[node_exporter],#1)<>last(/Linux by Prom/system.name[node_exporter],#2) and length(last(/Linux by Prom/system.name[node_exporter]))>0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: ccc3c4d69fef412aa53c6a7320ef44fb
           name: 'Free swap space'
@@ -889,8 +919,11 @@ zabbix_export:
             key: node_exporter.get
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
+            -
+              tag: component
+              value: storage
         -
           uuid: 99feb76b7da04b00a0d191b92bf979a1
           name: 'Free swap space in %'
@@ -903,8 +936,11 @@ zabbix_export:
           description: 'The free space of swap volume/file in percent.'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
+            -
+              tag: component
+              value: storage
         -
           uuid: d0c1ef0a679546d780df30a02a27df44
           name: 'Total swap space'
@@ -926,8 +962,11 @@ zabbix_export:
             key: node_exporter.get
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
+            -
+              tag: component
+              value: storage
         -
           uuid: 7eeabdb6bf44483bab91faaab8bb24d5
           name: 'System uptime'
@@ -955,8 +994,8 @@ zabbix_export:
             key: node_exporter.get
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 83311a7c73c441d39d88fe0fc7b55af9
@@ -965,6 +1004,10 @@ zabbix_export:
               priority: WARNING
               description: 'The device uptime is less than 10 minutes.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 70a75efafbc84cbebd1bb262ec797523
           name: 'Available memory'
@@ -986,8 +1029,8 @@ zabbix_export:
             key: node_exporter.get
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: e3ad296f16084e9caa923b449d8c725f
           name: 'Total memory'
@@ -1009,8 +1052,8 @@ zabbix_export:
             key: node_exporter.get
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 60c716c692fb482f9abffb0fc9ce4324
           name: 'Memory utilization'
@@ -1023,8 +1066,8 @@ zabbix_export:
           description: 'Memory used percentage is calculated as (total-available)/total*100.'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: 72304b3a167e41ccbcdb75568c65294a
@@ -1035,7 +1078,14 @@ zabbix_export:
               dependencies:
                 -
                   name: 'Lack of available memory (<{$MEMORY.AVAILABLE.MIN} of {ITEM.VALUE2})'
-                  expression: 'min(/Linux by Prom/vm.memory.available[node_exporter],5m)<{$MEMORY.AVAILABLE.MIN} and last(/Linux by Prom/vm.memory.total[node_exporter])>0'
+                  expression: 'max(/Linux by Prom/vm.memory.available[node_exporter],5m)<{$MEMORY.AVAILABLE.MIN} and last(/Linux by Prom/vm.memory.total[node_exporter])>0'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
       discovery_rules:
         -
           uuid: 91531a7a68564860976096df6899fe88
@@ -1098,8 +1148,14 @@ zabbix_export:
                 key: node_exporter.get
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: f6b39f743bb6438d876236ae651f68ee
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -1123,8 +1179,14 @@ zabbix_export:
                 key: node_exporter.get
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: eea37c3779994ac5b35bb3b125429340
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -1153,8 +1215,14 @@ zabbix_export:
                 key: node_exporter.get
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: aec995b7fe724823bdb41f134594b648
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -1178,8 +1246,14 @@ zabbix_export:
                 key: node_exporter.get
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 4ffe74b94eb14a4ea61c0df790d0920f
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -1203,8 +1277,14 @@ zabbix_export:
                 key: node_exporter.get
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: ddc4111fefec473e8d8b079f6eb50c05
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -1233,8 +1313,14 @@ zabbix_export:
                 key: node_exporter.get
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 51f9a39ad6d940ae914cd0a350d83dab
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -1262,8 +1348,14 @@ zabbix_export:
                 key: node_exporter.get
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 4097f76d86cd417db586c5973e1da90b
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -1316,8 +1408,14 @@ zabbix_export:
                 key: node_exporter.get
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: e35b59dc09754451a721793831edc3d4
@@ -1335,6 +1433,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: ce9cfd9880c44aaea18cfa2ab2fdf0e1
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -1357,8 +1459,14 @@ zabbix_export:
                 key: node_exporter.get
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           trigger_prototypes:
             -
               uuid: 96bbb9726ef149a5b97f96d54502593a
@@ -1388,6 +1496,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Linux by Prom/net.if.status[node_exporter,"{#IFNAME}"])=2 and (last(/Linux by Prom/net.if.status[node_exporter,"{#IFNAME}"],#1)<>last(/Linux by Prom/net.if.status[node_exporter,"{#IFNAME}"],#2))'
                   recovery_expression: 'last(/Linux by Prom/net.if.status[node_exporter,"{#IFNAME}"])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 08d5857e474042b5906288156c8c5d52
               expression: |
@@ -1411,6 +1523,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Linux by Prom/net.if.status[node_exporter,"{#IFNAME}"])=2 and (last(/Linux by Prom/net.if.status[node_exporter,"{#IFNAME}"],#1)<>last(/Linux by Prom/net.if.status[node_exporter,"{#IFNAME}"],#2))'
                   recovery_expression: 'last(/Linux by Prom/net.if.status[node_exporter,"{#IFNAME}"])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 11e2c8023463482da878cdad5bb7de76
               expression: |
@@ -1431,6 +1547,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Linux by Prom/net.if.status[node_exporter,"{#IFNAME}"])=2 and (last(/Linux by Prom/net.if.status[node_exporter,"{#IFNAME}"],#1)<>last(/Linux by Prom/net.if.status[node_exporter,"{#IFNAME}"],#2))'
                   recovery_expression: 'last(/Linux by Prom/net.if.status[node_exporter,"{#IFNAME}"])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 6e8269b2260e42de97aec08043a768df
               expression: |
@@ -1443,13 +1563,20 @@ zabbix_export:
               name: 'Interface {#IFNAME}({#IFALIAS}): High error rate (>{$IF.ERRORS.WARN:"{#IFNAME}"} for 5m)'
               opdata: 'errors in: {ITEM.LASTVALUE1}, errors out: {ITEM.LASTVALUE2}'
               priority: WARNING
-              description: 'Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold.'
+              description: 'Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold'
               manual_close: 'YES'
               dependencies:
                 -
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Linux by Prom/net.if.status[node_exporter,"{#IFNAME}"])=2 and (last(/Linux by Prom/net.if.status[node_exporter,"{#IFNAME}"],#1)<>last(/Linux by Prom/net.if.status[node_exporter,"{#IFNAME}"],#2))'
                   recovery_expression: 'last(/Linux by Prom/net.if.status[node_exporter,"{#IFNAME}"])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: cf143a7bb6d548fc9d3b089dcbb47ccf
@@ -1559,8 +1686,11 @@ zabbix_export:
                 key: node_exporter.get
               tags:
                 -
-                  tag: Application
-                  value: 'Disk {#DEVNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: disk
+                  value: '{#DEVNAME}'
             -
               uuid: 9d158ecffdaa43f6bd0ab867ca68620b
               name: '{#DEVNAME}: Disk read request avg waiting time (r_await)'
@@ -1573,8 +1703,11 @@ zabbix_export:
               description: 'This formula contains two boolean expressions that evaluates to 1 or 0 in order to set calculated metric to zero and to avoid division by zero exception.'
               tags:
                 -
-                  tag: Application
-                  value: 'Disk {#DEVNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: disk
+                  value: '{#DEVNAME}'
             -
               uuid: dcd6f61ffb2f491ba78845514654a8cf
               name: '{#DEVNAME}: Disk read rate'
@@ -1600,8 +1733,11 @@ zabbix_export:
                 key: node_exporter.get
               tags:
                 -
-                  tag: Application
-                  value: 'Disk {#DEVNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: disk
+                  value: '{#DEVNAME}'
             -
               uuid: 73940f30ea2b4b88b0047e54b773b747
               name: '{#DEVNAME}: Disk read time (rate)'
@@ -1626,8 +1762,11 @@ zabbix_export:
                 key: node_exporter.get
               tags:
                 -
-                  tag: Application
-                  value: 'Zabbix raw items'
+                  tag: component
+                  value: storage
+                -
+                  tag: disk
+                  value: '{#DEVNAME}'
             -
               uuid: d087a0525500450c9a307ff21f58482a
               name: '{#DEVNAME}: Disk utilization'
@@ -1657,8 +1796,11 @@ zabbix_export:
                 key: node_exporter.get
               tags:
                 -
-                  tag: Application
-                  value: 'Disk {#DEVNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: disk
+                  value: '{#DEVNAME}'
             -
               uuid: 94203a49081047b6bc76cd66aecd55ce
               name: '{#DEVNAME}: Disk write request avg waiting time (w_await)'
@@ -1671,8 +1813,11 @@ zabbix_export:
               description: 'This formula contains two boolean expressions that evaluates to 1 or 0 in order to set calculated metric to zero and to avoid division by zero exception.'
               tags:
                 -
-                  tag: Application
-                  value: 'Disk {#DEVNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: disk
+                  value: '{#DEVNAME}'
             -
               uuid: 806ba0a56fab4b5094008c98bb817e2b
               name: '{#DEVNAME}: Disk write rate'
@@ -1698,8 +1843,11 @@ zabbix_export:
                 key: node_exporter.get
               tags:
                 -
-                  tag: Application
-                  value: 'Disk {#DEVNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: disk
+                  value: '{#DEVNAME}'
             -
               uuid: 601cc30457934b7f8f050b2cea13ccea
               name: '{#DEVNAME}: Disk write time (rate)'
@@ -1724,8 +1872,11 @@ zabbix_export:
                 key: node_exporter.get
               tags:
                 -
-                  tag: Application
-                  value: 'Zabbix raw items'
+                  tag: component
+                  value: storage
+                -
+                  tag: disk
+                  value: '{#DEVNAME}'
           trigger_prototypes:
             -
               uuid: 412381f71bba441b955898839f81d51c
@@ -1734,6 +1885,10 @@ zabbix_export:
               priority: WARNING
               description: 'This trigger might indicate disk {#DEVNAME} saturation.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: 13a5a74a99734449b08075bbb25bb498
@@ -1856,8 +2011,11 @@ zabbix_export:
                 key: node_exporter.get
               tags:
                 -
-                  tag: Application
-                  value: 'Filesystem {#FSNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: ee1dad3677214561baafa6d930358ee0
               name: '{#FSNAME}: Free inodes in %'
@@ -1891,8 +2049,11 @@ zabbix_export:
                 key: node_exporter.get
               tags:
                 -
-                  tag: Application
-                  value: 'Filesystem {#FSNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
               trigger_prototypes:
                 -
                   uuid: 27cabcc9d9644ba6b7bd8c92a740e3cc
@@ -1903,6 +2064,13 @@ zabbix_export:
                   description: |
                     It may become impossible to write to disk if there are no index nodes left.
                     As symptoms, 'No space left on device' or 'Disk is full' errors may be seen even though free space is available.
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: c639215f6dd94c71aebf97265a282a0d
                   expression: 'min(/Linux by Prom/vfs.fs.inode.pfree[node_exporter,"{#FSNAME}"],5m)<{$VFS.FS.INODE.PFREE.MIN.WARN:"{#FSNAME}"}'
@@ -1916,6 +2084,13 @@ zabbix_export:
                     -
                       name: '{#FSNAME}: Running out of free inodes (free < {$VFS.FS.INODE.PFREE.MIN.CRIT:"{#FSNAME}"}%)'
                       expression: 'min(/Linux by Prom/vfs.fs.inode.pfree[node_exporter,"{#FSNAME}"],5m)<{$VFS.FS.INODE.PFREE.MIN.CRIT:"{#FSNAME}"}'
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 89afe41bb0d74c579a9cff8b036d30dc
               name: '{#FSNAME}: Space utilization'
@@ -1928,8 +2103,11 @@ zabbix_export:
               description: 'Space utilization in % for {#FSNAME}'
               tags:
                 -
-                  tag: Application
-                  value: 'Filesystem {#FSNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: acb3d42ae23b48cbacd0e99c27697798
               name: '{#FSNAME}: Total space'
@@ -1951,8 +2129,11 @@ zabbix_export:
                 key: node_exporter.get
               tags:
                 -
-                  tag: Application
-                  value: 'Filesystem {#FSNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 89e559a7ff364dd78b638454896692c5
               name: '{#FSNAME}: Used space'
@@ -1965,8 +2146,11 @@ zabbix_export:
               description: 'Used storage in Bytes'
               tags:
                 -
-                  tag: Application
-                  value: 'Filesystem {#FSNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
           trigger_prototypes:
             -
               uuid: d5687d7aa0484b389f0bd168d50ee1e6
@@ -1982,6 +2166,13 @@ zabbix_export:
                  - The disk free space is less than 5G.
                  - The disk will be full in less than 24 hours.
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
             -
               uuid: 8f765148cfd64d5ebda93f39d0b20e36
               expression: |
@@ -2002,6 +2193,13 @@ zabbix_export:
                   expression: |
                     last(/Linux by Prom/vfs.fs.pused[node_exporter,"{#FSNAME}"])>{$VFS.FS.PUSED.MAX.CRIT:"{#FSNAME}"} and
                     ((last(/Linux by Prom/vfs.fs.total[node_exporter,"{#FSNAME}"])-last(/Linux by Prom/vfs.fs.used[node_exporter,"{#FSNAME}"]))<5G or timeleft(/Linux by Prom/vfs.fs.pused[node_exporter,"{#FSNAME}"],1h,100)<1d)
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
           graph_prototypes:
             -
               uuid: aa350a426fcd40af96cd15f778cdf62d
@@ -2045,6 +2243,13 @@ zabbix_export:
               type: PROMETHEUS_TO_JSON
               parameters:
                 - '{__name__=~"^node_filesystem_size(?:_bytes)?$", mountpoint=~".+"}'
+      tags:
+        -
+          tag: class
+          value: os
+        -
+          tag: target
+          value: linux
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
@@ -2598,24 +2803,35 @@ zabbix_export:
   triggers:
     -
       uuid: 16e6a4d340164dee9379a3fc0aac0576
-      expression: 'min(/Linux by Prom/system.swap.pfree[node_exporter],5m)<{$SWAP.PFREE.MIN.WARN} and last(/Linux by Prom/system.swap.total[node_exporter])>0'
+      expression: 'max(/Linux by Prom/system.swap.pfree[node_exporter],5m)<{$SWAP.PFREE.MIN.WARN} and last(/Linux by Prom/system.swap.total[node_exporter])>0'
       name: 'High swap space usage (less than {$SWAP.PFREE.MIN.WARN}% free)'
       opdata: 'Free: {ITEM.LASTVALUE1}, total: {ITEM.LASTVALUE2}'
       priority: WARNING
-      description: 'This trigger is ignored, if there is no swap configured.'
+      description: 'This trigger is ignored, if there is no swap configured'
       dependencies:
         -
           name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
           expression: 'min(/Linux by Prom/vm.memory.util[node_exporter],5m)>{$MEMORY.UTIL.MAX}'
         -
           name: 'Lack of available memory (<{$MEMORY.AVAILABLE.MIN} of {ITEM.VALUE2})'
-          expression: 'min(/Linux by Prom/vm.memory.available[node_exporter],5m)<{$MEMORY.AVAILABLE.MIN} and last(/Linux by Prom/vm.memory.total[node_exporter])>0'
+          expression: 'max(/Linux by Prom/vm.memory.available[node_exporter],5m)<{$MEMORY.AVAILABLE.MIN} and last(/Linux by Prom/vm.memory.total[node_exporter])>0'
+      tags:
+        -
+          tag: scope
+          value: capacity
     -
       uuid: f78ed17586964a46a9de0c4f183984f6
-      expression: 'min(/Linux by Prom/vm.memory.available[node_exporter],5m)<{$MEMORY.AVAILABLE.MIN} and last(/Linux by Prom/vm.memory.total[node_exporter])>0'
+      expression: 'max(/Linux by Prom/vm.memory.available[node_exporter],5m)<{$MEMORY.AVAILABLE.MIN} and last(/Linux by Prom/vm.memory.total[node_exporter])>0'
       name: 'Lack of available memory (<{$MEMORY.AVAILABLE.MIN} of {ITEM.VALUE2})'
       opdata: 'Available: {ITEM.LASTVALUE1}, total: {ITEM.LASTVALUE2}'
       priority: AVERAGE
+      tags:
+        -
+          tag: scope
+          value: capacity
+        -
+          tag: scope
+          value: performance
     -
       uuid: e5897641e5594bf6b7b18ae4e107bd50
       expression: |
@@ -2626,12 +2842,23 @@ zabbix_export:
       opdata: 'Load averages(1m 5m 15m): ({ITEM.LASTVALUE1} {ITEM.LASTVALUE3} {ITEM.LASTVALUE4}), # of CPUs: {ITEM.LASTVALUE2}'
       priority: AVERAGE
       description: 'Per CPU load average is too high. Your system may be slow to respond.'
+      tags:
+        -
+          tag: scope
+          value: capacity
+        -
+          tag: scope
+          value: performance
     -
       uuid: 7effa63c9c994a6786279802aa7328ad
       expression: 'last(/Linux by Prom/fd.open[node_exporter])/last(/Linux by Prom/kernel.maxfiles[node_exporter])*100>80'
       name: 'Running out of file descriptors (less than < 20% free)'
       opdata: '{ITEM.LASTVALUE1} of {ITEM.LASTVALUE2} file descriptors are in use.'
       priority: WARNING
+      tags:
+        -
+          tag: scope
+          value: performance
   graphs:
     -
       uuid: bb8bb267b32b46bfa2a6277b65730396
diff --git a/templates/os/linux_snmp_snmp/README.md b/templates/os/linux_snmp_snmp/README.md
index 739e027e106..3160352a183 100644
--- a/templates/os/linux_snmp_snmp/README.md
+++ b/templates/os/linux_snmp_snmp/README.md
@@ -47,8 +47,8 @@ There are no template links in this template.
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
 |High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/Linux memory SNMP/vm.memory.util[snmp],5m)>{$MEMORY.UTIL.MAX}` |AVERAGE |<p>**Depends on**:</p><p>- Lack of available memory (<{$MEMORY.AVAILABLE.MIN} of {ITEM.VALUE2})</p> |
-|Lack of available memory (<{$MEMORY.AVAILABLE.MIN} of {ITEM.VALUE2}) |<p>-</p> |`min(/Linux memory SNMP/vm.memory.available[snmp],5m)<{$MEMORY.AVAILABLE.MIN} and last(/Linux memory SNMP/vm.memory.total[memTotalReal.0])>0` |AVERAGE | |
-|High swap space usage (less than {$SWAP.PFREE.MIN.WARN}% free) |<p>This trigger is ignored, if there is no swap configured</p> |`min(/Linux memory SNMP/system.swap.pfree[snmp],5m)<{$SWAP.PFREE.MIN.WARN} and last(/Linux memory SNMP/system.swap.total[memTotalSwap.0])>0` |WARNING |<p>**Depends on**:</p><p>- High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)</p><p>- Lack of available memory (<{$MEMORY.AVAILABLE.MIN} of {ITEM.VALUE2})</p> |
+|Lack of available memory (<{$MEMORY.AVAILABLE.MIN} of {ITEM.VALUE2}) |<p>-</p> |`max(/Linux memory SNMP/vm.memory.available[snmp],5m)<{$MEMORY.AVAILABLE.MIN} and last(/Linux memory SNMP/vm.memory.total[memTotalReal.0])>0` |AVERAGE | |
+|High swap space usage (less than {$SWAP.PFREE.MIN.WARN}% free) |<p>This trigger is ignored, if there is no swap configured</p> |`max(/Linux memory SNMP/system.swap.pfree[snmp],5m)<{$SWAP.PFREE.MIN.WARN} and last(/Linux memory SNMP/system.swap.total[memTotalSwap.0])>0` |WARNING |<p>**Depends on**:</p><p>- High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)</p><p>- Lack of available memory (<{$MEMORY.AVAILABLE.MIN} of {ITEM.VALUE2})</p> |
 
 ## Feedback
 
@@ -163,7 +163,7 @@ There are no template links in this template.
 
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
-|Load average is too high (per CPU load over {$LOAD_AVG_PER_CPU.MAX.WARN} for 5m) |<p>Per CPU load average is too high. Your system may be slow to respond.</p> |`min(/Linux CPU SNMP/system.cpu.load.avg1[laLoad.1],5m)/last(/Linux CPU SNMP/system.cpu.num[snmp])>{$LOAD_AVG_PER_CPU.MAX.WARN} and last(/Linux CPU SNMP/system.cpu.load.avg5[laLoad.2])>0 and last(/Linux CPU SNMP/system.cpu.load.avg15[laLoad.3])>0 ` |AVERAGE | |
+|Load average is too high (per CPU load over {$LOAD_AVG_PER_CPU.MAX.WARN} for 5m) |<p>Per CPU load average is too high. Your system may be slow to respond.</p> |`min(/Linux CPU SNMP/system.cpu.load.avg1[laLoad.1],5m)/last(/Linux CPU SNMP/system.cpu.num[snmp])>{$LOAD_AVG_PER_CPU.MAX.WARN} and last(/Linux CPU SNMP/system.cpu.load.avg5[laLoad.2])>0 and last(/Linux CPU SNMP/system.cpu.load.avg15[laLoad.3])>0` |AVERAGE | |
 |High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/Linux CPU SNMP/system.cpu.util[snmp,{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}` |WARNING | |
 
 ## Feedback
@@ -375,17 +375,17 @@ There are no template links in this template.
 
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
-|Load average is too high (per CPU load over {$LOAD_AVG_PER_CPU.MAX.WARN} for 5m) |<p>Per CPU load average is too high. Your system may be slow to respond.</p> |`min(/Linux SNMP/system.cpu.load.avg1[laLoad.1],5m)/last(/Linux SNMP/system.cpu.num[snmp])>{$LOAD_AVG_PER_CPU.MAX.WARN} and last(/Linux SNMP/system.cpu.load.avg5[laLoad.2])>0 and last(/Linux SNMP/system.cpu.load.avg15[laLoad.3])>0 ` |AVERAGE | |
+|Load average is too high (per CPU load over {$LOAD_AVG_PER_CPU.MAX.WARN} for 5m) |<p>Per CPU load average is too high. Your system may be slow to respond.</p> |`min(/Linux SNMP/system.cpu.load.avg1[laLoad.1],5m)/last(/Linux SNMP/system.cpu.num[snmp])>{$LOAD_AVG_PER_CPU.MAX.WARN} and last(/Linux SNMP/system.cpu.load.avg5[laLoad.2])>0 and last(/Linux SNMP/system.cpu.load.avg15[laLoad.3])>0` |AVERAGE | |
 |High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/Linux SNMP/system.cpu.util[snmp,{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}` |WARNING | |
 |System name has changed (new name: {ITEM.VALUE}) |<p>System name has changed. Ack to close.</p> |`last(/Linux SNMP/system.name,#1)<>last(/Linux SNMP/system.name,#2) and length(last(/Linux SNMP/system.name))>0` |INFO |<p>Manual close: YES</p> |
 |High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/Linux SNMP/vm.memory.util[snmp],5m)>{$MEMORY.UTIL.MAX}` |AVERAGE |<p>**Depends on**:</p><p>- Lack of available memory (<{$MEMORY.AVAILABLE.MIN} of {ITEM.VALUE2})</p> |
-|Lack of available memory (<{$MEMORY.AVAILABLE.MIN} of {ITEM.VALUE2}) |<p>-</p> |`min(/Linux SNMP/vm.memory.available[snmp],5m)<{$MEMORY.AVAILABLE.MIN} and last(/Linux SNMP/vm.memory.total[memTotalReal.0])>0` |AVERAGE | |
-|High swap space usage (less than {$SWAP.PFREE.MIN.WARN}% free) |<p>This trigger is ignored, if there is no swap configured</p> |`min(/Linux SNMP/system.swap.pfree[snmp],5m)<{$SWAP.PFREE.MIN.WARN} and last(/Linux SNMP/system.swap.total[memTotalSwap.0])>0` |WARNING |<p>**Depends on**:</p><p>- High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)</p><p>- Lack of available memory (<{$MEMORY.AVAILABLE.MIN} of {ITEM.VALUE2})</p> |
+|Lack of available memory (<{$MEMORY.AVAILABLE.MIN} of {ITEM.VALUE2}) |<p>-</p> |`max(/Linux SNMP/vm.memory.available[snmp],5m)<{$MEMORY.AVAILABLE.MIN} and last(/Linux SNMP/vm.memory.total[memTotalReal.0])>0` |AVERAGE | |
+|High swap space usage (less than {$SWAP.PFREE.MIN.WARN}% free) |<p>This trigger is ignored, if there is no swap configured</p> |`max(/Linux SNMP/system.swap.pfree[snmp],5m)<{$SWAP.PFREE.MIN.WARN} and last(/Linux SNMP/system.swap.total[memTotalSwap.0])>0` |WARNING |<p>**Depends on**:</p><p>- High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)</p><p>- Lack of available memory (<{$MEMORY.AVAILABLE.MIN} of {ITEM.VALUE2})</p> |
 |Interface {#IFNAME}({#IFALIAS}): In half-duplex mode |<p>Please check autonegotiation settings and cabling</p> |`last(/Linux SNMP/net.if.duplex[dot3StatsDuplexStatus.{#SNMPINDEX}])=2` |WARNING |<p>Manual close: YES</p> |
 |Interface {#IFNAME}({#IFALIAS}): Link down |<p>This trigger expression works as follows:</p><p>1. Can be triggered if operations status is down.</p><p>2. {$IFCONTROL:"{#IFNAME}"}=1 - user can redefine Context macro to value - 0. That marks this interface as not important. No new trigger will be fired if this interface is down.</p><p>3. {TEMPLATE_NAME:METRIC.diff()}=1) - trigger fires only if operational status was up(1) sometime before. (So, do not fire 'ethernal off' interfaces.)</p><p>WARNING: if closed manually - won't fire again on next poll, because of .diff.</p> |`{$IFCONTROL:"{#IFNAME}"}=1 and last(/Linux SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/Linux SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/Linux SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))`<p>Recovery expression:</p>`last(/Linux SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0` |AVERAGE |<p>Manual close: YES</p> |
 |Interface {#IFNAME}({#IFALIAS}): High bandwidth usage (>{$IF.UTIL.MAX:"{#IFNAME}"}%) |<p>The network interface utilization is close to its estimated maximum bandwidth.</p> |`(avg(/Linux SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/Linux SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) or avg(/Linux SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)>({$IF.UTIL.MAX:"{#IFNAME}"}/100)*last(/Linux SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])) and last(/Linux SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0`<p>Recovery expression:</p>`avg(/Linux SNMP/net.if.in[ifHCInOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/Linux SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}]) and avg(/Linux SNMP/net.if.out[ifHCOutOctets.{#SNMPINDEX}],15m)<(({$IF.UTIL.MAX:"{#IFNAME}"}-3)/100)*last(/Linux SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |Interface {#IFNAME}({#IFALIAS}): High error rate (>{$IF.ERRORS.WARN:"{#IFNAME}"} for 5m) |<p>Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold</p> |`min(/Linux SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"} or min(/Linux SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)>{$IF.ERRORS.WARN:"{#IFNAME}"}`<p>Recovery expression:</p>`max(/Linux SNMP/net.if.in.errors[ifInErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8 and max(/Linux SNMP/net.if.out.errors[ifOutErrors.{#SNMPINDEX}],5m)<{$IF.ERRORS.WARN:"{#IFNAME}"}*0.8` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
-|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/Linux SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/Linux SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/Linux SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/Linux SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/Linux SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/Linux SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/Linux SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/Linux SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/Linux SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2) `<p>Recovery expression:</p>`(change(/Linux SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/Linux SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/Linux SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2) ` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
+|Interface {#IFNAME}({#IFALIAS}): Ethernet has changed to lower speed than it was before |<p>This Ethernet connection has transitioned down from its known maximum speed. This might be a sign of autonegotiation issues. Ack to close.</p> |`change(/Linux SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])<0 and last(/Linux SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and ( last(/Linux SNMP/net.if.type[ifType.{#SNMPINDEX}])=6 or last(/Linux SNMP/net.if.type[ifType.{#SNMPINDEX}])=7 or last(/Linux SNMP/net.if.type[ifType.{#SNMPINDEX}])=11 or last(/Linux SNMP/net.if.type[ifType.{#SNMPINDEX}])=62 or last(/Linux SNMP/net.if.type[ifType.{#SNMPINDEX}])=69 or last(/Linux SNMP/net.if.type[ifType.{#SNMPINDEX}])=117 ) and (last(/Linux SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2)`<p>Recovery expression:</p>`(change(/Linux SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}])>0 and last(/Linux SNMP/net.if.speed[ifHighSpeed.{#SNMPINDEX}],#2)>0) or (last(/Linux SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2)` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Interface {#IFNAME}({#IFALIAS}): Link down</p> |
 |{HOST.NAME} has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/Linux SNMP/system.uptime[sysUpTime.0])<10m` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- No SNMP data collection</p> |
 |No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`max(/Linux SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0` |WARNING |<p>**Depends on**:</p><p>- Unavailable by ICMP ping</p> |
 |Unavailable by ICMP ping |<p>Last three attempts returned timeout.  Please check device connectivity.</p> |`max(/Linux SNMP/icmpping,#3)=0` |HIGH | |
diff --git a/templates/os/linux_snmp_snmp/template_os_linux_snmp_snmp.yaml b/templates/os/linux_snmp_snmp/template_os_linux_snmp_snmp.yaml
index 40c89d56825..b6f2ebae895 100644
--- a/templates/os/linux_snmp_snmp/template_os_linux_snmp_snmp.yaml
+++ b/templates/os/linux_snmp_snmp/template_os_linux_snmp_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:36:59Z'
+  date: '2022-01-26T10:40:15Z'
   groups:
     -
       uuid: 57b7ae836ca64446ba2c296389c009b7
@@ -62,8 +62,11 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Disk {#DEVNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: disk
+                  value: '{#DEVNAME}'
             -
               uuid: 5e96a297e7e54c0ba4607949c854edc8
               name: '{#DEVNAME}: Disk utilization'
@@ -78,8 +81,11 @@ zabbix_export:
                 The 1 minute average load of disk (%)
               tags:
                 -
-                  tag: Application
-                  value: 'Disk {#DEVNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: disk
+                  value: '{#DEVNAME}'
             -
               uuid: a060b61ad4f24be299c0a9b2582dda87
               name: '{#DEVNAME}: Disk write rate'
@@ -99,8 +105,11 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Disk {#DEVNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: disk
+                  value: '{#DEVNAME}'
           graph_prototypes:
             -
               uuid: 15f4080e061d4b86a253709d56f444a5
@@ -156,8 +165,8 @@ zabbix_export:
                 - ''
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: 335279fa524d48089d99ffba47017a0f
           name: 'Load average (1m avg)'
@@ -169,8 +178,8 @@ zabbix_export:
           description: 'MIB: UCD-SNMP-MIB'
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: 74a03675fdba49969d7286d718edc4e8
           name: 'Load average (5m avg)'
@@ -182,8 +191,8 @@ zabbix_export:
           description: 'MIB: UCD-SNMP-MIB'
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: d774c8d00aab4158b856feda354fcef6
           name: 'Load average (15m avg)'
@@ -195,8 +204,8 @@ zabbix_export:
           description: 'MIB: UCD-SNMP-MIB'
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: 20dbc1d9ed25400983eadb6e9d6f1f04
           name: 'Number of CPUs'
@@ -216,8 +225,8 @@ zabbix_export:
                   return JSON.parse(value).length;
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: 2e52405bed144bd392ba386d8d8fa752
           name: 'Context switches per second'
@@ -233,8 +242,8 @@ zabbix_export:
                 - ''
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
       discovery_rules:
         -
           uuid: bb04cfa331214963b311d7b397cb3c12
@@ -269,8 +278,8 @@ zabbix_export:
                       return value/{#CPU.COUNT}
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
             -
               uuid: 47939519397147e7be84d1d3223e8111
               name: 'CPU guest nice time'
@@ -296,8 +305,8 @@ zabbix_export:
                       return value/{#CPU.COUNT}
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
             -
               uuid: b20769f44f8247e1a6a5908ff084ff81
               name: 'CPU idle time'
@@ -323,8 +332,8 @@ zabbix_export:
                       return value/{#CPU.COUNT}
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
             -
               uuid: 7da67bc8887a4d36abba6b041a72f221
               name: 'CPU interrupt time'
@@ -350,8 +359,8 @@ zabbix_export:
                       return value/{#CPU.COUNT}
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
             -
               uuid: ce41593112f1497884643f7f99075f4b
               name: 'CPU iowait time'
@@ -377,8 +386,8 @@ zabbix_export:
                       return value/{#CPU.COUNT}
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
             -
               uuid: 80c42f533f3d40529a1451ecdbaf3d62
               name: 'CPU nice time'
@@ -404,8 +413,8 @@ zabbix_export:
                       return value/{#CPU.COUNT}
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
             -
               uuid: 1c121eeb3f864dd68569efff6ab79ac8
               name: 'CPU softirq time'
@@ -431,8 +440,8 @@ zabbix_export:
                       return value/{#CPU.COUNT}
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
             -
               uuid: b98feceb5d1b4dafbbbbc80d3f9598f9
               name: 'CPU steal time'
@@ -458,8 +467,8 @@ zabbix_export:
                       return value/{#CPU.COUNT}
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
             -
               uuid: 0b45abb043f14f23bd8d71f0bca70c06
               name: 'CPU system time'
@@ -485,8 +494,8 @@ zabbix_export:
                       return value/{#CPU.COUNT}
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
             -
               uuid: 295af9e607aa46c4886a49905137b7ad
               name: 'CPU user time'
@@ -512,8 +521,8 @@ zabbix_export:
                       return value/{#CPU.COUNT}
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
             -
               uuid: aa01918c9d864f498cc211772103ba27
               name: 'CPU utilization'
@@ -535,8 +544,8 @@ zabbix_export:
                 key: 'system.cpu.idle[ssCpuRawIdle.{#SNMPINDEX}]'
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
               trigger_prototypes:
                 -
                   uuid: 305450aac4ce4170a3a7942f6b092593
@@ -545,6 +554,10 @@ zabbix_export:
                   opdata: 'Current utilization: {ITEM.LASTVALUE1}'
                   priority: WARNING
                   description: 'CPU utilization is too high. The system might be slow to respond.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 1ed285cca7774aad9335101f373eb642
@@ -698,8 +711,11 @@ zabbix_export:
                     - 'return (100-value);'
               tags:
                 -
-                  tag: Application
-                  value: 'Filesystem {#FSNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
               trigger_prototypes:
                 -
                   uuid: 377f4ffa529f4b0690a11228f4021294
@@ -710,6 +726,13 @@ zabbix_export:
                   description: |
                     It may become impossible to write to disk if there are no index nodes left.
                     As symptoms, 'No space left on device' or 'Disk is full' errors may be seen even though free space is available.
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 5f80199affa44ed7a6b875c49ca00aa7
                   expression: 'min(/Linux filesystems SNMP/vfs.fs.inode.pfree[dskPercentNode.{#SNMPINDEX}],5m)<{$VFS.FS.INODE.PFREE.MIN.WARN:"{#FSNAME}"}'
@@ -723,6 +746,13 @@ zabbix_export:
                     -
                       name: '{#FSNAME}: Running out of free inodes (free < {$VFS.FS.INODE.PFREE.MIN.CRIT:"{#FSNAME}"}%)'
                       expression: 'min(/Linux filesystems SNMP/vfs.fs.inode.pfree[dskPercentNode.{#SNMPINDEX}],5m)<{$VFS.FS.INODE.PFREE.MIN.CRIT:"{#FSNAME}"}'
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 3cc99f32a3a44b2a94c2bab5f2765c8e
               name: '{#FSNAME}: Space utilization'
@@ -735,8 +765,11 @@ zabbix_export:
               description: 'Space utilization in % for {#FSNAME}'
               tags:
                 -
-                  tag: Application
-                  value: 'Filesystem {#FSNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 9e9b2eb864164eebb4825ba0331b0b95
               name: '{#FSNAME}: Total space'
@@ -757,8 +790,11 @@ zabbix_export:
                     - '{#ALLOC_UNITS}'
               tags:
                 -
-                  tag: Application
-                  value: 'Filesystem {#FSNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 2cfbdae09907476ea6d73af86338f279
               name: '{#FSNAME}: Used space'
@@ -777,8 +813,11 @@ zabbix_export:
                     - '{#ALLOC_UNITS}'
               tags:
                 -
-                  tag: Application
-                  value: 'Filesystem {#FSNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
           trigger_prototypes:
             -
               uuid: ae3535ef3f674dccb6c809dc7d01172c
@@ -794,6 +833,13 @@ zabbix_export:
                  - The disk free space is less than 5G.
                  - The disk will be full in less than 24 hours.
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
             -
               uuid: 3bef4897bcd549288203241c5ca9f017
               expression: |
@@ -814,6 +860,13 @@ zabbix_export:
                   expression: |
                     last(/Linux filesystems SNMP/vfs.fs.pused[storageUsedPercentage.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"{#FSNAME}"} and
                     ((last(/Linux filesystems SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/Linux filesystems SNMP/vfs.fs.used[hrStorageUsed.{#SNMPINDEX}]))<5G or timeleft(/Linux filesystems SNMP/vfs.fs.pused[storageUsedPercentage.{#SNMPINDEX}],1h,100)<1d)
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
           graph_prototypes:
             -
               uuid: f1000d7a017f4954a32103b345ae4fdf
@@ -901,8 +954,11 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
+            -
+              tag: component
+              value: storage
         -
           uuid: 95b96317790d467c8f2c3acbe4f508a2
           name: 'Free swap space in %'
@@ -915,8 +971,11 @@ zabbix_export:
           description: 'The free space of swap volume/file in percent.'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
+            -
+              tag: component
+              value: storage
         -
           uuid: 7e3c9bc424684af8b16852548145d240
           name: 'Total swap space'
@@ -935,8 +994,11 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
+            -
+              tag: component
+              value: storage
         -
           uuid: d2f2a3127c83459696bb7496de04830b
           name: 'Available memory'
@@ -948,8 +1010,8 @@ zabbix_export:
           description: 'Please note that memory utilization is a rough estimate, since memory available is calculated as free+buffers+cached, which is not 100% accurate, but the best we can get using SNMP.'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 81c8a8aa72144ec99c0723bd1c7efde0
           name: 'Memory (buffers)'
@@ -968,8 +1030,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: a74e6bc72c8c45f2b01ee1b50ce64fdc
           name: 'Memory (cached)'
@@ -988,8 +1050,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: b13aae9bb13c432998688f8c3230ddb2
           name: 'Free memory'
@@ -1006,8 +1068,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 849c5cd7aec94ed48c6a0a321b54d801
           name: 'Total memory'
@@ -1026,8 +1088,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: ac10ac53a99e464bbf0c5894d4297cfc
           name: 'Memory utilization'
@@ -1040,8 +1102,8 @@ zabbix_export:
           description: 'Please note that memory utilization is a rough estimate, since memory available is calculated as free+buffers+cached, which is not 100% accurate, but the best we can get using SNMP.'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: 38e4d31ccb594ba1a041c47633887ef6
@@ -1052,7 +1114,14 @@ zabbix_export:
               dependencies:
                 -
                   name: 'Lack of available memory (<{$MEMORY.AVAILABLE.MIN} of {ITEM.VALUE2})'
-                  expression: 'min(/Linux memory SNMP/vm.memory.available[snmp],5m)<{$MEMORY.AVAILABLE.MIN} and last(/Linux memory SNMP/vm.memory.total[memTotalReal.0])>0'
+                  expression: 'max(/Linux memory SNMP/vm.memory.available[snmp],5m)<{$MEMORY.AVAILABLE.MIN} and last(/Linux memory SNMP/vm.memory.total[memTotalReal.0])>0'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
       macros:
         -
           macro: '{$MEMORY.AVAILABLE.MIN}'
@@ -1095,8 +1164,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 28927c3715714a77a259d48943ddb8fe
@@ -1104,6 +1176,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: bc5a3fbab2834f8bb012325071c5b2e0
           name: 'ICMP loss'
@@ -1114,8 +1190,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: f6d63c03e6f34888897464102fa369ec
@@ -1127,6 +1206,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/Linux SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: b1e02fd733c14d71935e24fbe8786d40
           name: 'ICMP response time'
@@ -1137,8 +1223,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 1c1b86790d6442e59f50d94f9844c337
@@ -1153,6 +1242,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/Linux SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 85a597b741bb4e6e8fa9806e8737caf4
           name: 'SNMP traps (fallback)'
@@ -1165,8 +1261,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: e45c4b2df4a640a1a36154cb2b717e9d
           name: 'System contact details'
@@ -1188,8 +1284,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: fdb0807c4a9a452f8a3cbab01a4ddb2e
           name: 'Interrupts per second'
@@ -1205,8 +1301,8 @@ zabbix_export:
                 - ''
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: eeaba506dee342518660c03d422faa2a
           name: 'Load average (1m avg)'
@@ -1218,8 +1314,8 @@ zabbix_export:
           description: 'MIB: UCD-SNMP-MIB'
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: e0c8a351d59f42b78e6db4a0c50aa5d2
           name: 'Load average (5m avg)'
@@ -1231,8 +1327,8 @@ zabbix_export:
           description: 'MIB: UCD-SNMP-MIB'
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: 0a5c406d4e434dbba248a18318f6a869
           name: 'Load average (15m avg)'
@@ -1244,8 +1340,8 @@ zabbix_export:
           description: 'MIB: UCD-SNMP-MIB'
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: f835f2d2e65c4efc8934a61870d907ca
           name: 'Number of CPUs'
@@ -1265,8 +1361,8 @@ zabbix_export:
                   return JSON.parse(value).length;
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: e10a890dc6724cbda96f7c40c49cd730
           name: 'Context switches per second'
@@ -1282,8 +1378,8 @@ zabbix_export:
                 - ''
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: abd4d4b7097644478329b578dfa7bf09
           name: 'System description'
@@ -1306,8 +1402,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 9f2b3de3245e4ffea5aefc636e0f3da1
           name: 'System location'
@@ -1329,8 +1425,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 3ee68ecd1edc4f5d9cddefa78f8d502e
           name: 'System name'
@@ -1352,8 +1448,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: eeb0355174d74892a4e3a078e6ac7952
@@ -1362,6 +1458,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: 5b17833c4646423d8fd4115fa19d2ffe
           name: 'System object ID'
@@ -1382,8 +1485,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: a8ad10709a6e457187f58695de20b027
           name: 'Free swap space'
@@ -1402,8 +1505,11 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
+            -
+              tag: component
+              value: storage
         -
           uuid: 52ae3f1d7b3d4b669b40f0fddbb0e326
           name: 'Free swap space in %'
@@ -1416,8 +1522,11 @@ zabbix_export:
           description: 'The free space of swap volume/file in percent.'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
+            -
+              tag: component
+              value: storage
         -
           uuid: 7db5193027794961840c228c6280fe5b
           name: 'Total swap space'
@@ -1436,8 +1545,11 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
+            -
+              tag: component
+              value: storage
         -
           uuid: d3fba18851db4be08df04ab85536bb14
           name: Uptime
@@ -1458,8 +1570,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: e129fb90ec084a83806aec27141cd6eb
@@ -1472,6 +1584,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/Linux SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: ad8a3857e8b04dffbc0c052a0d36fe08
           name: 'Available memory'
@@ -1483,8 +1599,8 @@ zabbix_export:
           description: 'Please note that memory utilization is a rough estimate, since memory available is calculated as free+buffers+cached, which is not 100% accurate, but the best we can get using SNMP.'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: c071dae605b64cce886df7d2865e77e0
           name: 'Memory (buffers)'
@@ -1503,8 +1619,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: d5e0a99bfd9844108c3d26d53d1a3d0c
           name: 'Memory (cached)'
@@ -1523,8 +1639,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: fc3fb5310e8f4af7a093b9df9eede403
           name: 'Free memory'
@@ -1541,8 +1657,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: de35484e53b24894aa050f15e1941106
           name: 'Total memory'
@@ -1561,8 +1677,8 @@ zabbix_export:
                 - '1024'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 640d893d48d44f2ebe2c9e9bb0158f76
           name: 'Memory utilization'
@@ -1575,8 +1691,8 @@ zabbix_export:
           description: 'Please note that memory utilization is a rough estimate, since memory available is calculated as free+buffers+cached, which is not 100% accurate, but the best we can get using SNMP.'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: 063b87d246b04e74a439114a05f00fe5
@@ -1587,7 +1703,14 @@ zabbix_export:
               dependencies:
                 -
                   name: 'Lack of available memory (<{$MEMORY.AVAILABLE.MIN} of {ITEM.VALUE2})'
-                  expression: 'min(/Linux SNMP/vm.memory.available[snmp],5m)<{$MEMORY.AVAILABLE.MIN} and last(/Linux SNMP/vm.memory.total[memTotalReal.0])>0'
+                  expression: 'max(/Linux SNMP/vm.memory.available[snmp],5m)<{$MEMORY.AVAILABLE.MIN} and last(/Linux SNMP/vm.memory.total[memTotalReal.0])>0'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 03491bb9b98f4267bf1ff56cc226d819
           name: 'SNMP agent availability'
@@ -1604,8 +1727,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 63d99e49b3584fb2bf61a7d56725fb3c
@@ -1618,6 +1744,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/Linux SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: 4089ef5360ec4b2a98b7742e8e4e9dd6
@@ -1652,8 +1782,8 @@ zabbix_export:
                       return value/{#CPU.COUNT}
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
             -
               uuid: ce514c83afb345b2b0f3b85d6ec89dc3
               name: 'CPU guest nice time'
@@ -1679,8 +1809,8 @@ zabbix_export:
                       return value/{#CPU.COUNT}
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
             -
               uuid: 394bffd2086545af806f4ad990f853a1
               name: 'CPU idle time'
@@ -1706,8 +1836,8 @@ zabbix_export:
                       return value/{#CPU.COUNT}
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
             -
               uuid: 88e9044abe71483a8670b572517ff4ad
               name: 'CPU interrupt time'
@@ -1733,8 +1863,8 @@ zabbix_export:
                       return value/{#CPU.COUNT}
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
             -
               uuid: 87d1467c79cc4a3d8e5caf3b35de7e17
               name: 'CPU iowait time'
@@ -1760,8 +1890,8 @@ zabbix_export:
                       return value/{#CPU.COUNT}
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
             -
               uuid: d35896698d2a459fb682eb170e7005de
               name: 'CPU nice time'
@@ -1787,8 +1917,8 @@ zabbix_export:
                       return value/{#CPU.COUNT}
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
             -
               uuid: b48b79d7c2464bd996776477e55ce724
               name: 'CPU softirq time'
@@ -1814,8 +1944,8 @@ zabbix_export:
                       return value/{#CPU.COUNT}
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
             -
               uuid: f0e15f783b434cc49c97681e15def25c
               name: 'CPU steal time'
@@ -1841,8 +1971,8 @@ zabbix_export:
                       return value/{#CPU.COUNT}
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
             -
               uuid: 9f063ab6a217459e9e1ae95cc77071ff
               name: 'CPU system time'
@@ -1868,8 +1998,8 @@ zabbix_export:
                       return value/{#CPU.COUNT}
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
             -
               uuid: e07c1afe5f8c4db0bae364933df3e571
               name: 'CPU user time'
@@ -1895,8 +2025,8 @@ zabbix_export:
                       return value/{#CPU.COUNT}
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
             -
               uuid: dfd150b9966c49e6b8bf08570438f17c
               name: 'CPU utilization'
@@ -1918,8 +2048,8 @@ zabbix_export:
                 key: 'system.cpu.idle[ssCpuRawIdle.{#SNMPINDEX}]'
               tags:
                 -
-                  tag: Application
-                  value: CPU
+                  tag: component
+                  value: cpu
               trigger_prototypes:
                 -
                   uuid: 34b29a2e43b347d0ada6b80a472a659e
@@ -1928,6 +2058,10 @@ zabbix_export:
                   opdata: 'Current utilization: {ITEM.LASTVALUE1}'
                   priority: WARNING
                   description: 'CPU utilization is too high. The system might be slow to respond.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: fe9835f96dfd4912933e1c3db7943fdf
@@ -2098,8 +2232,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 23d5c37a8a66495c81babc76085dd0d0
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -2118,8 +2258,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 229e36fe673e43c0a69f942c086fea97
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -2143,8 +2289,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: bbaad86407a349ed81b3b329e0754cdb
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -2167,8 +2319,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 184b63fa8f184915a8bd365afebae00f
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -2187,8 +2345,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: ad64f09ccd88467f811499ef17096c0a
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -2212,8 +2376,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 54b1b171187b44c2a0b8dfadf06f9b00
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -2238,8 +2408,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 4aaabfdfeeac4c779255fd8b5a4550f4
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -2261,8 +2437,14 @@ zabbix_export:
                 name: 'IF-MIB::ifOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 038c4ebc6bdf48f69b60fca856318638
@@ -2280,6 +2462,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: ce0a2b8f62ff4591b5e3bc8b348bf946
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -2303,8 +2489,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           trigger_prototypes:
             -
               uuid: 02387536c92f449384c23a0744e71ee3
@@ -2334,6 +2526,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Linux SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/Linux SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/Linux SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/Linux SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: efe5516d1c164a8cb243c4806b9684a2
               expression: |
@@ -2354,6 +2550,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Linux SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/Linux SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/Linux SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/Linux SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: dbbd6222837345b891dd613f6d40f98f
               expression: |
@@ -2373,6 +2573,13 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Linux SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/Linux SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/Linux SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/Linux SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: c09b8ad9356741fcb9560446b50d8cf0
@@ -2476,8 +2683,14 @@ zabbix_export:
                 name: 'EtherLike-MIB::dot3StatsDuplexStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: 1e1f12c0cf744fd3aaac6570325bd661
@@ -2486,6 +2699,10 @@ zabbix_export:
                   priority: WARNING
                   description: 'Please check autonegotiation settings and cabling'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           preprocessing:
             -
               type: JAVASCRIPT
@@ -2544,8 +2761,11 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Disk {#DEVNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: disk
+                  value: '{#DEVNAME}'
             -
               uuid: b1fb6665c96b4c9f999b3803d45eea3e
               name: '{#DEVNAME}: Disk utilization'
@@ -2560,8 +2780,11 @@ zabbix_export:
                 The 1 minute average load of disk (%)
               tags:
                 -
-                  tag: Application
-                  value: 'Disk {#DEVNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: disk
+                  value: '{#DEVNAME}'
             -
               uuid: 147ad615fd544ab39494ce829da0bb14
               name: '{#DEVNAME}: Disk write rate'
@@ -2581,8 +2804,11 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Disk {#DEVNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: disk
+                  value: '{#DEVNAME}'
           graph_prototypes:
             -
               uuid: 76f7583a5256463a82d60c0fef3c6a7f
@@ -2649,8 +2875,11 @@ zabbix_export:
                     - 'return (100-value);'
               tags:
                 -
-                  tag: Application
-                  value: 'Filesystem {#FSNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
               trigger_prototypes:
                 -
                   uuid: c2a464a9d8f24b1f96251feabeec8b6a
@@ -2661,6 +2890,13 @@ zabbix_export:
                   description: |
                     It may become impossible to write to disk if there are no index nodes left.
                     As symptoms, 'No space left on device' or 'Disk is full' errors may be seen even though free space is available.
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 396da67ae447497781d9f37215490b71
                   expression: 'min(/Linux SNMP/vfs.fs.inode.pfree[dskPercentNode.{#SNMPINDEX}],5m)<{$VFS.FS.INODE.PFREE.MIN.WARN:"{#FSNAME}"}'
@@ -2674,6 +2910,13 @@ zabbix_export:
                     -
                       name: '{#FSNAME}: Running out of free inodes (free < {$VFS.FS.INODE.PFREE.MIN.CRIT:"{#FSNAME}"}%)'
                       expression: 'min(/Linux SNMP/vfs.fs.inode.pfree[dskPercentNode.{#SNMPINDEX}],5m)<{$VFS.FS.INODE.PFREE.MIN.CRIT:"{#FSNAME}"}'
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 0cb84e1611e944e68caf677492d169e5
               name: '{#FSNAME}: Space utilization'
@@ -2686,8 +2929,11 @@ zabbix_export:
               description: 'Space utilization in % for {#FSNAME}'
               tags:
                 -
-                  tag: Application
-                  value: 'Filesystem {#FSNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 9117a148b85c4593a3df470a1e023573
               name: '{#FSNAME}: Total space'
@@ -2708,8 +2954,11 @@ zabbix_export:
                     - '{#ALLOC_UNITS}'
               tags:
                 -
-                  tag: Application
-                  value: 'Filesystem {#FSNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 04168e44dd0f4d3c96496c3fadd13fde
               name: '{#FSNAME}: Used space'
@@ -2728,8 +2977,11 @@ zabbix_export:
                     - '{#ALLOC_UNITS}'
               tags:
                 -
-                  tag: Application
-                  value: 'Filesystem {#FSNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
           trigger_prototypes:
             -
               uuid: 4e84d5b0e3bb4729a6eabd5882d2d603
@@ -2745,6 +2997,13 @@ zabbix_export:
                  - The disk free space is less than 5G.
                  - The disk will be full in less than 24 hours.
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
             -
               uuid: 210ae86feef14fa0a82c97331e522937
               expression: |
@@ -2765,6 +3024,13 @@ zabbix_export:
                   expression: |
                     last(/Linux SNMP/vfs.fs.pused[storageUsedPercentage.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"{#FSNAME}"} and
                     ((last(/Linux SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/Linux SNMP/vfs.fs.used[hrStorageUsed.{#SNMPINDEX}]))<5G or timeleft(/Linux SNMP/vfs.fs.pused[storageUsedPercentage.{#SNMPINDEX}],1h,100)<1d)
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
           graph_prototypes:
             -
               uuid: 10878869ac0641bc96b9898820a4f3ea
@@ -2788,6 +3054,13 @@ zabbix_export:
                   item:
                     host: 'Linux SNMP'
                     key: 'vfs.fs.used[hrStorageUsed.{#SNMPINDEX}]'
+      tags:
+        -
+          tag: class
+          value: os
+        -
+          tag: target
+          value: linux
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
@@ -4027,7 +4300,7 @@ zabbix_export:
   triggers:
     -
       uuid: 12324c6e7b564c858406702148b43bc4
-      expression: 'min(/Linux memory SNMP/system.swap.pfree[snmp],5m)<{$SWAP.PFREE.MIN.WARN} and last(/Linux memory SNMP/system.swap.total[memTotalSwap.0])>0'
+      expression: 'max(/Linux memory SNMP/system.swap.pfree[snmp],5m)<{$SWAP.PFREE.MIN.WARN} and last(/Linux memory SNMP/system.swap.total[memTotalSwap.0])>0'
       name: 'High swap space usage (less than {$SWAP.PFREE.MIN.WARN}% free)'
       opdata: 'Free: {ITEM.LASTVALUE1}, total: {ITEM.LASTVALUE2}'
       priority: WARNING
@@ -4038,10 +4311,14 @@ zabbix_export:
           expression: 'min(/Linux memory SNMP/vm.memory.util[snmp],5m)>{$MEMORY.UTIL.MAX}'
         -
           name: 'Lack of available memory (<{$MEMORY.AVAILABLE.MIN} of {ITEM.VALUE2})'
-          expression: 'min(/Linux memory SNMP/vm.memory.available[snmp],5m)<{$MEMORY.AVAILABLE.MIN} and last(/Linux memory SNMP/vm.memory.total[memTotalReal.0])>0'
+          expression: 'max(/Linux memory SNMP/vm.memory.available[snmp],5m)<{$MEMORY.AVAILABLE.MIN} and last(/Linux memory SNMP/vm.memory.total[memTotalReal.0])>0'
+      tags:
+        -
+          tag: scope
+          value: capacity
     -
       uuid: 8d66563ff7744cd6847325d473eaacfe
-      expression: 'min(/Linux SNMP/system.swap.pfree[snmp],5m)<{$SWAP.PFREE.MIN.WARN} and last(/Linux SNMP/system.swap.total[memTotalSwap.0])>0'
+      expression: 'max(/Linux SNMP/system.swap.pfree[snmp],5m)<{$SWAP.PFREE.MIN.WARN} and last(/Linux SNMP/system.swap.total[memTotalSwap.0])>0'
       name: 'High swap space usage (less than {$SWAP.PFREE.MIN.WARN}% free)'
       opdata: 'Free: {ITEM.LASTVALUE1}, total: {ITEM.LASTVALUE2}'
       priority: WARNING
@@ -4052,19 +4329,37 @@ zabbix_export:
           expression: 'min(/Linux SNMP/vm.memory.util[snmp],5m)>{$MEMORY.UTIL.MAX}'
         -
           name: 'Lack of available memory (<{$MEMORY.AVAILABLE.MIN} of {ITEM.VALUE2})'
-          expression: 'min(/Linux SNMP/vm.memory.available[snmp],5m)<{$MEMORY.AVAILABLE.MIN} and last(/Linux SNMP/vm.memory.total[memTotalReal.0])>0'
+          expression: 'max(/Linux SNMP/vm.memory.available[snmp],5m)<{$MEMORY.AVAILABLE.MIN} and last(/Linux SNMP/vm.memory.total[memTotalReal.0])>0'
+      tags:
+        -
+          tag: scope
+          value: capacity
     -
       uuid: 687586e62f4b4191aa95ba1ba74c7787
-      expression: 'min(/Linux memory SNMP/vm.memory.available[snmp],5m)<{$MEMORY.AVAILABLE.MIN} and last(/Linux memory SNMP/vm.memory.total[memTotalReal.0])>0'
+      expression: 'max(/Linux memory SNMP/vm.memory.available[snmp],5m)<{$MEMORY.AVAILABLE.MIN} and last(/Linux memory SNMP/vm.memory.total[memTotalReal.0])>0'
       name: 'Lack of available memory (<{$MEMORY.AVAILABLE.MIN} of {ITEM.VALUE2})'
       opdata: 'Available: {ITEM.LASTVALUE1}, total: {ITEM.LASTVALUE2}'
       priority: AVERAGE
+      tags:
+        -
+          tag: scope
+          value: capacity
+        -
+          tag: scope
+          value: performance
     -
       uuid: b0a04a6a01854d0eb6f9f225c1108261
-      expression: 'min(/Linux SNMP/vm.memory.available[snmp],5m)<{$MEMORY.AVAILABLE.MIN} and last(/Linux SNMP/vm.memory.total[memTotalReal.0])>0'
+      expression: 'max(/Linux SNMP/vm.memory.available[snmp],5m)<{$MEMORY.AVAILABLE.MIN} and last(/Linux SNMP/vm.memory.total[memTotalReal.0])>0'
       name: 'Lack of available memory (<{$MEMORY.AVAILABLE.MIN} of {ITEM.VALUE2})'
       opdata: 'Available: {ITEM.LASTVALUE1}, total: {ITEM.LASTVALUE2}'
       priority: AVERAGE
+      tags:
+        -
+          tag: scope
+          value: capacity
+        -
+          tag: scope
+          value: performance
     -
       uuid: 4e08b6e41268476292ac92da123bd8d7
       expression: |
@@ -4075,6 +4370,13 @@ zabbix_export:
       opdata: 'Load averages(1m 5m 15m): ({ITEM.LASTVALUE1} {ITEM.LASTVALUE3} {ITEM.LASTVALUE4}), # of CPUs: {ITEM.LASTVALUE2}'
       priority: AVERAGE
       description: 'Per CPU load average is too high. Your system may be slow to respond.'
+      tags:
+        -
+          tag: scope
+          value: capacity
+        -
+          tag: scope
+          value: performance
     -
       uuid: 33df3354161047f0b47ad7736b70a302
       expression: |
@@ -4085,6 +4387,13 @@ zabbix_export:
       opdata: 'Load averages(1m 5m 15m): ({ITEM.LASTVALUE1} {ITEM.LASTVALUE3} {ITEM.LASTVALUE4}), # of CPUs: {ITEM.LASTVALUE2}'
       priority: AVERAGE
       description: 'Per CPU load average is too high. Your system may be slow to respond.'
+      tags:
+        -
+          tag: scope
+          value: capacity
+        -
+          tag: scope
+          value: performance
   graphs:
     -
       uuid: 1b06aa0505e94191bce3bf15d41ad113
@@ -4117,7 +4426,7 @@ zabbix_export:
             host: 'Linux SNMP'
             key: 'system.cpu.intr[ssRawInterrupts.0]'
     -
-      uuid: 6af175b5899946c5bae1e7ab4e8f0635
+      uuid: 16b11e6079864c71a7d068276a8e8650
       name: 'Memory usage'
       ymin_type_1: FIXED
       graph_items:
@@ -4125,17 +4434,17 @@ zabbix_export:
           drawtype: BOLD_LINE
           color: 1A7C11
           item:
-            host: 'Linux memory SNMP'
+            host: 'Linux SNMP'
             key: 'vm.memory.total[memTotalReal.0]'
         -
           sortorder: '1'
           drawtype: GRADIENT_LINE
           color: 2774A4
           item:
-            host: 'Linux memory SNMP'
+            host: 'Linux SNMP'
             key: 'vm.memory.available[snmp]'
     -
-      uuid: 16b11e6079864c71a7d068276a8e8650
+      uuid: 6af175b5899946c5bae1e7ab4e8f0635
       name: 'Memory usage'
       ymin_type_1: FIXED
       graph_items:
@@ -4143,17 +4452,17 @@ zabbix_export:
           drawtype: BOLD_LINE
           color: 1A7C11
           item:
-            host: 'Linux SNMP'
+            host: 'Linux memory SNMP'
             key: 'vm.memory.total[memTotalReal.0]'
         -
           sortorder: '1'
           drawtype: GRADIENT_LINE
           color: 2774A4
           item:
-            host: 'Linux SNMP'
+            host: 'Linux memory SNMP'
             key: 'vm.memory.available[snmp]'
     -
-      uuid: edd17c68085b4a328c24ebd8d37fd30c
+      uuid: 5cd95425d8fe4705833995ccfb484c66
       name: 'Memory utilization'
       ymin_type_1: FIXED
       ymax_type_1: FIXED
@@ -4162,10 +4471,10 @@ zabbix_export:
           drawtype: GRADIENT_LINE
           color: 1A7C11
           item:
-            host: 'Linux memory SNMP'
+            host: 'Linux SNMP'
             key: 'vm.memory.util[snmp]'
     -
-      uuid: 5cd95425d8fe4705833995ccfb484c66
+      uuid: edd17c68085b4a328c24ebd8d37fd30c
       name: 'Memory utilization'
       ymin_type_1: FIXED
       ymax_type_1: FIXED
@@ -4174,93 +4483,93 @@ zabbix_export:
           drawtype: GRADIENT_LINE
           color: 1A7C11
           item:
-            host: 'Linux SNMP'
+            host: 'Linux memory SNMP'
             key: 'vm.memory.util[snmp]'
     -
-      uuid: 24bd0481e30a49a78410fef4e1470546
+      uuid: 421c99e9076c4f24931206255577c988
       name: 'Swap usage'
       graph_items:
         -
           color: 1A7C11
           item:
-            host: 'Linux memory SNMP'
+            host: 'Linux SNMP'
             key: 'system.swap.free[memAvailSwap.0]'
         -
           sortorder: '1'
           color: 2774A4
           item:
-            host: 'Linux memory SNMP'
+            host: 'Linux SNMP'
             key: 'system.swap.total[memTotalSwap.0]'
     -
-      uuid: 421c99e9076c4f24931206255577c988
+      uuid: 24bd0481e30a49a78410fef4e1470546
       name: 'Swap usage'
       graph_items:
         -
           color: 1A7C11
           item:
-            host: 'Linux SNMP'
+            host: 'Linux memory SNMP'
             key: 'system.swap.free[memAvailSwap.0]'
         -
           sortorder: '1'
           color: 2774A4
           item:
-            host: 'Linux SNMP'
+            host: 'Linux memory SNMP'
             key: 'system.swap.total[memTotalSwap.0]'
     -
-      uuid: 1ec155ff28e14859b26e9804e96c7fb8
+      uuid: feff7234e6cc420e94acc3c0dab0a61e
       name: 'System load'
       ymin_type_1: FIXED
       graph_items:
         -
           color: 1A7C11
           item:
-            host: 'Linux CPU SNMP'
+            host: 'Linux SNMP'
             key: 'system.cpu.load.avg1[laLoad.1]'
         -
           sortorder: '1'
           color: 2774A4
           item:
-            host: 'Linux CPU SNMP'
+            host: 'Linux SNMP'
             key: 'system.cpu.load.avg5[laLoad.2]'
         -
           sortorder: '2'
           color: F63100
           item:
-            host: 'Linux CPU SNMP'
+            host: 'Linux SNMP'
             key: 'system.cpu.load.avg15[laLoad.3]'
         -
           sortorder: '3'
           color: A54F10
           yaxisside: RIGHT
           item:
-            host: 'Linux CPU SNMP'
+            host: 'Linux SNMP'
             key: 'system.cpu.num[snmp]'
     -
-      uuid: feff7234e6cc420e94acc3c0dab0a61e
+      uuid: 1ec155ff28e14859b26e9804e96c7fb8
       name: 'System load'
       ymin_type_1: FIXED
       graph_items:
         -
           color: 1A7C11
           item:
-            host: 'Linux SNMP'
+            host: 'Linux CPU SNMP'
             key: 'system.cpu.load.avg1[laLoad.1]'
         -
           sortorder: '1'
           color: 2774A4
           item:
-            host: 'Linux SNMP'
+            host: 'Linux CPU SNMP'
             key: 'system.cpu.load.avg5[laLoad.2]'
         -
           sortorder: '2'
           color: F63100
           item:
-            host: 'Linux SNMP'
+            host: 'Linux CPU SNMP'
             key: 'system.cpu.load.avg15[laLoad.3]'
         -
           sortorder: '3'
           color: A54F10
           yaxisside: RIGHT
           item:
-            host: 'Linux SNMP'
+            host: 'Linux CPU SNMP'
             key: 'system.cpu.num[snmp]'
diff --git a/templates/os/macos/template_os_macos.yaml b/templates/os/macos/template_os_macos.yaml
index 40832071bb6..d21e4246b0d 100644
--- a/templates/os/macos/template_os_macos.yaml
+++ b/templates/os/macos/template_os_macos.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:37:04Z'
+  date: '2022-01-26T10:40:25Z'
   groups:
     -
       uuid: 846977d1dfed4968bc5f8bdb363285bc
@@ -35,8 +35,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: 'Monitoring agent'
+              tag: component
+              value: system
         -
           uuid: 3e70e8cc76bb4099a3a6b96f5669f059
           name: 'Zabbix agent ping'
@@ -47,8 +47,8 @@ zabbix_export:
             name: 'Zabbix agent ping status'
           tags:
             -
-              tag: Application
-              value: 'Monitoring agent'
+              tag: component
+              value: system
         -
           uuid: 32e67f37a30c4fb28db9119d9e26a996
           name: 'Version of Zabbix agent running'
@@ -64,8 +64,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: 'Monitoring agent'
+              tag: component
+              value: application
         -
           uuid: d25aa1f2eae445ceb18b7e4ee5383585
           name: 'Maximum number of opened files'
@@ -75,14 +75,21 @@ zabbix_export:
           description: 'It could be increased by using sysctrl utility or modifying file /etc/sysctl.conf.'
           tags:
             -
-              tag: Application
-              value: OS
+              tag: component
+              value: os
           triggers:
             -
               uuid: 933b14ead0974a9c96d36c833da90ebb
               expression: last(/macOS/kernel.maxfiles)<1024
               name: 'Configured max number of opened files is too low'
               priority: INFO
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 5c376cae54854613a1533eb804bcee56
           name: 'Maximum number of processes'
@@ -92,14 +99,21 @@ zabbix_export:
           description: 'It could be increased by using sysctrl utility or modifying file /etc/sysctl.conf.'
           tags:
             -
-              tag: Application
-              value: OS
+              tag: component
+              value: os
           triggers:
             -
               uuid: 0e89b2e0cad948c0b81bc223d2ed673c
               expression: last(/macOS/kernel.maxproc)<256
               name: 'Configured max number of processes is too low'
               priority: INFO
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 951d874e6b644f9787c7a0d267bafcf8
           name: 'Incoming network traffic on en0'
@@ -117,8 +131,8 @@ zabbix_export:
                 - '8'
           tags:
             -
-              tag: Application
-              value: 'Network interfaces'
+              tag: component
+              value: network
         -
           uuid: ac875bd25d484d38b16cb02c30be6b67
           name: 'Outgoing network traffic on en0'
@@ -136,8 +150,8 @@ zabbix_export:
                 - '8'
           tags:
             -
-              tag: Application
-              value: 'Network interfaces'
+              tag: component
+              value: network
         -
           uuid: 928f973c004447d099a79e09a8b98cee
           name: 'Host boot time'
@@ -147,11 +161,8 @@ zabbix_export:
           units: unixtime
           tags:
             -
-              tag: Application
-              value: General
-            -
-              tag: Application
-              value: OS
+              tag: component
+              value: os
         -
           uuid: 5abd63bb64114794ae6d253dcc12afb4
           name: 'Processor load (1 min average per core)'
@@ -161,17 +172,21 @@ zabbix_export:
           description: 'The processor load is calculated as system CPU load divided by number of CPU cores.'
           tags:
             -
-              tag: Application
-              value: CPU
-            -
-              tag: Application
-              value: Performance
+              tag: component
+              value: cpu
           triggers:
             -
               uuid: 3cf40421e61b41bab7697bbf9a2649d6
               expression: 'avg(/macOS/system.cpu.load[percpu,avg1],5m)>5'
               name: 'Processor load is too high'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 7e569411a7b4415098d21aaa44068dee
           name: 'Processor load (5 min average per core)'
@@ -181,11 +196,8 @@ zabbix_export:
           description: 'The processor load is calculated as system CPU load divided by number of CPU cores.'
           tags:
             -
-              tag: Application
-              value: CPU
-            -
-              tag: Application
-              value: Performance
+              tag: component
+              value: cpu
         -
           uuid: 1ddc219f824541ca9c9ef30afda56df2
           name: 'Processor load (15 min average per core)'
@@ -195,11 +207,8 @@ zabbix_export:
           description: 'The processor load is calculated as system CPU load divided by number of CPU cores.'
           tags:
             -
-              tag: Application
-              value: CPU
-            -
-              tag: Application
-              value: Performance
+              tag: component
+              value: cpu
         -
           uuid: 9c0230c0bb944523bd781c37304bb87b
           name: 'Host name'
@@ -217,17 +226,18 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: General
-            -
-              tag: Application
-              value: OS
+              tag: component
+              value: os
           triggers:
             -
               uuid: ffb713a281a543879e4196e4207bdd62
               expression: 'last(/macOS/system.hostname,#1)<>last(/macOS/system.hostname,#2)'
               name: 'Hostname was changed'
               priority: INFO
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 5a7ce2c61d3a4696ac76e0406308e61b
           name: 'Host local time'
@@ -236,11 +246,8 @@ zabbix_export:
           units: unixtime
           tags:
             -
-              tag: Application
-              value: General
-            -
-              tag: Application
-              value: OS
+              tag: component
+              value: os
         -
           uuid: 5c73ff0f28d24d92955c667e5245cfa0
           name: 'System information'
@@ -258,17 +265,18 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: General
-            -
-              tag: Application
-              value: OS
+              tag: component
+              value: os
           triggers:
             -
               uuid: 55d8650af70d4aeea56345985e454df9
               expression: 'last(/macOS/system.uname,#1)<>last(/macOS/system.uname,#2)'
               name: 'Host information was changed'
               priority: INFO
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 34c001a77a904224aa90338590375870
           name: 'System uptime'
@@ -278,17 +286,18 @@ zabbix_export:
           units: uptime
           tags:
             -
-              tag: Application
-              value: General
-            -
-              tag: Application
-              value: OS
+              tag: component
+              value: os
           triggers:
             -
               uuid: 1f0cc03186cc4bb98483927f425df8e9
               expression: change(/macOS/system.uptime)<0
               name: 'Server has just been restarted'
               priority: INFO
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 31ea6bafabbe440ea1b8d1b6cea74444
           name: 'Number of logged in users'
@@ -297,11 +306,11 @@ zabbix_export:
           description: 'Number of users who are currently logged in.'
           tags:
             -
-              tag: Application
-              value: OS
+              tag: component
+              value: os
             -
-              tag: Application
-              value: Security
+              tag: component
+              value: security
         -
           uuid: 6df0d9e8694d45dfa11e433d8de7be41
           name: 'Checksum of /etc/passwd'
@@ -310,14 +319,18 @@ zabbix_export:
           history: 7d
           tags:
             -
-              tag: Application
-              value: Security
+              tag: component
+              value: security
           triggers:
             -
               uuid: 39cfe50a3d2a46ad9a53b9ec7443ec18
               expression: 'last(/macOS/vfs.file.cksum[/etc/passwd,sha256],#1)<>last(/macOS/vfs.file.cksum[/etc/passwd,sha256],#2)'
               name: '/etc/passwd has been changed'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: security
         -
           uuid: daf35c33bb84443f893bb06bfe10f870
           name: 'Available memory'
@@ -327,14 +340,21 @@ zabbix_export:
           description: 'Available memory is defined as free+cached+buffers memory.'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: c38dfc1b95d1463585d378f60d6a689a
               expression: 'last(/macOS/vm.memory.size[available])<20M'
               name: 'Lack of available memory on server'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 83c0218324a548c4a01054801a4d8b0b
           name: 'Total memory'
@@ -344,8 +364,8 @@ zabbix_export:
           units: B
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: d00cf9691f6c446fa35dab03b2201aa4
           name: 'Zabbix agent availability'
@@ -357,8 +377,8 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 0766e9c2a02f46e7adbb86dbef67556f
@@ -367,6 +387,10 @@ zabbix_export:
               priority: AVERAGE
               description: 'For passive only agents, host availability is used with {$AGENT.TIMEOUT} as time threshold.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: c537fbe006d7434dab08add1dcf87537
@@ -390,14 +414,24 @@ zabbix_export:
               units: '%'
               tags:
                 -
-                  tag: Application
-                  value: Filesystems
+                  tag: component
+                  value: filesystem
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
               trigger_prototypes:
                 -
                   uuid: 91cccd7935854a47bf4ca184b1d4d09a
                   expression: 'last(/macOS/vfs.fs.inode[{#FSNAME},pfree])<20'
                   name: '{#FSNAME}: Free inodes is less than 20%'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 29340ac4c5d3419cb4508641e85d787d
               name: '{#FSNAME}: Free disk space'
@@ -406,8 +440,11 @@ zabbix_export:
               units: B
               tags:
                 -
-                  tag: Application
-                  value: Filesystems
+                  tag: component
+                  value: filesystem
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 6d9aa50bddb642499ad575a0cc71146b
               name: '{#FSNAME}: Free disk space (percentage)'
@@ -417,14 +454,24 @@ zabbix_export:
               units: '%'
               tags:
                 -
-                  tag: Application
-                  value: Filesystems
+                  tag: component
+                  value: filesystem
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
               trigger_prototypes:
                 -
                   uuid: 673dbc5aec474abda3a3b392d31b6c11
                   expression: 'last(/macOS/vfs.fs.size[{#FSNAME},pfree])<20'
                   name: '{#FSNAME}: Free disk space is less than 20%'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: c311ced2b4204b368af1c8a8c27f9c99
               name: '{#FSNAME}: Total disk space'
@@ -434,8 +481,11 @@ zabbix_export:
               units: B
               tags:
                 -
-                  tag: Application
-                  value: Filesystems
+                  tag: component
+                  value: filesystem
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 748612098b4e4befa0f39f11b99eced4
               name: '{#FSNAME}: Used disk space'
@@ -444,8 +494,11 @@ zabbix_export:
               units: B
               tags:
                 -
-                  tag: Application
-                  value: Filesystems
+                  tag: component
+                  value: filesystem
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
           graph_prototypes:
             -
               uuid: 6ce28b13df4e4494a4d39750afb25290
@@ -469,6 +522,13 @@ zabbix_export:
                   item:
                     host: macOS
                     key: 'vfs.fs.size[{#FSNAME},free]'
+      tags:
+        -
+          tag: class
+          value: os
+        -
+          tag: target
+          value: macos
       macros:
         -
           macro: '{$AGENT.TIMEOUT}'
diff --git a/templates/os/openbsd/template_os_openbsd.yaml b/templates/os/openbsd/template_os_openbsd.yaml
index b0b81bca190..fd81c2be99b 100644
--- a/templates/os/openbsd/template_os_openbsd.yaml
+++ b/templates/os/openbsd/template_os_openbsd.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:37:08Z'
+  date: '2022-01-26T10:41:44Z'
   groups:
     -
       uuid: 846977d1dfed4968bc5f8bdb363285bc
@@ -35,8 +35,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: 'Monitoring agent'
+              tag: component
+              value: system
         -
           uuid: 99dbf8825c0d4e1f9ae433bcb786d7c7
           name: 'Zabbix agent ping'
@@ -47,8 +47,8 @@ zabbix_export:
             name: 'Zabbix agent ping status'
           tags:
             -
-              tag: Application
-              value: 'Monitoring agent'
+              tag: component
+              value: system
         -
           uuid: c65db5a2b42c46dc90cf4891ad1ecc83
           name: 'Version of Zabbix agent running'
@@ -64,8 +64,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: 'Monitoring agent'
+              tag: component
+              value: application
         -
           uuid: 56a83dc0e14e47339e13a451adcefef7
           name: 'Maximum number of opened files'
@@ -75,14 +75,21 @@ zabbix_export:
           description: 'It could be increased by using sysctrl utility or modifying file /etc/sysctl.conf.'
           tags:
             -
-              tag: Application
-              value: OS
+              tag: component
+              value: os
           triggers:
             -
               uuid: aab96e16dd194d72b9b049ffa8b41b02
               expression: 'last(/OpenBSD by Zabbix agent/kernel.maxfiles)<1024'
               name: 'Configured max number of opened files is too low on {HOST.NAME}'
               priority: INFO
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: e55f8256dd2d48fd9e7fd786f872b4bc
           name: 'Maximum number of processes'
@@ -92,14 +99,21 @@ zabbix_export:
           description: 'It could be increased by using sysctrl utility or modifying file /etc/sysctl.conf.'
           tags:
             -
-              tag: Application
-              value: OS
+              tag: component
+              value: processes
           triggers:
             -
               uuid: 149b9b77d17543fba253666ccbd6a607
               expression: 'last(/OpenBSD by Zabbix agent/kernel.maxproc)<256'
               name: 'Configured max number of processes is too low on {HOST.NAME}'
               priority: INFO
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 7f8fdbc74cf14fa2afda3b57c548c751
           name: 'Number of running processes'
@@ -108,14 +122,18 @@ zabbix_export:
           description: 'Number of processes in running state.'
           tags:
             -
-              tag: Application
-              value: Processes
+              tag: component
+              value: processes
           triggers:
             -
               uuid: d67740bc103348ab8ab11df2bdb0ad8f
               expression: 'avg(/OpenBSD by Zabbix agent/proc.num[,,run],5m)>30'
               name: 'Too many processes running on {HOST.NAME}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 966acafb928b43f8a63ee673b1716d28
           name: 'Number of processes'
@@ -124,14 +142,18 @@ zabbix_export:
           description: 'Total number of processes in any state.'
           tags:
             -
-              tag: Application
-              value: Processes
+              tag: component
+              value: processes
           triggers:
             -
               uuid: dd1b0c14e6dd439ea8f7323cdcc607de
               expression: 'avg(/OpenBSD by Zabbix agent/proc.num[],5m)>300'
               name: 'Too many processes on {HOST.NAME}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 4e06c5b504c04c169ea1a0d6a7951eeb
           name: 'Host boot time'
@@ -141,11 +163,8 @@ zabbix_export:
           units: unixtime
           tags:
             -
-              tag: Application
-              value: General
-            -
-              tag: Application
-              value: OS
+              tag: component
+              value: os
         -
           uuid: f6ed0de8cbb545298b174b19938a527e
           name: 'Interrupts per second'
@@ -159,11 +178,8 @@ zabbix_export:
                 - ''
           tags:
             -
-              tag: Application
-              value: CPU
-            -
-              tag: Application
-              value: Performance
+              tag: component
+              value: cpu
         -
           uuid: 7e4eab397cfd43d2a4aef7e2aa8c3a37
           name: 'Processor load (1 min average per core)'
@@ -173,17 +189,18 @@ zabbix_export:
           description: 'The processor load is calculated as system CPU load divided by number of CPU cores.'
           tags:
             -
-              tag: Application
-              value: CPU
-            -
-              tag: Application
-              value: Performance
+              tag: component
+              value: cpu
           triggers:
             -
               uuid: 1128bfb41f5f420c81feffb1d395cf9f
               expression: 'avg(/OpenBSD by Zabbix agent/system.cpu.load[percpu,avg1],5m)>5'
               name: 'Processor load is too high on {HOST.NAME}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 55ad1da5b20c465f8db86701dcf3e974
           name: 'Processor load (5 min average per core)'
@@ -193,11 +210,8 @@ zabbix_export:
           description: 'The processor load is calculated as system CPU load divided by number of CPU cores.'
           tags:
             -
-              tag: Application
-              value: CPU
-            -
-              tag: Application
-              value: Performance
+              tag: component
+              value: cpu
         -
           uuid: 0403d3b318a649d4aa0da97e18546bcb
           name: 'Processor load (15 min average per core)'
@@ -207,11 +221,8 @@ zabbix_export:
           description: 'The processor load is calculated as system CPU load divided by number of CPU cores.'
           tags:
             -
-              tag: Application
-              value: CPU
-            -
-              tag: Application
-              value: Performance
+              tag: component
+              value: cpu
         -
           uuid: 2226fac821fe4928a9d727770e0af4d0
           name: 'Context switches per second'
@@ -225,11 +236,8 @@ zabbix_export:
                 - ''
           tags:
             -
-              tag: Application
-              value: CPU
-            -
-              tag: Application
-              value: Performance
+              tag: component
+              value: cpu
         -
           uuid: 4689c51946c845e5b31cb7ca5b58fbe3
           name: 'CPU idle time'
@@ -240,11 +248,8 @@ zabbix_export:
           description: 'The time the CPU has spent doing nothing.'
           tags:
             -
-              tag: Application
-              value: CPU
-            -
-              tag: Application
-              value: Performance
+              tag: component
+              value: cpu
         -
           uuid: ad032417f6de4e03a4f956bea65d8ce0
           name: 'CPU interrupt time'
@@ -255,11 +260,8 @@ zabbix_export:
           description: 'The amount of time the CPU has been servicing hardware interrupts.'
           tags:
             -
-              tag: Application
-              value: CPU
-            -
-              tag: Application
-              value: Performance
+              tag: component
+              value: cpu
         -
           uuid: 84030949a4d545b59db4aa3b38402174
           name: 'CPU nice time'
@@ -270,11 +272,8 @@ zabbix_export:
           description: 'The time the CPU has spent running users'' processes that have been niced.'
           tags:
             -
-              tag: Application
-              value: CPU
-            -
-              tag: Application
-              value: Performance
+              tag: component
+              value: cpu
         -
           uuid: 63121eb34bc94eeabd7352992b67befb
           name: 'CPU system time'
@@ -285,11 +284,8 @@ zabbix_export:
           description: 'The time the CPU has spent running the kernel and its processes.'
           tags:
             -
-              tag: Application
-              value: CPU
-            -
-              tag: Application
-              value: Performance
+              tag: component
+              value: cpu
         -
           uuid: c9adb1a7c2fd4db9b176f9008483f2d7
           name: 'CPU user time'
@@ -300,11 +296,8 @@ zabbix_export:
           description: 'The time the CPU has spent running users'' processes that are not niced.'
           tags:
             -
-              tag: Application
-              value: CPU
-            -
-              tag: Application
-              value: Performance
+              tag: component
+              value: cpu
         -
           uuid: a80cd7ca70954cd1b6b89a686f642b9d
           name: 'Host name'
@@ -322,17 +315,18 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: General
-            -
-              tag: Application
-              value: OS
+              tag: component
+              value: os
           triggers:
             -
               uuid: d6927a9b74eb4cb8b15400baf784fc36
               expression: 'last(/OpenBSD by Zabbix agent/system.hostname,#1)<>last(/OpenBSD by Zabbix agent/system.hostname,#2)'
               name: 'Hostname was changed on {HOST.NAME}'
               priority: INFO
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: cfff34f2374c410492b89cce1c6b5198
           name: 'Host local time'
@@ -341,11 +335,8 @@ zabbix_export:
           units: unixtime
           tags:
             -
-              tag: Application
-              value: General
-            -
-              tag: Application
-              value: OS
+              tag: component
+              value: os
         -
           uuid: e758448d5ec242e6a7a17f67c8f62874
           name: 'Free swap space'
@@ -354,8 +345,8 @@ zabbix_export:
           units: B
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 43648a7f2c79443781a0ad500e7a9e6c
           name: 'Free swap space in %'
@@ -365,8 +356,8 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: 0efa45d2c8884bc6b4090afc6408198b
@@ -374,6 +365,13 @@ zabbix_export:
               name: 'Lack of free swap space on {HOST.NAME}'
               priority: WARNING
               description: 'It probably means that the systems requires more physical memory.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 61f33f0c3e35499b999626058048ec66
           name: 'Total swap space'
@@ -383,8 +381,8 @@ zabbix_export:
           units: B
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: b19974c64b4141c2aca0e997b03c2f0a
           name: 'System information'
@@ -402,17 +400,18 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: General
-            -
-              tag: Application
-              value: OS
+              tag: component
+              value: os
           triggers:
             -
               uuid: 3d3bcd54f24448c1a11746a4e75ea736
               expression: 'last(/OpenBSD by Zabbix agent/system.uname,#1)<>last(/OpenBSD by Zabbix agent/system.uname,#2)'
               name: 'Host information was changed on {HOST.NAME}'
               priority: INFO
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: d14bcdc15cc24f90baea06a13077a54f
           name: 'System uptime'
@@ -422,17 +421,18 @@ zabbix_export:
           units: uptime
           tags:
             -
-              tag: Application
-              value: General
-            -
-              tag: Application
-              value: OS
+              tag: component
+              value: os
           triggers:
             -
               uuid: de874b9d875a4298ab39888c9e9cb747
               expression: 'change(/OpenBSD by Zabbix agent/system.uptime)<0'
               name: '{HOST.NAME} has just been restarted'
               priority: INFO
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 165a44bf3b9d49378e500acb90aa7957
           name: 'Number of logged in users'
@@ -441,11 +441,11 @@ zabbix_export:
           description: 'Number of users who are currently logged in.'
           tags:
             -
-              tag: Application
-              value: OS
+              tag: component
+              value: os
             -
-              tag: Application
-              value: Security
+              tag: component
+              value: security
         -
           uuid: f11f6e3539a244409f1c72dbd6f16b76
           name: 'Checksum of /etc/passwd'
@@ -454,14 +454,18 @@ zabbix_export:
           history: 1w
           tags:
             -
-              tag: Application
-              value: Security
+              tag: component
+              value: security
           triggers:
             -
               uuid: 9db4055df94d414d86938066ed05dbc5
               expression: 'last(/OpenBSD by Zabbix agent/vfs.file.cksum[/etc/passwd,sha256],#1)<>last(/OpenBSD by Zabbix agent/vfs.file.cksum[/etc/passwd,sha256],#2)'
               name: '/etc/passwd has been changed on {HOST.NAME}'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: security
         -
           uuid: 5b6c92c92e434dff8ce19e28b3ba785e
           name: 'Available memory'
@@ -471,14 +475,21 @@ zabbix_export:
           description: 'Available memory is defined as free+cached+buffers memory.'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: bdf3c729b8bc4a9481c9041e4c1ea624
               expression: 'last(/OpenBSD by Zabbix agent/vm.memory.size[available])<20M'
               name: 'Lack of available memory on server {HOST.NAME}'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: b32320608732421fac18437006bc1874
           name: 'Total memory'
@@ -488,8 +499,8 @@ zabbix_export:
           units: B
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 7ab36f1fcf0244229effa26f16889a36
           name: 'Zabbix agent availability'
@@ -501,8 +512,8 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: d046f431e11d4bd7be42e66e14a21663
@@ -511,6 +522,10 @@ zabbix_export:
               priority: AVERAGE
               description: 'For passive only agents, host availability is used with {$AGENT.TIMEOUT} as time threshold.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: d02d41ad698942bfab1fe29fad31010a
@@ -542,8 +557,11 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Network interfaces'
+                  tag: component
+                  value: interfaces
+                -
+                  tag: interfaces
+                  value: '{#IFNAME}'
             -
               uuid: 16bced1c77eb46799ecedcde5049dbdb
               name: 'Network interfaces: Outgoing network traffic on {#IFNAME}'
@@ -561,8 +579,11 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Network interfaces'
+                  tag: component
+                  value: interfaces
+                -
+                  tag: interfaces
+                  value: '{#IFNAME}'
           graph_prototypes:
             -
               uuid: c79845ab3101451c8f0fe033b5b2166e
@@ -604,14 +625,24 @@ zabbix_export:
               units: '%'
               tags:
                 -
-                  tag: Application
-                  value: Filesystems
+                  tag: component
+                  value: filesystem
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
               trigger_prototypes:
                 -
                   uuid: 7802203fd5ba471db2be4f35eda44a0b
                   expression: 'last(/OpenBSD by Zabbix agent/vfs.fs.inode[{#FSNAME},pfree])<20'
                   name: 'Filesystems: Free inodes is less than 20% on volume {#FSNAME}'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: d53bf828e684464a88157fd3dfd1b8d4
               name: 'Filesystems: Free disk space on {#FSNAME}'
@@ -620,8 +651,11 @@ zabbix_export:
               units: B
               tags:
                 -
-                  tag: Application
-                  value: Filesystems
+                  tag: component
+                  value: filesystem
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: bcae23e8404349af87c570c353bfe0fe
               name: 'Filesystems: Free disk space on {#FSNAME} (percentage)'
@@ -631,14 +665,24 @@ zabbix_export:
               units: '%'
               tags:
                 -
-                  tag: Application
-                  value: Filesystems
+                  tag: component
+                  value: filesystem
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
               trigger_prototypes:
                 -
                   uuid: 9741c9425c984804ac8fb9a52ef22221
                   expression: 'last(/OpenBSD by Zabbix agent/vfs.fs.size[{#FSNAME},pfree])<20'
                   name: 'Filesystems: Free disk space is less than 20% on volume {#FSNAME}'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 5c27bfca98fc4e709b5fe66e8c181fbd
               name: 'Filesystems: Total disk space on {#FSNAME}'
@@ -648,8 +692,11 @@ zabbix_export:
               units: B
               tags:
                 -
-                  tag: Application
-                  value: Filesystems
+                  tag: component
+                  value: filesystem
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 840eed51cf264b5698fe4f38fd03ea16
               name: 'Filesystems: Used disk space on {#FSNAME}'
@@ -658,8 +705,11 @@ zabbix_export:
               units: B
               tags:
                 -
-                  tag: Application
-                  value: Filesystems
+                  tag: component
+                  value: filesystem
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
           graph_prototypes:
             -
               uuid: ef0e881cfc3f4552a163a653cd52869c
@@ -683,6 +733,13 @@ zabbix_export:
                   item:
                     host: 'OpenBSD by Zabbix agent'
                     key: 'vfs.fs.size[{#FSNAME},free]'
+      tags:
+        -
+          tag: class
+          value: os
+        -
+          tag: target
+          value: openbsd
       macros:
         -
           macro: '{$AGENT.TIMEOUT}'
diff --git a/templates/os/solaris/template_os_solaris.yaml b/templates/os/solaris/template_os_solaris.yaml
index 5b8dc9664bd..0bcfb9e9890 100644
--- a/templates/os/solaris/template_os_solaris.yaml
+++ b/templates/os/solaris/template_os_solaris.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:37:13Z'
+  date: '2022-01-26T10:42:06Z'
   groups:
     -
       uuid: 846977d1dfed4968bc5f8bdb363285bc
@@ -13,7 +13,7 @@ zabbix_export:
       description: |
         Official Solaris OS template. Requires Zabbix agent 4.0.0 or newer.
         
-        You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/
+        You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/+
         
         Template tooling version used: 0.41
       groups:
@@ -35,8 +35,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: 'Monitoring agent'
+              tag: component
+              value: system
         -
           uuid: d708ce58ad214d19a740824512e8be6a
           name: 'Zabbix agent ping'
@@ -47,8 +47,8 @@ zabbix_export:
             name: 'Zabbix agent ping status'
           tags:
             -
-              tag: Application
-              value: 'Monitoring agent'
+              tag: component
+              value: system
         -
           uuid: 633a1d74569f4f61892dabf7e0acf6c1
           name: 'Version of Zabbix agent running'
@@ -64,8 +64,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: 'Monitoring agent'
+              tag: component
+              value: application
         -
           uuid: 2fa6d58a5c7d48da90b1caf521e867cd
           name: 'Maximum number of processes'
@@ -75,14 +75,21 @@ zabbix_export:
           description: 'It could be increased by using sysctrl utility or modifying file /etc/sysctl.conf.'
           tags:
             -
-              tag: Application
-              value: OS
+              tag: component
+              value: processes
           triggers:
             -
               uuid: 2a567bc9d5584dfea986b5b70c89fc65
               expression: last(/Solaris/kernel.maxproc)<256
               name: 'Configured max number of processes is too low'
               priority: INFO
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 7c8c8421fb514e67bc9f14cefe4018f3
           name: 'Number of running processes'
@@ -91,14 +98,21 @@ zabbix_export:
           description: 'Number of processes in running state.'
           tags:
             -
-              tag: Application
-              value: Processes
+              tag: component
+              value: processes
           triggers:
             -
               uuid: 6504ba0f7fa445ea9083af008d52c525
               expression: 'avg(/Solaris/proc.num[,,run],5m)>30'
               name: 'Too many processes running'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 74c805e8bfd947348b206a0d33bfc461
           name: 'Number of processes'
@@ -107,14 +121,21 @@ zabbix_export:
           description: 'Total number of processes in any state.'
           tags:
             -
-              tag: Application
-              value: Processes
+              tag: component
+              value: processes
           triggers:
             -
               uuid: cc2731add899436ca2c12fff13c838fb
               expression: 'avg(/Solaris/proc.num[],5m)>300'
               name: 'Too many processes'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 1812e26de9ad4a36abb5498154e6ea3c
           name: 'Host boot time'
@@ -124,11 +145,8 @@ zabbix_export:
           units: unixtime
           tags:
             -
-              tag: Application
-              value: General
-            -
-              tag: Application
-              value: OS
+              tag: component
+              value: os
         -
           uuid: 8186ed95ed8c4d6eb52ea2e718984170
           name: 'Interrupts per second'
@@ -142,11 +160,8 @@ zabbix_export:
                 - ''
           tags:
             -
-              tag: Application
-              value: CPU
-            -
-              tag: Application
-              value: Performance
+              tag: component
+              value: cpu
         -
           uuid: 1a7cc53a5497427da28f882b1b185fad
           name: 'Processor load (1 min average per core)'
@@ -156,17 +171,18 @@ zabbix_export:
           description: 'The processor load is calculated as system CPU load divided by number of CPU cores.'
           tags:
             -
-              tag: Application
-              value: CPU
-            -
-              tag: Application
-              value: Performance
+              tag: component
+              value: cpu
           triggers:
             -
               uuid: e7ef1c2b702440a3a7a20a544446a068
               expression: 'avg(/Solaris/system.cpu.load[percpu,avg1],5m)>5'
               name: 'Processor load is too high'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 5b053b6c00464f8b8f5fc49fffda1394
           name: 'Processor load (5 min average per core)'
@@ -176,11 +192,8 @@ zabbix_export:
           description: 'The processor load is calculated as system CPU load divided by number of CPU cores.'
           tags:
             -
-              tag: Application
-              value: CPU
-            -
-              tag: Application
-              value: Performance
+              tag: component
+              value: cpu
         -
           uuid: c13c2ff556594c5d985420dc974659cf
           name: 'Processor load (15 min average per core)'
@@ -190,11 +203,8 @@ zabbix_export:
           description: 'The processor load is calculated as system CPU load divided by number of CPU cores.'
           tags:
             -
-              tag: Application
-              value: CPU
-            -
-              tag: Application
-              value: Performance
+              tag: component
+              value: cpu
         -
           uuid: 320f8803624f4ad2b9e66f1a08f5a145
           name: 'Context switches per second'
@@ -208,11 +218,8 @@ zabbix_export:
                 - ''
           tags:
             -
-              tag: Application
-              value: CPU
-            -
-              tag: Application
-              value: Performance
+              tag: component
+              value: cpu
         -
           uuid: a653205d5ce4462089da4ed4d6f97f3a
           name: 'CPU idle time'
@@ -223,11 +230,8 @@ zabbix_export:
           description: 'The time the CPU has spent doing nothing.'
           tags:
             -
-              tag: Application
-              value: CPU
-            -
-              tag: Application
-              value: Performance
+              tag: component
+              value: cpu
         -
           uuid: 9bee92be803c48489509e41c19718abc
           name: 'CPU iowait time'
@@ -238,11 +242,8 @@ zabbix_export:
           description: 'Amount of time the CPU has been waiting for I/O to complete.'
           tags:
             -
-              tag: Application
-              value: CPU
-            -
-              tag: Application
-              value: Performance
+              tag: component
+              value: cpu
           triggers:
             -
               uuid: 280634a65c9d4702a4913c9c2cd5869c
@@ -250,6 +251,10 @@ zabbix_export:
               name: 'Disk I/O is overloaded'
               priority: WARNING
               description: 'OS spends significant time waiting for I/O (input/output) operations. It could be indicator of performance issues with storage system.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: bb32808bf73f489399ecb3e02bc18194
           name: 'CPU system time'
@@ -260,11 +265,8 @@ zabbix_export:
           description: 'The time the CPU has spent running the kernel and its processes.'
           tags:
             -
-              tag: Application
-              value: CPU
-            -
-              tag: Application
-              value: Performance
+              tag: component
+              value: cpu
         -
           uuid: d30ad6a457df4e39819b76fc1be7a562
           name: 'CPU user time'
@@ -275,11 +277,8 @@ zabbix_export:
           description: 'The time the CPU has spent running users'' processes that are not niced.'
           tags:
             -
-              tag: Application
-              value: CPU
-            -
-              tag: Application
-              value: Performance
+              tag: component
+              value: cpu
         -
           uuid: 1945e624e1864f2ba543f9438b1733f1
           name: 'Host name'
@@ -297,17 +296,18 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: General
-            -
-              tag: Application
-              value: OS
+              tag: component
+              value: os
           triggers:
             -
               uuid: cc5a9c97827f4091b83af8be33d58560
               expression: 'last(/Solaris/system.hostname,#1)<>last(/Solaris/system.hostname,#2)'
               name: 'Hostname was changed'
               priority: INFO
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 0a0a8ab7047b400aaffe99917349291e
           name: 'Host local time'
@@ -316,11 +316,8 @@ zabbix_export:
           units: unixtime
           tags:
             -
-              tag: Application
-              value: General
-            -
-              tag: Application
-              value: OS
+              tag: component
+              value: os
         -
           uuid: 71597a2dfdeb4c63acf7505ffb7f4f08
           name: 'Free swap space'
@@ -329,8 +326,8 @@ zabbix_export:
           units: B
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: b2ee2b52a64841e282915d6de3c7f739
           name: 'Free swap space in %'
@@ -340,8 +337,8 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: 7be6856162ca445388b13e524f01a3c2
@@ -349,6 +346,13 @@ zabbix_export:
               name: 'Lack of free swap space'
               priority: WARNING
               description: 'It probably means that the systems requires more physical memory.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 0e7ea1fd204c44f3b0a7880eac21a0df
           name: 'Total swap space'
@@ -358,8 +362,8 @@ zabbix_export:
           units: B
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 034f7934cdb54cc6b99194fac9197bfb
           name: 'System information'
@@ -377,17 +381,18 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: General
-            -
-              tag: Application
-              value: OS
+              tag: component
+              value: os
           triggers:
             -
               uuid: dc293e688ac54ac0aee61e398d8bc5c5
               expression: 'last(/Solaris/system.uname,#1)<>last(/Solaris/system.uname,#2)'
               name: 'Host information was changed'
               priority: INFO
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: c15a8b1b6cbd446bad669ead64a172a1
           name: 'System uptime'
@@ -397,17 +402,18 @@ zabbix_export:
           units: uptime
           tags:
             -
-              tag: Application
-              value: General
-            -
-              tag: Application
-              value: OS
+              tag: component
+              value: os
           triggers:
             -
               uuid: 56284beb4a464017b3aa2f4c00bc271f
               expression: change(/Solaris/system.uptime)<0
               name: 'Server has just been restarted'
               priority: INFO
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: a2c0d69124424e49aa4fc1f2416ffc37
           name: 'Number of logged in users'
@@ -416,11 +422,8 @@ zabbix_export:
           description: 'Number of users who are currently logged in.'
           tags:
             -
-              tag: Application
-              value: OS
-            -
-              tag: Application
-              value: Security
+              tag: component
+              value: security
         -
           uuid: 5dd55b892d1b4828bfc570d6bf48251d
           name: 'Checksum of /etc/passwd'
@@ -429,14 +432,18 @@ zabbix_export:
           history: 7d
           tags:
             -
-              tag: Application
-              value: Security
+              tag: component
+              value: security
           triggers:
             -
               uuid: 50e5be0acabb41658ec82772d9ec234e
               expression: 'last(/Solaris/vfs.file.cksum[/etc/passwd,sha256],#1)<>last(/Solaris/vfs.file.cksum[/etc/passwd,sha256],#2)'
               name: '/etc/passwd has been changed'
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: security
         -
           uuid: 6888f0dd6b2e418f8c28a0ee59648fa3
           name: 'Available memory'
@@ -446,14 +453,21 @@ zabbix_export:
           description: 'Available memory is defined as free+cached+buffers memory.'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: a0769befcb4e4c649557926824d7dbf3
               expression: 'last(/Solaris/vm.memory.size[available])<20M'
               name: 'Lack of available memory on server'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: d96d5ebfa074428e957335b5fa58189b
           name: 'Total memory'
@@ -463,8 +477,8 @@ zabbix_export:
           units: B
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 46dc8d0138314f41962dc357d1e4af20
           name: 'Zabbix agent availability'
@@ -476,8 +490,8 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 4ca39fa4a86c45e19e03eff89edd239b
@@ -486,6 +500,10 @@ zabbix_export:
               priority: AVERAGE
               description: 'For passive only agents, host availability is used with {$AGENT.TIMEOUT} as time threshold.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: 6a47f796859241c1aa30f0d731cacf52
@@ -517,8 +535,11 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Network interfaces'
+                  tag: component
+                  value: interfaces
+                -
+                  tag: interfaces
+                  value: '{#IFNAME}'
             -
               uuid: 02dbf0af85294ab0bbf042fca79448cc
               name: 'Interface {#IFNAME}: Outgoing network traffic'
@@ -536,8 +557,11 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Network interfaces'
+                  tag: component
+                  value: interfaces
+                -
+                  tag: interfaces
+                  value: '{#IFNAME}'
           graph_prototypes:
             -
               uuid: 61d0d627f36e4b1b97fec7857ac99ac1
@@ -579,14 +603,24 @@ zabbix_export:
               units: '%'
               tags:
                 -
-                  tag: Application
-                  value: Filesystems
+                  tag: component
+                  value: filesystem
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
               trigger_prototypes:
                 -
                   uuid: a56d85c866814b5e9273815beafba98c
                   expression: 'last(/Solaris/vfs.fs.inode[{#FSNAME},pfree])<20'
                   name: '{#FSNAME}: Free inodes is less than 20%'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: e4c935091c6c49f185ef0e93963388ff
               name: '{#FSNAME}: Free disk space'
@@ -595,8 +629,11 @@ zabbix_export:
               units: B
               tags:
                 -
-                  tag: Application
-                  value: Filesystems
+                  tag: component
+                  value: filesystem
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: e2805fb218d64ddd8ea58beae73e1343
               name: '{#FSNAME}: Free disk space (percentage)'
@@ -606,14 +643,24 @@ zabbix_export:
               units: '%'
               tags:
                 -
-                  tag: Application
-                  value: Filesystems
+                  tag: component
+                  value: filesystem
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
               trigger_prototypes:
                 -
                   uuid: e93165ebd8d94064836405c8c377bf62
                   expression: 'last(/Solaris/vfs.fs.size[{#FSNAME},pfree])<20'
                   name: '{#FSNAME}: Free disk space is less than 20%'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: e15cfb60494944db8e9b2fe929d91fef
               name: '{#FSNAME}: Total disk space'
@@ -623,8 +670,11 @@ zabbix_export:
               units: B
               tags:
                 -
-                  tag: Application
-                  value: Filesystems
+                  tag: component
+                  value: filesystem
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 0da8a65250ec4027b3093772f5c26532
               name: '{#FSNAME}: Used disk space'
@@ -633,8 +683,11 @@ zabbix_export:
               units: B
               tags:
                 -
-                  tag: Application
-                  value: Filesystems
+                  tag: component
+                  value: filesystem
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
           graph_prototypes:
             -
               uuid: ba1e86d39b2d4f61892228add27101f2
@@ -658,6 +711,13 @@ zabbix_export:
                   item:
                     host: Solaris
                     key: 'vfs.fs.size[{#FSNAME},free]'
+      tags:
+        -
+          tag: class
+          value: os
+        -
+          tag: target
+          value: solaris
       macros:
         -
           macro: '{$AGENT.TIMEOUT}'
diff --git a/templates/os/windows_agent/template_os_windows_agent.yaml b/templates/os/windows_agent/template_os_windows_agent.yaml
index 8ac93f2289e..7603d32bd55 100644
--- a/templates/os/windows_agent/template_os_windows_agent.yaml
+++ b/templates/os/windows_agent/template_os_windows_agent.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:37:18Z'
+  date: '2022-01-26T10:41:09Z'
   groups:
     -
       uuid: 57b7ae836ca64446ba2c296389c009b7
@@ -39,8 +39,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: 'Monitoring agent'
+              tag: component
+              value: system
         -
           uuid: f81e2ce0d1104f9aaf1fc49284ed0ed4
           name: 'Zabbix agent ping'
@@ -51,8 +51,8 @@ zabbix_export:
             name: 'Zabbix agent ping status'
           tags:
             -
-              tag: Application
-              value: 'Monitoring agent'
+              tag: component
+              value: system
         -
           uuid: 5707443d739d4689bde192e75ff4bd0f
           name: 'Version of Zabbix agent running'
@@ -68,8 +68,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: 'Monitoring agent'
+              tag: component
+              value: application
         -
           uuid: 5219a246de0641a89685a961cdd08c0b
           name: 'Cache bytes'
@@ -82,8 +82,8 @@ zabbix_export:
             the last observed value only; it is not an average.
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 2ea74fafb9334de095adcb47cced578d
           name: 'Free system page table entries'
@@ -94,8 +94,8 @@ zabbix_export:
             than 5,000, there may well be a memory leak or you running out of memory.
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: e3118e2e6109460f80cc2d56795ed42f
@@ -107,6 +107,10 @@ zabbix_export:
                 -
                   name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
                   expression: 'min(/Windows by Zabbix agent/vm.memory.util,5m)>{$MEMORY.UTIL.MAX}'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
         -
           uuid: 6c41d254585a4d7b81a0c5766a8913c1
           name: 'Memory page faults per second'
@@ -122,8 +126,8 @@ zabbix_export:
             which require disk access, can cause significant delays.
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 287163bc5b0441c4bf51489432a278eb
           name: 'Memory pages per second'
@@ -135,8 +139,8 @@ zabbix_export:
             If the value is greater than 1,000, as a result of excessive paging, there may be a memory leak.
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: ab4c9a66d16f42e6a32f6144f4d2a3ca
@@ -148,6 +152,10 @@ zabbix_export:
                 -
                   name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
                   expression: 'min(/Windows by Zabbix agent/vm.memory.util,5m)>{$MEMORY.UTIL.MAX}'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
         -
           uuid: fb822cb2a17948208a61bd6661c496df
           name: 'Memory pool non-paged'
@@ -161,8 +169,8 @@ zabbix_export:
             A typical Event ID 2019 is recorded in the system event log.
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: b99a722d267d455fad3c07c53302b20f
           name: 'Used swap space in %'
@@ -173,8 +181,11 @@ zabbix_export:
           description: 'The used space of swap volume/file in percent.'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
+            -
+              tag: component
+              value: storage
         -
           uuid: ee1f116fdab34969a6e6f5e1c25fc3d2
           name: 'CPU DPC time'
@@ -190,8 +201,8 @@ zabbix_export:
             significantly diminish overall system performance.
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: e403552481b04ebdba2e8a019f114f20
           name: 'CPU interrupt time'
@@ -207,8 +218,8 @@ zabbix_export:
             hardware failure. This should never be higher than 20%.
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
           triggers:
             -
               uuid: f67bedcb282349b2aac052baf4963480
@@ -226,6 +237,10 @@ zabbix_export:
                 -
                   name: 'High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m)'
                   expression: 'min(/Windows by Zabbix agent/system.cpu.util,5m)>{$CPU.UTIL.CRIT}'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 37448f05afe340a3891d05528c9d1adc
           name: 'CPU privileged time'
@@ -240,8 +255,8 @@ zabbix_export:
             functions of the Windows® Operating System.
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
           triggers:
             -
               uuid: 4d099256b3ba42f1b90143e2014900dd
@@ -256,6 +271,10 @@ zabbix_export:
                 -
                   name: 'High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m)'
                   expression: 'min(/Windows by Zabbix agent/system.cpu.util,5m)>{$CPU.UTIL.CRIT}'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 575912d512624143b564ca0fbfd0bb8f
           name: 'CPU user time'
@@ -268,8 +287,8 @@ zabbix_export:
             in User mode.
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: 2322a85bfc1049a3b5c892d83b5d5054
           name: 'Context switches per second'
@@ -283,8 +302,8 @@ zabbix_export:
             There are context switch counters on the System and Thread objects. This counter displays the difference between the values observed in the last two samples, divided by the duration of the sample interval.
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: 002af28df72f4a788c88bc022d88c6dd
           name: 'CPU queue length'
@@ -296,8 +315,8 @@ zabbix_export:
             and are waiting to be executed.
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: 630b7b2af6274936ab80b1dd774113e5
           name: 'Number of threads'
@@ -306,8 +325,8 @@ zabbix_export:
           description: 'The number of threads used by all running processes.'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: os
         -
           uuid: b305029532f84daf93c8da2d181ac3a1
           name: 'Number of processes'
@@ -316,8 +335,8 @@ zabbix_export:
           description: 'The number of processes.'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: os
         -
           uuid: c2ed8e2efab04564b6c70ee8ad14730f
           name: 'CPU utilization'
@@ -328,8 +347,8 @@ zabbix_export:
           description: 'CPU utilization in %'
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
           triggers:
             -
               uuid: 806aa232f56640ab98aacc79491fc4d7
@@ -338,6 +357,10 @@ zabbix_export:
               opdata: 'Current utilization: {ITEM.LASTVALUE1}'
               priority: WARNING
               description: 'CPU utilization is too high. The system might be slow to respond.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: cb056886ce72426e833a0445f9263906
           name: 'System name'
@@ -355,8 +378,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 6b50d36a4e29468a9546e880f3004399
@@ -365,6 +388,10 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 94c4dfe23e2e4c6e995a3a715941a8eb
           name: 'System local time'
@@ -374,8 +401,8 @@ zabbix_export:
           description: 'System local time of the host.'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 37ca2366c8474cc8a49a605e93377601
@@ -384,6 +411,10 @@ zabbix_export:
               priority: WARNING
               description: 'The host system time is different from the Zabbix server time.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 7e8b3476db6d4322a10cd1a28cbdb7ea
           name: 'Operating system architecture'
@@ -400,8 +431,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: os
         -
           uuid: 11cac38334544e5cbb028cfd473cb39e
           name: 'Free swap space'
@@ -413,8 +444,11 @@ zabbix_export:
           description: 'The free space of swap volume/file in bytes.'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
+            -
+              tag: component
+              value: storage
         -
           uuid: 9c7e3c843a3045df81dddc5d18de267c
           name: 'Free swap space in %'
@@ -434,8 +468,11 @@ zabbix_export:
             key: 'perf_counter_en["\Paging file(_Total)\% Usage"]'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
+            -
+              tag: component
+              value: storage
         -
           uuid: f981835baf04494eaff2f33f159e0ab5
           name: 'Total swap space'
@@ -445,8 +482,11 @@ zabbix_export:
           description: 'The total space of swap volume/file in bytes.'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
+            -
+              tag: component
+              value: storage
         -
           uuid: b103a2c22fe344f886e9dc9f4e4a65ec
           name: 'System description'
@@ -463,8 +503,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 12503fbf4400488e9b5ff0488f164cb6
           name: Uptime
@@ -476,8 +516,8 @@ zabbix_export:
           description: 'System uptime in ''N days, hh:mm:ss'' format.'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: d27b9eab4034439f91dff41fe6f043ab
@@ -486,6 +526,10 @@ zabbix_export:
               priority: WARNING
               description: 'The device uptime is less than 10 minutes.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 09e9a345a0f445b1a65685911f5eb9b0
           name: 'Total memory'
@@ -495,8 +539,8 @@ zabbix_export:
           description: 'Total memory in Bytes'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 1cbf45e11dab453797fe291639aa0c01
           name: 'Used memory'
@@ -506,8 +550,8 @@ zabbix_export:
           description: 'Used memory in Bytes'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 3b1e4ecaa04a46e9b0aee956918f0713
           name: 'Memory utilization'
@@ -520,8 +564,8 @@ zabbix_export:
           description: 'Memory utilization in %'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: b442993bb2a6404a8ebcb7be39d16ce6
@@ -529,6 +573,13 @@ zabbix_export:
               name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
               priority: AVERAGE
               description: 'The system is running out of free memory.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 08b70a5b80fd435ba393e3deb3ca5adb
           name: 'Network interfaces WMI get'
@@ -544,8 +595,8 @@ zabbix_export:
                 - 1h
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
         -
           uuid: 83c8c6f15b524a2fb04fc90d04d3e8a2
           name: 'Number of cores'
@@ -554,8 +605,8 @@ zabbix_export:
           description: 'The number of logical processors available on the computer.'
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: 3dcb0f79342b4ded97cdec0794472266
           name: 'Zabbix agent availability'
@@ -567,8 +618,8 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 05beb4500cae480892fad0739f99807d
@@ -577,6 +628,10 @@ zabbix_export:
               priority: AVERAGE
               description: 'For passive only agents, host availability is used with {$AGENT.TIMEOUT} as time threshold.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: ba19d6566fdb4a668d4363769d1fee01
@@ -630,8 +685,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: network
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: 6e1f3dfb91024095a20870ee94d01822
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -646,8 +707,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: network
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: 82accc942f5747a2b399484466625051
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -667,8 +734,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: network
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: 9ddb9aaf863a45c0affbd90e4a6fa393
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -683,8 +756,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: network
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: 38c8a1aa95b343e39e23e7b508521dad
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -699,8 +778,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: network
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: 3b090da19af842189bb6fa56d49ceec3
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -720,8 +805,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: network
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: 0445b842d1ce4c7f9fd5716c78a079c4
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -751,8 +842,14 @@ zabbix_export:
                 key: 'wmi.getall[root\cimv2,"select Name,Description,NetConnectionID,Speed,AdapterTypeId,NetConnectionStatus,GUID from win32_networkadapter where PhysicalAdapter=True and NetConnectionStatus>0"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: network
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: c495bffb7e244e5caf5dc013d839b758
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -777,8 +874,14 @@ zabbix_export:
                 key: 'wmi.getall[root\cimv2,"select Name,Description,NetConnectionID,Speed,AdapterTypeId,NetConnectionStatus,GUID from win32_networkadapter where PhysicalAdapter=True and NetConnectionStatus>0"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: network
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: a9b1c61ac4a6481aab93d40c6fb93462
@@ -797,6 +900,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 11ce3d38745a49f58f713fcef1a913c5
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -821,8 +928,14 @@ zabbix_export:
                 key: 'wmi.getall[root\cimv2,"select Name,Description,NetConnectionID,Speed,AdapterTypeId,NetConnectionStatus,GUID from win32_networkadapter where PhysicalAdapter=True and NetConnectionStatus>0"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: network
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
           trigger_prototypes:
             -
               uuid: b2191521a7a54985a19740e3ee2674f2
@@ -840,6 +953,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Windows by Zabbix agent/net.if.status["{#IFGUID}"])<>2 and (last(/Windows by Zabbix agent/net.if.status["{#IFGUID}"],#1)<>last(/Windows by Zabbix agent/net.if.status["{#IFGUID}"],#2))'
                   recovery_expression: 'last(/Windows by Zabbix agent/net.if.status["{#IFGUID}"])=2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
             -
               uuid: c93048183c3942808c60d6dd61963bc0
               expression: |
@@ -860,6 +977,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Windows by Zabbix agent/net.if.status["{#IFGUID}"])<>2 and (last(/Windows by Zabbix agent/net.if.status["{#IFGUID}"],#1)<>last(/Windows by Zabbix agent/net.if.status["{#IFGUID}"],#2))'
                   recovery_expression: 'last(/Windows by Zabbix agent/net.if.status["{#IFGUID}"])=2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: a4fa6e161bb64b98b25b1a2a501a83f4
               expression: |
@@ -879,6 +1000,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Windows by Zabbix agent/net.if.status["{#IFGUID}"])<>2 and (last(/Windows by Zabbix agent/net.if.status["{#IFGUID}"],#1)<>last(/Windows by Zabbix agent/net.if.status["{#IFGUID}"],#2))'
                   recovery_expression: 'last(/Windows by Zabbix agent/net.if.status["{#IFGUID}"])=2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
           graph_prototypes:
             -
               uuid: 5cbfad75590746718cf4eabbeeea43f3
@@ -978,8 +1103,11 @@ zabbix_export:
                     - 'return (100 - value)'
               tags:
                 -
-                  tag: Application
-                  value: 'Disk {#DEVNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: disk
+                  value: '{#DEVNAME}'
               trigger_prototypes:
                 -
                   uuid: 4777fa000fa9460baab1fd7bc7e40604
@@ -995,6 +1123,10 @@ zabbix_export:
                     -
                       name: '{#DEVNAME}: Disk write request responses are too high (write > {$VFS.DEV.WRITE.AWAIT.WARN:"{#DEVNAME}"}s for 15m)'
                       expression: 'min(/Windows by Zabbix agent/perf_counter_en["\PhysicalDisk({#DEVNAME})\Avg. Disk sec/Write",60],15m) > {$VFS.DEV.WRITE.AWAIT.WARN:"{#DEVNAME}"}'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 77e33448596a498ba211d23a1977e9ca
               name: '{#DEVNAME}: Average disk read queue length'
@@ -1004,8 +1136,11 @@ zabbix_export:
               description: 'Average disk read queue, the number of requests outstanding on the disk at the time the performance data is collected.'
               tags:
                 -
-                  tag: Application
-                  value: 'Disk {#DEVNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: disk
+                  value: '{#DEVNAME}'
             -
               uuid: 7d91ed70bc3b4ef2a7991b3a5ba3bde4
               name: '{#DEVNAME}: Disk read request avg waiting time'
@@ -1016,8 +1151,11 @@ zabbix_export:
               description: 'The average time for read requests issued to the device to be served. This includes the time spent by the requests in queue and the time spent servicing them.'
               tags:
                 -
-                  tag: Application
-                  value: 'Disk {#DEVNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: disk
+                  value: '{#DEVNAME}'
               trigger_prototypes:
                 -
                   uuid: 85a8c002b3d84121ad2e73c8aced0987
@@ -1026,6 +1164,10 @@ zabbix_export:
                   priority: WARNING
                   description: 'This trigger might indicate disk {#DEVNAME} saturation.'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 898784d050664f8eaf197ebebc16077e
               name: '{#DEVNAME}: Disk write request avg waiting time'
@@ -1036,8 +1178,11 @@ zabbix_export:
               description: 'The average time for write requests issued to the device to be served. This includes the time spent by the requests in queue and the time spent servicing them.'
               tags:
                 -
-                  tag: Application
-                  value: 'Disk {#DEVNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: disk
+                  value: '{#DEVNAME}'
               trigger_prototypes:
                 -
                   uuid: db6809fd85e241948fb5ef76cb7cc17b
@@ -1046,6 +1191,10 @@ zabbix_export:
                   priority: WARNING
                   description: 'This trigger might indicate disk {#DEVNAME} saturation.'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 71a2c065efaa437fb7296972f516bd82
               name: '{#DEVNAME}: Average disk write queue length'
@@ -1055,8 +1204,11 @@ zabbix_export:
               description: 'Average disk write queue, the number of requests outstanding on the disk at the time the performance data is collected.'
               tags:
                 -
-                  tag: Application
-                  value: 'Disk {#DEVNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: disk
+                  value: '{#DEVNAME}'
             -
               uuid: b49884669dbf43cc95ea3d27fb23698c
               name: '{#DEVNAME}: Disk average queue size (avgqu-sz)'
@@ -1066,8 +1218,11 @@ zabbix_export:
               description: 'Current average disk queue, the number of requests outstanding on the disk at the time the performance data is collected.'
               tags:
                 -
-                  tag: Application
-                  value: 'Disk {#DEVNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: disk
+                  value: '{#DEVNAME}'
             -
               uuid: 390c6e4f2c134ae2939810892eefd6f7
               name: '{#DEVNAME}: Disk read rate'
@@ -1078,8 +1233,11 @@ zabbix_export:
               description: 'Rate of read operations on the disk.'
               tags:
                 -
-                  tag: Application
-                  value: 'Disk {#DEVNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: disk
+                  value: '{#DEVNAME}'
             -
               uuid: 6353d621a9c4415c94247208fc996075
               name: '{#DEVNAME}: Disk write rate'
@@ -1090,8 +1248,11 @@ zabbix_export:
               description: 'Rate of write operations on the disk.'
               tags:
                 -
-                  tag: Application
-                  value: 'Disk {#DEVNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: disk
+                  value: '{#DEVNAME}'
           graph_prototypes:
             -
               uuid: 6d37f811023b4f65a071b1deb9b1b8ec
@@ -1200,8 +1361,14 @@ zabbix_export:
                 name: 'Windows service state'
               tags:
                 -
-                  tag: Application
-                  value: Services
+                  tag: component
+                  value: system
+                -
+                  tag: name
+                  value: '{#SERVICE.DISPLAYNAME}'
+                -
+                  tag: service
+                  value: '{#SERVICE.NAME}'
               trigger_prototypes:
                 -
                   uuid: 4708592603db4577b26cb6daade41754
@@ -1209,6 +1376,10 @@ zabbix_export:
                   name: '"{#SERVICE.NAME}" ({#SERVICE.DISPLAYNAME}) is not running (startup type {#SERVICE.STARTUPNAME})'
                   priority: AVERAGE
                   description: 'The service has a state other than "Running" for the last three times.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
         -
           uuid: c22b79b52f9148728095bda2796a753e
           name: 'Mounted filesystem discovery'
@@ -1256,8 +1427,11 @@ zabbix_export:
               description: 'Space utilization in % for {#FSNAME}'
               tags:
                 -
-                  tag: Application
-                  value: 'Filesystem {#FSNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 69378521b7e844ec89afe753a7cba30e
               name: '{#FSLABEL}({#FSNAME}): Total space'
@@ -1267,8 +1441,11 @@ zabbix_export:
               description: 'Total space in Bytes'
               tags:
                 -
-                  tag: Application
-                  value: 'Filesystem {#FSNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: a29509b4b7f24c25a768e88e0c23c154
               name: '{#FSLABEL}({#FSNAME}): Used space'
@@ -1278,8 +1455,11 @@ zabbix_export:
               description: 'Used storage in Bytes'
               tags:
                 -
-                  tag: Application
-                  value: 'Filesystem {#FSNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
           trigger_prototypes:
             -
               uuid: d3e99134a1d04894918f2c92ff38cb92
@@ -1295,6 +1475,10 @@ zabbix_export:
                  - The disk free space is less than 5G.
                  - The disk will be full in less than 24 hours.
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
             -
               uuid: 97115bbe4f6b4a8cb2873b8fa01f95d3
               expression: |
@@ -1315,6 +1499,10 @@ zabbix_export:
                   expression: |
                     last(/Windows by Zabbix agent/vfs.fs.size[{#FSNAME},pused])>{$VFS.FS.PUSED.MAX.CRIT:"{#FSNAME}"} and
                     ((last(/Windows by Zabbix agent/vfs.fs.size[{#FSNAME},total])-last(/Windows by Zabbix agent/vfs.fs.size[{#FSNAME},used]))<5G or timeleft(/Windows by Zabbix agent/vfs.fs.size[{#FSNAME},pused],1h,100)<1d)
+              tags:
+                -
+                  tag: scope
+                  value: capacity
           graph_prototypes:
             -
               uuid: f80e47b8d4db4c378f25056c02b72382
@@ -1338,6 +1526,13 @@ zabbix_export:
                   item:
                     host: 'Windows by Zabbix agent'
                     key: 'vfs.fs.size[{#FSNAME},used]'
+      tags:
+        -
+          tag: class
+          value: os
+        -
+          tag: target
+          value: windows
       macros:
         -
           macro: '{$AGENT.TIMEOUT}'
@@ -1841,8 +2036,8 @@ zabbix_export:
             significantly diminish overall system performance.
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: 609619e2b6364d9e90bef828610b23f8
           name: 'CPU interrupt time'
@@ -1858,8 +2053,8 @@ zabbix_export:
             hardware failure. This should never be higher than 20%.
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
           triggers:
             -
               uuid: 3f6cca07bc6c48f0b21fee3aeb89bf6b
@@ -1877,6 +2072,10 @@ zabbix_export:
                 -
                   name: 'High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m)'
                   expression: 'min(/Windows CPU by Zabbix agent/system.cpu.util,5m)>{$CPU.UTIL.CRIT}'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: eb5144d1e3cb4417ae0abcdeca10e0ed
           name: 'CPU privileged time'
@@ -1891,8 +2090,8 @@ zabbix_export:
             functions of the Windows® Operating System.
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
           triggers:
             -
               uuid: 999464a5a73540d3b7b7cd86efa5488e
@@ -1907,6 +2106,10 @@ zabbix_export:
                 -
                   name: 'High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m)'
                   expression: 'min(/Windows CPU by Zabbix agent/system.cpu.util,5m)>{$CPU.UTIL.CRIT}'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 5611c125bf01479fadc2e59db073cc9c
           name: 'CPU user time'
@@ -1919,8 +2122,8 @@ zabbix_export:
             in User mode.
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: 8ee61e8919984a3d9a7125fd4fe7c397
           name: 'Context switches per second'
@@ -1934,8 +2137,8 @@ zabbix_export:
             There are context switch counters on the System and Thread objects. This counter displays the difference between the values observed in the last two samples, divided by the duration of the sample interval.
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: 1a2b85fb8355459e9c5c723164d09d41
           name: 'CPU queue length'
@@ -1947,8 +2150,8 @@ zabbix_export:
             and are waiting to be executed.
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: 177e472955434cb19dadb06c0f34eb31
           name: 'CPU utilization'
@@ -1959,8 +2162,8 @@ zabbix_export:
           description: 'CPU utilization in %'
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
           triggers:
             -
               uuid: afd1711dca1542a5bec9091cbae2bcf0
@@ -1969,6 +2172,10 @@ zabbix_export:
               opdata: 'Current utilization: {ITEM.LASTVALUE1}'
               priority: WARNING
               description: 'CPU utilization is too high. The system might be slow to respond.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: d6b17d211ed746aaabac591a3dad5813
           name: 'Number of cores'
@@ -1977,8 +2184,8 @@ zabbix_export:
           description: 'The number of logical processors available on the computer.'
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
       macros:
         -
           macro: '{$CPU.INTERRUPT.CRIT.MAX}'
@@ -2052,8 +2259,11 @@ zabbix_export:
               description: 'Space utilization in % for {#FSNAME}'
               tags:
                 -
-                  tag: Application
-                  value: 'Filesystem {#FSNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: a1661dae47c640be9cfa9e807e125ff3
               name: '{#FSLABEL}({#FSNAME}): Total space'
@@ -2063,8 +2273,11 @@ zabbix_export:
               description: 'Total space in Bytes'
               tags:
                 -
-                  tag: Application
-                  value: 'Filesystem {#FSNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: ed0c1057b2704ab098847ae62fec9064
               name: '{#FSLABEL}({#FSNAME}): Used space'
@@ -2074,8 +2287,11 @@ zabbix_export:
               description: 'Used storage in Bytes'
               tags:
                 -
-                  tag: Application
-                  value: 'Filesystem {#FSNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
           trigger_prototypes:
             -
               uuid: 68544e02e3cc4d389269448f34ca66e1
@@ -2091,6 +2307,10 @@ zabbix_export:
                  - The disk free space is less than 5G.
                  - The disk will be full in less than 24 hours.
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
             -
               uuid: ba0e859e58c34107a792098cfe9d31a4
               expression: |
@@ -2111,6 +2331,10 @@ zabbix_export:
                   expression: |
                     last(/Windows filesystems by Zabbix agent/vfs.fs.size[{#FSNAME},pused])>{$VFS.FS.PUSED.MAX.CRIT:"{#FSNAME}"} and
                     ((last(/Windows filesystems by Zabbix agent/vfs.fs.size[{#FSNAME},total])-last(/Windows filesystems by Zabbix agent/vfs.fs.size[{#FSNAME},used]))<5G or timeleft(/Windows filesystems by Zabbix agent/vfs.fs.size[{#FSNAME},pused],1h,100)<1d)
+              tags:
+                -
+                  tag: scope
+                  value: capacity
           graph_prototypes:
             -
               uuid: 78d604a4bde244c38bcfbabd7ef5e09d
@@ -2184,8 +2408,8 @@ zabbix_export:
           description: 'The number of threads used by all running processes.'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: os
         -
           uuid: 8401ea3152ea45269eeb6cc7fa70f1aa
           name: 'Number of processes'
@@ -2194,8 +2418,8 @@ zabbix_export:
           description: 'The number of processes.'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: os
         -
           uuid: 78ae4dbd2d894819a36a7d3d00f2e508
           name: 'System name'
@@ -2213,8 +2437,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 13c5f9c0f7f645cc9dde522ff20a1860
@@ -2223,6 +2447,10 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 25454c401bea41a4b3c49da3165f3d3d
           name: 'System local time'
@@ -2232,8 +2460,8 @@ zabbix_export:
           description: 'System local time of the host.'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 3144a1b15227479e9ea4ce858faea74b
@@ -2242,6 +2470,10 @@ zabbix_export:
               priority: WARNING
               description: 'The host system time is different from the Zabbix server time.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 5ed680dff3154af58e7adc0571a6ee9d
           name: 'Operating system architecture'
@@ -2258,8 +2490,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: os
         -
           uuid: 76ef3297b4b740bfaf891e039f7d4dff
           name: 'System description'
@@ -2276,8 +2508,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 24411175d64f48a195ee4a2323d8e799
           name: Uptime
@@ -2289,8 +2521,8 @@ zabbix_export:
           description: 'System uptime in ''N days, hh:mm:ss'' format.'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: d24a0366e99c4e31815bbbaa3af71ac6
@@ -2299,6 +2531,10 @@ zabbix_export:
               priority: WARNING
               description: 'The device uptime is less than 10 minutes.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
       macros:
         -
           macro: '{$SYSTEM.FUZZYTIME.MAX}'
@@ -2325,8 +2561,8 @@ zabbix_export:
             the last observed value only; it is not an average.
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: bea4109baa6e425eaa7b8cb3bbb1c01a
           name: 'Free system page table entries'
@@ -2337,8 +2573,8 @@ zabbix_export:
             than 5,000, there may well be a memory leak or you running out of memory.
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: 5055a8fdc127479cbe97fdfd849831ea
@@ -2350,6 +2586,10 @@ zabbix_export:
                 -
                   name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
                   expression: 'min(/Windows memory by Zabbix agent/vm.memory.util,5m)>{$MEMORY.UTIL.MAX}'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
         -
           uuid: c54782d0e8384d9cba8fe79af050e7ac
           name: 'Memory page faults per second'
@@ -2365,8 +2605,8 @@ zabbix_export:
             which require disk access, can cause significant delays.
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 1ce3e64002424f29b73a5159152ae529
           name: 'Memory pages per second'
@@ -2378,8 +2618,8 @@ zabbix_export:
             If the value is greater than 1,000, as a result of excessive paging, there may be a memory leak.
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: 045574e4dd814b7e97d292b134f0a755
@@ -2391,6 +2631,10 @@ zabbix_export:
                 -
                   name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
                   expression: 'min(/Windows memory by Zabbix agent/vm.memory.util,5m)>{$MEMORY.UTIL.MAX}'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
         -
           uuid: b4ae2ff5830b47f882744f5fbcfcca05
           name: 'Memory pool non-paged'
@@ -2404,8 +2648,8 @@ zabbix_export:
             A typical Event ID 2019 is recorded in the system event log.
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: d24566c5c0fc4c219f521a1d4ae18546
           name: 'Used swap space in %'
@@ -2416,8 +2660,11 @@ zabbix_export:
           description: 'The used space of swap volume/file in percent.'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
+            -
+              tag: component
+              value: storage
         -
           uuid: 3b8acdfa9b744fb595590daa370b16a9
           name: 'Free swap space'
@@ -2429,8 +2676,11 @@ zabbix_export:
           description: 'The free space of swap volume/file in bytes.'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
+            -
+              tag: component
+              value: storage
         -
           uuid: 88eb59f25fde40a49f3b35f576fab29d
           name: 'Free swap space in %'
@@ -2450,8 +2700,11 @@ zabbix_export:
             key: 'perf_counter_en["\Paging file(_Total)\% Usage"]'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
+            -
+              tag: component
+              value: storage
         -
           uuid: 711aae9de25e43728bfc9c26f06c800a
           name: 'Total swap space'
@@ -2461,8 +2714,11 @@ zabbix_export:
           description: 'The total space of swap volume/file in bytes.'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
+            -
+              tag: component
+              value: storage
         -
           uuid: 35f397ade625477eba0b557a58113761
           name: 'Total memory'
@@ -2472,8 +2728,8 @@ zabbix_export:
           description: 'Total memory in Bytes'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 69f61ded5de04623be01a77e160a41e6
           name: 'Used memory'
@@ -2483,8 +2739,8 @@ zabbix_export:
           description: 'Used memory in Bytes'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 97295c0987bd44f1af578a2e37f469f4
           name: 'Memory utilization'
@@ -2497,8 +2753,8 @@ zabbix_export:
           description: 'Memory utilization in %'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: 2766be7a10d444be9893dcdfab75f3be
@@ -2506,6 +2762,13 @@ zabbix_export:
               name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
               priority: AVERAGE
               description: 'The system is running out of free memory.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
       macros:
         -
           macro: '{$MEM.PAGE_SEC.CRIT.MAX}'
@@ -2547,8 +2810,8 @@ zabbix_export:
                 - 1h
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
       discovery_rules:
         -
           uuid: e4ea554f9a1c4d3db0233c8babdf9bc1
@@ -2602,8 +2865,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: network
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: 29d94ac228794aa9a89a4147014c35d1
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -2618,8 +2887,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: network
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: 18cb6d1cde06482a8adb10e78576b512
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -2639,8 +2914,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: network
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: e3065d25674045938470ce2e10fbd6c0
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -2655,8 +2936,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: network
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: b3472a08272143bead7b9dc366b4992f
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -2671,8 +2958,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: network
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: 2e208f1d9ca949f582f24015350395b6
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -2692,8 +2985,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: network
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: db8d1c51fdcc4cffbff0c8974b5233f9
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -2723,8 +3022,14 @@ zabbix_export:
                 key: 'wmi.getall[root\cimv2,"select Name,Description,NetConnectionID,Speed,AdapterTypeId,NetConnectionStatus,GUID from win32_networkadapter where PhysicalAdapter=True and NetConnectionStatus>0"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: network
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: efe5e7b10dbe4b5c8f86a60e6611c22f
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -2749,8 +3054,14 @@ zabbix_export:
                 key: 'wmi.getall[root\cimv2,"select Name,Description,NetConnectionID,Speed,AdapterTypeId,NetConnectionStatus,GUID from win32_networkadapter where PhysicalAdapter=True and NetConnectionStatus>0"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: network
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 36effba3975c408aba50096464719479
@@ -2769,6 +3080,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 9ea1818be4d7423fb7799b9cf1546491
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -2793,8 +3108,14 @@ zabbix_export:
                 key: 'wmi.getall[root\cimv2,"select Name,Description,NetConnectionID,Speed,AdapterTypeId,NetConnectionStatus,GUID from win32_networkadapter where PhysicalAdapter=True and NetConnectionStatus>0"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: network
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
           trigger_prototypes:
             -
               uuid: 81cea5af79844f298849ca5ef6cde4b3
@@ -2812,6 +3133,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Windows network by Zabbix agent/net.if.status["{#IFGUID}"])<>2 and (last(/Windows network by Zabbix agent/net.if.status["{#IFGUID}"],#1)<>last(/Windows network by Zabbix agent/net.if.status["{#IFGUID}"],#2))'
                   recovery_expression: 'last(/Windows network by Zabbix agent/net.if.status["{#IFGUID}"])=2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
             -
               uuid: c0e8e89730f04d92b26dd5da215894e1
               expression: |
@@ -2832,6 +3157,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Windows network by Zabbix agent/net.if.status["{#IFGUID}"])<>2 and (last(/Windows network by Zabbix agent/net.if.status["{#IFGUID}"],#1)<>last(/Windows network by Zabbix agent/net.if.status["{#IFGUID}"],#2))'
                   recovery_expression: 'last(/Windows network by Zabbix agent/net.if.status["{#IFGUID}"])=2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 2a59eec0032a41e48e2443507cbd173d
               expression: |
@@ -2851,6 +3180,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Windows network by Zabbix agent/net.if.status["{#IFGUID}"])<>2 and (last(/Windows network by Zabbix agent/net.if.status["{#IFGUID}"],#1)<>last(/Windows network by Zabbix agent/net.if.status["{#IFGUID}"],#2))'
                   recovery_expression: 'last(/Windows network by Zabbix agent/net.if.status["{#IFGUID}"])=2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
           graph_prototypes:
             -
               uuid: 08ea837e8c2448018cff873dacd95dcb
@@ -3113,8 +3446,11 @@ zabbix_export:
                     - 'return (100 - value)'
               tags:
                 -
-                  tag: Application
-                  value: 'Disk {#DEVNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: disk
+                  value: '{#DEVNAME}'
               trigger_prototypes:
                 -
                   uuid: c194f813f0c5417aaac56875b955637a
@@ -3130,6 +3466,10 @@ zabbix_export:
                     -
                       name: '{#DEVNAME}: Disk write request responses are too high (write > {$VFS.DEV.WRITE.AWAIT.WARN:"{#DEVNAME}"}s for 15m)'
                       expression: 'min(/Windows physical disks by Zabbix agent/perf_counter_en["\PhysicalDisk({#DEVNAME})\Avg. Disk sec/Write",60],15m) > {$VFS.DEV.WRITE.AWAIT.WARN:"{#DEVNAME}"}'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 8122d6fd46a54d5f8b23c4b21a333959
               name: '{#DEVNAME}: Average disk read queue length'
@@ -3139,8 +3479,11 @@ zabbix_export:
               description: 'Average disk read queue, the number of requests outstanding on the disk at the time the performance data is collected.'
               tags:
                 -
-                  tag: Application
-                  value: 'Disk {#DEVNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: disk
+                  value: '{#DEVNAME}'
             -
               uuid: f6896b69665d4a9bb160b23a322919d4
               name: '{#DEVNAME}: Disk read request avg waiting time'
@@ -3151,8 +3494,11 @@ zabbix_export:
               description: 'The average time for read requests issued to the device to be served. This includes the time spent by the requests in queue and the time spent servicing them.'
               tags:
                 -
-                  tag: Application
-                  value: 'Disk {#DEVNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: disk
+                  value: '{#DEVNAME}'
               trigger_prototypes:
                 -
                   uuid: d96338f9104a4eb4bc7725a5736c96d0
@@ -3161,6 +3507,10 @@ zabbix_export:
                   priority: WARNING
                   description: 'This trigger might indicate disk {#DEVNAME} saturation.'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 704680610f6a42dc9373db929a3d0d53
               name: '{#DEVNAME}: Disk write request avg waiting time'
@@ -3171,8 +3521,11 @@ zabbix_export:
               description: 'The average time for write requests issued to the device to be served. This includes the time spent by the requests in queue and the time spent servicing them.'
               tags:
                 -
-                  tag: Application
-                  value: 'Disk {#DEVNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: disk
+                  value: '{#DEVNAME}'
               trigger_prototypes:
                 -
                   uuid: 205acd9a37424bd78618ebdc197f251f
@@ -3181,6 +3534,10 @@ zabbix_export:
                   priority: WARNING
                   description: 'This trigger might indicate disk {#DEVNAME} saturation.'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 9f5d1cdb629847ad97e0fa0804883e91
               name: '{#DEVNAME}: Average disk write queue length'
@@ -3190,8 +3547,11 @@ zabbix_export:
               description: 'Average disk write queue, the number of requests outstanding on the disk at the time the performance data is collected.'
               tags:
                 -
-                  tag: Application
-                  value: 'Disk {#DEVNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: disk
+                  value: '{#DEVNAME}'
             -
               uuid: 3565ad70600d4c8aa5ebbbebd3f67270
               name: '{#DEVNAME}: Disk average queue size (avgqu-sz)'
@@ -3201,8 +3561,11 @@ zabbix_export:
               description: 'Current average disk queue, the number of requests outstanding on the disk at the time the performance data is collected.'
               tags:
                 -
-                  tag: Application
-                  value: 'Disk {#DEVNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: disk
+                  value: '{#DEVNAME}'
             -
               uuid: 3485202f1e6b42ce8099ce6d6347a994
               name: '{#DEVNAME}: Disk read rate'
@@ -3213,8 +3576,11 @@ zabbix_export:
               description: 'Rate of read operations on the disk.'
               tags:
                 -
-                  tag: Application
-                  value: 'Disk {#DEVNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: disk
+                  value: '{#DEVNAME}'
             -
               uuid: 66e312629db1460c8b215d34d29f7418
               name: '{#DEVNAME}: Disk write rate'
@@ -3225,8 +3591,11 @@ zabbix_export:
               description: 'Rate of write operations on the disk.'
               tags:
                 -
-                  tag: Application
-                  value: 'Disk {#DEVNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: disk
+                  value: '{#DEVNAME}'
           graph_prototypes:
             -
               uuid: 5fcd9dc53cd34e4981bf5e48a88951a0
@@ -3368,8 +3737,14 @@ zabbix_export:
                 name: 'Windows service state'
               tags:
                 -
-                  tag: Application
-                  value: Services
+                  tag: component
+                  value: system
+                -
+                  tag: name
+                  value: '{#SERVICE.DISPLAYNAME}'
+                -
+                  tag: service
+                  value: '{#SERVICE.NAME}'
               trigger_prototypes:
                 -
                   uuid: 9fab20eab61d48c09682fe5c142cc917
@@ -3377,6 +3752,10 @@ zabbix_export:
                   name: '"{#SERVICE.NAME}" ({#SERVICE.DISPLAYNAME}) is not running (startup type {#SERVICE.STARTUPNAME})'
                   priority: AVERAGE
                   description: 'The service has a state other than "Running" for the last three times.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
       macros:
         -
           macro: '{$SERVICE.NAME.MATCHES}'
@@ -3437,6 +3816,10 @@ zabbix_export:
         -
           name: 'High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m)'
           expression: 'min(/Windows by Zabbix agent/system.cpu.util,5m)>{$CPU.UTIL.CRIT}'
+      tags:
+        -
+          tag: scope
+          value: performance
     -
       uuid: cc301d844a7b42e79756d1bc74adf307
       expression: 'min(/Windows CPU by Zabbix agent/perf_counter_en["\System\Processor Queue Length"],5m) - last(/Windows CPU by Zabbix agent/wmi.get[root/cimv2,"Select NumberOfLogicalProcessors from Win32_ComputerSystem"]) * 2 > {$CPU.QUEUE.CRIT.MAX}'
@@ -3447,6 +3830,10 @@ zabbix_export:
         -
           name: 'High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m)'
           expression: 'min(/Windows CPU by Zabbix agent/system.cpu.util,5m)>{$CPU.UTIL.CRIT}'
+      tags:
+        -
+          tag: scope
+          value: performance
     -
       uuid: 7c23e03060ce42b094aac2f8aea1a9ad
       expression: 'min(/Windows by Zabbix agent/system.swap.pfree,5m)<{$SWAP.PFREE.MIN.WARN} and last(/Windows by Zabbix agent/system.swap.size[,total])>0'
@@ -3458,6 +3845,10 @@ zabbix_export:
         -
           name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
           expression: 'min(/Windows by Zabbix agent/vm.memory.util,5m)>{$MEMORY.UTIL.MAX}'
+      tags:
+        -
+          tag: scope
+          value: performance
     -
       uuid: b2a97432e79e4a999324d3fde7dacdeb
       expression: 'min(/Windows memory by Zabbix agent/system.swap.pfree,5m)<{$SWAP.PFREE.MIN.WARN} and last(/Windows memory by Zabbix agent/system.swap.size[,total])>0'
@@ -3469,39 +3860,43 @@ zabbix_export:
         -
           name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
           expression: 'min(/Windows memory by Zabbix agent/vm.memory.util,5m)>{$MEMORY.UTIL.MAX}'
+      tags:
+        -
+          tag: scope
+          value: performance
   graphs:
     -
-      uuid: e3029427b9124e30a9aa06000219f572
+      uuid: 02ec085b49614b30a45287a7e88a8da1
       name: 'CPU jumps'
       graph_items:
         -
           color: 1A7C11
           item:
-            host: 'Windows CPU by Zabbix agent'
+            host: 'Windows by Zabbix agent'
             key: 'perf_counter_en["\System\Context Switches/sec"]'
         -
           sortorder: '1'
           color: 2774A4
           item:
-            host: 'Windows CPU by Zabbix agent'
+            host: 'Windows by Zabbix agent'
             key: 'perf_counter_en["\Processor Information(_total)\% Interrupt Time"]'
     -
-      uuid: 02ec085b49614b30a45287a7e88a8da1
+      uuid: e3029427b9124e30a9aa06000219f572
       name: 'CPU jumps'
       graph_items:
         -
           color: 1A7C11
           item:
-            host: 'Windows by Zabbix agent'
+            host: 'Windows CPU by Zabbix agent'
             key: 'perf_counter_en["\System\Context Switches/sec"]'
         -
           sortorder: '1'
           color: 2774A4
           item:
-            host: 'Windows by Zabbix agent'
+            host: 'Windows CPU by Zabbix agent'
             key: 'perf_counter_en["\Processor Information(_total)\% Interrupt Time"]'
     -
-      uuid: 0b520e68348e4c17983672c5ca4dffb1
+      uuid: 0c2db401fe574282ab0beb6955049330
       name: 'CPU usage'
       type: STACKED
       ymin_type_1: FIXED
@@ -3510,16 +3905,16 @@ zabbix_export:
         -
           color: 1A7C11
           item:
-            host: 'Windows CPU by Zabbix agent'
+            host: 'Windows by Zabbix agent'
             key: 'perf_counter_en["\Processor Information(_total)\% User Time"]'
         -
           sortorder: '1'
           color: 2774A4
           item:
-            host: 'Windows CPU by Zabbix agent'
+            host: 'Windows by Zabbix agent'
             key: 'perf_counter_en["\Processor Information(_total)\% Privileged Time"]'
     -
-      uuid: 0c2db401fe574282ab0beb6955049330
+      uuid: 0b520e68348e4c17983672c5ca4dffb1
       name: 'CPU usage'
       type: STACKED
       ymin_type_1: FIXED
@@ -3528,16 +3923,16 @@ zabbix_export:
         -
           color: 1A7C11
           item:
-            host: 'Windows by Zabbix agent'
+            host: 'Windows CPU by Zabbix agent'
             key: 'perf_counter_en["\Processor Information(_total)\% User Time"]'
         -
           sortorder: '1'
           color: 2774A4
           item:
-            host: 'Windows by Zabbix agent'
+            host: 'Windows CPU by Zabbix agent'
             key: 'perf_counter_en["\Processor Information(_total)\% Privileged Time"]'
     -
-      uuid: d7543150b21e4678a29ca1072c8660df
+      uuid: 5de711b16f3845659289483f6deb4761
       name: 'CPU utilization'
       ymin_type_1: FIXED
       ymax_type_1: FIXED
@@ -3546,10 +3941,10 @@ zabbix_export:
           drawtype: GRADIENT_LINE
           color: 1A7C11
           item:
-            host: 'Windows CPU by Zabbix agent'
+            host: 'Windows by Zabbix agent'
             key: system.cpu.util
     -
-      uuid: 5de711b16f3845659289483f6deb4761
+      uuid: d7543150b21e4678a29ca1072c8660df
       name: 'CPU utilization'
       ymin_type_1: FIXED
       ymax_type_1: FIXED
@@ -3558,10 +3953,10 @@ zabbix_export:
           drawtype: GRADIENT_LINE
           color: 1A7C11
           item:
-            host: 'Windows by Zabbix agent'
+            host: 'Windows CPU by Zabbix agent'
             key: system.cpu.util
     -
-      uuid: 61a375b6875641bf93145be801809ece
+      uuid: 1b86c8f6fe3343e6838c5d02f4f64b2b
       name: 'Memory utilization'
       ymin_type_1: FIXED
       ymax_type_1: FIXED
@@ -3570,10 +3965,10 @@ zabbix_export:
           drawtype: GRADIENT_LINE
           color: 1A7C11
           item:
-            host: 'Windows memory by Zabbix agent'
+            host: 'Windows by Zabbix agent'
             key: vm.memory.util
     -
-      uuid: 1b86c8f6fe3343e6838c5d02f4f64b2b
+      uuid: 61a375b6875641bf93145be801809ece
       name: 'Memory utilization'
       ymin_type_1: FIXED
       ymax_type_1: FIXED
@@ -3582,35 +3977,35 @@ zabbix_export:
           drawtype: GRADIENT_LINE
           color: 1A7C11
           item:
-            host: 'Windows by Zabbix agent'
+            host: 'Windows memory by Zabbix agent'
             key: vm.memory.util
     -
-      uuid: 8891c435d3df489ea18847abb82054ca
+      uuid: 518f6bcdcefc4cf493244798ccd09ec1
       name: 'Swap usage'
       graph_items:
         -
           color: 1A7C11
           item:
-            host: 'Windows memory by Zabbix agent'
+            host: 'Windows by Zabbix agent'
             key: system.swap.free
         -
           sortorder: '1'
           color: 2774A4
           item:
-            host: 'Windows memory by Zabbix agent'
+            host: 'Windows by Zabbix agent'
             key: 'system.swap.size[,total]'
     -
-      uuid: 518f6bcdcefc4cf493244798ccd09ec1
+      uuid: 8891c435d3df489ea18847abb82054ca
       name: 'Swap usage'
       graph_items:
         -
           color: 1A7C11
           item:
-            host: 'Windows by Zabbix agent'
+            host: 'Windows memory by Zabbix agent'
             key: system.swap.free
         -
           sortorder: '1'
           color: 2774A4
           item:
-            host: 'Windows by Zabbix agent'
+            host: 'Windows memory by Zabbix agent'
             key: 'system.swap.size[,total]'
diff --git a/templates/os/windows_agent_active/template_os_windows_agent_active.yaml b/templates/os/windows_agent_active/template_os_windows_agent_active.yaml
index 8be4c4ea8c3..c3342323871 100644
--- a/templates/os/windows_agent_active/template_os_windows_agent_active.yaml
+++ b/templates/os/windows_agent_active/template_os_windows_agent_active.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:37:23Z'
+  date: '2022-01-26T10:42:18Z'
   groups:
     -
       uuid: 57b7ae836ca64446ba2c296389c009b7
@@ -40,8 +40,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: 'Monitoring agent'
+              tag: component
+              value: system
         -
           uuid: bd8864ac5450401b9ad479c1ee455805
           name: 'Zabbix agent ping'
@@ -53,8 +53,8 @@ zabbix_export:
             name: 'Zabbix agent ping status'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: e77c3b1849b64d45a3078794057a2582
@@ -63,6 +63,10 @@ zabbix_export:
               priority: AVERAGE
               description: 'For active agents, nodata() with agent.ping is used with {$AGENT.NODATA_TIMEOUT} as time threshold.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 41cec8b443a94efc9ebca6f66c46ad8a
           name: 'Version of Zabbix agent running'
@@ -79,8 +83,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: 'Monitoring agent'
+              tag: component
+              value: application
         -
           uuid: 20dceb831b1a4d63af7635656239c495
           name: 'Cache bytes'
@@ -94,8 +98,8 @@ zabbix_export:
             the last observed value only; it is not an average.
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 71bb18af403248c7818d16444a2eec06
           name: 'Free system page table entries'
@@ -107,8 +111,8 @@ zabbix_export:
             than 5,000, there may well be a memory leak or you running out of memory.
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: 37d6b965dd184b66b37018d4375d3e56
@@ -120,6 +124,10 @@ zabbix_export:
                 -
                   name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
                   expression: 'min(/Windows by Zabbix agent active/vm.memory.util,5m)>{$MEMORY.UTIL.MAX}'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
         -
           uuid: 19ec57305ba34ed890e2e4c8a500a214
           name: 'Memory page faults per second'
@@ -136,8 +144,8 @@ zabbix_export:
             which require disk access, can cause significant delays.
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 920faa3a434d46d48f99395e16ef04ec
           name: 'Memory pages per second'
@@ -150,8 +158,8 @@ zabbix_export:
             If the value is greater than 1,000, as a result of excessive paging, there may be a memory leak.
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: 05da8b30835e440fb1228fb9a0bc24a4
@@ -163,6 +171,10 @@ zabbix_export:
                 -
                   name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
                   expression: 'min(/Windows by Zabbix agent active/vm.memory.util,5m)>{$MEMORY.UTIL.MAX}'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
         -
           uuid: 3af0a0717da747849c2b5a2ebfa61a2c
           name: 'Memory pool non-paged'
@@ -177,8 +189,8 @@ zabbix_export:
             A typical Event ID 2019 is recorded in the system event log.
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 4f7b86eff6c84193a2f9187fff578416
           name: 'Used swap space in %'
@@ -190,8 +202,11 @@ zabbix_export:
           description: 'The used space of swap volume/file in percent.'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
+            -
+              tag: component
+              value: storage
         -
           uuid: 553249b52ca7492c87386d051ec53db9
           name: 'CPU DPC time'
@@ -208,8 +223,8 @@ zabbix_export:
             significantly diminish overall system performance.
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: 32a32b9fea5d49989668a96bc52db87b
           name: 'CPU interrupt time'
@@ -226,8 +241,8 @@ zabbix_export:
             hardware failure. This should never be higher than 20%.
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
           triggers:
             -
               uuid: 2eb661f6a42f40ce8cc25cef542763a9
@@ -245,6 +260,10 @@ zabbix_export:
                 -
                   name: 'High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m)'
                   expression: 'min(/Windows by Zabbix agent active/system.cpu.util,5m)>{$CPU.UTIL.CRIT}'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 0747e92e52cc4a6a9b83c6f94889bff1
           name: 'CPU privileged time'
@@ -260,8 +279,8 @@ zabbix_export:
             functions of the Windows® Operating System.
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
           triggers:
             -
               uuid: cee69c70da6a415186b922305d0cabdc
@@ -276,6 +295,10 @@ zabbix_export:
                 -
                   name: 'High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m)'
                   expression: 'min(/Windows by Zabbix agent active/system.cpu.util,5m)>{$CPU.UTIL.CRIT}'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 954a81efad4c4791bee052194b900268
           name: 'CPU user time'
@@ -289,8 +312,8 @@ zabbix_export:
             in User mode.
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: f23957a6fb9a44a3a7010b19b16e77b5
           name: 'Context switches per second'
@@ -305,8 +328,8 @@ zabbix_export:
             There are context switch counters on the System and Thread objects. This counter displays the difference between the values observed in the last two samples, divided by the duration of the sample interval.
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: c1da358e5c8f40279c703d93896aa571
           name: 'CPU queue length'
@@ -319,8 +342,8 @@ zabbix_export:
             and are waiting to be executed.
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: c738b97ec0dc49f380ed0e4a27ae9bb6
           name: 'Number of threads'
@@ -330,8 +353,8 @@ zabbix_export:
           description: 'The number of threads used by all running processes.'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: os
         -
           uuid: 5229689338ae4a559d3c94a98032131e
           name: 'Number of processes'
@@ -341,8 +364,8 @@ zabbix_export:
           description: 'The number of processes.'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: os
         -
           uuid: 0f3ffe45092d461a91a1296cd6cfb19f
           name: 'CPU utilization'
@@ -354,8 +377,8 @@ zabbix_export:
           description: 'CPU utilization in %'
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
           triggers:
             -
               uuid: ab3cbf18088a4d7a82f6c678ce49ffce
@@ -364,6 +387,10 @@ zabbix_export:
               opdata: 'Current utilization: {ITEM.LASTVALUE1}'
               priority: WARNING
               description: 'CPU utilization is too high. The system might be slow to respond.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 5d99b356e30444a0b99e597506f35a69
           name: 'System name'
@@ -382,8 +409,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 3aea75603e584d2f9dc96e7f3cc2b7fa
@@ -392,6 +419,10 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 89f928affba54c4a8dc7abead09cac68
           name: 'System local time'
@@ -402,8 +433,8 @@ zabbix_export:
           description: 'System local time of the host.'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: c5c52f75d4214a68b095e8bf55a6a934
@@ -412,6 +443,10 @@ zabbix_export:
               priority: WARNING
               description: 'The host system time is different from the Zabbix server time.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 16a7ae509f0c4f9d8631efae88fe6324
           name: 'Operating system architecture'
@@ -429,8 +464,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: os
         -
           uuid: 9d6f14cc540846ab98052bf741a4247b
           name: 'Free swap space'
@@ -442,8 +477,11 @@ zabbix_export:
           description: 'The free space of swap volume/file in bytes.'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
+            -
+              tag: component
+              value: storage
         -
           uuid: e91b5f08c6b745bca975797ea4abd02a
           name: 'Free swap space in %'
@@ -463,8 +501,11 @@ zabbix_export:
             key: 'perf_counter_en["\Paging file(_Total)\% Usage"]'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
+            -
+              tag: component
+              value: storage
         -
           uuid: b5af29f7b8ee451895b49c0444e929f4
           name: 'Total swap space'
@@ -475,8 +516,11 @@ zabbix_export:
           description: 'The total space of swap volume/file in bytes.'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
+            -
+              tag: component
+              value: storage
         -
           uuid: 8fa1259420ad486ab6e2520c9b047073
           name: 'System description'
@@ -494,8 +538,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 695053710ea14cc48692b5cb260d0dfb
           name: Uptime
@@ -508,8 +552,8 @@ zabbix_export:
           description: 'System uptime in ''N days, hh:mm:ss'' format.'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 4114e248a3b347f4a2fefc7816f2e940
@@ -518,6 +562,10 @@ zabbix_export:
               priority: WARNING
               description: 'The device uptime is less than 10 minutes.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 83185781999742268a7742695c5d3ee3
           name: 'Total memory'
@@ -528,8 +576,8 @@ zabbix_export:
           description: 'Total memory in Bytes'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: f85ec8917f084c7d9b6bc36e186d74d6
           name: 'Used memory'
@@ -540,8 +588,8 @@ zabbix_export:
           description: 'Used memory in Bytes'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 9b62965a4670472b8c672dc1021bb8fd
           name: 'Memory utilization'
@@ -554,8 +602,8 @@ zabbix_export:
           description: 'Memory utilization in %'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: 610a0893be834c11b35a0472dcabab7c
@@ -563,6 +611,13 @@ zabbix_export:
               name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
               priority: AVERAGE
               description: 'The system is running out of free memory.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: c35940d1a12e4b96b7114ac8dbbfcec4
           name: 'Network interfaces WMI get'
@@ -579,8 +634,8 @@ zabbix_export:
                 - 1h
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
         -
           uuid: 3dcf69f6637f496ca0406e0ed403f03c
           name: 'Number of cores'
@@ -590,8 +645,8 @@ zabbix_export:
           description: 'The number of logical processors available on the computer.'
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
       discovery_rules:
         -
           uuid: c05c8d1be5614ffab1688cc92db32f12
@@ -646,8 +701,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: network
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: a2461163f9b44b678008e3d5fd96a168
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -663,8 +724,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: network
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: a8f69dac86d646b194f9b204f22aeb3b
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -685,8 +752,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: network
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: 46d947876b844223bb500f29cbf82273
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -702,8 +775,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: network
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: 1f5854d4ad5d4b65b63e5ca9ffa5007c
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -719,8 +798,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: network
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: 1adceed263804e089108bb2cc1aa51e1
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -741,8 +826,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: network
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: 820ca9809e6f46af8aa3f41195f246d9
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -772,8 +863,14 @@ zabbix_export:
                 key: 'wmi.getall[root\cimv2,"select Name,Description,NetConnectionID,Speed,AdapterTypeId,NetConnectionStatus,GUID from win32_networkadapter where PhysicalAdapter=True and NetConnectionStatus>0"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: network
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: 929917f16ecd4369a5535fe8178248d6
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -798,8 +895,14 @@ zabbix_export:
                 key: 'wmi.getall[root\cimv2,"select Name,Description,NetConnectionID,Speed,AdapterTypeId,NetConnectionStatus,GUID from win32_networkadapter where PhysicalAdapter=True and NetConnectionStatus>0"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: network
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: f9d1ac2feb0e43249cc849166ca9014c
@@ -818,6 +921,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 1e513ffd8cd24a39a04b2140dce65b62
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -842,8 +949,14 @@ zabbix_export:
                 key: 'wmi.getall[root\cimv2,"select Name,Description,NetConnectionID,Speed,AdapterTypeId,NetConnectionStatus,GUID from win32_networkadapter where PhysicalAdapter=True and NetConnectionStatus>0"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: network
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
           trigger_prototypes:
             -
               uuid: 27a60f88cbd0457291153105ace75e4d
@@ -861,6 +974,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Windows by Zabbix agent active/net.if.status["{#IFGUID}"])<>2 and (last(/Windows by Zabbix agent active/net.if.status["{#IFGUID}"],#1)<>last(/Windows by Zabbix agent active/net.if.status["{#IFGUID}"],#2))'
                   recovery_expression: 'last(/Windows by Zabbix agent active/net.if.status["{#IFGUID}"])=2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
             -
               uuid: a9ead42a45f5496a84a6a2bc619cece4
               expression: |
@@ -881,6 +998,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Windows by Zabbix agent active/net.if.status["{#IFGUID}"])<>2 and (last(/Windows by Zabbix agent active/net.if.status["{#IFGUID}"],#1)<>last(/Windows by Zabbix agent active/net.if.status["{#IFGUID}"],#2))'
                   recovery_expression: 'last(/Windows by Zabbix agent active/net.if.status["{#IFGUID}"])=2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 1945fd9bc15c471fb050d0a5430245a6
               expression: |
@@ -900,6 +1021,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Windows by Zabbix agent active/net.if.status["{#IFGUID}"])<>2 and (last(/Windows by Zabbix agent active/net.if.status["{#IFGUID}"],#1)<>last(/Windows by Zabbix agent active/net.if.status["{#IFGUID}"],#2))'
                   recovery_expression: 'last(/Windows by Zabbix agent active/net.if.status["{#IFGUID}"])=2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
           graph_prototypes:
             -
               uuid: 1181f5ffedb643d4953c9fd5df14a21e
@@ -1001,8 +1126,11 @@ zabbix_export:
                     - 'return (100 - value)'
               tags:
                 -
-                  tag: Application
-                  value: 'Disk {#DEVNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: disk
+                  value: '{#DEVNAME}'
               trigger_prototypes:
                 -
                   uuid: 00031ae791d6424dbd29c91be91a249f
@@ -1018,6 +1146,10 @@ zabbix_export:
                     -
                       name: '{#DEVNAME}: Disk write request responses are too high (write > {$VFS.DEV.WRITE.AWAIT.WARN:"{#DEVNAME}"}s for 15m)'
                       expression: 'min(/Windows by Zabbix agent active/perf_counter_en["\PhysicalDisk({#DEVNAME})\Avg. Disk sec/Write",60],15m) > {$VFS.DEV.WRITE.AWAIT.WARN:"{#DEVNAME}"}'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: abdcdffc92114fda93d4893c772cf14a
               name: '{#DEVNAME}: Average disk read queue length'
@@ -1028,8 +1160,11 @@ zabbix_export:
               description: 'Average disk read queue, the number of requests outstanding on the disk at the time the performance data is collected.'
               tags:
                 -
-                  tag: Application
-                  value: 'Disk {#DEVNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: disk
+                  value: '{#DEVNAME}'
             -
               uuid: 208b3a3868844e85a7e3e5f3940d744d
               name: '{#DEVNAME}: Disk read request avg waiting time'
@@ -1041,8 +1176,11 @@ zabbix_export:
               description: 'The average time for read requests issued to the device to be served. This includes the time spent by the requests in queue and the time spent servicing them.'
               tags:
                 -
-                  tag: Application
-                  value: 'Disk {#DEVNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: disk
+                  value: '{#DEVNAME}'
               trigger_prototypes:
                 -
                   uuid: f6c28fa8eef542a786b29d745dd2e56f
@@ -1051,6 +1189,10 @@ zabbix_export:
                   priority: WARNING
                   description: 'This trigger might indicate disk {#DEVNAME} saturation.'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 6a162aca790c48a7bd726d54494d67e9
               name: '{#DEVNAME}: Disk write request avg waiting time'
@@ -1062,8 +1204,11 @@ zabbix_export:
               description: 'The average time for write requests issued to the device to be served. This includes the time spent by the requests in queue and the time spent servicing them.'
               tags:
                 -
-                  tag: Application
-                  value: 'Disk {#DEVNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: disk
+                  value: '{#DEVNAME}'
               trigger_prototypes:
                 -
                   uuid: 9a0c7aa60e0e40d8abec9be6d6d49190
@@ -1072,6 +1217,10 @@ zabbix_export:
                   priority: WARNING
                   description: 'This trigger might indicate disk {#DEVNAME} saturation.'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: ba3a369741544f6c88a476a4f2d30ab2
               name: '{#DEVNAME}: Average disk write queue length'
@@ -1082,8 +1231,11 @@ zabbix_export:
               description: 'Average disk write queue, the number of requests outstanding on the disk at the time the performance data is collected.'
               tags:
                 -
-                  tag: Application
-                  value: 'Disk {#DEVNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: disk
+                  value: '{#DEVNAME}'
             -
               uuid: 24d15f53439148919e11d5811f25adf1
               name: '{#DEVNAME}: Disk average queue size (avgqu-sz)'
@@ -1094,8 +1246,11 @@ zabbix_export:
               description: 'Current average disk queue, the number of requests outstanding on the disk at the time the performance data is collected.'
               tags:
                 -
-                  tag: Application
-                  value: 'Disk {#DEVNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: disk
+                  value: '{#DEVNAME}'
             -
               uuid: c1424c1c2fe647a8baf3357c34ae261e
               name: '{#DEVNAME}: Disk read rate'
@@ -1107,8 +1262,11 @@ zabbix_export:
               description: 'Rate of read operations on the disk.'
               tags:
                 -
-                  tag: Application
-                  value: 'Disk {#DEVNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: disk
+                  value: '{#DEVNAME}'
             -
               uuid: 4d10e563bbd1402daa1c9c8516095aa8
               name: '{#DEVNAME}: Disk write rate'
@@ -1120,8 +1278,11 @@ zabbix_export:
               description: 'Rate of write operations on the disk.'
               tags:
                 -
-                  tag: Application
-                  value: 'Disk {#DEVNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: disk
+                  value: '{#DEVNAME}'
           graph_prototypes:
             -
               uuid: e249ca7462a14508bdbdbf748102015a
@@ -1232,8 +1393,14 @@ zabbix_export:
                 name: 'Windows service state'
               tags:
                 -
-                  tag: Application
-                  value: Services
+                  tag: component
+                  value: system
+                -
+                  tag: name
+                  value: '{#SERVICE.DISPLAYNAME}'
+                -
+                  tag: service
+                  value: '{#SERVICE.NAME}'
               trigger_prototypes:
                 -
                   uuid: c6f2c1c32cdf401091e4439624a24fab
@@ -1241,6 +1408,10 @@ zabbix_export:
                   name: '"{#SERVICE.NAME}" ({#SERVICE.DISPLAYNAME}) is not running (startup type {#SERVICE.STARTUPNAME})'
                   priority: AVERAGE
                   description: 'The service has a state other than "Running" for the last three times.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
         -
           uuid: 4fbbdf83609e48e68011f6c394c652f9
           name: 'Mounted filesystem discovery'
@@ -1290,8 +1461,11 @@ zabbix_export:
               description: 'Space utilization in % for {#FSNAME}'
               tags:
                 -
-                  tag: Application
-                  value: 'Filesystem {#FSNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: d45f2c3469dd424486bdee586e4a61eb
               name: '{#FSLABEL}({#FSNAME}): Total space'
@@ -1302,8 +1476,11 @@ zabbix_export:
               description: 'Total space in Bytes'
               tags:
                 -
-                  tag: Application
-                  value: 'Filesystem {#FSNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: ddd24d7eaa5742ac9d6cbae42bcfa1ae
               name: '{#FSLABEL}({#FSNAME}): Used space'
@@ -1314,8 +1491,11 @@ zabbix_export:
               description: 'Used storage in Bytes'
               tags:
                 -
-                  tag: Application
-                  value: 'Filesystem {#FSNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
           trigger_prototypes:
             -
               uuid: 5bed682545044584852888d96454df86
@@ -1331,6 +1511,10 @@ zabbix_export:
                  - The disk free space is less than 5G.
                  - The disk will be full in less than 24 hours.
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
             -
               uuid: 1e5e9718c5a14099b9421ff7956b2f33
               expression: |
@@ -1351,6 +1535,10 @@ zabbix_export:
                   expression: |
                     last(/Windows by Zabbix agent active/vfs.fs.size[{#FSNAME},pused])>{$VFS.FS.PUSED.MAX.CRIT:"{#FSNAME}"} and
                     ((last(/Windows by Zabbix agent active/vfs.fs.size[{#FSNAME},total])-last(/Windows by Zabbix agent active/vfs.fs.size[{#FSNAME},used]))<5G or timeleft(/Windows by Zabbix agent active/vfs.fs.size[{#FSNAME},pused],1h,100)<1d)
+              tags:
+                -
+                  tag: scope
+                  value: capacity
           graph_prototypes:
             -
               uuid: 8d0581d07b92406aa9f007f6d03ad24e
@@ -1374,6 +1562,13 @@ zabbix_export:
                   item:
                     host: 'Windows by Zabbix agent active'
                     key: 'vfs.fs.size[{#FSNAME},used]'
+      tags:
+        -
+          tag: class
+          value: os
+        -
+          tag: target
+          value: windows
       macros:
         -
           macro: '{$AGENT.NODATA_TIMEOUT}'
@@ -1878,8 +2073,8 @@ zabbix_export:
             significantly diminish overall system performance.
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: 9c3ee1744a604a41b90dcec49effaff7
           name: 'CPU interrupt time'
@@ -1896,8 +2091,8 @@ zabbix_export:
             hardware failure. This should never be higher than 20%.
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
           triggers:
             -
               uuid: cbcd8d6c2eab4f18be5a40c2128e1b76
@@ -1915,6 +2110,10 @@ zabbix_export:
                 -
                   name: 'High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m)'
                   expression: 'min(/Windows CPU by Zabbix agent active/system.cpu.util,5m)>{$CPU.UTIL.CRIT}'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 49073e4ccf964d349945824888ec46b0
           name: 'CPU privileged time'
@@ -1930,8 +2129,8 @@ zabbix_export:
             functions of the Windows® Operating System.
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
           triggers:
             -
               uuid: 150f35f3b43c48eb995a1e8f1211e9b3
@@ -1946,6 +2145,10 @@ zabbix_export:
                 -
                   name: 'High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m)'
                   expression: 'min(/Windows CPU by Zabbix agent active/system.cpu.util,5m)>{$CPU.UTIL.CRIT}'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: bebffbf027bb48feba459e7f344d67f2
           name: 'CPU user time'
@@ -1959,8 +2162,8 @@ zabbix_export:
             in User mode.
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: 8d1d279c74324690a1ee37dbc90a7f88
           name: 'Context switches per second'
@@ -1975,8 +2178,8 @@ zabbix_export:
             There are context switch counters on the System and Thread objects. This counter displays the difference between the values observed in the last two samples, divided by the duration of the sample interval.
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: b7a1b8f5c4664195921d459a60f09d57
           name: 'CPU queue length'
@@ -1989,8 +2192,8 @@ zabbix_export:
             and are waiting to be executed.
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
         -
           uuid: 6f3c6b7312be445eb54e0851447a879e
           name: 'CPU utilization'
@@ -2002,8 +2205,8 @@ zabbix_export:
           description: 'CPU utilization in %'
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
           triggers:
             -
               uuid: 5f1bdb9eb4c44e8a8f33afee709b0667
@@ -2012,6 +2215,10 @@ zabbix_export:
               opdata: 'Current utilization: {ITEM.LASTVALUE1}'
               priority: WARNING
               description: 'CPU utilization is too high. The system might be slow to respond.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: cb071eb5cc82471c83e88b9125c2832a
           name: 'Number of cores'
@@ -2021,8 +2228,8 @@ zabbix_export:
           description: 'The number of logical processors available on the computer.'
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
       macros:
         -
           macro: '{$CPU.INTERRUPT.CRIT.MAX}'
@@ -2098,8 +2305,11 @@ zabbix_export:
               description: 'Space utilization in % for {#FSNAME}'
               tags:
                 -
-                  tag: Application
-                  value: 'Filesystem {#FSNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 4ca1e75a143f4b1c9cb1b1e9d0d02286
               name: '{#FSLABEL}({#FSNAME}): Total space'
@@ -2110,8 +2320,11 @@ zabbix_export:
               description: 'Total space in Bytes'
               tags:
                 -
-                  tag: Application
-                  value: 'Filesystem {#FSNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: c221010d5aef4bb182681092d0df3586
               name: '{#FSLABEL}({#FSNAME}): Used space'
@@ -2122,8 +2335,11 @@ zabbix_export:
               description: 'Used storage in Bytes'
               tags:
                 -
-                  tag: Application
-                  value: 'Filesystem {#FSNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
           trigger_prototypes:
             -
               uuid: d09b152f2b53451b9daec16eadeaa0ee
@@ -2139,6 +2355,10 @@ zabbix_export:
                  - The disk free space is less than 5G.
                  - The disk will be full in less than 24 hours.
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
             -
               uuid: c3e9ee6d771d4047b4351e5870b8ca01
               expression: |
@@ -2159,6 +2379,10 @@ zabbix_export:
                   expression: |
                     last(/Windows filesystems by Zabbix agent active/vfs.fs.size[{#FSNAME},pused])>{$VFS.FS.PUSED.MAX.CRIT:"{#FSNAME}"} and
                     ((last(/Windows filesystems by Zabbix agent active/vfs.fs.size[{#FSNAME},total])-last(/Windows filesystems by Zabbix agent active/vfs.fs.size[{#FSNAME},used]))<5G or timeleft(/Windows filesystems by Zabbix agent active/vfs.fs.size[{#FSNAME},pused],1h,100)<1d)
+              tags:
+                -
+                  tag: scope
+                  value: capacity
           graph_prototypes:
             -
               uuid: 112006f664834dcf932373b57900425c
@@ -2233,8 +2457,8 @@ zabbix_export:
           description: 'The number of threads used by all running processes.'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: os
         -
           uuid: 665093a48f39404e9ae3221657a5e962
           name: 'Number of processes'
@@ -2244,8 +2468,8 @@ zabbix_export:
           description: 'The number of processes.'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: os
         -
           uuid: 73b821a638a74e6d86be642952d2d6fe
           name: 'System name'
@@ -2264,8 +2488,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 2f5aa644755c4d18a3eafc74bde2d3ad
@@ -2274,6 +2498,10 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 78f2089b58f54042ac70fd9ac3b2aa7e
           name: 'System local time'
@@ -2284,8 +2512,8 @@ zabbix_export:
           description: 'System local time of the host.'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: ed8075fd5332427ca0f9b56d55f4912b
@@ -2294,6 +2522,10 @@ zabbix_export:
               priority: WARNING
               description: 'The host system time is different from the Zabbix server time.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 0522b89bdee248c5aad6ff77d9a68311
           name: 'Operating system architecture'
@@ -2311,8 +2543,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: os
         -
           uuid: 383c3f59afee455d8981fe85e46c94dd
           name: 'System description'
@@ -2330,8 +2562,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: e5342587828d40ed8feafdccdd6d92e3
           name: Uptime
@@ -2344,8 +2576,8 @@ zabbix_export:
           description: 'System uptime in ''N days, hh:mm:ss'' format.'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 13f9c722d9664d988a97a1c8123ad17a
@@ -2354,6 +2586,10 @@ zabbix_export:
               priority: WARNING
               description: 'The device uptime is less than 10 minutes.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
       macros:
         -
           macro: '{$SYSTEM.FUZZYTIME.MAX}'
@@ -2381,8 +2617,8 @@ zabbix_export:
             the last observed value only; it is not an average.
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 6faf395b5bb14456a33e6689b7618613
           name: 'Free system page table entries'
@@ -2394,8 +2630,8 @@ zabbix_export:
             than 5,000, there may well be a memory leak or you running out of memory.
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: 24fd9695799846b3ba812f8ec6148972
@@ -2407,6 +2643,10 @@ zabbix_export:
                 -
                   name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
                   expression: 'min(/Windows memory by Zabbix agent active/vm.memory.util,5m)>{$MEMORY.UTIL.MAX}'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
         -
           uuid: 9529c721229841f78362b4759cf2a910
           name: 'Memory page faults per second'
@@ -2423,8 +2663,8 @@ zabbix_export:
             which require disk access, can cause significant delays.
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: f6c50f669f59467e9c5dca1c54f11ba6
           name: 'Memory pages per second'
@@ -2437,8 +2677,8 @@ zabbix_export:
             If the value is greater than 1,000, as a result of excessive paging, there may be a memory leak.
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: 655191afccad4673a641808be5500b46
@@ -2450,6 +2690,10 @@ zabbix_export:
                 -
                   name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
                   expression: 'min(/Windows memory by Zabbix agent active/vm.memory.util,5m)>{$MEMORY.UTIL.MAX}'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
         -
           uuid: 46dbc910c830421f9a95e0da1e467b39
           name: 'Memory pool non-paged'
@@ -2464,8 +2708,8 @@ zabbix_export:
             A typical Event ID 2019 is recorded in the system event log.
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 81b54eadc3c546858982dc8cf9228dd4
           name: 'Used swap space in %'
@@ -2477,8 +2721,11 @@ zabbix_export:
           description: 'The used space of swap volume/file in percent.'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
+            -
+              tag: component
+              value: storage
         -
           uuid: 2eec55a22cf74c16b06eb6f9028637f8
           name: 'Free swap space'
@@ -2490,8 +2737,11 @@ zabbix_export:
           description: 'The free space of swap volume/file in bytes.'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
+            -
+              tag: component
+              value: storage
         -
           uuid: 5f86e2a308a342769cb5bf91da3976ef
           name: 'Free swap space in %'
@@ -2511,8 +2761,11 @@ zabbix_export:
             key: 'perf_counter_en["\Paging file(_Total)\% Usage"]'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
+            -
+              tag: component
+              value: storage
         -
           uuid: 9a73bfe24f884eea9bb9a13042b6dbfd
           name: 'Total swap space'
@@ -2523,8 +2776,11 @@ zabbix_export:
           description: 'The total space of swap volume/file in bytes.'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
+            -
+              tag: component
+              value: storage
         -
           uuid: b6b897e08b0f4dd1b858304d5456ab86
           name: 'Total memory'
@@ -2535,8 +2791,8 @@ zabbix_export:
           description: 'Total memory in Bytes'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 7b6b29a6d984476785e77b9604874ed5
           name: 'Used memory'
@@ -2547,8 +2803,8 @@ zabbix_export:
           description: 'Used memory in Bytes'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
         -
           uuid: 5731f496327c422e8fb33a1db6412d74
           name: 'Memory utilization'
@@ -2561,8 +2817,8 @@ zabbix_export:
           description: 'Memory utilization in %'
           tags:
             -
-              tag: Application
-              value: Memory
+              tag: component
+              value: memory
           triggers:
             -
               uuid: df816288349743ad9b2015dda9066abb
@@ -2570,6 +2826,13 @@ zabbix_export:
               name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
               priority: AVERAGE
               description: 'The system is running out of free memory.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
+                -
+                  tag: scope
+                  value: performance
       macros:
         -
           macro: '{$MEM.PAGE_SEC.CRIT.MAX}'
@@ -2612,8 +2875,8 @@ zabbix_export:
                 - 1h
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
       discovery_rules:
         -
           uuid: 876e793097d949e49d23b6c4e7df4988
@@ -2668,8 +2931,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: network
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: 3ee5bf3e405c4de2856bfaa729b0f469
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -2685,8 +2954,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: network
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: ea8b2a4901254965b40e57f7bdf1ea3f
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -2707,8 +2982,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: network
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: 8feffdee85e2486191de0968ec7918b7
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -2724,8 +3005,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: network
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: 84d1943e15c046f894bf0219288671e4
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -2741,8 +3028,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: network
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: fb0785a7e7e54743bef715fb60dbe890
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -2763,8 +3056,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: network
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: 27bf112e7c1f4652aa326fa240215e41
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -2794,8 +3093,14 @@ zabbix_export:
                 key: 'wmi.getall[root\cimv2,"select Name,Description,NetConnectionID,Speed,AdapterTypeId,NetConnectionStatus,GUID from win32_networkadapter where PhysicalAdapter=True and NetConnectionStatus>0"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: network
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: 44fd303ebab348ceb99c74599c587cb4
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -2820,8 +3125,14 @@ zabbix_export:
                 key: 'wmi.getall[root\cimv2,"select Name,Description,NetConnectionID,Speed,AdapterTypeId,NetConnectionStatus,GUID from win32_networkadapter where PhysicalAdapter=True and NetConnectionStatus>0"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: network
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: d2af1fae64c940f2b2b923e159b836e6
@@ -2840,6 +3151,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 14f7982f0a1a49799646fe4685df7db8
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -2864,8 +3179,14 @@ zabbix_export:
                 key: 'wmi.getall[root\cimv2,"select Name,Description,NetConnectionID,Speed,AdapterTypeId,NetConnectionStatus,GUID from win32_networkadapter where PhysicalAdapter=True and NetConnectionStatus>0"]'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: network
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
           trigger_prototypes:
             -
               uuid: d2629ca744034cf7b92a39d7f847195a
@@ -2883,6 +3204,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Windows network by Zabbix agent active/net.if.status["{#IFGUID}"])<>2 and (last(/Windows network by Zabbix agent active/net.if.status["{#IFGUID}"],#1)<>last(/Windows network by Zabbix agent active/net.if.status["{#IFGUID}"],#2))'
                   recovery_expression: 'last(/Windows network by Zabbix agent active/net.if.status["{#IFGUID}"])=2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
             -
               uuid: 3bdd014bdaf04f0885816cbf1da11309
               expression: |
@@ -2903,6 +3228,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Windows network by Zabbix agent active/net.if.status["{#IFGUID}"])<>2 and (last(/Windows network by Zabbix agent active/net.if.status["{#IFGUID}"],#1)<>last(/Windows network by Zabbix agent active/net.if.status["{#IFGUID}"],#2))'
                   recovery_expression: 'last(/Windows network by Zabbix agent active/net.if.status["{#IFGUID}"])=2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: e29c3aa283d74838b45040394a3eabe1
               expression: |
@@ -2922,6 +3251,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Windows network by Zabbix agent active/net.if.status["{#IFGUID}"])<>2 and (last(/Windows network by Zabbix agent active/net.if.status["{#IFGUID}"],#1)<>last(/Windows network by Zabbix agent active/net.if.status["{#IFGUID}"],#2))'
                   recovery_expression: 'last(/Windows network by Zabbix agent active/net.if.status["{#IFGUID}"])=2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
           graph_prototypes:
             -
               uuid: 5042d069d9364413bc594f2a22a31cb6
@@ -3186,8 +3519,11 @@ zabbix_export:
                     - 'return (100 - value)'
               tags:
                 -
-                  tag: Application
-                  value: 'Disk {#DEVNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: disk
+                  value: '{#DEVNAME}'
               trigger_prototypes:
                 -
                   uuid: 6baacd2fab15466ab3b12dcfb7e2980a
@@ -3203,6 +3539,10 @@ zabbix_export:
                     -
                       name: '{#DEVNAME}: Disk write request responses are too high (write > {$VFS.DEV.WRITE.AWAIT.WARN:"{#DEVNAME}"}s for 15m)'
                       expression: 'min(/Windows physical disks by Zabbix agent active/perf_counter_en["\PhysicalDisk({#DEVNAME})\Avg. Disk sec/Write",60],15m) > {$VFS.DEV.WRITE.AWAIT.WARN:"{#DEVNAME}"}'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: ee3e17e348f84f8bb4eb9675cb0ef045
               name: '{#DEVNAME}: Average disk read queue length'
@@ -3213,8 +3553,11 @@ zabbix_export:
               description: 'Average disk read queue, the number of requests outstanding on the disk at the time the performance data is collected.'
               tags:
                 -
-                  tag: Application
-                  value: 'Disk {#DEVNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: disk
+                  value: '{#DEVNAME}'
             -
               uuid: 83bc066220ec47bb898351e8d20fb81d
               name: '{#DEVNAME}: Disk read request avg waiting time'
@@ -3226,8 +3569,11 @@ zabbix_export:
               description: 'The average time for read requests issued to the device to be served. This includes the time spent by the requests in queue and the time spent servicing them.'
               tags:
                 -
-                  tag: Application
-                  value: 'Disk {#DEVNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: disk
+                  value: '{#DEVNAME}'
               trigger_prototypes:
                 -
                   uuid: 32f7d131336348178069bbafbdabcfee
@@ -3236,6 +3582,10 @@ zabbix_export:
                   priority: WARNING
                   description: 'This trigger might indicate disk {#DEVNAME} saturation.'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 9f906bcb67f847b7bfbca098659063d4
               name: '{#DEVNAME}: Disk write request avg waiting time'
@@ -3247,8 +3597,11 @@ zabbix_export:
               description: 'The average time for write requests issued to the device to be served. This includes the time spent by the requests in queue and the time spent servicing them.'
               tags:
                 -
-                  tag: Application
-                  value: 'Disk {#DEVNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: disk
+                  value: '{#DEVNAME}'
               trigger_prototypes:
                 -
                   uuid: d7116046921d441dba5830140f8bf433
@@ -3257,6 +3610,10 @@ zabbix_export:
                   priority: WARNING
                   description: 'This trigger might indicate disk {#DEVNAME} saturation.'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 584f4a8fba0b4e3cba7f37cba42cd97c
               name: '{#DEVNAME}: Average disk write queue length'
@@ -3267,8 +3624,11 @@ zabbix_export:
               description: 'Average disk write queue, the number of requests outstanding on the disk at the time the performance data is collected.'
               tags:
                 -
-                  tag: Application
-                  value: 'Disk {#DEVNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: disk
+                  value: '{#DEVNAME}'
             -
               uuid: 1201592953094d48af20a0e420bfa846
               name: '{#DEVNAME}: Disk average queue size (avgqu-sz)'
@@ -3279,8 +3639,11 @@ zabbix_export:
               description: 'Current average disk queue, the number of requests outstanding on the disk at the time the performance data is collected.'
               tags:
                 -
-                  tag: Application
-                  value: 'Disk {#DEVNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: disk
+                  value: '{#DEVNAME}'
             -
               uuid: e0f052d64ea544b09dfe619cb91f28c8
               name: '{#DEVNAME}: Disk read rate'
@@ -3292,8 +3655,11 @@ zabbix_export:
               description: 'Rate of read operations on the disk.'
               tags:
                 -
-                  tag: Application
-                  value: 'Disk {#DEVNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: disk
+                  value: '{#DEVNAME}'
             -
               uuid: 33e5e9eccad84737bf428fc54b25fc5c
               name: '{#DEVNAME}: Disk write rate'
@@ -3305,8 +3671,11 @@ zabbix_export:
               description: 'Rate of write operations on the disk.'
               tags:
                 -
-                  tag: Application
-                  value: 'Disk {#DEVNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: disk
+                  value: '{#DEVNAME}'
           graph_prototypes:
             -
               uuid: b84e9fa116434ec8ba9ab9bb7a2aa6d2
@@ -3450,8 +3819,14 @@ zabbix_export:
                 name: 'Windows service state'
               tags:
                 -
-                  tag: Application
-                  value: Services
+                  tag: component
+                  value: system
+                -
+                  tag: name
+                  value: '{#SERVICE.DISPLAYNAME}'
+                -
+                  tag: service
+                  value: '{#SERVICE.NAME}'
               trigger_prototypes:
                 -
                   uuid: df3247515e2e4b48b2decd8401c11736
@@ -3459,6 +3834,10 @@ zabbix_export:
                   name: '"{#SERVICE.NAME}" ({#SERVICE.DISPLAYNAME}) is not running (startup type {#SERVICE.STARTUPNAME})'
                   priority: AVERAGE
                   description: 'The service has a state other than "Running" for the last three times.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
       macros:
         -
           macro: '{$SERVICE.NAME.MATCHES}'
@@ -3519,6 +3898,10 @@ zabbix_export:
         -
           name: 'High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m)'
           expression: 'min(/Windows by Zabbix agent active/system.cpu.util,5m)>{$CPU.UTIL.CRIT}'
+      tags:
+        -
+          tag: scope
+          value: performance
     -
       uuid: dfba6b17ab94449181584c8a4410f50f
       expression: 'min(/Windows CPU by Zabbix agent active/perf_counter_en["\System\Processor Queue Length"],5m) - last(/Windows CPU by Zabbix agent active/wmi.get[root/cimv2,"Select NumberOfLogicalProcessors from Win32_ComputerSystem"]) * 2 > {$CPU.QUEUE.CRIT.MAX}'
@@ -3529,6 +3912,10 @@ zabbix_export:
         -
           name: 'High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m)'
           expression: 'min(/Windows CPU by Zabbix agent active/system.cpu.util,5m)>{$CPU.UTIL.CRIT}'
+      tags:
+        -
+          tag: scope
+          value: performance
     -
       uuid: ac93631f79584e2d9909f4bb2f12c866
       expression: 'min(/Windows by Zabbix agent active/system.swap.pfree,5m)<{$SWAP.PFREE.MIN.WARN} and last(/Windows by Zabbix agent active/system.swap.size[,total])>0'
@@ -3540,6 +3927,10 @@ zabbix_export:
         -
           name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
           expression: 'min(/Windows by Zabbix agent active/vm.memory.util,5m)>{$MEMORY.UTIL.MAX}'
+      tags:
+        -
+          tag: scope
+          value: performance
     -
       uuid: 237760596cd647bca82044e843992d87
       expression: 'min(/Windows memory by Zabbix agent active/system.swap.pfree,5m)<{$SWAP.PFREE.MIN.WARN} and last(/Windows memory by Zabbix agent active/system.swap.size[,total])>0'
@@ -3551,6 +3942,10 @@ zabbix_export:
         -
           name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
           expression: 'min(/Windows memory by Zabbix agent active/vm.memory.util,5m)>{$MEMORY.UTIL.MAX}'
+      tags:
+        -
+          tag: scope
+          value: performance
   graphs:
     -
       uuid: 12c859baa46044a0a439f26d2eb50436
diff --git a/templates/os/windows_snmp/template_os_windows_snmp.yaml b/templates/os/windows_snmp/template_os_windows_snmp.yaml
index c449196d810..f1c923f7f6e 100644
--- a/templates/os/windows_snmp/template_os_windows_snmp.yaml
+++ b/templates/os/windows_snmp/template_os_windows_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:37:28Z'
+  date: '2022-01-26T10:40:36Z'
   groups:
     -
       uuid: 846977d1dfed4968bc5f8bdb363285bc
@@ -49,8 +49,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 08e22bd77606469d9e03183ec70dc89d
@@ -58,6 +61,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 9e311b1e5e8841da85c5ec6145d9c75f
           name: 'ICMP loss'
@@ -68,8 +75,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: fa81e50132464ec486ea72929d18d778
@@ -81,6 +91,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/Windows SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: fba6328e6e6240f28c1b901a9c2fc376
           name: 'ICMP response time'
@@ -91,8 +108,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: fba819f734de4b469fb7851501e55b21
@@ -107,6 +127,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/Windows SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: b75c480b7ec648a5b2762b20fc5c2ed8
           name: 'SNMP traps (fallback)'
@@ -119,8 +146,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: dd26c7a0a46240279bb907b8a1253029
           name: 'System contact details'
@@ -142,8 +169,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 16a592f6b9f64403999f92d677f1cd2e
           name: 'CPU utilization'
@@ -164,8 +191,8 @@ zabbix_export:
                 - '$..[''{#CPU.UTIL}''].avg()'
           tags:
             -
-              tag: Application
-              value: CPU
+              tag: component
+              value: cpu
           triggers:
             -
               uuid: ad2261f1ab77449cb1279725e8cf02f9
@@ -174,6 +201,10 @@ zabbix_export:
               opdata: 'Current utilization: {ITEM.LASTVALUE1}'
               priority: WARNING
               description: 'CPU utilization is too high. The system might be slow to respond.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: e95e030765e84abfa5a51194e81ac719
           name: 'System description'
@@ -196,8 +227,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: d19b9bfdfe7344a28eaf69a1b7961adb
           name: 'System location'
@@ -219,8 +250,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 9feb2f561b3d4356bc6ef2cac955a495
           name: 'System name'
@@ -242,8 +273,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: e257b5cf5d9949028c690722e4153612
@@ -252,6 +283,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: c9e67b57c15747e8ab4f67e24837ce49
           name: 'System object ID'
@@ -272,8 +310,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: af7f47f4cf884282bbd9d296ba61b1c2
           name: Uptime
@@ -294,8 +332,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: b7a0b390f8844d2aa05ee849d12495f7
@@ -308,6 +346,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/Windows SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 4863042ade2143a0b34e1fc9403742b0
           name: 'SNMP agent availability'
@@ -324,8 +366,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: a20254c09f7a4d4d9793da7b075121f3
@@ -338,6 +383,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/Windows SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: 3c6bc0ce8a4c4452a3bd0c0c67a6995c
@@ -427,8 +476,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: network
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: 758aca2642c146ddad89ed9934077533
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -447,8 +502,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: network
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: 713b5c5067174b90b686737606616664
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -472,8 +533,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: network
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: 2d76edd04b2c4d35a15fc04749edfedc
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -496,8 +563,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: network
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: 40fe302325ff452997f34cb05d517c59
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -516,8 +589,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: network
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: 48652cf9a87142d39df11617f354df36
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -541,8 +620,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: network
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: 389b55d85fcc49219a055d0db005c715
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -567,8 +652,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: network
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
             -
               uuid: 71e55a8fd22c443e8a39a44c4c22433b
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -590,8 +681,14 @@ zabbix_export:
                 name: 'IF-MIB::ifOperStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: network
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
               trigger_prototypes:
                 -
                   uuid: 101b888ea92348689bbc499bbe15b212
@@ -609,6 +706,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: ad62c98e35b24d0082c07ea4543963ad
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -632,8 +733,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: network
+                -
+                  tag: description
+                  value: '{#IFALIAS}'
+                -
+                  tag: interface
+                  value: '{#IFNAME}'
           trigger_prototypes:
             -
               uuid: fe3e2d20c6eb475ba9f0e8f0c5766720
@@ -663,6 +770,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Windows SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/Windows SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/Windows SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/Windows SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 5ab179badc3747438cf988c437b7b735
               expression: |
@@ -683,6 +794,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Windows SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/Windows SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/Windows SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/Windows SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 8acdf247d86b4b2785c92266291682ac
               expression: |
@@ -702,6 +817,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Windows SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/Windows SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/Windows SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/Windows SNMP/net.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: 616105fbea704079b1257feb370367a5
@@ -790,8 +909,11 @@ zabbix_export:
               description: 'Space utilization in % for {#FSNAME}'
               tags:
                 -
-                  tag: Application
-                  value: 'Filesystem {#FSNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 19d244950a414faa86cbcaf0d2859cbd
               name: '{#FSNAME}: Total space'
@@ -812,8 +934,11 @@ zabbix_export:
                     - '{#ALLOC_UNITS}'
               tags:
                 -
-                  tag: Application
-                  value: 'Filesystem {#FSNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
             -
               uuid: 2d00ecfcea564fef8b94d293d023b709
               name: '{#FSNAME}: Used space'
@@ -832,8 +957,11 @@ zabbix_export:
                     - '{#ALLOC_UNITS}'
               tags:
                 -
-                  tag: Application
-                  value: 'Filesystem {#FSNAME}'
+                  tag: component
+                  value: storage
+                -
+                  tag: filesystem
+                  value: '{#FSNAME}'
           trigger_prototypes:
             -
               uuid: 597ea2f6059746c0b2e5b7312f764224
@@ -849,6 +977,13 @@ zabbix_export:
                  - The disk free space is less than 5G.
                  - The disk will be full in less than 24 hours.
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
             -
               uuid: 028b24edaf9c4640a2316845f50a4a7e
               expression: |
@@ -869,6 +1004,13 @@ zabbix_export:
                   expression: |
                     last(/Windows SNMP/vfs.fs.pused[storageUsedPercentage.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"{#FSNAME}"} and
                     ((last(/Windows SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/Windows SNMP/vfs.fs.used[hrStorageUsed.{#SNMPINDEX}]))<5G or timeleft(/Windows SNMP/vfs.fs.pused[storageUsedPercentage.{#SNMPINDEX}],1h,100)<1d)
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: capacity
           graph_prototypes:
             -
               uuid: 2c1a1d995f8646dd82739a56e411ccf4
@@ -942,8 +1084,8 @@ zabbix_export:
                     - '{#ALLOC_UNITS}'
               tags:
                 -
-                  tag: Application
-                  value: Memory
+                  tag: component
+                  value: memory
             -
               uuid: 71453175f6f54027a8e428b7438af99a
               name: '{#MEMNAME}: Used memory'
@@ -962,8 +1104,8 @@ zabbix_export:
                     - '{#ALLOC_UNITS}'
               tags:
                 -
-                  tag: Application
-                  value: Memory
+                  tag: component
+                  value: memory
             -
               uuid: 5ccc66d7a78f4501b794bd46759c738b
               name: '{#MEMNAME}: Memory utilization'
@@ -976,8 +1118,8 @@ zabbix_export:
               description: 'Memory utilization in %'
               tags:
                 -
-                  tag: Application
-                  value: Memory
+                  tag: component
+                  value: memory
               trigger_prototypes:
                 -
                   uuid: ab4b4ad08664454096f5e2cf3b7da1e9
@@ -985,6 +1127,13 @@ zabbix_export:
                   name: '{#MEMNAME}: High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
                   priority: AVERAGE
                   description: 'The system is running out of free memory.'
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 864bc9c487984f68b4da443b8af6c448
@@ -998,6 +1147,13 @@ zabbix_export:
                   item:
                     host: 'Windows SNMP'
                     key: 'vm.memory.util[memoryUsedPercentage.{#SNMPINDEX}]'
+      tags:
+        -
+          tag: class
+          value: os
+        -
+          tag: target
+          value: windows
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/power/apc/apc_ups_galaxy_3500_snmp/README.md b/templates/power/apc/apc_ups_galaxy_3500_snmp/README.md
index 1cc2b88f90a..4e04ac75f25 100644
--- a/templates/power/apc/apc_ups_galaxy_3500_snmp/README.md
+++ b/templates/power/apc/apc_ups_galaxy_3500_snmp/README.md
@@ -51,12 +51,12 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|Input phases discovery |<p>The input phase identifier. OID upsPhaseInputPhaseIndex.1.1</p> |SNMP |input.phases.discovery |
-|Output phases discovery |<p>The output phase identifier. OID upsPhaseOutputPhaseIndex.1.1</p> |SNMP |output.phases.discovery |
-|External battery packs discovery |<p>-</p> |SNMP |battery.packs.discovery<p>**Filter**:</p>AND <p>- {#CARTRIDGE_STATUS} NOT_MATCHES_REGEX `^$`</p> |
 |External bad battery packs discovery |<p>Discovery of the number of external defective battery packs.</p> |SNMP |battery.packs.bad.discovery |
+|External battery packs discovery |<p>-</p> |SNMP |battery.packs.discovery<p>**Filter**:</p>AND <p>- {#CARTRIDGE_STATUS} NOT_MATCHES_REGEX `^$`</p> |
 |External sensor port 1 discovery |<p>uioSensorStatusTable</p> |SNMP |external.sensor1.discovery<p>**Overrides:**</p><p>Temp<br> - {#EXTERNAL_SENSOR1_NAME} MATCHES_REGEX `Temp`<br>  - ITEM_PROTOTYPE LIKE `Humidity` - NO_DISCOVER</p> |
 |External sensor port 2 discovery |<p>uioSensorStatusTable</p> |SNMP |external.sensor2.discovery<p>**Overrides:**</p><p>Temp<br> - {#EXTERNAL_SENSOR2_NAME} MATCHES_REGEX `Temp`<br>  - ITEM_PROTOTYPE LIKE `Humidity` - NO_DISCOVER</p> |
+|Input phases discovery |<p>The input phase identifier. OID upsPhaseInputPhaseIndex.1.1</p> |SNMP |input.phases.discovery |
+|Output phases discovery |<p>The output phase identifier. OID upsPhaseOutputPhaseIndex.1.1</p> |SNMP |output.phases.discovery |
 
 ## Items collected
 
@@ -147,5 +147,5 @@ There are no template links in this template.
 
 Please report any issues with the template at https://support.zabbix.com
 
-You can also provide a feedback, discuss the template or ask for help with it at [ZABBIX forums](https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/420730-discussion-thread-for-official-zabbix-template-apc-ups).
+You can also provide feedback, discuss the template or ask for help with it at [ZABBIX forums](https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/420730-discussion-thread-for-official-zabbix-template-apc-ups).
 
diff --git a/templates/power/apc/apc_ups_galaxy_3500_snmp/template_power_apc_ups_galaxy_3500_snmp.yaml b/templates/power/apc/apc_ups_galaxy_3500_snmp/template_power_apc_ups_galaxy_3500_snmp.yaml
index 415e7b58e43..e85e9e686c2 100644
--- a/templates/power/apc/apc_ups_galaxy_3500_snmp/template_power_apc_ups_galaxy_3500_snmp.yaml
+++ b/templates/power/apc/apc_ups_galaxy_3500_snmp/template_power_apc_ups_galaxy_3500_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-15T17:56:41Z'
+  date: '2022-01-26T10:21:07Z'
   groups:
     -
       uuid: 3dcd5bbe90534f9e8eb5c2d53756af63
@@ -19,7 +19,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/420730-discussion-thread-for-official-zabbix-template-apc-ups
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Power
@@ -48,8 +48,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
           triggers:
             -
               uuid: 1800690ba0504df9940a4e667c846132
@@ -57,6 +57,10 @@ zabbix_export:
               name: 'Battery has low capacity (below {$BATTERY.CAPACITY.MIN.WARN}%)'
               opdata: 'Current capacity: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: capacity
         -
           uuid: 2b417eadc988460a89db04efdaca4ffc
           name: 'External battery packs count'
@@ -77,8 +81,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: inventory
         -
           uuid: 98af792142464656b925a452e5ebf1cc
           name: 'Battery last replace date'
@@ -103,8 +107,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: inventory
         -
           uuid: b7614652ff6f4e0890f366b8e0831b80
           name: 'Battery replace indicator'
@@ -124,8 +128,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
           triggers:
             -
               uuid: b4d10f8908f4473facde6d2db1520e0f
@@ -133,6 +137,10 @@ zabbix_export:
               name: 'Battery needs replacement'
               priority: HIGH
               description: 'A battery installed has an internal error condition.'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 89cca909c60745fe824d02aa0d4bc3d7
           name: 'Battery runtime remaining'
@@ -157,8 +165,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
         -
           uuid: 22a95e447ad74d43a191f368346fde59
           name: 'Battery status'
@@ -184,8 +192,11 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: power
           triggers:
             -
               uuid: d84ec0d0b8d84e3294cbe7ffaed0c83e
@@ -193,12 +204,20 @@ zabbix_export:
               name: 'Battery has an internal error condition'
               priority: AVERAGE
               description: 'A battery installed has an internal error condition.'
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 8f569ce6c916456581e1cb2cdd8d4dba
               expression: 'last(/APC UPS Galaxy 3500 SNMP/battery.status[upsBasicBatteryStatus])=3'
               name: 'Battery is Low'
               priority: AVERAGE
               description: 'The UPS will be unable to sustain the current load, and its services will be lost if power is not restored.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
         -
           uuid: 7a0a2b5e702f473fa1144eaf499367b2
           name: 'Battery temperature'
@@ -223,8 +242,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: temperature
           triggers:
             -
               uuid: 0e1f47f0604d4b1b8769e497d7f328b9
@@ -232,6 +251,10 @@ zabbix_export:
               name: 'Battery has high temperature (over {$BATTERY.TEMP.MAX.WARN}℃ for {$TIME.PERIOD})'
               opdata: 'Current temperature: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 756f727fe8374aeba9d1afd7bbe77f02
           name: 'Battery voltage'
@@ -255,8 +278,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
         -
           uuid: 9069a1c0d9304e7fa5f2df133dbb46cd
           name: 'Input fail cause'
@@ -299,8 +322,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
         -
           uuid: 3a64740655ca455ab0280592b5f0055f
           name: 'Input frequency'
@@ -324,8 +347,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
           triggers:
             -
               uuid: 786d9928356e41ad9b6b2de3b4f3a96f
@@ -333,6 +356,10 @@ zabbix_export:
               name: 'Unacceptable input frequency (out of range {$UPS.INPUT_FREQ.MIN.WARN}-{$UPS.INPUT_FREQ.MAX.WARN}Hz for {$TIME.PERIOD})'
               opdata: 'Current frequency: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 89bb663e356c4420bcbe2a9470ae3195
           name: 'Input voltage'
@@ -356,8 +383,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
           triggers:
             -
               uuid: de88ed3b64644d3f9ad1cc3f965757bc
@@ -365,6 +392,10 @@ zabbix_export:
               name: 'Unacceptable input voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD})'
               opdata: 'Current voltage: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: a6737781029b422ca7a8bbfa0ed80b56
           name: 'Output current'
@@ -388,8 +419,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
         -
           uuid: 5774ead79e8b4d63a4a31bc091d1c52a
           name: 'Output load'
@@ -414,8 +445,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
           triggers:
             -
               uuid: fb7ca4b92e714fda95152b698cf1aa92
@@ -424,6 +455,10 @@ zabbix_export:
               opdata: 'Current load: {ITEM.LASTVALUE1}'
               priority: HIGH
               description: 'A battery installed has an internal error condition.'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 8a6c9b134ebc4fd19876cf5d50dfc17b
           name: 'Output status'
@@ -449,64 +484,111 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: power
           triggers:
             -
               uuid: efed1ccf301740c1a29e71cd89e5659f
               expression: 'last(/APC UPS Galaxy 3500 SNMP/output.status[upsBasicOutputStatus])=16'
               name: 'UPS is Emergency Static Bypass'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 44394841911641c4972165b59b8f6a5b
               expression: 'last(/APC UPS Galaxy 3500 SNMP/output.status[upsBasicOutputStatus])=10'
               name: 'UPS is Hardware Failure Bypass'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: d60b075bfaaa4aeea2398d058fb79c92
               expression: 'last(/APC UPS Galaxy 3500 SNMP/output.status[upsBasicOutputStatus])=7'
               name: 'UPS is Off'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 4d54e6e979f94801a3c1e9d6080886bb
               expression: 'last(/APC UPS Galaxy 3500 SNMP/output.status[upsBasicOutputStatus])=3'
               name: 'UPS is on battery'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: eb430f5409a24f89b0a9e56fb28087c4
               expression: 'last(/APC UPS Galaxy 3500 SNMP/output.status[upsBasicOutputStatus])=4'
               name: 'UPS is on Smart Boost'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 77dbd58283b542cfbca9a9255344e97e
               expression: 'last(/APC UPS Galaxy 3500 SNMP/output.status[upsBasicOutputStatus])=12'
               name: 'UPS is On Smart Trim'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 3856ff4ac1d64f8e80c4e0cbb1e04c1a
               expression: 'last(/APC UPS Galaxy 3500 SNMP/output.status[upsBasicOutputStatus])=8'
               name: 'UPS is Rebooting'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 10d8d392f93a492b9be767c7ccdf06ed
               expression: 'last(/APC UPS Galaxy 3500 SNMP/output.status[upsBasicOutputStatus])=11'
               name: 'UPS is Sleeping Until Power Return'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 2ab92cb281754de6ad5245509c20056d
               expression: 'last(/APC UPS Galaxy 3500 SNMP/output.status[upsBasicOutputStatus])=6'
               name: 'UPS is Software Bypass'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 8fabe8958cfd4dbbabd70648dff1be06
               expression: 'last(/APC UPS Galaxy 3500 SNMP/output.status[upsBasicOutputStatus])=9'
               name: 'UPS is Switched Bypass'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 9846ac1bbf024e63a05a83e2c02de7ba
               expression: 'last(/APC UPS Galaxy 3500 SNMP/output.status[upsBasicOutputStatus])=5'
               name: 'UPS is Timed Sleeping'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 4ec893da7b8540548d60a91ee7e2df83
           name: 'Output voltage'
@@ -530,8 +612,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
         -
           uuid: 7d20aa252c5143c98de837dbd2f0cd53
           name: 'SNMP traps (fallback)'
@@ -544,8 +626,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: aa5e85ef78504fc080b97342baf6cb35
           name: 'System contact details'
@@ -569,8 +651,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: f1df592a2b114677a1beabec33ce01f9
           name: 'System description'
@@ -593,8 +675,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: b109475e72e74e76846aa478e9937101
           name: 'System location'
@@ -617,8 +699,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 93b6e128e95a4a96bde38ef15d74d510
           name: Model
@@ -639,8 +721,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: inventory
         -
           uuid: d6f2c9770c28487d9fa6af2b63917958
           name: 'System name'
@@ -664,8 +746,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 811ff6e90d904c8c98feadc89a18e733
@@ -674,6 +756,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: 5497f3649b9348dca290c55e94f48597
           name: 'System object ID'
@@ -699,8 +788,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: ef25b1e818534420920ff6260fa2932e
           name: 'Serial number'
@@ -724,8 +813,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: inventory
         -
           uuid: fc207a1df4324fcf99ba1da262527fe3
           name: Uptime
@@ -747,8 +836,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 5c50881846c649dbb47adcfb3dfc7d68
@@ -761,6 +850,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/APC UPS Galaxy 3500 SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: efad5c028c0d4c11b57a19dc04830ea7
           name: 'SNMP agent availability'
@@ -782,8 +875,11 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: e12b11324a634eeba56db1aec1834d5f
@@ -792,6 +888,10 @@ zabbix_export:
               opdata: 'Current state: {ITEM.LASTVALUE1}'
               priority: WARNING
               description: 'SNMP is not available for polling. Please check device connectivity and SNMP settings.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: 54a867c14c814e4ab4803c5a59082e44
@@ -822,8 +922,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: inventory
         -
           uuid: 0c8fc55bbe984d919c3b87a096d900d5
           name: 'External battery packs discovery'
@@ -860,8 +960,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: inventory
+                -
+                  tag: component
+                  value: power
             -
               uuid: 41cd82bb312344b7bdb9c7c5aac2eb21
               name: '{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery pack cartridge health'
@@ -888,8 +991,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: health
+                -
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: 94e469f639cb4ae4ab3ac23918cfa651
@@ -906,6 +1012,10 @@ zabbix_export:
                       bit 4 Battery lifetime exceeded acknowledged, replace battery
                       bit 5 Battery measured lifetime near end, order replacement cartridge
                       bit 6 Battery measured lifetime near end acknowledged, order replacement cartridge
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 241efd4ef6204c58adc04e4e04660845
               name: '{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery status'
@@ -937,8 +1047,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: health
+                -
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: 60bf7de80cd741caa1c622e797da1d69
@@ -960,6 +1073,10 @@ zabbix_export:
                     bit 9 Communication
                     bit 10 DisconnectedFrame
                     bit 11 FirmwareMismatch
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: a55dd3033a2645aab5592f356043c342
               name: '{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery temperature'
@@ -983,8 +1100,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: bdd4bb9fac784bc0b0dc72db3ac9e040
@@ -992,6 +1109,10 @@ zabbix_export:
                   name: '{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery has high temperature (over {$BATTERY.TEMP.MAX.WARN}℃ for {$TIME.PERIOD})'
                   opdata: 'Current temperature: {ITEM.LASTVALUE1}'
                   priority: HIGH
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 8ea7d066a5ae4141b4cd0af13d96c40c
               name: '{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Serial number'
@@ -1012,8 +1133,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: General
+                  tag: component
+                  value: inventory
         -
           uuid: ffb60da941114174932b219e14892be9
           name: 'External sensor port 1 discovery'
@@ -1044,8 +1165,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: humidity
+                -
+                  tag: component
+                  value: power
             -
               uuid: 1a41c120082948bdb6865413bdc09917
               name: '{#EXTERNAL_SENSOR1_NAME}: Sensor alarm status'
@@ -1069,8 +1193,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: health
+                -
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: 93d474d1badc45d5a48fe0e610744ff6
@@ -1078,18 +1205,30 @@ zabbix_export:
                   name: '{#EXTERNAL_SENSOR1_NAME}: Sensor has status Critical'
                   priority: HIGH
                   description: 'The external sensor has returned a value greater than the critical threshold.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: 48fa5f120bd5495185a9d6f86fc823fd
                   expression: 'last(/APC UPS Galaxy 3500 SNMP/external.sensor.status[uioSensorStatusAlarmStatus.1.{#SNMPINDEX}])=4'
                   name: '{#EXTERNAL_SENSOR1_NAME}: Sensor has status Not Applicable'
                   priority: INFO
                   description: 'The external sensor does not work or is not connected.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: b0652e627c10477c9e61786d85560d93
                   expression: 'last(/APC UPS Galaxy 3500 SNMP/external.sensor.status[uioSensorStatusAlarmStatus.1.{#SNMPINDEX}])=2'
                   name: '{#EXTERNAL_SENSOR1_NAME}: Sensor has status Warning'
                   priority: AVERAGE
                   description: 'The external sensor has returned a value greater than the warning threshold.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: a191d2ff066e4f4ba04aede67cd6876d
               name: '{#EXTERNAL_SENSOR1_NAME}: Temperature sensor'
@@ -1110,8 +1249,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: power
+                -
+                  tag: component
+                  value: temperature
           overrides:
             -
               name: Temp
@@ -1159,8 +1301,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: humidity
+                -
+                  tag: component
+                  value: power
             -
               uuid: 492835d959d644d7b95fc480cba5d3dc
               name: '{#EXTERNAL_SENSOR2_NAME}: Sensor alarm status'
@@ -1184,8 +1329,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: health
+                -
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: 55acc85739e04ebea3414059907ef2e4
@@ -1193,18 +1341,30 @@ zabbix_export:
                   name: '{#EXTERNAL_SENSOR2_NAME}: Sensor has status Critical'
                   priority: HIGH
                   description: 'The external sensor has returned a value greater than the critical threshold.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: e8753aa5ca16449c8dc21af6c8c2a727
                   expression: 'last(/APC UPS Galaxy 3500 SNMP/external.sensor.status[uioSensorStatusAlarmStatus.2.{#SNMPINDEX}])=4'
                   name: '{#EXTERNAL_SENSOR2_NAME}: Sensor has status Not Applicable'
                   priority: INFO
                   description: 'The external sensor does not work or is not connected.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: d16c60a30b5d46459237eef4df38df9f
                   expression: 'last(/APC UPS Galaxy 3500 SNMP/external.sensor.status[uioSensorStatusAlarmStatus.2.{#SNMPINDEX}])=2'
                   name: '{#EXTERNAL_SENSOR2_NAME}: Sensor has status Warning'
                   priority: AVERAGE
                   description: 'The external sensor has returned a value greater than the warning threshold.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 2cf2d697c95845ba8ec61af2ec698f4c
               name: '{#EXTERNAL_SENSOR2_NAME}: Temperature sensor'
@@ -1225,8 +1385,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: power
+                -
+                  tag: component
+                  value: temperature
           overrides:
             -
               name: Temp
@@ -1277,8 +1440,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: power
             -
               uuid: 7356945fc0e94026a2ca04d297fdf953
               name: '{#PHASEINDEX}: Phase input voltage'
@@ -1299,8 +1462,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: 1824f0be30284d13bad9f895f7adaa0e
@@ -1308,6 +1471,10 @@ zabbix_export:
                   name: '{#PHASEINDEX}: Unacceptable phase {#PHASEINDEX} input voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD})'
                   opdata: 'Current phase {#PHASEINDEX} voltage: {ITEM.LASTVALUE1}'
                   priority: HIGH
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
         -
           uuid: 518ca26562f04d7b8e5af9d26317d138
           name: 'Output phases discovery'
@@ -1342,8 +1509,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: power
             -
               uuid: 3eb001cece8340d59cd0e7f59812f149
               name: '{#PHASEINDEX}: Phase output load, %'
@@ -1365,8 +1532,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: power
             -
               uuid: f09e23dcb5b24170b356556a36bb39cc
               name: '{#PHASEINDEX}: Phase output voltage'
@@ -1387,8 +1554,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: 675dc7c59e974f7eadd5d1562dec00ce
@@ -1396,6 +1563,20 @@ zabbix_export:
                   name: '{#PHASEINDEX}: Unacceptable phase {#PHASEINDEX} output voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD})'
                   opdata: 'Current phase {#PHASEINDEX} voltage: {ITEM.LASTVALUE1}'
                   priority: HIGH
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
+      tags:
+        -
+          tag: class
+          value: power
+        -
+          tag: target
+          value: apc
+        -
+          tag: target
+          value: apc-ups-galaxy-3500
       macros:
         -
           macro: '{$BATTERY.CAPACITY.MIN.WARN}'
@@ -1433,178 +1614,6 @@ zabbix_export:
           macro: '{$UPS.OUTPUT.MAX.WARN}'
           value: '80'
           description: 'Maximum output load in % for trigger expression.'
-      dashboards:
-        -
-          uuid: 23bf458b1bbc4ae0b145597292d098cb
-          name: 'UPS Summary'
-          pages:
-            -
-              widgets:
-                -
-                  type: PLAIN_TEXT
-                  width: '8'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: show_as_html
-                      value: '0'
-                    -
-                      type: INTEGER
-                      name: show_lines
-                      value: '1'
-                    -
-                      type: ITEM
-                      name: itemids
-                      value:
-                        key: 'system.uptime[sysUpTime.0]'
-                        host: 'APC UPS Galaxy 3500 SNMP'
-                -
-                  type: PLAIN_TEXT
-                  x: '8'
-                  width: '8'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: show_as_html
-                      value: '0'
-                    -
-                      type: INTEGER
-                      name: show_lines
-                      value: '1'
-                    -
-                      type: ITEM
-                      name: itemids
-                      value:
-                        key: 'input.fail[upsAdvInputLineFailCause]'
-                        host: 'APC UPS Galaxy 3500 SNMP'
-                -
-                  type: PLAIN_TEXT
-                  x: '16'
-                  width: '8'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: show_as_html
-                      value: '0'
-                    -
-                      type: INTEGER
-                      name: show_lines
-                      value: '1'
-                    -
-                      type: ITEM
-                      name: itemids
-                      value:
-                        key: 'output.status[upsBasicOutputStatus]'
-                        host: 'APC UPS Galaxy 3500 SNMP'
-                -
-                  type: PLAIN_TEXT
-                  'y': '2'
-                  width: '8'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: show_as_html
-                      value: '0'
-                    -
-                      type: INTEGER
-                      name: show_lines
-                      value: '1'
-                    -
-                      type: ITEM
-                      name: itemids
-                      value:
-                        key: 'battery.status[upsBasicBatteryStatus]'
-                        host: 'APC UPS Galaxy 3500 SNMP'
-                -
-                  type: PLAIN_TEXT
-                  x: '8'
-                  'y': '2'
-                  width: '8'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: show_as_html
-                      value: '0'
-                    -
-                      type: INTEGER
-                      name: show_lines
-                      value: '1'
-                    -
-                      type: ITEM
-                      name: itemids
-                      value:
-                        key: 'battery.runtime_remaining[upsAdvBatteryRunTimeRemaining]'
-                        host: 'APC UPS Galaxy 3500 SNMP'
-                -
-                  type: PLAIN_TEXT
-                  x: '16'
-                  'y': '2'
-                  width: '8'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: show_as_html
-                      value: '0'
-                    -
-                      type: INTEGER
-                      name: show_lines
-                      value: '1'
-                    -
-                      type: ITEM
-                      name: itemids
-                      value:
-                        key: 'battery.last_replace_date[upsBasicBatteryLastReplaceDate]'
-                        host: 'APC UPS Galaxy 3500 SNMP'
-                -
-                  type: GRAPH_CLASSIC
-                  'y': '4'
-                  width: '8'
-                  height: '7'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: source_type
-                      value: '0'
-                    -
-                      type: GRAPH
-                      name: graphid
-                      value:
-                        name: 'Capacity of the UPS batteries'
-                        host: 'APC UPS Galaxy 3500 SNMP'
-                -
-                  type: GRAPH_CLASSIC
-                  x: '8'
-                  'y': '4'
-                  width: '8'
-                  height: '7'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: source_type
-                      value: '0'
-                    -
-                      type: GRAPH
-                      name: graphid
-                      value:
-                        name: Voltage
-                        host: 'APC UPS Galaxy 3500 SNMP'
-                -
-                  type: GRAPH_CLASSIC
-                  x: '16'
-                  'y': '4'
-                  width: '8'
-                  height: '7'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: source_type
-                      value: '0'
-                    -
-                      type: GRAPH
-                      name: graphid
-                      value:
-                        name: Output
-                        host: 'APC UPS Galaxy 3500 SNMP'
       valuemaps:
         -
           uuid: 30a78904cbc94fc58609dc1a11aa48ef
diff --git a/templates/power/apc/apc_ups_smart_2200_rm_snmp/README.md b/templates/power/apc/apc_ups_smart_2200_rm_snmp/README.md
index b97045fd302..40ba33b9f73 100644
--- a/templates/power/apc/apc_ups_smart_2200_rm_snmp/README.md
+++ b/templates/power/apc/apc_ups_smart_2200_rm_snmp/README.md
@@ -51,12 +51,12 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|Input phases discovery |<p>The input phase identifier. OID upsPhaseInputPhaseIndex.1.1</p> |SNMP |input.phases.discovery |
-|Output phases discovery |<p>The output phase identifier. OID upsPhaseOutputPhaseIndex.1.1</p> |SNMP |output.phases.discovery |
-|External battery packs discovery |<p>-</p> |SNMP |battery.packs.discovery<p>**Filter**:</p>AND <p>- {#CARTRIDGE_STATUS} NOT_MATCHES_REGEX `^$`</p> |
 |External bad battery packs discovery |<p>Discovery of the number of external defective battery packs.</p> |SNMP |battery.packs.bad.discovery |
+|External battery packs discovery |<p>-</p> |SNMP |battery.packs.discovery<p>**Filter**:</p>AND <p>- {#CARTRIDGE_STATUS} NOT_MATCHES_REGEX `^$`</p> |
 |External sensor port 1 discovery |<p>uioSensorStatusTable</p> |SNMP |external.sensor1.discovery<p>**Overrides:**</p><p>Temp<br> - {#EXTERNAL_SENSOR1_NAME} MATCHES_REGEX `Temp`<br>  - ITEM_PROTOTYPE LIKE `Humidity` - NO_DISCOVER</p> |
 |External sensor port 2 discovery |<p>uioSensorStatusTable</p> |SNMP |external.sensor2.discovery<p>**Overrides:**</p><p>Temp<br> - {#EXTERNAL_SENSOR2_NAME} MATCHES_REGEX `Temp`<br>  - ITEM_PROTOTYPE LIKE `Humidity` - NO_DISCOVER</p> |
+|Input phases discovery |<p>The input phase identifier. OID upsPhaseInputPhaseIndex.1.1</p> |SNMP |input.phases.discovery |
+|Output phases discovery |<p>The output phase identifier. OID upsPhaseOutputPhaseIndex.1.1</p> |SNMP |output.phases.discovery |
 
 ## Items collected
 
@@ -147,5 +147,5 @@ There are no template links in this template.
 
 Please report any issues with the template at https://support.zabbix.com
 
-You can also provide a feedback, discuss the template or ask for help with it at [ZABBIX forums](https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/420730-discussion-thread-for-official-zabbix-template-apc-ups).
+You can also provide feedback, discuss the template or ask for help with it at [ZABBIX forums](https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/420730-discussion-thread-for-official-zabbix-template-apc-ups).
 
diff --git a/templates/power/apc/apc_ups_smart_2200_rm_snmp/template_power_apc_ups_smart_2200_rm_snmp.yaml b/templates/power/apc/apc_ups_smart_2200_rm_snmp/template_power_apc_ups_smart_2200_rm_snmp.yaml
index 1fa2f0dc531..5695840e1fa 100644
--- a/templates/power/apc/apc_ups_smart_2200_rm_snmp/template_power_apc_ups_smart_2200_rm_snmp.yaml
+++ b/templates/power/apc/apc_ups_smart_2200_rm_snmp/template_power_apc_ups_smart_2200_rm_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-15T17:56:45Z'
+  date: '2022-01-26T10:22:01Z'
   groups:
     -
       uuid: 3dcd5bbe90534f9e8eb5c2d53756af63
@@ -19,7 +19,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/420730-discussion-thread-for-official-zabbix-template-apc-ups
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Power
@@ -48,8 +48,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
           triggers:
             -
               uuid: 58a0749ef9c94cf9802a62d274b6dad9
@@ -57,6 +57,10 @@ zabbix_export:
               name: 'Battery has low capacity (below {$BATTERY.CAPACITY.MIN.WARN}%)'
               opdata: 'Current capacity: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: capacity
         -
           uuid: 8ba1d824fdc548b4bca770f4145f7169
           name: 'External battery packs count'
@@ -77,8 +81,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: inventory
         -
           uuid: 147e0b7b466e402ba59d73d66801ef1a
           name: 'Battery last replace date'
@@ -103,8 +107,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: inventory
         -
           uuid: 4c1107eb93114d9096518dc134e08bdc
           name: 'Battery replace indicator'
@@ -124,8 +128,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
           triggers:
             -
               uuid: 8370727883de45dfa6b6d79f60cc86b3
@@ -133,6 +137,10 @@ zabbix_export:
               name: 'Battery needs replacement'
               priority: HIGH
               description: 'A battery installed has an internal error condition.'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 05be71fcb7c1484f876229f48649039e
           name: 'Battery runtime remaining'
@@ -157,8 +165,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
         -
           uuid: 078719d0396247bca76d85e1e4c650de
           name: 'Battery status'
@@ -184,8 +192,11 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: power
           triggers:
             -
               uuid: 2fb002b1a4584aa0bf0389360171893c
@@ -193,12 +204,20 @@ zabbix_export:
               name: 'Battery has an internal error condition'
               priority: AVERAGE
               description: 'A battery installed has an internal error condition.'
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 05aa81dc53ab45ffaf46580c9f827759
               expression: 'last(/APC Smart-UPS 2200 RM SNMP/battery.status[upsBasicBatteryStatus])=3'
               name: 'Battery is Low'
               priority: AVERAGE
               description: 'The UPS will be unable to sustain the current load, and its services will be lost if power is not restored.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
         -
           uuid: bda8df2bbd2a40dc937b2cd5b8017a68
           name: 'Battery temperature'
@@ -223,8 +242,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: temperature
           triggers:
             -
               uuid: 1e8c0b3d2d65487199e7fc3e1dde6e50
@@ -232,6 +251,10 @@ zabbix_export:
               name: 'Battery has high temperature (over {$BATTERY.TEMP.MAX.WARN}℃ for {$TIME.PERIOD})'
               opdata: 'Current temperature: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 805d95a6f256410ca083f31cc480b88b
           name: 'Battery voltage'
@@ -255,8 +278,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
         -
           uuid: b83275fc1176451dacaa28606edf045a
           name: 'Input fail cause'
@@ -299,8 +322,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
         -
           uuid: cfd390d57dbc4046a3a6af384420b697
           name: 'Input frequency'
@@ -324,8 +347,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
           triggers:
             -
               uuid: b89b059a430842aebbd3e6af71514303
@@ -333,6 +356,10 @@ zabbix_export:
               name: 'Unacceptable input frequency (out of range {$UPS.INPUT_FREQ.MIN.WARN}-{$UPS.INPUT_FREQ.MAX.WARN}Hz for {$TIME.PERIOD})'
               opdata: 'Current frequency: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 91a6bc765a954f9e97b855d9dfebd3f7
           name: 'Input voltage'
@@ -356,8 +383,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
           triggers:
             -
               uuid: 2dbc2b96d332488cae4cbf87c985c6b0
@@ -365,6 +392,10 @@ zabbix_export:
               name: 'Unacceptable input voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD})'
               opdata: 'Current voltage: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 744d345cd3964baf85f8fefed19f9001
           name: 'Output current'
@@ -388,8 +419,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
         -
           uuid: df799c65dbe5437aa941de3e6d386b26
           name: 'Output load'
@@ -414,8 +445,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
           triggers:
             -
               uuid: edb059eeee004d80a9b42154f16ab18a
@@ -424,6 +455,10 @@ zabbix_export:
               opdata: 'Current load: {ITEM.LASTVALUE1}'
               priority: HIGH
               description: 'A battery installed has an internal error condition.'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 54d22d1cc362492ebe8695257afc20ec
           name: 'Output status'
@@ -449,64 +484,111 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: power
           triggers:
             -
               uuid: 20ffc78c2f314ff58b5e75907605c82f
               expression: 'last(/APC Smart-UPS 2200 RM SNMP/output.status[upsBasicOutputStatus])=16'
               name: 'UPS is Emergency Static Bypass'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: ec6e892f4c51414f887d428510d889e7
               expression: 'last(/APC Smart-UPS 2200 RM SNMP/output.status[upsBasicOutputStatus])=10'
               name: 'UPS is Hardware Failure Bypass'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: f4cb0ed7e65d4ea29394435cce7600f0
               expression: 'last(/APC Smart-UPS 2200 RM SNMP/output.status[upsBasicOutputStatus])=7'
               name: 'UPS is Off'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: e29c2a37586f474f87c388fa8eaf8b9c
               expression: 'last(/APC Smart-UPS 2200 RM SNMP/output.status[upsBasicOutputStatus])=3'
               name: 'UPS is on battery'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: a07afe38040c4fd08488786ca3f529e5
               expression: 'last(/APC Smart-UPS 2200 RM SNMP/output.status[upsBasicOutputStatus])=4'
               name: 'UPS is on Smart Boost'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 58f44a830386434db0f76553f64ebe67
               expression: 'last(/APC Smart-UPS 2200 RM SNMP/output.status[upsBasicOutputStatus])=12'
               name: 'UPS is On Smart Trim'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: eb99c49157a948769128bc9eeeaff3fc
               expression: 'last(/APC Smart-UPS 2200 RM SNMP/output.status[upsBasicOutputStatus])=8'
               name: 'UPS is Rebooting'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: b3d77823096e4bf4a06db8f2307284db
               expression: 'last(/APC Smart-UPS 2200 RM SNMP/output.status[upsBasicOutputStatus])=11'
               name: 'UPS is Sleeping Until Power Return'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 000d6b412dd3467aaee40ce230cc059e
               expression: 'last(/APC Smart-UPS 2200 RM SNMP/output.status[upsBasicOutputStatus])=6'
               name: 'UPS is Software Bypass'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: f1f86a1f23c745658d0c5d10557f67fc
               expression: 'last(/APC Smart-UPS 2200 RM SNMP/output.status[upsBasicOutputStatus])=9'
               name: 'UPS is Switched Bypass'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 434d70c967a9447a9fa927fc2867aa6d
               expression: 'last(/APC Smart-UPS 2200 RM SNMP/output.status[upsBasicOutputStatus])=5'
               name: 'UPS is Timed Sleeping'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 4e43a6966bf642e19567dcd3763125e7
           name: 'Output voltage'
@@ -530,8 +612,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
         -
           uuid: 94d838cc8cf2438296477c0139a3c152
           name: 'SNMP traps (fallback)'
@@ -544,8 +626,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: 943b146891ac461c92d286704a0864b2
           name: 'System contact details'
@@ -569,8 +651,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: e5d72eba4dfb41f8ae73904c936dd64b
           name: 'System description'
@@ -593,8 +675,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: ac995904f95240d9b1f44c27adea5731
           name: 'System location'
@@ -617,8 +699,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 1ba45d867e3d4bb99eeb8c0c320ef127
           name: Model
@@ -639,8 +721,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: inventory
         -
           uuid: d9452c921e4946719726b292d8c0cbd6
           name: 'System name'
@@ -664,8 +746,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 30153a623f0649e380de8f9ec5086b48
@@ -674,6 +756,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: 5a393860311b4b64ae5a4ce7cd7000dc
           name: 'System object ID'
@@ -699,8 +788,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 4e87619ed81346d497c3c3f548c342b5
           name: 'Serial number'
@@ -724,8 +813,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: inventory
         -
           uuid: f077c3558d24471ca807ea24b3f0c5ea
           name: Uptime
@@ -747,8 +836,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: f23282a63bec4b1d951f80439947672d
@@ -761,6 +850,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/APC Smart-UPS 2200 RM SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: d679688992124f6c91c3f70bcc341d2d
           name: 'SNMP agent availability'
@@ -782,8 +875,11 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: e9dc225935594e8aa25fb80fcfa68e4c
@@ -792,6 +888,10 @@ zabbix_export:
               opdata: 'Current state: {ITEM.LASTVALUE1}'
               priority: WARNING
               description: 'SNMP is not available for polling. Please check device connectivity and SNMP settings.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: 72077c26a51b43a6afea271e70d13004
@@ -822,8 +922,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: inventory
         -
           uuid: 38aa32616e964db088f4faff12867f1a
           name: 'External battery packs discovery'
@@ -860,8 +960,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: inventory
+                -
+                  tag: component
+                  value: power
             -
               uuid: 2e3adbdd7c9a4f3f9f151d19e69885bf
               name: '{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery pack cartridge health'
@@ -888,8 +991,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: health
+                -
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: 02e19fb51d6949cdb99a6aafa71ff654
@@ -906,6 +1012,10 @@ zabbix_export:
                       bit 4 Battery lifetime exceeded acknowledged, replace battery
                       bit 5 Battery measured lifetime near end, order replacement cartridge
                       bit 6 Battery measured lifetime near end acknowledged, order replacement cartridge
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 90e566dbc3184ef8b2ff171630a37c8a
               name: '{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery status'
@@ -937,8 +1047,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: health
+                -
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: a4f42d0a944f41349e0d206f1181bd3b
@@ -960,6 +1073,10 @@ zabbix_export:
                     bit 9 Communication
                     bit 10 DisconnectedFrame
                     bit 11 FirmwareMismatch
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 9277c9b4e065400eb31f2ad965bfa2a5
               name: '{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery temperature'
@@ -983,8 +1100,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: cb9603c5b7674e12a1a1ac98d4b73a65
@@ -992,6 +1109,10 @@ zabbix_export:
                   name: '{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery has high temperature (over {$BATTERY.TEMP.MAX.WARN}℃ for {$TIME.PERIOD})'
                   opdata: 'Current temperature: {ITEM.LASTVALUE1}'
                   priority: HIGH
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 70a45fc5ad1945a89133a4729340bdee
               name: '{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Serial number'
@@ -1012,8 +1133,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: General
+                  tag: component
+                  value: inventory
         -
           uuid: e428310ecc5f4a53ab7932bcf1247a30
           name: 'External sensor port 1 discovery'
@@ -1044,8 +1165,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: humidity
+                -
+                  tag: component
+                  value: power
             -
               uuid: c4bd5c3b0af145448aa2b084738f5149
               name: '{#EXTERNAL_SENSOR1_NAME}: Sensor alarm status'
@@ -1069,8 +1193,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: health
+                -
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: 603b13b89c7b4ad0bd51d63b93501174
@@ -1078,18 +1205,30 @@ zabbix_export:
                   name: '{#EXTERNAL_SENSOR1_NAME}: Sensor has status Critical'
                   priority: HIGH
                   description: 'The external sensor has returned a value greater than the critical threshold.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: 9e108d20e6c74e8b96d92f4ce0e7c840
                   expression: 'last(/APC Smart-UPS 2200 RM SNMP/external.sensor.status[uioSensorStatusAlarmStatus.1.{#SNMPINDEX}])=4'
                   name: '{#EXTERNAL_SENSOR1_NAME}: Sensor has status Not Applicable'
                   priority: INFO
                   description: 'The external sensor does not work or is not connected.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: 007b2f89fc1f445c8e5afb06a176748d
                   expression: 'last(/APC Smart-UPS 2200 RM SNMP/external.sensor.status[uioSensorStatusAlarmStatus.1.{#SNMPINDEX}])=2'
                   name: '{#EXTERNAL_SENSOR1_NAME}: Sensor has status Warning'
                   priority: AVERAGE
                   description: 'The external sensor has returned a value greater than the warning threshold.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 87494b17faf349248ed6cffc4c932a0f
               name: '{#EXTERNAL_SENSOR1_NAME}: Temperature sensor'
@@ -1110,8 +1249,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: power
+                -
+                  tag: component
+                  value: temperature
           overrides:
             -
               name: Temp
@@ -1159,8 +1301,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: humidity
+                -
+                  tag: component
+                  value: power
             -
               uuid: fc4623c5e962448dbffc98301ddcef4b
               name: '{#EXTERNAL_SENSOR2_NAME}: Sensor alarm status'
@@ -1184,8 +1329,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: health
+                -
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: 7639c07a79054f9b99687f84db5c95a0
@@ -1193,18 +1341,30 @@ zabbix_export:
                   name: '{#EXTERNAL_SENSOR2_NAME}: Sensor has status Critical'
                   priority: HIGH
                   description: 'The external sensor has returned a value greater than the critical threshold.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: a499a1af78a04c77a21c424f3e790787
                   expression: 'last(/APC Smart-UPS 2200 RM SNMP/external.sensor.status[uioSensorStatusAlarmStatus.2.{#SNMPINDEX}])=4'
                   name: '{#EXTERNAL_SENSOR2_NAME}: Sensor has status Not Applicable'
                   priority: INFO
                   description: 'The external sensor does not work or is not connected.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: c6fc64bbdb3845d5b80d868c392259ac
                   expression: 'last(/APC Smart-UPS 2200 RM SNMP/external.sensor.status[uioSensorStatusAlarmStatus.2.{#SNMPINDEX}])=2'
                   name: '{#EXTERNAL_SENSOR2_NAME}: Sensor has status Warning'
                   priority: AVERAGE
                   description: 'The external sensor has returned a value greater than the warning threshold.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: b4e350ad5bb24d7b96091f8b9766cff7
               name: '{#EXTERNAL_SENSOR2_NAME}: Temperature sensor'
@@ -1225,8 +1385,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: power
+                -
+                  tag: component
+                  value: temperature
           overrides:
             -
               name: Temp
@@ -1277,8 +1440,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: power
             -
               uuid: dac612b382ce4b93b588e2ba43c01c68
               name: '{#PHASEINDEX}: Phase input voltage'
@@ -1299,8 +1462,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: 0e9c22ab97cb4db8b96fb907e4b21e04
@@ -1308,6 +1471,10 @@ zabbix_export:
                   name: '{#PHASEINDEX}: Unacceptable phase {#PHASEINDEX} input voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD})'
                   opdata: 'Current phase {#PHASEINDEX} voltage: {ITEM.LASTVALUE1}'
                   priority: HIGH
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
         -
           uuid: f56bcd41c5ee4e16b2558563718bf2a6
           name: 'Output phases discovery'
@@ -1342,8 +1509,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: power
             -
               uuid: 3af338de874c439daeba535156033317
               name: '{#PHASEINDEX}: Phase output load, %'
@@ -1365,8 +1532,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: power
             -
               uuid: a7aecf3b0c2e448b9c09babc79c52380
               name: '{#PHASEINDEX}: Phase output voltage'
@@ -1387,8 +1554,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: 91ac886a5dda41cdb6a6912672d70625
@@ -1396,6 +1563,20 @@ zabbix_export:
                   name: '{#PHASEINDEX}: Unacceptable phase {#PHASEINDEX} output voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD})'
                   opdata: 'Current phase {#PHASEINDEX} voltage: {ITEM.LASTVALUE1}'
                   priority: HIGH
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
+      tags:
+        -
+          tag: class
+          value: power
+        -
+          tag: target
+          value: apc
+        -
+          tag: target
+          value: apc-smart-ups-2200-rm
       macros:
         -
           macro: '{$BATTERY.CAPACITY.MIN.WARN}'
@@ -1433,178 +1614,6 @@ zabbix_export:
           macro: '{$UPS.OUTPUT.MAX.WARN}'
           value: '80'
           description: 'Maximum output load in % for trigger expression.'
-      dashboards:
-        -
-          uuid: ac27c888a2c547b2b71fe6bf1aad69b1
-          name: 'UPS Summary'
-          pages:
-            -
-              widgets:
-                -
-                  type: PLAIN_TEXT
-                  width: '8'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: show_as_html
-                      value: '0'
-                    -
-                      type: INTEGER
-                      name: show_lines
-                      value: '1'
-                    -
-                      type: ITEM
-                      name: itemids
-                      value:
-                        key: 'system.uptime[sysUpTime.0]'
-                        host: 'APC Smart-UPS 2200 RM SNMP'
-                -
-                  type: PLAIN_TEXT
-                  x: '8'
-                  width: '8'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: show_as_html
-                      value: '0'
-                    -
-                      type: INTEGER
-                      name: show_lines
-                      value: '1'
-                    -
-                      type: ITEM
-                      name: itemids
-                      value:
-                        key: 'input.fail[upsAdvInputLineFailCause]'
-                        host: 'APC Smart-UPS 2200 RM SNMP'
-                -
-                  type: PLAIN_TEXT
-                  x: '16'
-                  width: '8'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: show_as_html
-                      value: '0'
-                    -
-                      type: INTEGER
-                      name: show_lines
-                      value: '1'
-                    -
-                      type: ITEM
-                      name: itemids
-                      value:
-                        key: 'output.status[upsBasicOutputStatus]'
-                        host: 'APC Smart-UPS 2200 RM SNMP'
-                -
-                  type: PLAIN_TEXT
-                  'y': '2'
-                  width: '8'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: show_as_html
-                      value: '0'
-                    -
-                      type: INTEGER
-                      name: show_lines
-                      value: '1'
-                    -
-                      type: ITEM
-                      name: itemids
-                      value:
-                        key: 'battery.status[upsBasicBatteryStatus]'
-                        host: 'APC Smart-UPS 2200 RM SNMP'
-                -
-                  type: PLAIN_TEXT
-                  x: '8'
-                  'y': '2'
-                  width: '8'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: show_as_html
-                      value: '0'
-                    -
-                      type: INTEGER
-                      name: show_lines
-                      value: '1'
-                    -
-                      type: ITEM
-                      name: itemids
-                      value:
-                        key: 'battery.runtime_remaining[upsAdvBatteryRunTimeRemaining]'
-                        host: 'APC Smart-UPS 2200 RM SNMP'
-                -
-                  type: PLAIN_TEXT
-                  x: '16'
-                  'y': '2'
-                  width: '8'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: show_as_html
-                      value: '0'
-                    -
-                      type: INTEGER
-                      name: show_lines
-                      value: '1'
-                    -
-                      type: ITEM
-                      name: itemids
-                      value:
-                        key: 'battery.last_replace_date[upsBasicBatteryLastReplaceDate]'
-                        host: 'APC Smart-UPS 2200 RM SNMP'
-                -
-                  type: GRAPH_CLASSIC
-                  'y': '4'
-                  width: '8'
-                  height: '7'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: source_type
-                      value: '0'
-                    -
-                      type: GRAPH
-                      name: graphid
-                      value:
-                        name: 'Capacity of the UPS batteries'
-                        host: 'APC Smart-UPS 2200 RM SNMP'
-                -
-                  type: GRAPH_CLASSIC
-                  x: '8'
-                  'y': '4'
-                  width: '8'
-                  height: '7'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: source_type
-                      value: '0'
-                    -
-                      type: GRAPH
-                      name: graphid
-                      value:
-                        name: Voltage
-                        host: 'APC Smart-UPS 2200 RM SNMP'
-                -
-                  type: GRAPH_CLASSIC
-                  x: '16'
-                  'y': '4'
-                  width: '8'
-                  height: '7'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: source_type
-                      value: '0'
-                    -
-                      type: GRAPH
-                      name: graphid
-                      value:
-                        name: Output
-                        host: 'APC Smart-UPS 2200 RM SNMP'
       valuemaps:
         -
           uuid: 6940a4d08173433bb4bc8ff3b44e578c
diff --git a/templates/power/apc/apc_ups_smart_3000_xlm_snmp/README.md b/templates/power/apc/apc_ups_smart_3000_xlm_snmp/README.md
index 00b678f59db..6c697d8fa53 100644
--- a/templates/power/apc/apc_ups_smart_3000_xlm_snmp/README.md
+++ b/templates/power/apc/apc_ups_smart_3000_xlm_snmp/README.md
@@ -51,12 +51,12 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|Input phases discovery |<p>The input phase identifier. OID upsPhaseInputPhaseIndex.1.1</p> |SNMP |input.phases.discovery |
-|Output phases discovery |<p>The output phase identifier. OID upsPhaseOutputPhaseIndex.1.1</p> |SNMP |output.phases.discovery |
-|External battery packs discovery |<p>-</p> |SNMP |battery.packs.discovery<p>**Filter**:</p>AND <p>- {#CARTRIDGE_STATUS} NOT_MATCHES_REGEX `^$`</p> |
 |External bad battery packs discovery |<p>Discovery of the number of external defective battery packs.</p> |SNMP |battery.packs.bad.discovery |
+|External battery packs discovery |<p>-</p> |SNMP |battery.packs.discovery<p>**Filter**:</p>AND <p>- {#CARTRIDGE_STATUS} NOT_MATCHES_REGEX `^$`</p> |
 |External sensor port 1 discovery |<p>uioSensorStatusTable</p> |SNMP |external.sensor1.discovery<p>**Overrides:**</p><p>Temp<br> - {#EXTERNAL_SENSOR1_NAME} MATCHES_REGEX `Temp`<br>  - ITEM_PROTOTYPE LIKE `Humidity` - NO_DISCOVER</p> |
 |External sensor port 2 discovery |<p>uioSensorStatusTable</p> |SNMP |external.sensor2.discovery<p>**Overrides:**</p><p>Temp<br> - {#EXTERNAL_SENSOR2_NAME} MATCHES_REGEX `Temp`<br>  - ITEM_PROTOTYPE LIKE `Humidity` - NO_DISCOVER</p> |
+|Input phases discovery |<p>The input phase identifier. OID upsPhaseInputPhaseIndex.1.1</p> |SNMP |input.phases.discovery |
+|Output phases discovery |<p>The output phase identifier. OID upsPhaseOutputPhaseIndex.1.1</p> |SNMP |output.phases.discovery |
 
 ## Items collected
 
@@ -147,5 +147,5 @@ There are no template links in this template.
 
 Please report any issues with the template at https://support.zabbix.com
 
-You can also provide a feedback, discuss the template or ask for help with it at [ZABBIX forums](https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/420730-discussion-thread-for-official-zabbix-template-apc-ups).
+You can also provide feedback, discuss the template or ask for help with it at [ZABBIX forums](https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/420730-discussion-thread-for-official-zabbix-template-apc-ups).
 
diff --git a/templates/power/apc/apc_ups_smart_3000_xlm_snmp/template_power_apc_ups_smart_3000_xlm_snmp.yaml b/templates/power/apc/apc_ups_smart_3000_xlm_snmp/template_power_apc_ups_smart_3000_xlm_snmp.yaml
index 31b276b7670..4a56282f4be 100644
--- a/templates/power/apc/apc_ups_smart_3000_xlm_snmp/template_power_apc_ups_smart_3000_xlm_snmp.yaml
+++ b/templates/power/apc/apc_ups_smart_3000_xlm_snmp/template_power_apc_ups_smart_3000_xlm_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-15T17:56:49Z'
+  date: '2022-01-26T10:42:51Z'
   groups:
     -
       uuid: 3dcd5bbe90534f9e8eb5c2d53756af63
@@ -19,7 +19,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/420730-discussion-thread-for-official-zabbix-template-apc-ups
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Power
@@ -48,8 +48,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
           triggers:
             -
               uuid: 13fe1336e40c4bafb8dbd409497abf8f
@@ -57,6 +57,10 @@ zabbix_export:
               name: 'Battery has low capacity (below {$BATTERY.CAPACITY.MIN.WARN}%)'
               opdata: 'Current capacity: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: capacity
         -
           uuid: 86780568c0594469bc7324c68440cbec
           name: 'External battery packs count'
@@ -77,8 +81,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: inventory
         -
           uuid: 1928e58e65a34b188916086bad5b8725
           name: 'Battery last replace date'
@@ -103,8 +107,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: inventory
         -
           uuid: b50a17ab043c404990dd088ac9f74078
           name: 'Battery replace indicator'
@@ -124,8 +128,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
           triggers:
             -
               uuid: 4590ac935e044c19978fe01d117e2995
@@ -133,6 +137,10 @@ zabbix_export:
               name: 'Battery needs replacement'
               priority: HIGH
               description: 'A battery installed has an internal error condition.'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: d15c36fb66754791b1014f52171efe1c
           name: 'Battery runtime remaining'
@@ -157,8 +165,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
         -
           uuid: 9fa77fdcbd7343ca904c6282efcb7c72
           name: 'Battery status'
@@ -184,8 +192,11 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: power
           triggers:
             -
               uuid: e98ba83e63d246408aeeda76da62d5a4
@@ -193,12 +204,20 @@ zabbix_export:
               name: 'Battery has an internal error condition'
               priority: AVERAGE
               description: 'A battery installed has an internal error condition.'
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 51e3281c49454cf997561c857a34a803
               expression: 'last(/APC Smart-UPS 3000 XLM SNMP/battery.status[upsBasicBatteryStatus])=3'
               name: 'Battery is Low'
               priority: AVERAGE
               description: 'The UPS will be unable to sustain the current load, and its services will be lost if power is not restored.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
         -
           uuid: bded43c8a4eb4d1b9cf5403d3f3027cd
           name: 'Battery temperature'
@@ -223,8 +242,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: temperature
           triggers:
             -
               uuid: 1c67af712882479bbf7143bd3e16ed77
@@ -232,6 +251,10 @@ zabbix_export:
               name: 'Battery has high temperature (over {$BATTERY.TEMP.MAX.WARN}℃ for {$TIME.PERIOD})'
               opdata: 'Current temperature: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: e478bdaa89674f6792e39ff1a2d9a413
           name: 'Battery voltage'
@@ -255,8 +278,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
         -
           uuid: 7b7d6fdeea2e49c9bb74eb301ecca93a
           name: 'Input fail cause'
@@ -299,8 +322,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
         -
           uuid: ab28b72c192e48b5819079bd386ba8ea
           name: 'Input frequency'
@@ -324,8 +347,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
           triggers:
             -
               uuid: 78e47553d4bb488991067f53cc8f8a01
@@ -333,6 +356,10 @@ zabbix_export:
               name: 'Unacceptable input frequency (out of range {$UPS.INPUT_FREQ.MIN.WARN}-{$UPS.INPUT_FREQ.MAX.WARN}Hz for {$TIME.PERIOD})'
               opdata: 'Current frequency: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: e90dbc034cc447afb4ac1c8ced484882
           name: 'Input voltage'
@@ -356,8 +383,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
           triggers:
             -
               uuid: 28ad85fa6035433f9a7ec45a8393b603
@@ -365,6 +392,10 @@ zabbix_export:
               name: 'Unacceptable input voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD})'
               opdata: 'Current voltage: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: a8d017e0fa5d4eca838ad068f0dffcd9
           name: 'Output current'
@@ -388,8 +419,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
         -
           uuid: a2613c8d71864594a0c94064d99e059e
           name: 'Output load'
@@ -414,8 +445,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
           triggers:
             -
               uuid: f667172a5cf44ed6b98f2bb38a3f3806
@@ -424,6 +455,10 @@ zabbix_export:
               opdata: 'Current load: {ITEM.LASTVALUE1}'
               priority: HIGH
               description: 'A battery installed has an internal error condition.'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 107461ac37984a708acf7f55ae248d67
           name: 'Output status'
@@ -449,64 +484,111 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: power
           triggers:
             -
               uuid: 80e30d37b1724c6ba1d58cedbcf6307f
               expression: 'last(/APC Smart-UPS 3000 XLM SNMP/output.status[upsBasicOutputStatus])=16'
               name: 'UPS is Emergency Static Bypass'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 9bb143ada4194c0084eb70af7bb2c5dc
               expression: 'last(/APC Smart-UPS 3000 XLM SNMP/output.status[upsBasicOutputStatus])=10'
               name: 'UPS is Hardware Failure Bypass'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 7132f256542540acadb0caf90144a29c
               expression: 'last(/APC Smart-UPS 3000 XLM SNMP/output.status[upsBasicOutputStatus])=7'
               name: 'UPS is Off'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 737693e5e4274823a9a21ff92a6ca98a
               expression: 'last(/APC Smart-UPS 3000 XLM SNMP/output.status[upsBasicOutputStatus])=3'
               name: 'UPS is on battery'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: c2fd31cfe3b8474f80b52a2340108b6a
               expression: 'last(/APC Smart-UPS 3000 XLM SNMP/output.status[upsBasicOutputStatus])=4'
               name: 'UPS is on Smart Boost'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 2c3a2e962c1e45f6858e5c1aaecee4a3
               expression: 'last(/APC Smart-UPS 3000 XLM SNMP/output.status[upsBasicOutputStatus])=12'
               name: 'UPS is On Smart Trim'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 59d415b15bbf43de85453f5b2ffb73d7
               expression: 'last(/APC Smart-UPS 3000 XLM SNMP/output.status[upsBasicOutputStatus])=8'
               name: 'UPS is Rebooting'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 6811d34cec57401089af9accfd66ca8f
               expression: 'last(/APC Smart-UPS 3000 XLM SNMP/output.status[upsBasicOutputStatus])=11'
               name: 'UPS is Sleeping Until Power Return'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 3c96ce14f54a4a59a2568f1f62117e7b
               expression: 'last(/APC Smart-UPS 3000 XLM SNMP/output.status[upsBasicOutputStatus])=6'
               name: 'UPS is Software Bypass'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 60e83c77157741cbb3d24920e87d7d59
               expression: 'last(/APC Smart-UPS 3000 XLM SNMP/output.status[upsBasicOutputStatus])=9'
               name: 'UPS is Switched Bypass'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: da442de0e8874736aaab88f009aabe76
               expression: 'last(/APC Smart-UPS 3000 XLM SNMP/output.status[upsBasicOutputStatus])=5'
               name: 'UPS is Timed Sleeping'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: ebf71f0afed5460ba4c7f66bb162de9f
           name: 'Output voltage'
@@ -530,8 +612,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
         -
           uuid: 92c2ef138bf148199cdb6d9684b6fa23
           name: 'SNMP traps (fallback)'
@@ -544,8 +626,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: fbcbe2cffc8c4bb6b11276cdd03376c3
           name: 'System contact details'
@@ -569,8 +651,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: a312df9175ca45528375398f56fa3b3b
           name: 'System description'
@@ -593,8 +675,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: a5c6c4c44132439abd0e5fd88e3c90cf
           name: 'System location'
@@ -617,8 +699,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 272883d0a1cd4bb585a6ede50336c873
           name: Model
@@ -639,8 +721,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: inventory
         -
           uuid: 1f591627fea54a9ebdd8f10cbf39b9ed
           name: 'System name'
@@ -664,8 +746,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: c9b1f69a882148a180ec1e2600068671
@@ -674,6 +756,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: f6922cd0f93a4a4288a978ff8336226b
           name: 'System object ID'
@@ -699,8 +788,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 0c36d0bb59a44db2b80ae4a4ff2d7c1b
           name: 'Serial number'
@@ -724,8 +813,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: inventory
         -
           uuid: 39dd6b9b815a4a838a43d2ebf3fcc8f9
           name: Uptime
@@ -747,8 +836,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 15764a5819174d3fadc75436f42650fb
@@ -761,6 +850,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/APC Smart-UPS 3000 XLM SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: edb39f7236d74c6783e0d4b832e0b94b
           name: 'SNMP agent availability'
@@ -782,8 +875,11 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 71994587c45546bfb0950606d7f69936
@@ -792,6 +888,10 @@ zabbix_export:
               opdata: 'Current state: {ITEM.LASTVALUE1}'
               priority: WARNING
               description: 'SNMP is not available for polling. Please check device connectivity and SNMP settings.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: 2edf8773186845499a991288d1a7a55b
@@ -822,8 +922,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: inventory
         -
           uuid: a0d8d681bfb54c1d9792beaf3f708d69
           name: 'External battery packs discovery'
@@ -860,8 +960,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: inventory
+                -
+                  tag: component
+                  value: power
             -
               uuid: b86ac9ee81fe40c8995618c387775270
               name: '{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery pack cartridge health'
@@ -888,8 +991,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: health
+                -
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: 400987be93b34a78865685fedb72a5ee
@@ -906,6 +1012,10 @@ zabbix_export:
                       bit 4 Battery lifetime exceeded acknowledged, replace battery
                       bit 5 Battery measured lifetime near end, order replacement cartridge
                       bit 6 Battery measured lifetime near end acknowledged, order replacement cartridge
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: db78c715c220433cb338199d43cb84a0
               name: '{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery status'
@@ -937,8 +1047,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: health
+                -
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: 03a100c0bb8d457690e2467c502fcadb
@@ -960,6 +1073,10 @@ zabbix_export:
                     bit 9 Communication
                     bit 10 DisconnectedFrame
                     bit 11 FirmwareMismatch
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: bab950aa54ca425db4593049a64cf56f
               name: '{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery temperature'
@@ -983,8 +1100,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 9760f6a951a64e3fa6c67a9dd751f79a
@@ -992,6 +1109,10 @@ zabbix_export:
                   name: '{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery has high temperature (over {$BATTERY.TEMP.MAX.WARN}℃ for {$TIME.PERIOD})'
                   opdata: 'Current temperature: {ITEM.LASTVALUE1}'
                   priority: HIGH
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: d2983b402dfd4435a4790d560da8f6f6
               name: '{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Serial number'
@@ -1012,8 +1133,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: General
+                  tag: component
+                  value: inventory
         -
           uuid: 88f5bc98004740fe886f5b1144de2c35
           name: 'External sensor port 1 discovery'
@@ -1044,8 +1165,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: humidity
+                -
+                  tag: component
+                  value: power
             -
               uuid: 04425d6cc153491d9cb710b875f8c9cb
               name: '{#EXTERNAL_SENSOR1_NAME}: Sensor alarm status'
@@ -1069,8 +1193,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: health
+                -
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: 9ba51ee0398444e1bd12cb805c1f7452
@@ -1078,18 +1205,30 @@ zabbix_export:
                   name: '{#EXTERNAL_SENSOR1_NAME}: Sensor has status Critical'
                   priority: HIGH
                   description: 'The external sensor has returned a value greater than the critical threshold.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: 490e952dfac944afb23eb0e72e081db3
                   expression: 'last(/APC Smart-UPS 3000 XLM SNMP/external.sensor.status[uioSensorStatusAlarmStatus.1.{#SNMPINDEX}])=4'
                   name: '{#EXTERNAL_SENSOR1_NAME}: Sensor has status Not Applicable'
                   priority: INFO
                   description: 'The external sensor does not work or is not connected.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: 8b740b88389b457eaa4d1d6c768ec8ae
                   expression: 'last(/APC Smart-UPS 3000 XLM SNMP/external.sensor.status[uioSensorStatusAlarmStatus.1.{#SNMPINDEX}])=2'
                   name: '{#EXTERNAL_SENSOR1_NAME}: Sensor has status Warning'
                   priority: AVERAGE
                   description: 'The external sensor has returned a value greater than the warning threshold.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 29cedff7a5f043caaaa8ff5798b3e925
               name: '{#EXTERNAL_SENSOR1_NAME}: Temperature sensor'
@@ -1110,8 +1249,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: power
+                -
+                  tag: component
+                  value: temperature
           overrides:
             -
               name: Temp
@@ -1159,8 +1301,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: humidity
+                -
+                  tag: component
+                  value: power
             -
               uuid: 58a2e39cd7fc4fe1bd825ce6086b4931
               name: '{#EXTERNAL_SENSOR2_NAME}: Sensor alarm status'
@@ -1184,8 +1329,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: health
+                -
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: 944fd36a2ad14fd29dd063ad03197cd7
@@ -1193,18 +1341,30 @@ zabbix_export:
                   name: '{#EXTERNAL_SENSOR2_NAME}: Sensor has status Critical'
                   priority: HIGH
                   description: 'The external sensor has returned a value greater than the critical threshold.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: 1a4473a5e1bf4fbbb5761fdb141769c0
                   expression: 'last(/APC Smart-UPS 3000 XLM SNMP/external.sensor.status[uioSensorStatusAlarmStatus.2.{#SNMPINDEX}])=4'
                   name: '{#EXTERNAL_SENSOR2_NAME}: Sensor has status Not Applicable'
                   priority: INFO
                   description: 'The external sensor does not work or is not connected.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: af8e01a221b84c73a3f67ab84ed9cfa0
                   expression: 'last(/APC Smart-UPS 3000 XLM SNMP/external.sensor.status[uioSensorStatusAlarmStatus.2.{#SNMPINDEX}])=2'
                   name: '{#EXTERNAL_SENSOR2_NAME}: Sensor has status Warning'
                   priority: AVERAGE
                   description: 'The external sensor has returned a value greater than the warning threshold.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: c78cd23b59254174b333514d9c8d28e1
               name: '{#EXTERNAL_SENSOR2_NAME}: Temperature sensor'
@@ -1225,8 +1385,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: power
+                -
+                  tag: component
+                  value: temperature
           overrides:
             -
               name: Temp
@@ -1277,8 +1440,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: power
             -
               uuid: 593b355efb0a4e40bd3527c24994da0a
               name: '{#PHASEINDEX}: Phase input voltage'
@@ -1299,8 +1462,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: 709ad3894aca49f0be051d338d4ffaed
@@ -1308,6 +1471,10 @@ zabbix_export:
                   name: '{#PHASEINDEX}: Unacceptable phase {#PHASEINDEX} input voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD})'
                   opdata: 'Current phase {#PHASEINDEX} voltage: {ITEM.LASTVALUE1}'
                   priority: HIGH
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
         -
           uuid: c1771434bf6b476280c2f2d15bb52608
           name: 'Output phases discovery'
@@ -1342,8 +1509,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: power
             -
               uuid: 32c88f722f074fd699d880a603aaa91b
               name: '{#PHASEINDEX}: Phase output load, %'
@@ -1365,8 +1532,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: power
             -
               uuid: 0502345887e54bbc849a9a4e46a571da
               name: '{#PHASEINDEX}: Phase output voltage'
@@ -1387,8 +1554,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: dbdf66b61dce4b6dbf49371e9b1f8146
@@ -1396,6 +1563,20 @@ zabbix_export:
                   name: '{#PHASEINDEX}: Unacceptable phase {#PHASEINDEX} output voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD})'
                   opdata: 'Current phase {#PHASEINDEX} voltage: {ITEM.LASTVALUE1}'
                   priority: HIGH
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
+      tags:
+        -
+          tag: class
+          value: power
+        -
+          tag: target
+          value: apc
+        -
+          tag: target
+          value: apc-smart-ups-3000-xlm
       macros:
         -
           macro: '{$BATTERY.CAPACITY.MIN.WARN}'
@@ -1433,178 +1614,6 @@ zabbix_export:
           macro: '{$UPS.OUTPUT.MAX.WARN}'
           value: '80'
           description: 'Maximum output load in % for trigger expression.'
-      dashboards:
-        -
-          uuid: 829373d305ce44cc9441714fc9d828a5
-          name: 'UPS Summary'
-          pages:
-            -
-              widgets:
-                -
-                  type: PLAIN_TEXT
-                  width: '8'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: show_as_html
-                      value: '0'
-                    -
-                      type: INTEGER
-                      name: show_lines
-                      value: '1'
-                    -
-                      type: ITEM
-                      name: itemids
-                      value:
-                        key: 'system.uptime[sysUpTime.0]'
-                        host: 'APC Smart-UPS 3000 XLM SNMP'
-                -
-                  type: PLAIN_TEXT
-                  x: '8'
-                  width: '8'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: show_as_html
-                      value: '0'
-                    -
-                      type: INTEGER
-                      name: show_lines
-                      value: '1'
-                    -
-                      type: ITEM
-                      name: itemids
-                      value:
-                        key: 'input.fail[upsAdvInputLineFailCause]'
-                        host: 'APC Smart-UPS 3000 XLM SNMP'
-                -
-                  type: PLAIN_TEXT
-                  x: '16'
-                  width: '8'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: show_as_html
-                      value: '0'
-                    -
-                      type: INTEGER
-                      name: show_lines
-                      value: '1'
-                    -
-                      type: ITEM
-                      name: itemids
-                      value:
-                        key: 'output.status[upsBasicOutputStatus]'
-                        host: 'APC Smart-UPS 3000 XLM SNMP'
-                -
-                  type: PLAIN_TEXT
-                  'y': '2'
-                  width: '8'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: show_as_html
-                      value: '0'
-                    -
-                      type: INTEGER
-                      name: show_lines
-                      value: '1'
-                    -
-                      type: ITEM
-                      name: itemids
-                      value:
-                        key: 'battery.status[upsBasicBatteryStatus]'
-                        host: 'APC Smart-UPS 3000 XLM SNMP'
-                -
-                  type: PLAIN_TEXT
-                  x: '8'
-                  'y': '2'
-                  width: '8'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: show_as_html
-                      value: '0'
-                    -
-                      type: INTEGER
-                      name: show_lines
-                      value: '1'
-                    -
-                      type: ITEM
-                      name: itemids
-                      value:
-                        key: 'battery.runtime_remaining[upsAdvBatteryRunTimeRemaining]'
-                        host: 'APC Smart-UPS 3000 XLM SNMP'
-                -
-                  type: PLAIN_TEXT
-                  x: '16'
-                  'y': '2'
-                  width: '8'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: show_as_html
-                      value: '0'
-                    -
-                      type: INTEGER
-                      name: show_lines
-                      value: '1'
-                    -
-                      type: ITEM
-                      name: itemids
-                      value:
-                        key: 'battery.last_replace_date[upsBasicBatteryLastReplaceDate]'
-                        host: 'APC Smart-UPS 3000 XLM SNMP'
-                -
-                  type: GRAPH_CLASSIC
-                  'y': '4'
-                  width: '8'
-                  height: '7'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: source_type
-                      value: '0'
-                    -
-                      type: GRAPH
-                      name: graphid
-                      value:
-                        name: 'Capacity of the UPS batteries'
-                        host: 'APC Smart-UPS 3000 XLM SNMP'
-                -
-                  type: GRAPH_CLASSIC
-                  x: '8'
-                  'y': '4'
-                  width: '8'
-                  height: '7'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: source_type
-                      value: '0'
-                    -
-                      type: GRAPH
-                      name: graphid
-                      value:
-                        name: Voltage
-                        host: 'APC Smart-UPS 3000 XLM SNMP'
-                -
-                  type: GRAPH_CLASSIC
-                  x: '16'
-                  'y': '4'
-                  width: '8'
-                  height: '7'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: source_type
-                      value: '0'
-                    -
-                      type: GRAPH
-                      name: graphid
-                      value:
-                        name: Output
-                        host: 'APC Smart-UPS 3000 XLM SNMP'
       valuemaps:
         -
           uuid: 55fecbd639c44c328b4199569a7305ef
diff --git a/templates/power/apc/apc_ups_smart_rt_1000_rm_xl_snmp/README.md b/templates/power/apc/apc_ups_smart_rt_1000_rm_xl_snmp/README.md
index ed1a80d5037..bde32b1123d 100644
--- a/templates/power/apc/apc_ups_smart_rt_1000_rm_xl_snmp/README.md
+++ b/templates/power/apc/apc_ups_smart_rt_1000_rm_xl_snmp/README.md
@@ -51,12 +51,12 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|Input phases discovery |<p>The input phase identifier. OID upsPhaseInputPhaseIndex.1.1</p> |SNMP |input.phases.discovery |
-|Output phases discovery |<p>The output phase identifier. OID upsPhaseOutputPhaseIndex.1.1</p> |SNMP |output.phases.discovery |
-|External battery packs discovery |<p>-</p> |SNMP |battery.packs.discovery<p>**Filter**:</p>AND <p>- {#CARTRIDGE_STATUS} NOT_MATCHES_REGEX `^$`</p> |
 |External bad battery packs discovery |<p>Discovery of the number of external defective battery packs.</p> |SNMP |battery.packs.bad.discovery |
+|External battery packs discovery |<p>-</p> |SNMP |battery.packs.discovery<p>**Filter**:</p>AND <p>- {#CARTRIDGE_STATUS} NOT_MATCHES_REGEX `^$`</p> |
 |External sensor port 1 discovery |<p>uioSensorStatusTable</p> |SNMP |external.sensor1.discovery<p>**Overrides:**</p><p>Temp<br> - {#EXTERNAL_SENSOR1_NAME} MATCHES_REGEX `Temp`<br>  - ITEM_PROTOTYPE LIKE `Humidity` - NO_DISCOVER</p> |
 |External sensor port 2 discovery |<p>uioSensorStatusTable</p> |SNMP |external.sensor2.discovery<p>**Overrides:**</p><p>Temp<br> - {#EXTERNAL_SENSOR2_NAME} MATCHES_REGEX `Temp`<br>  - ITEM_PROTOTYPE LIKE `Humidity` - NO_DISCOVER</p> |
+|Input phases discovery |<p>The input phase identifier. OID upsPhaseInputPhaseIndex.1.1</p> |SNMP |input.phases.discovery |
+|Output phases discovery |<p>The output phase identifier. OID upsPhaseOutputPhaseIndex.1.1</p> |SNMP |output.phases.discovery |
 
 ## Items collected
 
@@ -147,5 +147,5 @@ There are no template links in this template.
 
 Please report any issues with the template at https://support.zabbix.com
 
-You can also provide a feedback, discuss the template or ask for help with it at [ZABBIX forums](https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/420730-discussion-thread-for-official-zabbix-template-apc-ups).
+You can also provide feedback, discuss the template or ask for help with it at [ZABBIX forums](https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/420730-discussion-thread-for-official-zabbix-template-apc-ups).
 
diff --git a/templates/power/apc/apc_ups_smart_rt_1000_rm_xl_snmp/template_power_apc_ups_smart_rt_1000_rm_xl_snmp.yaml b/templates/power/apc/apc_ups_smart_rt_1000_rm_xl_snmp/template_power_apc_ups_smart_rt_1000_rm_xl_snmp.yaml
index 7b5ec3fef54..50372350454 100644
--- a/templates/power/apc/apc_ups_smart_rt_1000_rm_xl_snmp/template_power_apc_ups_smart_rt_1000_rm_xl_snmp.yaml
+++ b/templates/power/apc/apc_ups_smart_rt_1000_rm_xl_snmp/template_power_apc_ups_smart_rt_1000_rm_xl_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-15T17:56:53Z'
+  date: '2022-01-26T10:22:12Z'
   groups:
     -
       uuid: 3dcd5bbe90534f9e8eb5c2d53756af63
@@ -19,7 +19,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/420730-discussion-thread-for-official-zabbix-template-apc-ups
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Power
@@ -48,8 +48,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
           triggers:
             -
               uuid: 8ab182b26a0443539a1a114767d8acd7
@@ -57,6 +57,10 @@ zabbix_export:
               name: 'Battery has low capacity (below {$BATTERY.CAPACITY.MIN.WARN}%)'
               opdata: 'Current capacity: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: capacity
         -
           uuid: 1a52452353b443d6b965293fda3b16b9
           name: 'External battery packs count'
@@ -77,8 +81,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: inventory
         -
           uuid: 7a887ae254b04b19bac605bb36141767
           name: 'Battery last replace date'
@@ -103,8 +107,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: inventory
         -
           uuid: 8f4351d23be04a3abee1e6edb746a9ec
           name: 'Battery replace indicator'
@@ -124,8 +128,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
           triggers:
             -
               uuid: ab0db1327cf04a9c9a9ee757f0869603
@@ -133,6 +137,10 @@ zabbix_export:
               name: 'Battery needs replacement'
               priority: HIGH
               description: 'A battery installed has an internal error condition.'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: f151210b9cd749b2b3e5af2145733c82
           name: 'Battery runtime remaining'
@@ -157,8 +165,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
         -
           uuid: a631704123c2498aa8ce973e36c13698
           name: 'Battery status'
@@ -184,8 +192,11 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: power
           triggers:
             -
               uuid: c8787a09c2ea4aeb977b868ae0a3218b
@@ -193,12 +204,20 @@ zabbix_export:
               name: 'Battery has an internal error condition'
               priority: AVERAGE
               description: 'A battery installed has an internal error condition.'
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 40d1fdcec63d4c3785b5ba77fbd14ee7
               expression: 'last(/APC Smart-UPS RT 1000 RM XL SNMP/battery.status[upsBasicBatteryStatus])=3'
               name: 'Battery is Low'
               priority: AVERAGE
               description: 'The UPS will be unable to sustain the current load, and its services will be lost if power is not restored.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
         -
           uuid: c03e15aaf58f4056b88677c44c5d7d87
           name: 'Battery temperature'
@@ -223,8 +242,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: temperature
           triggers:
             -
               uuid: e2debe06675d4d4584b60b768633887b
@@ -232,6 +251,10 @@ zabbix_export:
               name: 'Battery has high temperature (over {$BATTERY.TEMP.MAX.WARN}℃ for {$TIME.PERIOD})'
               opdata: 'Current temperature: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 4b456cb5c0224b31a2f8b4bb40d8203b
           name: 'Battery voltage'
@@ -255,8 +278,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
         -
           uuid: 0a12f157ae844129a35084b5ab0a8eab
           name: 'Input fail cause'
@@ -299,8 +322,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
         -
           uuid: 0ceb5a6d71f440fcbd2da06b0cc1bbb3
           name: 'Input frequency'
@@ -324,8 +347,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
           triggers:
             -
               uuid: b29cd7e33c1e4e16b10fe436c1f7e6d6
@@ -333,6 +356,10 @@ zabbix_export:
               name: 'Unacceptable input frequency (out of range {$UPS.INPUT_FREQ.MIN.WARN}-{$UPS.INPUT_FREQ.MAX.WARN}Hz for {$TIME.PERIOD})'
               opdata: 'Current frequency: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: d7281586af02462a9a2f511c0a5741eb
           name: 'Input voltage'
@@ -356,8 +383,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
           triggers:
             -
               uuid: d38f2151f0eb486e8d44b72a2e361a5f
@@ -365,6 +392,10 @@ zabbix_export:
               name: 'Unacceptable input voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD})'
               opdata: 'Current voltage: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 145d3bf81b00427aad5563a4feb7aea1
           name: 'Output current'
@@ -388,8 +419,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
         -
           uuid: cd7b2c1b12df4fd19f37485aa380b295
           name: 'Output load'
@@ -414,8 +445,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
           triggers:
             -
               uuid: 57197c601f8a433d8ccdcb040d047f6f
@@ -424,6 +455,10 @@ zabbix_export:
               opdata: 'Current load: {ITEM.LASTVALUE1}'
               priority: HIGH
               description: 'A battery installed has an internal error condition.'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 3170d441ede24494b9570b6d318cc05f
           name: 'Output status'
@@ -449,64 +484,111 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: power
           triggers:
             -
               uuid: e9289d8f4e124097990e2af98e916368
               expression: 'last(/APC Smart-UPS RT 1000 RM XL SNMP/output.status[upsBasicOutputStatus])=16'
               name: 'UPS is Emergency Static Bypass'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 13735964f51d4d1bb17e6b0587a43020
               expression: 'last(/APC Smart-UPS RT 1000 RM XL SNMP/output.status[upsBasicOutputStatus])=10'
               name: 'UPS is Hardware Failure Bypass'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: d74ae82199884a7fb4a20b48f3c7ff1f
               expression: 'last(/APC Smart-UPS RT 1000 RM XL SNMP/output.status[upsBasicOutputStatus])=7'
               name: 'UPS is Off'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 4df5271075904c228a0372d5f667530e
               expression: 'last(/APC Smart-UPS RT 1000 RM XL SNMP/output.status[upsBasicOutputStatus])=3'
               name: 'UPS is on battery'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 3f02d9cb7f5142599e59e7781808e5c3
               expression: 'last(/APC Smart-UPS RT 1000 RM XL SNMP/output.status[upsBasicOutputStatus])=4'
               name: 'UPS is on Smart Boost'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 515ad03892694fd4a2f2350a6bb8af6f
               expression: 'last(/APC Smart-UPS RT 1000 RM XL SNMP/output.status[upsBasicOutputStatus])=12'
               name: 'UPS is On Smart Trim'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 2a2d35e4e4674b6aa49068a7970caa03
               expression: 'last(/APC Smart-UPS RT 1000 RM XL SNMP/output.status[upsBasicOutputStatus])=8'
               name: 'UPS is Rebooting'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: ef1ddb8869074847b70e8f669883c56b
               expression: 'last(/APC Smart-UPS RT 1000 RM XL SNMP/output.status[upsBasicOutputStatus])=11'
               name: 'UPS is Sleeping Until Power Return'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 0d6e4e664ddf425e8c03155802fe45be
               expression: 'last(/APC Smart-UPS RT 1000 RM XL SNMP/output.status[upsBasicOutputStatus])=6'
               name: 'UPS is Software Bypass'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 12a3a33152824ffe863a8d79c1372195
               expression: 'last(/APC Smart-UPS RT 1000 RM XL SNMP/output.status[upsBasicOutputStatus])=9'
               name: 'UPS is Switched Bypass'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 273c561c2afb4d78be86218e370c9a1f
               expression: 'last(/APC Smart-UPS RT 1000 RM XL SNMP/output.status[upsBasicOutputStatus])=5'
               name: 'UPS is Timed Sleeping'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 6c7d7d803647478c8f2a79875457110c
           name: 'Output voltage'
@@ -530,8 +612,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
         -
           uuid: d08fb7e3fae84d2cbae64ab9771ffcdc
           name: 'SNMP traps (fallback)'
@@ -544,8 +626,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: da60acc731a64257a90512b5c70d1e92
           name: 'System contact details'
@@ -569,8 +651,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 01302a36cafd421c90d746f785c83f3f
           name: 'System description'
@@ -593,8 +675,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: d0351d1bc1dc4f1b853fe64d456b3570
           name: 'System location'
@@ -617,8 +699,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 866889bb71e949c18520bf8fefd3e7ea
           name: Model
@@ -639,8 +721,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: inventory
         -
           uuid: 482bec6573f249abbb721f2ec90def3b
           name: 'System name'
@@ -664,8 +746,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: b13b087b9828426aac82a281071ceb8b
@@ -674,6 +756,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: 1c00c980ff284fb2bafb8358cc477d13
           name: 'System object ID'
@@ -699,8 +788,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 269ce166bb904fa8b11fc2fdf1f67d76
           name: 'Serial number'
@@ -724,8 +813,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: inventory
         -
           uuid: 336ef2166914449fafa13ab08fe7c7a1
           name: Uptime
@@ -747,8 +836,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 87ebd137f2744ae6879d6fd9d51314ef
@@ -761,6 +850,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/APC Smart-UPS RT 1000 RM XL SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: f4f9ebb1e55b41a5a6e470a541e136bc
           name: 'SNMP agent availability'
@@ -782,8 +875,11 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 53263bf0536d479785b45883b9b7ab21
@@ -792,6 +888,10 @@ zabbix_export:
               opdata: 'Current state: {ITEM.LASTVALUE1}'
               priority: WARNING
               description: 'SNMP is not available for polling. Please check device connectivity and SNMP settings.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: 67fa8bb8687b4a36b8d32cda72083966
@@ -822,8 +922,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: inventory
         -
           uuid: b4a8277fdf6f4e76a641690aaf6e7faa
           name: 'External battery packs discovery'
@@ -860,8 +960,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: inventory
+                -
+                  tag: component
+                  value: power
             -
               uuid: 2e7f6a940840406cb17bb1af20936326
               name: '{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery pack cartridge health'
@@ -888,8 +991,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: health
+                -
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: c1eefbeeb0d146c3bea5cae929d0c30b
@@ -906,6 +1012,10 @@ zabbix_export:
                       bit 4 Battery lifetime exceeded acknowledged, replace battery
                       bit 5 Battery measured lifetime near end, order replacement cartridge
                       bit 6 Battery measured lifetime near end acknowledged, order replacement cartridge
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: ad5ce159270e41899665be0a9f9697e1
               name: '{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery status'
@@ -937,8 +1047,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: health
+                -
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: 28b8fb69a85549288cf0e26b9ca0a2cf
@@ -960,6 +1073,10 @@ zabbix_export:
                     bit 9 Communication
                     bit 10 DisconnectedFrame
                     bit 11 FirmwareMismatch
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 1628e49e7f7b468ca2dee87a80321b44
               name: '{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery temperature'
@@ -983,8 +1100,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: fa007fcfbe7c499d8f97a808991f2800
@@ -992,6 +1109,10 @@ zabbix_export:
                   name: '{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery has high temperature (over {$BATTERY.TEMP.MAX.WARN}℃ for {$TIME.PERIOD})'
                   opdata: 'Current temperature: {ITEM.LASTVALUE1}'
                   priority: HIGH
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 7c2aec802cfa4b0292e9d1daa94aee05
               name: '{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Serial number'
@@ -1012,8 +1133,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: General
+                  tag: component
+                  value: inventory
         -
           uuid: 59467725274d4dba8e839d167cabe693
           name: 'External sensor port 1 discovery'
@@ -1044,8 +1165,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: humidity
+                -
+                  tag: component
+                  value: power
             -
               uuid: 137fdf42e0ab476e86e7b0b3bc87d5cc
               name: '{#EXTERNAL_SENSOR1_NAME}: Sensor alarm status'
@@ -1069,8 +1193,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: health
+                -
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: 175c1def62ac412eb5f9ef015a9b8ac3
@@ -1078,18 +1205,30 @@ zabbix_export:
                   name: '{#EXTERNAL_SENSOR1_NAME}: Sensor has status Critical'
                   priority: HIGH
                   description: 'The external sensor has returned a value greater than the critical threshold.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: e7610cf822674591bea6ed7ba5e4198d
                   expression: 'last(/APC Smart-UPS RT 1000 RM XL SNMP/external.sensor.status[uioSensorStatusAlarmStatus.1.{#SNMPINDEX}])=4'
                   name: '{#EXTERNAL_SENSOR1_NAME}: Sensor has status Not Applicable'
                   priority: INFO
                   description: 'The external sensor does not work or is not connected.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: 44353bbfcfbe42e59d2e58b544d32b43
                   expression: 'last(/APC Smart-UPS RT 1000 RM XL SNMP/external.sensor.status[uioSensorStatusAlarmStatus.1.{#SNMPINDEX}])=2'
                   name: '{#EXTERNAL_SENSOR1_NAME}: Sensor has status Warning'
                   priority: AVERAGE
                   description: 'The external sensor has returned a value greater than the warning threshold.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: b97e3012569840f1bb7da5f5403db6e0
               name: '{#EXTERNAL_SENSOR1_NAME}: Temperature sensor'
@@ -1110,8 +1249,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: power
+                -
+                  tag: component
+                  value: temperature
           overrides:
             -
               name: Temp
@@ -1159,8 +1301,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: humidity
+                -
+                  tag: component
+                  value: power
             -
               uuid: e10189271da445a494d274d99269ab75
               name: '{#EXTERNAL_SENSOR2_NAME}: Sensor alarm status'
@@ -1184,8 +1329,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: health
+                -
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: 5e937c991aa146fe98c1a4f868be6b70
@@ -1193,18 +1341,30 @@ zabbix_export:
                   name: '{#EXTERNAL_SENSOR2_NAME}: Sensor has status Critical'
                   priority: HIGH
                   description: 'The external sensor has returned a value greater than the critical threshold.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: f8dd227322784a708ae6297e796177f9
                   expression: 'last(/APC Smart-UPS RT 1000 RM XL SNMP/external.sensor.status[uioSensorStatusAlarmStatus.2.{#SNMPINDEX}])=4'
                   name: '{#EXTERNAL_SENSOR2_NAME}: Sensor has status Not Applicable'
                   priority: INFO
                   description: 'The external sensor does not work or is not connected.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: b142607d33e9447d88f23fc3ff7dc11d
                   expression: 'last(/APC Smart-UPS RT 1000 RM XL SNMP/external.sensor.status[uioSensorStatusAlarmStatus.2.{#SNMPINDEX}])=2'
                   name: '{#EXTERNAL_SENSOR2_NAME}: Sensor has status Warning'
                   priority: AVERAGE
                   description: 'The external sensor has returned a value greater than the warning threshold.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 11cac46ee1834e7c816a2cd9dcc02e82
               name: '{#EXTERNAL_SENSOR2_NAME}: Temperature sensor'
@@ -1225,8 +1385,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: power
+                -
+                  tag: component
+                  value: temperature
           overrides:
             -
               name: Temp
@@ -1277,8 +1440,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: power
             -
               uuid: 1baaad88e9064b92b453fb2c1c7d73d5
               name: '{#PHASEINDEX}: Phase input voltage'
@@ -1299,8 +1462,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: 971301abf4d6457da125fd7ebd903728
@@ -1308,6 +1471,10 @@ zabbix_export:
                   name: '{#PHASEINDEX}: Unacceptable phase {#PHASEINDEX} input voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD})'
                   opdata: 'Current phase {#PHASEINDEX} voltage: {ITEM.LASTVALUE1}'
                   priority: HIGH
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
         -
           uuid: cbd6b174482c4769887fc1aa2dc2ad5a
           name: 'Output phases discovery'
@@ -1342,8 +1509,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: power
             -
               uuid: 6d1812674e5646f8acf2ea47acf05a6d
               name: '{#PHASEINDEX}: Phase output load, %'
@@ -1365,8 +1532,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: power
             -
               uuid: 3c0573d586b24e53aeebb6c44b907bbd
               name: '{#PHASEINDEX}: Phase output voltage'
@@ -1387,8 +1554,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: d7167a129de146d19218edb85c82c69b
@@ -1396,6 +1563,20 @@ zabbix_export:
                   name: '{#PHASEINDEX}: Unacceptable phase {#PHASEINDEX} output voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD})'
                   opdata: 'Current phase {#PHASEINDEX} voltage: {ITEM.LASTVALUE1}'
                   priority: HIGH
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
+      tags:
+        -
+          tag: class
+          value: power
+        -
+          tag: target
+          value: apc
+        -
+          tag: target
+          value: apc-smart-ups-rt-1000-rm-xl
       macros:
         -
           macro: '{$BATTERY.CAPACITY.MIN.WARN}'
@@ -1433,178 +1614,6 @@ zabbix_export:
           macro: '{$UPS.OUTPUT.MAX.WARN}'
           value: '80'
           description: 'Maximum output load in % for trigger expression.'
-      dashboards:
-        -
-          uuid: 2fba6e227f9b4d8fa584664bfd600cf4
-          name: 'UPS Summary'
-          pages:
-            -
-              widgets:
-                -
-                  type: PLAIN_TEXT
-                  width: '8'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: show_as_html
-                      value: '0'
-                    -
-                      type: INTEGER
-                      name: show_lines
-                      value: '1'
-                    -
-                      type: ITEM
-                      name: itemids
-                      value:
-                        key: 'system.uptime[sysUpTime.0]'
-                        host: 'APC Smart-UPS RT 1000 RM XL SNMP'
-                -
-                  type: PLAIN_TEXT
-                  x: '8'
-                  width: '8'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: show_as_html
-                      value: '0'
-                    -
-                      type: INTEGER
-                      name: show_lines
-                      value: '1'
-                    -
-                      type: ITEM
-                      name: itemids
-                      value:
-                        key: 'input.fail[upsAdvInputLineFailCause]'
-                        host: 'APC Smart-UPS RT 1000 RM XL SNMP'
-                -
-                  type: PLAIN_TEXT
-                  x: '16'
-                  width: '8'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: show_as_html
-                      value: '0'
-                    -
-                      type: INTEGER
-                      name: show_lines
-                      value: '1'
-                    -
-                      type: ITEM
-                      name: itemids
-                      value:
-                        key: 'output.status[upsBasicOutputStatus]'
-                        host: 'APC Smart-UPS RT 1000 RM XL SNMP'
-                -
-                  type: PLAIN_TEXT
-                  'y': '2'
-                  width: '8'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: show_as_html
-                      value: '0'
-                    -
-                      type: INTEGER
-                      name: show_lines
-                      value: '1'
-                    -
-                      type: ITEM
-                      name: itemids
-                      value:
-                        key: 'battery.status[upsBasicBatteryStatus]'
-                        host: 'APC Smart-UPS RT 1000 RM XL SNMP'
-                -
-                  type: PLAIN_TEXT
-                  x: '8'
-                  'y': '2'
-                  width: '8'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: show_as_html
-                      value: '0'
-                    -
-                      type: INTEGER
-                      name: show_lines
-                      value: '1'
-                    -
-                      type: ITEM
-                      name: itemids
-                      value:
-                        key: 'battery.runtime_remaining[upsAdvBatteryRunTimeRemaining]'
-                        host: 'APC Smart-UPS RT 1000 RM XL SNMP'
-                -
-                  type: PLAIN_TEXT
-                  x: '16'
-                  'y': '2'
-                  width: '8'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: show_as_html
-                      value: '0'
-                    -
-                      type: INTEGER
-                      name: show_lines
-                      value: '1'
-                    -
-                      type: ITEM
-                      name: itemids
-                      value:
-                        key: 'battery.last_replace_date[upsBasicBatteryLastReplaceDate]'
-                        host: 'APC Smart-UPS RT 1000 RM XL SNMP'
-                -
-                  type: GRAPH_CLASSIC
-                  'y': '4'
-                  width: '8'
-                  height: '7'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: source_type
-                      value: '0'
-                    -
-                      type: GRAPH
-                      name: graphid
-                      value:
-                        name: 'Capacity of the UPS batteries'
-                        host: 'APC Smart-UPS RT 1000 RM XL SNMP'
-                -
-                  type: GRAPH_CLASSIC
-                  x: '8'
-                  'y': '4'
-                  width: '8'
-                  height: '7'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: source_type
-                      value: '0'
-                    -
-                      type: GRAPH
-                      name: graphid
-                      value:
-                        name: Voltage
-                        host: 'APC Smart-UPS RT 1000 RM XL SNMP'
-                -
-                  type: GRAPH_CLASSIC
-                  x: '16'
-                  'y': '4'
-                  width: '8'
-                  height: '7'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: source_type
-                      value: '0'
-                    -
-                      type: GRAPH
-                      name: graphid
-                      value:
-                        name: Output
-                        host: 'APC Smart-UPS RT 1000 RM XL SNMP'
       valuemaps:
         -
           uuid: 7cf932d3b9304f2cb151134e9ea3be82
diff --git a/templates/power/apc/apc_ups_smart_rt_1000_xl_snmp/README.md b/templates/power/apc/apc_ups_smart_rt_1000_xl_snmp/README.md
index 08876651d82..17f94eb40c4 100644
--- a/templates/power/apc/apc_ups_smart_rt_1000_xl_snmp/README.md
+++ b/templates/power/apc/apc_ups_smart_rt_1000_xl_snmp/README.md
@@ -51,12 +51,12 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|Input phases discovery |<p>The input phase identifier. OID upsPhaseInputPhaseIndex.1.1</p> |SNMP |input.phases.discovery |
-|Output phases discovery |<p>The output phase identifier. OID upsPhaseOutputPhaseIndex.1.1</p> |SNMP |output.phases.discovery |
-|External battery packs discovery |<p>-</p> |SNMP |battery.packs.discovery<p>**Filter**:</p>AND <p>- {#CARTRIDGE_STATUS} NOT_MATCHES_REGEX `^$`</p> |
 |External bad battery packs discovery |<p>Discovery of the number of external defective battery packs.</p> |SNMP |battery.packs.bad.discovery |
+|External battery packs discovery |<p>-</p> |SNMP |battery.packs.discovery<p>**Filter**:</p>AND <p>- {#CARTRIDGE_STATUS} NOT_MATCHES_REGEX `^$`</p> |
 |External sensor port 1 discovery |<p>uioSensorStatusTable</p> |SNMP |external.sensor1.discovery<p>**Overrides:**</p><p>Temp<br> - {#EXTERNAL_SENSOR1_NAME} MATCHES_REGEX `Temp`<br>  - ITEM_PROTOTYPE LIKE `Humidity` - NO_DISCOVER</p> |
 |External sensor port 2 discovery |<p>uioSensorStatusTable</p> |SNMP |external.sensor2.discovery<p>**Overrides:**</p><p>Temp<br> - {#EXTERNAL_SENSOR2_NAME} MATCHES_REGEX `Temp`<br>  - ITEM_PROTOTYPE LIKE `Humidity` - NO_DISCOVER</p> |
+|Input phases discovery |<p>The input phase identifier. OID upsPhaseInputPhaseIndex.1.1</p> |SNMP |input.phases.discovery |
+|Output phases discovery |<p>The output phase identifier. OID upsPhaseOutputPhaseIndex.1.1</p> |SNMP |output.phases.discovery |
 
 ## Items collected
 
@@ -147,5 +147,5 @@ There are no template links in this template.
 
 Please report any issues with the template at https://support.zabbix.com
 
-You can also provide a feedback, discuss the template or ask for help with it at [ZABBIX forums](https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/420730-discussion-thread-for-official-zabbix-template-apc-ups).
+You can also provide feedback, discuss the template or ask for help with it at [ZABBIX forums](https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/420730-discussion-thread-for-official-zabbix-template-apc-ups).
 
diff --git a/templates/power/apc/apc_ups_smart_rt_1000_xl_snmp/template_power_apc_ups_smart_rt_1000_xl_snmp.yaml b/templates/power/apc/apc_ups_smart_rt_1000_xl_snmp/template_power_apc_ups_smart_rt_1000_xl_snmp.yaml
index 566fd363f2c..252188560be 100644
--- a/templates/power/apc/apc_ups_smart_rt_1000_xl_snmp/template_power_apc_ups_smart_rt_1000_xl_snmp.yaml
+++ b/templates/power/apc/apc_ups_smart_rt_1000_xl_snmp/template_power_apc_ups_smart_rt_1000_xl_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-15T17:56:56Z'
+  date: '2022-01-26T10:21:18Z'
   groups:
     -
       uuid: 3dcd5bbe90534f9e8eb5c2d53756af63
@@ -19,7 +19,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/420730-discussion-thread-for-official-zabbix-template-apc-ups
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Power
@@ -48,8 +48,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
           triggers:
             -
               uuid: b5d618c6090447429191fe4d07e85afa
@@ -57,6 +57,10 @@ zabbix_export:
               name: 'Battery has low capacity (below {$BATTERY.CAPACITY.MIN.WARN}%)'
               opdata: 'Current capacity: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: capacity
         -
           uuid: 7f3b05afa58142d5b8670c40c196baf8
           name: 'External battery packs count'
@@ -77,8 +81,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: inventory
         -
           uuid: 87b91005f5ff4ba5b0086e25eaa799bd
           name: 'Battery last replace date'
@@ -103,8 +107,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: inventory
         -
           uuid: 44a33eba233e4bd7ac51ca2dcabf2939
           name: 'Battery replace indicator'
@@ -124,8 +128,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
           triggers:
             -
               uuid: dc92c19a5b7e43a4b155d6d51912aaf8
@@ -133,6 +137,10 @@ zabbix_export:
               name: 'Battery needs replacement'
               priority: HIGH
               description: 'A battery installed has an internal error condition.'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 95749270e6234d6cbd1edb0c5e1118e0
           name: 'Battery runtime remaining'
@@ -157,8 +165,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
         -
           uuid: 047a5a3a957949d288588eb11f36f25e
           name: 'Battery status'
@@ -184,8 +192,11 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: power
           triggers:
             -
               uuid: 70c32834ea40487c8f13a55b7ed7c88f
@@ -193,12 +204,20 @@ zabbix_export:
               name: 'Battery has an internal error condition'
               priority: AVERAGE
               description: 'A battery installed has an internal error condition.'
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: e7aeaae896664729b66b42a94f626f9b
               expression: 'last(/APC Smart-UPS RT 1000 XL SNMP/battery.status[upsBasicBatteryStatus])=3'
               name: 'Battery is Low'
               priority: AVERAGE
               description: 'The UPS will be unable to sustain the current load, and its services will be lost if power is not restored.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
         -
           uuid: 04cd5e06823846b58ad57e2c358f346e
           name: 'Battery temperature'
@@ -223,8 +242,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: temperature
           triggers:
             -
               uuid: 33695c02cf6141f78e21ca899af10c03
@@ -232,6 +251,10 @@ zabbix_export:
               name: 'Battery has high temperature (over {$BATTERY.TEMP.MAX.WARN}℃ for {$TIME.PERIOD})'
               opdata: 'Current temperature: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 8ee98deaf4bf46afb06f694d19757237
           name: 'Battery voltage'
@@ -255,8 +278,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
         -
           uuid: 4cb80c94f3d14674bc7a3933c7571eac
           name: 'Input fail cause'
@@ -299,8 +322,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
         -
           uuid: 700a78a4ab3c441496ecafc5ddde6a9d
           name: 'Input frequency'
@@ -324,8 +347,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
           triggers:
             -
               uuid: 167de2d832984944878767571b0b5fe4
@@ -333,6 +356,10 @@ zabbix_export:
               name: 'Unacceptable input frequency (out of range {$UPS.INPUT_FREQ.MIN.WARN}-{$UPS.INPUT_FREQ.MAX.WARN}Hz for {$TIME.PERIOD})'
               opdata: 'Current frequency: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: e2b5b824c4704293ad68185971e9fb03
           name: 'Input voltage'
@@ -356,8 +383,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
           triggers:
             -
               uuid: b8741bc0081a4a9db2824c9f93ecb399
@@ -365,6 +392,10 @@ zabbix_export:
               name: 'Unacceptable input voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD})'
               opdata: 'Current voltage: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 861757e4bb1a4dc6ac1c8ef94d973328
           name: 'Output current'
@@ -388,8 +419,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
         -
           uuid: 1d9d7ef724ff41eda4fd536df6af93cb
           name: 'Output load'
@@ -414,8 +445,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
           triggers:
             -
               uuid: a4faec3975134cd59e83f1ca7fa3ef7d
@@ -424,6 +455,10 @@ zabbix_export:
               opdata: 'Current load: {ITEM.LASTVALUE1}'
               priority: HIGH
               description: 'A battery installed has an internal error condition.'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 3edf5e7776ae4cc6aebcedcbf4ab8d78
           name: 'Output status'
@@ -449,64 +484,111 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: power
           triggers:
             -
               uuid: deedd977f1ed4b9fbb5cc161dde0c116
               expression: 'last(/APC Smart-UPS RT 1000 XL SNMP/output.status[upsBasicOutputStatus])=16'
               name: 'UPS is Emergency Static Bypass'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: a7bbe6ca410743919f7c611a6faec9ba
               expression: 'last(/APC Smart-UPS RT 1000 XL SNMP/output.status[upsBasicOutputStatus])=10'
               name: 'UPS is Hardware Failure Bypass'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 974042a124b945068c6c16c4a01433dc
               expression: 'last(/APC Smart-UPS RT 1000 XL SNMP/output.status[upsBasicOutputStatus])=7'
               name: 'UPS is Off'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 90e810043e41467b8460278fc7923397
               expression: 'last(/APC Smart-UPS RT 1000 XL SNMP/output.status[upsBasicOutputStatus])=3'
               name: 'UPS is on battery'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 656ae233f3a946799c3ed3d48914c0b0
               expression: 'last(/APC Smart-UPS RT 1000 XL SNMP/output.status[upsBasicOutputStatus])=4'
               name: 'UPS is on Smart Boost'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 3fcbd14931854831ac603a254ffea0c3
               expression: 'last(/APC Smart-UPS RT 1000 XL SNMP/output.status[upsBasicOutputStatus])=12'
               name: 'UPS is On Smart Trim'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 65085178eef54189afdaf4937de49177
               expression: 'last(/APC Smart-UPS RT 1000 XL SNMP/output.status[upsBasicOutputStatus])=8'
               name: 'UPS is Rebooting'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 0aa402907ee446c0a13fa086b500fa87
               expression: 'last(/APC Smart-UPS RT 1000 XL SNMP/output.status[upsBasicOutputStatus])=11'
               name: 'UPS is Sleeping Until Power Return'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: be6cdd1fc22a4f0eacdbce4361cd6788
               expression: 'last(/APC Smart-UPS RT 1000 XL SNMP/output.status[upsBasicOutputStatus])=6'
               name: 'UPS is Software Bypass'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: b4375fc980ae4bee87531d18ea9a5397
               expression: 'last(/APC Smart-UPS RT 1000 XL SNMP/output.status[upsBasicOutputStatus])=9'
               name: 'UPS is Switched Bypass'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 7ae9e31ac32944928065d1cefb2c4e2f
               expression: 'last(/APC Smart-UPS RT 1000 XL SNMP/output.status[upsBasicOutputStatus])=5'
               name: 'UPS is Timed Sleeping'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: bcb28618699448ea8d9d056bad203a0e
           name: 'Output voltage'
@@ -530,8 +612,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
         -
           uuid: d633cd3273e74209a1b0c6b761028e0a
           name: 'SNMP traps (fallback)'
@@ -544,8 +626,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: 50cc8e7cea0c40948c006623dfa94dae
           name: 'System contact details'
@@ -569,8 +651,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: e0d638ab398f40e8a9555925cd8ba907
           name: 'System description'
@@ -593,8 +675,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 031b9d385cae4641b9ecfb76c4174262
           name: 'System location'
@@ -617,8 +699,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 320221ba30744ca78b8dce03dccd549b
           name: Model
@@ -639,8 +721,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: inventory
         -
           uuid: e4d9441075954c068b6fd92bbff49cef
           name: 'System name'
@@ -664,8 +746,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 31bb0ff1ea334cd59d9f8b8f489611ef
@@ -674,6 +756,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: 4e7a9b6aa8dd4371b83bf47f8246cebf
           name: 'System object ID'
@@ -699,8 +788,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 9ebb979a5e4a45fd9acf956df034f9be
           name: 'Serial number'
@@ -724,8 +813,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: inventory
         -
           uuid: bbcb555846df4169bc7aead77403e8eb
           name: Uptime
@@ -747,8 +836,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 860d3beb50c0400283a71c2c4b4ea5e2
@@ -761,6 +850,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/APC Smart-UPS RT 1000 XL SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: f24fc7ed9ffa4884891a01a0f1565fc4
           name: 'SNMP agent availability'
@@ -782,8 +875,11 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 21fc3a198f3b423fa14676278f53a4be
@@ -792,6 +888,10 @@ zabbix_export:
               opdata: 'Current state: {ITEM.LASTVALUE1}'
               priority: WARNING
               description: 'SNMP is not available for polling. Please check device connectivity and SNMP settings.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: 9389b159502e4242b02a11104124bae5
@@ -822,8 +922,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: inventory
         -
           uuid: ec66331f2ae64801a3ef51d6dec5a00f
           name: 'External battery packs discovery'
@@ -860,8 +960,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: inventory
+                -
+                  tag: component
+                  value: power
             -
               uuid: 3c829e3adec64fb39334dbacc03a3229
               name: '{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery pack cartridge health'
@@ -888,8 +991,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: health
+                -
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: c353d8e0b0584c6c8ba81514f5c66995
@@ -906,6 +1012,10 @@ zabbix_export:
                       bit 4 Battery lifetime exceeded acknowledged, replace battery
                       bit 5 Battery measured lifetime near end, order replacement cartridge
                       bit 6 Battery measured lifetime near end acknowledged, order replacement cartridge
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 15f52cb076cb414fb794113e9981fdde
               name: '{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery status'
@@ -937,8 +1047,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: health
+                -
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: 26535b11c27b4fbe92285b56cbbf5a73
@@ -960,6 +1073,10 @@ zabbix_export:
                     bit 9 Communication
                     bit 10 DisconnectedFrame
                     bit 11 FirmwareMismatch
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: e0d8f68302264c1b9420284f3e3a0272
               name: '{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery temperature'
@@ -983,8 +1100,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 7f8613d752524d588e60aa1cab2c60bd
@@ -992,6 +1109,10 @@ zabbix_export:
                   name: '{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery has high temperature (over {$BATTERY.TEMP.MAX.WARN}℃ for {$TIME.PERIOD})'
                   opdata: 'Current temperature: {ITEM.LASTVALUE1}'
                   priority: HIGH
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: bca352c952174256b9cfbcffb86fbf90
               name: '{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Serial number'
@@ -1012,8 +1133,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: General
+                  tag: component
+                  value: inventory
         -
           uuid: 19379361227740c3bf8bc9852886538d
           name: 'External sensor port 1 discovery'
@@ -1044,8 +1165,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: humidity
+                -
+                  tag: component
+                  value: power
             -
               uuid: 1a475822bc324bbf8c4aa15c34734270
               name: '{#EXTERNAL_SENSOR1_NAME}: Sensor alarm status'
@@ -1069,8 +1193,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: health
+                -
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: 40e22c5379f34edf87d1ea52ffae60b8
@@ -1078,18 +1205,30 @@ zabbix_export:
                   name: '{#EXTERNAL_SENSOR1_NAME}: Sensor has status Critical'
                   priority: HIGH
                   description: 'The external sensor has returned a value greater than the critical threshold.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: a482de04a5d34807874fc7a7c506dd40
                   expression: 'last(/APC Smart-UPS RT 1000 XL SNMP/external.sensor.status[uioSensorStatusAlarmStatus.1.{#SNMPINDEX}])=4'
                   name: '{#EXTERNAL_SENSOR1_NAME}: Sensor has status Not Applicable'
                   priority: INFO
                   description: 'The external sensor does not work or is not connected.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: dca875c511b04dc1857de74223c4f27b
                   expression: 'last(/APC Smart-UPS RT 1000 XL SNMP/external.sensor.status[uioSensorStatusAlarmStatus.1.{#SNMPINDEX}])=2'
                   name: '{#EXTERNAL_SENSOR1_NAME}: Sensor has status Warning'
                   priority: AVERAGE
                   description: 'The external sensor has returned a value greater than the warning threshold.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 6d1005b2b6ad41369174d93b1ebe1959
               name: '{#EXTERNAL_SENSOR1_NAME}: Temperature sensor'
@@ -1110,8 +1249,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: power
+                -
+                  tag: component
+                  value: temperature
           overrides:
             -
               name: Temp
@@ -1159,8 +1301,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: humidity
+                -
+                  tag: component
+                  value: power
             -
               uuid: 4774fd152aab49de9064490cf7ec1d0a
               name: '{#EXTERNAL_SENSOR2_NAME}: Sensor alarm status'
@@ -1184,8 +1329,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: health
+                -
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: 650a1d16e56c45188c6246e960d62857
@@ -1193,18 +1341,30 @@ zabbix_export:
                   name: '{#EXTERNAL_SENSOR2_NAME}: Sensor has status Critical'
                   priority: HIGH
                   description: 'The external sensor has returned a value greater than the critical threshold.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: 7518ae06e3a14866b9e6d90a224055f7
                   expression: 'last(/APC Smart-UPS RT 1000 XL SNMP/external.sensor.status[uioSensorStatusAlarmStatus.2.{#SNMPINDEX}])=4'
                   name: '{#EXTERNAL_SENSOR2_NAME}: Sensor has status Not Applicable'
                   priority: INFO
                   description: 'The external sensor does not work or is not connected.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: 65aa8a5380f141498dd9c718972110b3
                   expression: 'last(/APC Smart-UPS RT 1000 XL SNMP/external.sensor.status[uioSensorStatusAlarmStatus.2.{#SNMPINDEX}])=2'
                   name: '{#EXTERNAL_SENSOR2_NAME}: Sensor has status Warning'
                   priority: AVERAGE
                   description: 'The external sensor has returned a value greater than the warning threshold.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: d94425f2025045459af40e8fcb72734e
               name: '{#EXTERNAL_SENSOR2_NAME}: Temperature sensor'
@@ -1225,8 +1385,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: power
+                -
+                  tag: component
+                  value: temperature
           overrides:
             -
               name: Temp
@@ -1277,8 +1440,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: power
             -
               uuid: cf03abf328754a4082017f480051292f
               name: '{#PHASEINDEX}: Phase input voltage'
@@ -1299,8 +1462,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: 8c9226411afb4b32ba3e9d6232ff4710
@@ -1308,6 +1471,10 @@ zabbix_export:
                   name: '{#PHASEINDEX}: Unacceptable phase {#PHASEINDEX} input voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD})'
                   opdata: 'Current phase {#PHASEINDEX} voltage: {ITEM.LASTVALUE1}'
                   priority: HIGH
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
         -
           uuid: a7b39188df294ec182c3e1f2a2417154
           name: 'Output phases discovery'
@@ -1342,8 +1509,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: power
             -
               uuid: ba4a2ae8abea4e2692b9a43231783648
               name: '{#PHASEINDEX}: Phase output load, %'
@@ -1365,8 +1532,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: power
             -
               uuid: 4e22c7f6d7e14b20b3720e082042fd4f
               name: '{#PHASEINDEX}: Phase output voltage'
@@ -1387,8 +1554,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: 58e0697a9a9147a4b1dfda251f2b593e
@@ -1396,6 +1563,20 @@ zabbix_export:
                   name: '{#PHASEINDEX}: Unacceptable phase {#PHASEINDEX} output voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD})'
                   opdata: 'Current phase {#PHASEINDEX} voltage: {ITEM.LASTVALUE1}'
                   priority: HIGH
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
+      tags:
+        -
+          tag: class
+          value: power
+        -
+          tag: target
+          value: apc
+        -
+          tag: target
+          value: apc-smart-ups-rt-1000-xl
       macros:
         -
           macro: '{$BATTERY.CAPACITY.MIN.WARN}'
@@ -1433,178 +1614,6 @@ zabbix_export:
           macro: '{$UPS.OUTPUT.MAX.WARN}'
           value: '80'
           description: 'Maximum output load in % for trigger expression.'
-      dashboards:
-        -
-          uuid: 8e5f02a3eab44a5f85011b7331696284
-          name: 'UPS Summary'
-          pages:
-            -
-              widgets:
-                -
-                  type: PLAIN_TEXT
-                  width: '8'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: show_as_html
-                      value: '0'
-                    -
-                      type: INTEGER
-                      name: show_lines
-                      value: '1'
-                    -
-                      type: ITEM
-                      name: itemids
-                      value:
-                        key: 'system.uptime[sysUpTime.0]'
-                        host: 'APC Smart-UPS RT 1000 XL SNMP'
-                -
-                  type: PLAIN_TEXT
-                  x: '8'
-                  width: '8'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: show_as_html
-                      value: '0'
-                    -
-                      type: INTEGER
-                      name: show_lines
-                      value: '1'
-                    -
-                      type: ITEM
-                      name: itemids
-                      value:
-                        key: 'input.fail[upsAdvInputLineFailCause]'
-                        host: 'APC Smart-UPS RT 1000 XL SNMP'
-                -
-                  type: PLAIN_TEXT
-                  x: '16'
-                  width: '8'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: show_as_html
-                      value: '0'
-                    -
-                      type: INTEGER
-                      name: show_lines
-                      value: '1'
-                    -
-                      type: ITEM
-                      name: itemids
-                      value:
-                        key: 'output.status[upsBasicOutputStatus]'
-                        host: 'APC Smart-UPS RT 1000 XL SNMP'
-                -
-                  type: PLAIN_TEXT
-                  'y': '2'
-                  width: '8'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: show_as_html
-                      value: '0'
-                    -
-                      type: INTEGER
-                      name: show_lines
-                      value: '1'
-                    -
-                      type: ITEM
-                      name: itemids
-                      value:
-                        key: 'battery.status[upsBasicBatteryStatus]'
-                        host: 'APC Smart-UPS RT 1000 XL SNMP'
-                -
-                  type: PLAIN_TEXT
-                  x: '8'
-                  'y': '2'
-                  width: '8'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: show_as_html
-                      value: '0'
-                    -
-                      type: INTEGER
-                      name: show_lines
-                      value: '1'
-                    -
-                      type: ITEM
-                      name: itemids
-                      value:
-                        key: 'battery.runtime_remaining[upsAdvBatteryRunTimeRemaining]'
-                        host: 'APC Smart-UPS RT 1000 XL SNMP'
-                -
-                  type: PLAIN_TEXT
-                  x: '16'
-                  'y': '2'
-                  width: '8'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: show_as_html
-                      value: '0'
-                    -
-                      type: INTEGER
-                      name: show_lines
-                      value: '1'
-                    -
-                      type: ITEM
-                      name: itemids
-                      value:
-                        key: 'battery.last_replace_date[upsBasicBatteryLastReplaceDate]'
-                        host: 'APC Smart-UPS RT 1000 XL SNMP'
-                -
-                  type: GRAPH_CLASSIC
-                  'y': '4'
-                  width: '8'
-                  height: '7'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: source_type
-                      value: '0'
-                    -
-                      type: GRAPH
-                      name: graphid
-                      value:
-                        name: 'Capacity of the UPS batteries'
-                        host: 'APC Smart-UPS RT 1000 XL SNMP'
-                -
-                  type: GRAPH_CLASSIC
-                  x: '8'
-                  'y': '4'
-                  width: '8'
-                  height: '7'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: source_type
-                      value: '0'
-                    -
-                      type: GRAPH
-                      name: graphid
-                      value:
-                        name: Voltage
-                        host: 'APC Smart-UPS RT 1000 XL SNMP'
-                -
-                  type: GRAPH_CLASSIC
-                  x: '16'
-                  'y': '4'
-                  width: '8'
-                  height: '7'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: source_type
-                      value: '0'
-                    -
-                      type: GRAPH
-                      name: graphid
-                      value:
-                        name: Output
-                        host: 'APC Smart-UPS RT 1000 XL SNMP'
       valuemaps:
         -
           uuid: b2af1e2dcb874d43949c383f9b347f36
diff --git a/templates/power/apc/apc_ups_smart_srt_5000_snmp/README.md b/templates/power/apc/apc_ups_smart_srt_5000_snmp/README.md
index de12a500a86..9f499694f12 100644
--- a/templates/power/apc/apc_ups_smart_srt_5000_snmp/README.md
+++ b/templates/power/apc/apc_ups_smart_srt_5000_snmp/README.md
@@ -51,12 +51,12 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|Input phases discovery |<p>The input phase identifier. OID upsPhaseInputPhaseIndex.1.1</p> |SNMP |input.phases.discovery |
-|Output phases discovery |<p>The output phase identifier. OID upsPhaseOutputPhaseIndex.1.1</p> |SNMP |output.phases.discovery |
-|External battery packs discovery |<p>-</p> |SNMP |battery.packs.discovery<p>**Filter**:</p>AND <p>- {#CARTRIDGE_STATUS} NOT_MATCHES_REGEX `^$`</p> |
 |External bad battery packs discovery |<p>Discovery of the number of external defective battery packs.</p> |SNMP |battery.packs.bad.discovery |
+|External battery packs discovery |<p>-</p> |SNMP |battery.packs.discovery<p>**Filter**:</p>AND <p>- {#CARTRIDGE_STATUS} NOT_MATCHES_REGEX `^$`</p> |
 |External sensor port 1 discovery |<p>uioSensorStatusTable</p> |SNMP |external.sensor1.discovery<p>**Overrides:**</p><p>Temp<br> - {#EXTERNAL_SENSOR1_NAME} MATCHES_REGEX `Temp`<br>  - ITEM_PROTOTYPE LIKE `Humidity` - NO_DISCOVER</p> |
 |External sensor port 2 discovery |<p>uioSensorStatusTable</p> |SNMP |external.sensor2.discovery<p>**Overrides:**</p><p>Temp<br> - {#EXTERNAL_SENSOR2_NAME} MATCHES_REGEX `Temp`<br>  - ITEM_PROTOTYPE LIKE `Humidity` - NO_DISCOVER</p> |
+|Input phases discovery |<p>The input phase identifier. OID upsPhaseInputPhaseIndex.1.1</p> |SNMP |input.phases.discovery |
+|Output phases discovery |<p>The output phase identifier. OID upsPhaseOutputPhaseIndex.1.1</p> |SNMP |output.phases.discovery |
 
 ## Items collected
 
@@ -115,8 +115,8 @@ There are no template links in this template.
 |Battery has low capacity (below {$BATTERY.CAPACITY.MIN.WARN}%) |<p>-</p> |`last(/APC Smart-UPS SRT 5000 SNMP/battery.capacity[upsHighPrecBatteryCapacity]) < {$BATTERY.CAPACITY.MIN.WARN}` |HIGH | |
 |Battery needs replacement |<p>A battery installed has an internal error condition.</p> |`last(/APC Smart-UPS SRT 5000 SNMP/battery.replace_indicator[upsAdvBatteryReplaceIndicator])=2` |HIGH | |
 |Battery has high temperature (over {$BATTERY.TEMP.MAX.WARN}℃ for {$TIME.PERIOD}) |<p>-</p> |`min(/APC Smart-UPS SRT 5000 SNMP/battery.temperature[upsHighPrecBatteryTemperature],{$TIME.PERIOD}) > {$BATTERY.TEMP.MAX.WARN}` |HIGH | |
-|Unacceptable input voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD}) |<p>-</p> |`min(/APC Smart-UPS SRT 5000 SNMP/input.voltage[upsHighPrecInputLineVoltage],{$TIME.PERIOD}) > 0 and ((min(/APC Smart-UPS SRT 5000 SNMP/input.voltage[upsHighPrecInputLineVoltage],{$TIME.PERIOD}) > {$UPS.INPUT_VOLT.MAX.WARN} or max(/APC Smart-UPS SRT 5000 SNMP/input.voltage[upsHighPrecInputLineVoltage],{$TIME.PERIOD}) < {$UPS.INPUT_VOLT.MIN.WARN}))` |HIGH | |
-|Unacceptable input frequency (out of range {$UPS.INPUT_FREQ.MIN.WARN}-{$UPS.INPUT_FREQ.MAX.WARN}Hz for {$TIME.PERIOD}) |<p>-</p> |`min(/APC Smart-UPS SRT 5000 SNMP/input.frequency[upsHighPrecInputFrequency],{$TIME.PERIOD}) > 0 and ((min(/APC Smart-UPS SRT 5000 SNMP/input.frequency[upsHighPrecInputFrequency],{$TIME.PERIOD}) > {$UPS.INPUT_FREQ.MAX.WARN} or max(/APC Smart-UPS SRT 5000 SNMP/input.frequency[upsHighPrecInputFrequency],{$TIME.PERIOD}) < {$UPS.INPUT_FREQ.MIN.WARN}))` |HIGH | |
+|Unacceptable input voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD}) |<p>-</p> |`min(/APC Smart-UPS SRT 5000 SNMP/input.voltage[upsHighPrecInputLineVoltage],{$TIME.PERIOD}) > 0 and (min(/APC Smart-UPS SRT 5000 SNMP/input.voltage[upsHighPrecInputLineVoltage],{$TIME.PERIOD}) > {$UPS.INPUT_VOLT.MAX.WARN} or max(/APC Smart-UPS SRT 5000 SNMP/input.voltage[upsHighPrecInputLineVoltage],{$TIME.PERIOD}) < {$UPS.INPUT_VOLT.MIN.WARN})` |HIGH | |
+|Unacceptable input frequency (out of range {$UPS.INPUT_FREQ.MIN.WARN}-{$UPS.INPUT_FREQ.MAX.WARN}Hz for {$TIME.PERIOD}) |<p>-</p> |`min(/APC Smart-UPS SRT 5000 SNMP/input.frequency[upsHighPrecInputFrequency],{$TIME.PERIOD}) > 0 and (min(/APC Smart-UPS SRT 5000 SNMP/input.frequency[upsHighPrecInputFrequency],{$TIME.PERIOD}) > {$UPS.INPUT_FREQ.MAX.WARN} or max(/APC Smart-UPS SRT 5000 SNMP/input.frequency[upsHighPrecInputFrequency],{$TIME.PERIOD}) < {$UPS.INPUT_FREQ.MIN.WARN})` |HIGH | |
 |Output load is high (over {$UPS.OUTPUT.MAX.WARN}% for {$TIME.PERIOD}) |<p>A battery installed has an internal error condition.</p> |`min(/APC Smart-UPS SRT 5000 SNMP/output.load[upsHighPrecOutputLoad],{$TIME.PERIOD}) > {$UPS.OUTPUT.MAX.WARN}` |HIGH | |
 |UPS is Timed Sleeping |<p>-</p> |`last(/APC Smart-UPS SRT 5000 SNMP/output.status[upsBasicOutputStatus])=5` |AVERAGE | |
 |UPS is Switched Bypass |<p>-</p> |`last(/APC Smart-UPS SRT 5000 SNMP/output.status[upsBasicOutputStatus])=9` |AVERAGE | |
@@ -147,5 +147,5 @@ There are no template links in this template.
 
 Please report any issues with the template at https://support.zabbix.com
 
-You can also provide a feedback, discuss the template or ask for help with it at [ZABBIX forums](https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/420730-discussion-thread-for-official-zabbix-template-apc-ups).
+You can also provide feedback, discuss the template or ask for help with it at [ZABBIX forums](https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/420730-discussion-thread-for-official-zabbix-template-apc-ups).
 
diff --git a/templates/power/apc/apc_ups_smart_srt_5000_snmp/template_power_apc_ups_smart_srt_5000_snmp.yaml b/templates/power/apc/apc_ups_smart_srt_5000_snmp/template_power_apc_ups_smart_srt_5000_snmp.yaml
index 7941d8dab19..c280a2d7f4e 100644
--- a/templates/power/apc/apc_ups_smart_srt_5000_snmp/template_power_apc_ups_smart_srt_5000_snmp.yaml
+++ b/templates/power/apc/apc_ups_smart_srt_5000_snmp/template_power_apc_ups_smart_srt_5000_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-15T17:57:00Z'
+  date: '2022-01-26T10:21:40Z'
   groups:
     -
       uuid: 3dcd5bbe90534f9e8eb5c2d53756af63
@@ -19,7 +19,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/420730-discussion-thread-for-official-zabbix-template-apc-ups
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Power
@@ -48,8 +48,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
           triggers:
             -
               uuid: 0103da3d5f414d8ba1e9914d5c8d5f76
@@ -57,6 +57,10 @@ zabbix_export:
               name: 'Battery has low capacity (below {$BATTERY.CAPACITY.MIN.WARN}%)'
               opdata: 'Current capacity: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: capacity
         -
           uuid: 7652aff14f644896be902fe18f3bb46a
           name: 'External battery packs count'
@@ -77,8 +81,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: inventory
         -
           uuid: ee059b1bb6ac486c8c5dd29654899d71
           name: 'Battery last replace date'
@@ -103,8 +107,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: inventory
         -
           uuid: f4d790f93a1c4e75a7ebd3d89d0d9d90
           name: 'Battery replace indicator'
@@ -124,8 +128,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
           triggers:
             -
               uuid: 09573345f6ce4d648f56117c8755e368
@@ -133,6 +137,10 @@ zabbix_export:
               name: 'Battery needs replacement'
               priority: HIGH
               description: 'A battery installed has an internal error condition.'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 6aacf5a02a824b9d8b3c2676b126b186
           name: 'Battery runtime remaining'
@@ -157,8 +165,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
         -
           uuid: aebc8b49a97243038b97855c5d20edb7
           name: 'Battery status'
@@ -184,8 +192,11 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: power
           triggers:
             -
               uuid: 743aef1e53ee464da48d2953ddc3b85c
@@ -193,12 +204,20 @@ zabbix_export:
               name: 'Battery has an internal error condition'
               priority: AVERAGE
               description: 'A battery installed has an internal error condition.'
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: d648d686ff994625bd17f959c311fddd
               expression: 'last(/APC Smart-UPS SRT 5000 SNMP/battery.status[upsBasicBatteryStatus])=3'
               name: 'Battery is Low'
               priority: AVERAGE
               description: 'The UPS will be unable to sustain the current load, and its services will be lost if power is not restored.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
         -
           uuid: 48552e466ee54883ae3cbfd5e549ffc5
           name: 'Battery temperature'
@@ -223,8 +242,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: temperature
           triggers:
             -
               uuid: e47ba98e74c94bd3886ac65cd1075359
@@ -232,6 +251,10 @@ zabbix_export:
               name: 'Battery has high temperature (over {$BATTERY.TEMP.MAX.WARN}℃ for {$TIME.PERIOD})'
               opdata: 'Current temperature: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 560031163d54444cb5ead172e9e238d2
           name: 'Battery voltage'
@@ -255,8 +278,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
         -
           uuid: 09f34437ff2e422bb62d7ba44b05657c
           name: 'Input fail cause'
@@ -299,8 +322,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
         -
           uuid: fb816e1a6ff640d69a5465e78febc03e
           name: 'Input frequency'
@@ -324,15 +347,19 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
           triggers:
             -
               uuid: 3fa853edcebe42eba858e45f1a4465ee
-              expression: 'min(/APC Smart-UPS SRT 5000 SNMP/input.frequency[upsHighPrecInputFrequency],{$TIME.PERIOD}) > 0 and ((min(/APC Smart-UPS SRT 5000 SNMP/input.frequency[upsHighPrecInputFrequency],{$TIME.PERIOD}) > {$UPS.INPUT_FREQ.MAX.WARN} or max(/APC Smart-UPS SRT 5000 SNMP/input.frequency[upsHighPrecInputFrequency],{$TIME.PERIOD}) < {$UPS.INPUT_FREQ.MIN.WARN}))'
+              expression: 'min(/APC Smart-UPS SRT 5000 SNMP/input.frequency[upsHighPrecInputFrequency],{$TIME.PERIOD}) > 0 and (min(/APC Smart-UPS SRT 5000 SNMP/input.frequency[upsHighPrecInputFrequency],{$TIME.PERIOD}) > {$UPS.INPUT_FREQ.MAX.WARN} or max(/APC Smart-UPS SRT 5000 SNMP/input.frequency[upsHighPrecInputFrequency],{$TIME.PERIOD}) < {$UPS.INPUT_FREQ.MIN.WARN})'
               name: 'Unacceptable input frequency (out of range {$UPS.INPUT_FREQ.MIN.WARN}-{$UPS.INPUT_FREQ.MAX.WARN}Hz for {$TIME.PERIOD})'
               opdata: 'Current frequency: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 65acc805ec7f4a2883d28f51b32054cc
           name: 'Input voltage'
@@ -356,15 +383,19 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
           triggers:
             -
               uuid: 74b42439050b48b6bf41abb5bb39808b
-              expression: 'min(/APC Smart-UPS SRT 5000 SNMP/input.voltage[upsHighPrecInputLineVoltage],{$TIME.PERIOD}) > 0 and ((min(/APC Smart-UPS SRT 5000 SNMP/input.voltage[upsHighPrecInputLineVoltage],{$TIME.PERIOD}) > {$UPS.INPUT_VOLT.MAX.WARN} or max(/APC Smart-UPS SRT 5000 SNMP/input.voltage[upsHighPrecInputLineVoltage],{$TIME.PERIOD}) < {$UPS.INPUT_VOLT.MIN.WARN}))'
+              expression: 'min(/APC Smart-UPS SRT 5000 SNMP/input.voltage[upsHighPrecInputLineVoltage],{$TIME.PERIOD}) > 0 and (min(/APC Smart-UPS SRT 5000 SNMP/input.voltage[upsHighPrecInputLineVoltage],{$TIME.PERIOD}) > {$UPS.INPUT_VOLT.MAX.WARN} or max(/APC Smart-UPS SRT 5000 SNMP/input.voltage[upsHighPrecInputLineVoltage],{$TIME.PERIOD}) < {$UPS.INPUT_VOLT.MIN.WARN})'
               name: 'Unacceptable input voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD})'
               opdata: 'Current voltage: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: b0d66c706be8457cbf794171253dd927
           name: 'Output current'
@@ -388,8 +419,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
         -
           uuid: 5427a9b46ea54920b3fcc7d8ca413e0e
           name: 'Output load'
@@ -414,8 +445,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
           triggers:
             -
               uuid: e099efa7266f44008819979830147665
@@ -424,6 +455,10 @@ zabbix_export:
               opdata: 'Current load: {ITEM.LASTVALUE1}'
               priority: HIGH
               description: 'A battery installed has an internal error condition.'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: c87c096a38284b82bb0fd8c9dfe871ef
           name: 'Output status'
@@ -449,64 +484,111 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: power
           triggers:
             -
               uuid: edcc1dc962fa4a228b2f5cd3617efbc6
               expression: 'last(/APC Smart-UPS SRT 5000 SNMP/output.status[upsBasicOutputStatus])=16'
               name: 'UPS is Emergency Static Bypass'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 869fed8cdd5a4f369e3b1ff2474280de
               expression: 'last(/APC Smart-UPS SRT 5000 SNMP/output.status[upsBasicOutputStatus])=10'
               name: 'UPS is Hardware Failure Bypass'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 378a246b34454d73b2248757be60a7ea
               expression: 'last(/APC Smart-UPS SRT 5000 SNMP/output.status[upsBasicOutputStatus])=7'
               name: 'UPS is Off'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 286dc25a245f45c3bdcc64925b41aef6
               expression: 'last(/APC Smart-UPS SRT 5000 SNMP/output.status[upsBasicOutputStatus])=3'
               name: 'UPS is on battery'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 4d02a4c4f25a4efda7bd30def8364972
               expression: 'last(/APC Smart-UPS SRT 5000 SNMP/output.status[upsBasicOutputStatus])=4'
               name: 'UPS is on Smart Boost'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: ae91f99b089748cdaeb0185e31ffe82e
               expression: 'last(/APC Smart-UPS SRT 5000 SNMP/output.status[upsBasicOutputStatus])=12'
               name: 'UPS is On Smart Trim'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 0bb0ef56d82e4c2a9414468c61fb3a96
               expression: 'last(/APC Smart-UPS SRT 5000 SNMP/output.status[upsBasicOutputStatus])=8'
               name: 'UPS is Rebooting'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 6a5a7e4b17384131a337619ec4a9c1e6
               expression: 'last(/APC Smart-UPS SRT 5000 SNMP/output.status[upsBasicOutputStatus])=11'
               name: 'UPS is Sleeping Until Power Return'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 232c98b7ca654c91a20d52ce6f21d7a1
               expression: 'last(/APC Smart-UPS SRT 5000 SNMP/output.status[upsBasicOutputStatus])=6'
               name: 'UPS is Software Bypass'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 65b8d109db8d4448a7ead131581fcbbe
               expression: 'last(/APC Smart-UPS SRT 5000 SNMP/output.status[upsBasicOutputStatus])=9'
               name: 'UPS is Switched Bypass'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 917c1f3c82e044a89f2f56a2c8a602a6
               expression: 'last(/APC Smart-UPS SRT 5000 SNMP/output.status[upsBasicOutputStatus])=5'
               name: 'UPS is Timed Sleeping'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 998d1322a2274da19abe10cdcb3c52e0
           name: 'Output voltage'
@@ -530,8 +612,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
         -
           uuid: 3892c18baef54c598dc78035f5a7540a
           name: 'SNMP traps (fallback)'
@@ -544,8 +626,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: 7485fd42dd2749028a2d67f315888723
           name: 'System contact details'
@@ -569,8 +651,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 0617c89b47454dbd833fcc2b8d570db8
           name: 'System description'
@@ -593,8 +675,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: a57de4a9da144c2aa880253e4e2b46f9
           name: 'System location'
@@ -617,8 +699,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 7e81f54bbbdd41ca8f9e010dbddc485f
           name: Model
@@ -639,8 +721,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: inventory
         -
           uuid: 5778610ee61d472d9dc8c8da94f9e301
           name: 'System name'
@@ -664,8 +746,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 154aad534c35473cb4513cb4e3d4a082
@@ -674,6 +756,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: 1782e98504114e7c847b6d127b3a3ae1
           name: 'System object ID'
@@ -699,8 +788,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: a3069693d6e545978fb877d767dface5
           name: 'Serial number'
@@ -724,8 +813,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: inventory
         -
           uuid: 1b9e4b13cfcb4680b25dd8974900fc17
           name: Uptime
@@ -747,8 +836,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 7793a5e111c6466584ef6610aae707c1
@@ -761,6 +850,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/APC Smart-UPS SRT 5000 SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 63079124c55f479dad013d0c15077577
           name: 'SNMP agent availability'
@@ -782,8 +875,11 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 6e0f9b15effd4c9e9c416a99fd8f4517
@@ -792,6 +888,10 @@ zabbix_export:
               opdata: 'Current state: {ITEM.LASTVALUE1}'
               priority: WARNING
               description: 'SNMP is not available for polling. Please check device connectivity and SNMP settings.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: af4472b543b54699b6e812de51be2419
@@ -822,8 +922,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: inventory
         -
           uuid: a3716fb0833e4655b63ec4ccc5736950
           name: 'External battery packs discovery'
@@ -860,8 +960,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: inventory
+                -
+                  tag: component
+                  value: power
             -
               uuid: 8629f478f8e44e079b69914b498ce2f5
               name: '{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery pack cartridge health'
@@ -888,8 +991,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: health
+                -
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: b29f9bd2e80242be940682139f303121
@@ -906,6 +1012,10 @@ zabbix_export:
                       bit 4 Battery lifetime exceeded acknowledged, replace battery
                       bit 5 Battery measured lifetime near end, order replacement cartridge
                       bit 6 Battery measured lifetime near end acknowledged, order replacement cartridge
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: fd2d784d618a4ad883a4afb8a9b94940
               name: '{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery status'
@@ -937,8 +1047,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: health
+                -
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: 0a96a9726cdd4431ad6e6d52e7461d69
@@ -960,6 +1073,10 @@ zabbix_export:
                     bit 9 Communication
                     bit 10 DisconnectedFrame
                     bit 11 FirmwareMismatch
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 6b20217de8474cc08ca3818784804109
               name: '{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery temperature'
@@ -983,8 +1100,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: dbb191572a17451296ae4ee8d3aeec73
@@ -992,6 +1109,10 @@ zabbix_export:
                   name: '{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery has high temperature (over {$BATTERY.TEMP.MAX.WARN}℃ for {$TIME.PERIOD})'
                   opdata: 'Current temperature: {ITEM.LASTVALUE1}'
                   priority: HIGH
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 7757bd184a7c4c0bbd442c7a3013f6d9
               name: '{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Serial number'
@@ -1012,8 +1133,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: General
+                  tag: component
+                  value: inventory
         -
           uuid: e858b8966abc444a914ef60c1708b835
           name: 'External sensor port 1 discovery'
@@ -1044,8 +1165,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: humidity
+                -
+                  tag: component
+                  value: power
             -
               uuid: 5cab24d2166244fd9528930edbafa677
               name: '{#EXTERNAL_SENSOR1_NAME}: Sensor alarm status'
@@ -1069,8 +1193,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: health
+                -
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: fc448a3d2ae4462a903863364bec836d
@@ -1078,18 +1205,30 @@ zabbix_export:
                   name: '{#EXTERNAL_SENSOR1_NAME}: Sensor has status Critical'
                   priority: HIGH
                   description: 'The external sensor has returned a value greater than the critical threshold.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: 3340123b060949a4b806a5a757862026
                   expression: 'last(/APC Smart-UPS SRT 5000 SNMP/external.sensor.status[uioSensorStatusAlarmStatus.1.{#SNMPINDEX}])=4'
                   name: '{#EXTERNAL_SENSOR1_NAME}: Sensor has status Not Applicable'
                   priority: INFO
                   description: 'The external sensor does not work or is not connected.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: 5ac7c47c37804492947716e5857275c4
                   expression: 'last(/APC Smart-UPS SRT 5000 SNMP/external.sensor.status[uioSensorStatusAlarmStatus.1.{#SNMPINDEX}])=2'
                   name: '{#EXTERNAL_SENSOR1_NAME}: Sensor has status Warning'
                   priority: AVERAGE
                   description: 'The external sensor has returned a value greater than the warning threshold.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: af55c3c3bc2f45ec9f735de0fb5a4285
               name: '{#EXTERNAL_SENSOR1_NAME}: Temperature sensor'
@@ -1110,8 +1249,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: power
+                -
+                  tag: component
+                  value: temperature
           overrides:
             -
               name: Temp
@@ -1159,8 +1301,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: humidity
+                -
+                  tag: component
+                  value: power
             -
               uuid: e09e9e197d2f4afc83231cb304a26b09
               name: '{#EXTERNAL_SENSOR2_NAME}: Sensor alarm status'
@@ -1184,8 +1329,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: health
+                -
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: 8774e39abe784f6b9fe2f33c30f3fa05
@@ -1193,18 +1341,30 @@ zabbix_export:
                   name: '{#EXTERNAL_SENSOR2_NAME}: Sensor has status Critical'
                   priority: HIGH
                   description: 'The external sensor has returned a value greater than the critical threshold.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: d41c9de571ea4b48a1213f98a058c550
                   expression: 'last(/APC Smart-UPS SRT 5000 SNMP/external.sensor.status[uioSensorStatusAlarmStatus.2.{#SNMPINDEX}])=4'
                   name: '{#EXTERNAL_SENSOR2_NAME}: Sensor has status Not Applicable'
                   priority: INFO
                   description: 'The external sensor does not work or is not connected.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: c9e751b9449f4616beeb36b51cf0a3b9
                   expression: 'last(/APC Smart-UPS SRT 5000 SNMP/external.sensor.status[uioSensorStatusAlarmStatus.2.{#SNMPINDEX}])=2'
                   name: '{#EXTERNAL_SENSOR2_NAME}: Sensor has status Warning'
                   priority: AVERAGE
                   description: 'The external sensor has returned a value greater than the warning threshold.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 7bc1fa7e114e40ffadd4336a3980e4c2
               name: '{#EXTERNAL_SENSOR2_NAME}: Temperature sensor'
@@ -1225,8 +1385,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: power
+                -
+                  tag: component
+                  value: temperature
           overrides:
             -
               name: Temp
@@ -1277,8 +1440,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: power
             -
               uuid: 15de75236e9c44f1bb4bbf4c0425c9c2
               name: '{#PHASEINDEX}: Phase input voltage'
@@ -1299,8 +1462,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: b8d5cbee0bc14df58a217b33222aa75d
@@ -1308,6 +1471,10 @@ zabbix_export:
                   name: '{#PHASEINDEX}: Unacceptable phase {#PHASEINDEX} input voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD})'
                   opdata: 'Current phase {#PHASEINDEX} voltage: {ITEM.LASTVALUE1}'
                   priority: HIGH
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
         -
           uuid: e4f2cd7e1f004c4abd5be7e5fc28a9eb
           name: 'Output phases discovery'
@@ -1342,8 +1509,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: power
             -
               uuid: 3d35f771f73545e2806153f33e747bc4
               name: '{#PHASEINDEX}: Phase output load, %'
@@ -1365,8 +1532,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: power
             -
               uuid: d27c63f29e9b453a9bbdac1c0c8065ae
               name: '{#PHASEINDEX}: Phase output voltage'
@@ -1387,8 +1554,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: 176a3014124f4f23bedbad120cb2b69a
@@ -1396,6 +1563,20 @@ zabbix_export:
                   name: '{#PHASEINDEX}: Unacceptable phase {#PHASEINDEX} output voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD})'
                   opdata: 'Current phase {#PHASEINDEX} voltage: {ITEM.LASTVALUE1}'
                   priority: HIGH
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
+      tags:
+        -
+          tag: class
+          value: power
+        -
+          tag: target
+          value: apc
+        -
+          tag: target
+          value: apc-smart-ups-srt-5000
       macros:
         -
           macro: '{$BATTERY.CAPACITY.MIN.WARN}'
@@ -1433,178 +1614,6 @@ zabbix_export:
           macro: '{$UPS.OUTPUT.MAX.WARN}'
           value: '80'
           description: 'Maximum output load in % for trigger expression.'
-      dashboards:
-        -
-          uuid: ceb28c7c39e44859a4c1076978a40788
-          name: 'UPS Summary'
-          pages:
-            -
-              widgets:
-                -
-                  type: PLAIN_TEXT
-                  width: '8'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: show_lines
-                      value: '1'
-                    -
-                      type: INTEGER
-                      name: show_as_html
-                      value: '0'
-                    -
-                      type: ITEM
-                      name: itemids
-                      value:
-                        key: 'system.uptime[sysUpTime.0]'
-                        host: 'APC Smart-UPS SRT 5000 SNMP'
-                -
-                  type: PLAIN_TEXT
-                  x: '8'
-                  width: '8'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: show_lines
-                      value: '1'
-                    -
-                      type: INTEGER
-                      name: show_as_html
-                      value: '0'
-                    -
-                      type: ITEM
-                      name: itemids
-                      value:
-                        key: 'input.fail[upsAdvInputLineFailCause]'
-                        host: 'APC Smart-UPS SRT 5000 SNMP'
-                -
-                  type: PLAIN_TEXT
-                  x: '16'
-                  width: '8'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: show_lines
-                      value: '1'
-                    -
-                      type: INTEGER
-                      name: show_as_html
-                      value: '0'
-                    -
-                      type: ITEM
-                      name: itemids
-                      value:
-                        key: 'output.status[upsBasicOutputStatus]'
-                        host: 'APC Smart-UPS SRT 5000 SNMP'
-                -
-                  type: PLAIN_TEXT
-                  'y': '2'
-                  width: '8'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: show_lines
-                      value: '1'
-                    -
-                      type: INTEGER
-                      name: show_as_html
-                      value: '0'
-                    -
-                      type: ITEM
-                      name: itemids
-                      value:
-                        key: 'battery.status[upsBasicBatteryStatus]'
-                        host: 'APC Smart-UPS SRT 5000 SNMP'
-                -
-                  type: PLAIN_TEXT
-                  x: '8'
-                  'y': '2'
-                  width: '8'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: show_lines
-                      value: '1'
-                    -
-                      type: INTEGER
-                      name: show_as_html
-                      value: '0'
-                    -
-                      type: ITEM
-                      name: itemids
-                      value:
-                        key: 'battery.runtime_remaining[upsAdvBatteryRunTimeRemaining]'
-                        host: 'APC Smart-UPS SRT 5000 SNMP'
-                -
-                  type: PLAIN_TEXT
-                  x: '16'
-                  'y': '2'
-                  width: '8'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: show_lines
-                      value: '1'
-                    -
-                      type: INTEGER
-                      name: show_as_html
-                      value: '0'
-                    -
-                      type: ITEM
-                      name: itemids
-                      value:
-                        key: 'battery.last_replace_date[upsBasicBatteryLastReplaceDate]'
-                        host: 'APC Smart-UPS SRT 5000 SNMP'
-                -
-                  type: GRAPH_CLASSIC
-                  'y': '4'
-                  width: '8'
-                  height: '7'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: source_type
-                      value: '0'
-                    -
-                      type: GRAPH
-                      name: graphid
-                      value:
-                        name: 'Capacity of the UPS batteries'
-                        host: 'APC Smart-UPS SRT 5000 SNMP'
-                -
-                  type: GRAPH_CLASSIC
-                  x: '8'
-                  'y': '4'
-                  width: '8'
-                  height: '7'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: source_type
-                      value: '0'
-                    -
-                      type: GRAPH
-                      name: graphid
-                      value:
-                        name: Voltage
-                        host: 'APC Smart-UPS SRT 5000 SNMP'
-                -
-                  type: GRAPH_CLASSIC
-                  x: '16'
-                  'y': '4'
-                  width: '8'
-                  height: '7'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: source_type
-                      value: '0'
-                    -
-                      type: GRAPH
-                      name: graphid
-                      value:
-                        name: Output
-                        host: 'APC Smart-UPS SRT 5000 SNMP'
       valuemaps:
         -
           uuid: 41e166e2a5f948488238198920ab4b17
diff --git a/templates/power/apc/apc_ups_smart_srt_8000_snmp/README.md b/templates/power/apc/apc_ups_smart_srt_8000_snmp/README.md
index dd74bb85093..9426b13847b 100644
--- a/templates/power/apc/apc_ups_smart_srt_8000_snmp/README.md
+++ b/templates/power/apc/apc_ups_smart_srt_8000_snmp/README.md
@@ -51,12 +51,12 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|Input phases discovery |<p>The input phase identifier. OID upsPhaseInputPhaseIndex.1.1</p> |SNMP |input.phases.discovery |
-|Output phases discovery |<p>The output phase identifier. OID upsPhaseOutputPhaseIndex.1.1</p> |SNMP |output.phases.discovery |
-|External battery packs discovery |<p>-</p> |SNMP |battery.packs.discovery<p>**Filter**:</p>AND <p>- {#CARTRIDGE_STATUS} NOT_MATCHES_REGEX `^$`</p> |
 |External bad battery packs discovery |<p>Discovery of the number of external defective battery packs.</p> |SNMP |battery.packs.bad.discovery |
+|External battery packs discovery |<p>-</p> |SNMP |battery.packs.discovery<p>**Filter**:</p>AND <p>- {#CARTRIDGE_STATUS} NOT_MATCHES_REGEX `^$`</p> |
 |External sensor port 1 discovery |<p>uioSensorStatusTable</p> |SNMP |external.sensor1.discovery<p>**Overrides:**</p><p>Temp<br> - {#EXTERNAL_SENSOR1_NAME} MATCHES_REGEX `Temp`<br>  - ITEM_PROTOTYPE LIKE `Humidity` - NO_DISCOVER</p> |
 |External sensor port 2 discovery |<p>uioSensorStatusTable</p> |SNMP |external.sensor2.discovery<p>**Overrides:**</p><p>Temp<br> - {#EXTERNAL_SENSOR2_NAME} MATCHES_REGEX `Temp`<br>  - ITEM_PROTOTYPE LIKE `Humidity` - NO_DISCOVER</p> |
+|Input phases discovery |<p>The input phase identifier. OID upsPhaseInputPhaseIndex.1.1</p> |SNMP |input.phases.discovery |
+|Output phases discovery |<p>The output phase identifier. OID upsPhaseOutputPhaseIndex.1.1</p> |SNMP |output.phases.discovery |
 
 ## Items collected
 
@@ -147,5 +147,5 @@ There are no template links in this template.
 
 Please report any issues with the template at https://support.zabbix.com
 
-You can also provide a feedback, discuss the template or ask for help with it at [ZABBIX forums](https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/420730-discussion-thread-for-official-zabbix-template-apc-ups).
+You can also provide feedback, discuss the template or ask for help with it at [ZABBIX forums](https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/420730-discussion-thread-for-official-zabbix-template-apc-ups).
 
diff --git a/templates/power/apc/apc_ups_smart_srt_8000_snmp/template_power_apc_ups_smart_srt_8000_snmp.yaml b/templates/power/apc/apc_ups_smart_srt_8000_snmp/template_power_apc_ups_smart_srt_8000_snmp.yaml
index 54395e941bf..ee17973cca9 100644
--- a/templates/power/apc/apc_ups_smart_srt_8000_snmp/template_power_apc_ups_smart_srt_8000_snmp.yaml
+++ b/templates/power/apc/apc_ups_smart_srt_8000_snmp/template_power_apc_ups_smart_srt_8000_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-15T17:57:04Z'
+  date: '2022-01-26T10:21:50Z'
   groups:
     -
       uuid: 3dcd5bbe90534f9e8eb5c2d53756af63
@@ -19,7 +19,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/420730-discussion-thread-for-official-zabbix-template-apc-ups
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Power
@@ -48,8 +48,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
           triggers:
             -
               uuid: 92e6a65ffc6d4a6bae62303ee2796580
@@ -57,6 +57,10 @@ zabbix_export:
               name: 'Battery has low capacity (below {$BATTERY.CAPACITY.MIN.WARN}%)'
               opdata: 'Current capacity: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: capacity
         -
           uuid: 7d7c2b962e9843b8a6cf72c04ff1e479
           name: 'External battery packs count'
@@ -77,8 +81,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: inventory
         -
           uuid: 552e030c272d43a0998bc2648f15ae44
           name: 'Battery last replace date'
@@ -103,8 +107,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: inventory
         -
           uuid: 4cdd4bbff845477194a6d96a31431d23
           name: 'Battery replace indicator'
@@ -124,8 +128,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
           triggers:
             -
               uuid: 0e8030c0028144728361153c2b47016b
@@ -133,6 +137,10 @@ zabbix_export:
               name: 'Battery needs replacement'
               priority: HIGH
               description: 'A battery installed has an internal error condition.'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: ae8a19896d21405ca99a5bfbd5de1f95
           name: 'Battery runtime remaining'
@@ -157,8 +165,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
         -
           uuid: ceed5ddfc9964aabaebb0b97875b1bd9
           name: 'Battery status'
@@ -184,8 +192,11 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: power
           triggers:
             -
               uuid: cf186014cfd94ccbad3cc4cbd22b6aa1
@@ -193,12 +204,20 @@ zabbix_export:
               name: 'Battery has an internal error condition'
               priority: AVERAGE
               description: 'A battery installed has an internal error condition.'
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: e1957ee82be847e7bfb171560fc59293
               expression: 'last(/APC Smart-UPS SRT 8000 SNMP/battery.status[upsBasicBatteryStatus])=3'
               name: 'Battery is Low'
               priority: AVERAGE
               description: 'The UPS will be unable to sustain the current load, and its services will be lost if power is not restored.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
         -
           uuid: 533041b6831c451cb72991d3fdeca535
           name: 'Battery temperature'
@@ -223,8 +242,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: temperature
           triggers:
             -
               uuid: 1e883961b65e445997c57870734a58ca
@@ -232,6 +251,10 @@ zabbix_export:
               name: 'Battery has high temperature (over {$BATTERY.TEMP.MAX.WARN}℃ for {$TIME.PERIOD})'
               opdata: 'Current temperature: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: fa8256c826954defa82083ddc742624e
           name: 'Battery voltage'
@@ -255,8 +278,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
         -
           uuid: 07754bb421d0435995abbc49d4597908
           name: 'Input fail cause'
@@ -299,8 +322,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
         -
           uuid: 7574344f67544554804c4c68e39d3d72
           name: 'Input frequency'
@@ -324,8 +347,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
           triggers:
             -
               uuid: b9a134c942da46ffba1acdf85a7832e4
@@ -333,6 +356,10 @@ zabbix_export:
               name: 'Unacceptable input frequency (out of range {$UPS.INPUT_FREQ.MIN.WARN}-{$UPS.INPUT_FREQ.MAX.WARN}Hz for {$TIME.PERIOD})'
               opdata: 'Current frequency: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: c69418651f75413e95645c62fa3fee7f
           name: 'Input voltage'
@@ -356,8 +383,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
           triggers:
             -
               uuid: 694ab76079b1447b99ef510d80faab6a
@@ -365,6 +392,10 @@ zabbix_export:
               name: 'Unacceptable input voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD})'
               opdata: 'Current voltage: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: e4d76d857c4e46fd9b0e97405b17988a
           name: 'Output current'
@@ -388,8 +419,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
         -
           uuid: 0413f6ef89894dc6ba51e42f6a963f94
           name: 'Output load'
@@ -414,8 +445,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
           triggers:
             -
               uuid: 68f92026e7b345c88bf4aa679f9b642c
@@ -424,6 +455,10 @@ zabbix_export:
               opdata: 'Current load: {ITEM.LASTVALUE1}'
               priority: HIGH
               description: 'A battery installed has an internal error condition.'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 11c1742beed041999375e5a1ede42546
           name: 'Output status'
@@ -449,64 +484,111 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: power
           triggers:
             -
               uuid: 9952679fada845228bbbf05bcdada305
               expression: 'last(/APC Smart-UPS SRT 8000 SNMP/output.status[upsBasicOutputStatus])=16'
               name: 'UPS is Emergency Static Bypass'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: ee306606159f4930bcf580b5084c846a
               expression: 'last(/APC Smart-UPS SRT 8000 SNMP/output.status[upsBasicOutputStatus])=10'
               name: 'UPS is Hardware Failure Bypass'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: c4623dc4c6ae4c5b9ff4bdf4f43ed8b2
               expression: 'last(/APC Smart-UPS SRT 8000 SNMP/output.status[upsBasicOutputStatus])=7'
               name: 'UPS is Off'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 26c0b9b62d864c1ead7b16e0076a7226
               expression: 'last(/APC Smart-UPS SRT 8000 SNMP/output.status[upsBasicOutputStatus])=3'
               name: 'UPS is on battery'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 5c8408069c03421cb60b388451869b6f
               expression: 'last(/APC Smart-UPS SRT 8000 SNMP/output.status[upsBasicOutputStatus])=4'
               name: 'UPS is on Smart Boost'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 156c5260ed4444c19313ba491ce9352c
               expression: 'last(/APC Smart-UPS SRT 8000 SNMP/output.status[upsBasicOutputStatus])=12'
               name: 'UPS is On Smart Trim'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: c233bc86198140659ec3dd609c94ec94
               expression: 'last(/APC Smart-UPS SRT 8000 SNMP/output.status[upsBasicOutputStatus])=8'
               name: 'UPS is Rebooting'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 944e49d1b6d44adc8d720bd689d8c8cf
               expression: 'last(/APC Smart-UPS SRT 8000 SNMP/output.status[upsBasicOutputStatus])=11'
               name: 'UPS is Sleeping Until Power Return'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 9b376dbd2d614878b681b42bb2c7fe4d
               expression: 'last(/APC Smart-UPS SRT 8000 SNMP/output.status[upsBasicOutputStatus])=6'
               name: 'UPS is Software Bypass'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 499ac46836c1454dad3c1ffc5714c073
               expression: 'last(/APC Smart-UPS SRT 8000 SNMP/output.status[upsBasicOutputStatus])=9'
               name: 'UPS is Switched Bypass'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 8a0a5af39647494681e52595d179c336
               expression: 'last(/APC Smart-UPS SRT 8000 SNMP/output.status[upsBasicOutputStatus])=5'
               name: 'UPS is Timed Sleeping'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 07059c625de94e618925249492982fb7
           name: 'Output voltage'
@@ -530,8 +612,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
         -
           uuid: ae4579b14c424c0492acbfcb5aa5dd67
           name: 'SNMP traps (fallback)'
@@ -544,8 +626,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: e4995e72f6b442bd9b8c90f09eb54f16
           name: 'System contact details'
@@ -569,8 +651,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 13d3c18413a249d492272a7373ebd772
           name: 'System description'
@@ -593,8 +675,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 25aa469a757347089191eb8e364d4df9
           name: 'System location'
@@ -617,8 +699,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 57f3c4c2aff04eef83b7a7a53fa9f95c
           name: Model
@@ -639,8 +721,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: inventory
         -
           uuid: 13c26820947442f581c2234c38c052cc
           name: 'System name'
@@ -664,8 +746,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 852083234a55441aa2fa57b202227bef
@@ -674,6 +756,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: b59b3801f5584321a1fca9bdb466f191
           name: 'System object ID'
@@ -699,8 +788,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 63852531159c44f1beca7facd8f93fa2
           name: 'Serial number'
@@ -724,8 +813,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: inventory
         -
           uuid: 320bdbfd8076411bb1dd63fccddec126
           name: Uptime
@@ -747,8 +836,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 6f0fbe74ad4945e987e7ffdfa741d92f
@@ -761,6 +850,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/APC Smart-UPS SRT 8000 SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 567996748402435d80aae37818d4125e
           name: 'SNMP agent availability'
@@ -782,8 +875,11 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 9a0cb26712c14045a18a0e86de4cdd54
@@ -792,6 +888,10 @@ zabbix_export:
               opdata: 'Current state: {ITEM.LASTVALUE1}'
               priority: WARNING
               description: 'SNMP is not available for polling. Please check device connectivity and SNMP settings.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: 912994ce460742ebbb91c89d28d87d73
@@ -822,8 +922,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: inventory
         -
           uuid: abfe041a98dc4023b21ec6d9e829a94a
           name: 'External battery packs discovery'
@@ -860,8 +960,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: inventory
+                -
+                  tag: component
+                  value: power
             -
               uuid: 820d8eda050b41a3a9ba2889e290a28a
               name: '{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery pack cartridge health'
@@ -888,8 +991,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: health
+                -
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: 2d9c4ef006994ebea581b895424203f3
@@ -906,6 +1012,10 @@ zabbix_export:
                       bit 4 Battery lifetime exceeded acknowledged, replace battery
                       bit 5 Battery measured lifetime near end, order replacement cartridge
                       bit 6 Battery measured lifetime near end acknowledged, order replacement cartridge
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: cf709f051aa242799cf14ba923d9a0c0
               name: '{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery status'
@@ -937,8 +1047,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: health
+                -
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: 5358b97f94aa47f59351be88673407a0
@@ -960,6 +1073,10 @@ zabbix_export:
                     bit 9 Communication
                     bit 10 DisconnectedFrame
                     bit 11 FirmwareMismatch
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 99c570ed628343e99ac086167cec51ee
               name: '{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery temperature'
@@ -983,8 +1100,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: b88678e600694bc19ebaf57472d8658f
@@ -992,6 +1109,10 @@ zabbix_export:
                   name: '{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery has high temperature (over {$BATTERY.TEMP.MAX.WARN}℃ for {$TIME.PERIOD})'
                   opdata: 'Current temperature: {ITEM.LASTVALUE1}'
                   priority: HIGH
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 597b33ec3d4c4f79bc0acc36edaa6dec
               name: '{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Serial number'
@@ -1012,8 +1133,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: General
+                  tag: component
+                  value: inventory
         -
           uuid: 52e5451d8c7a41478ef9dde6a3c16378
           name: 'External sensor port 1 discovery'
@@ -1044,8 +1165,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: humidity
+                -
+                  tag: component
+                  value: power
             -
               uuid: 53102fe478cf47bd9fbe5240aab7cf65
               name: '{#EXTERNAL_SENSOR1_NAME}: Sensor alarm status'
@@ -1069,8 +1193,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: health
+                -
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: 33f4ac80a8d44752b97bc4f885a8c95f
@@ -1078,18 +1205,30 @@ zabbix_export:
                   name: '{#EXTERNAL_SENSOR1_NAME}: Sensor has status Critical'
                   priority: HIGH
                   description: 'The external sensor has returned a value greater than the critical threshold.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: 1a2080a561394f8c8a0dc639cbf2c812
                   expression: 'last(/APC Smart-UPS SRT 8000 SNMP/external.sensor.status[uioSensorStatusAlarmStatus.1.{#SNMPINDEX}])=4'
                   name: '{#EXTERNAL_SENSOR1_NAME}: Sensor has status Not Applicable'
                   priority: INFO
                   description: 'The external sensor does not work or is not connected.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: a53d5dd33e8548d5bcb73ffb936af910
                   expression: 'last(/APC Smart-UPS SRT 8000 SNMP/external.sensor.status[uioSensorStatusAlarmStatus.1.{#SNMPINDEX}])=2'
                   name: '{#EXTERNAL_SENSOR1_NAME}: Sensor has status Warning'
                   priority: AVERAGE
                   description: 'The external sensor has returned a value greater than the warning threshold.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 0f44bfc0e17b47919e83246046209bbf
               name: '{#EXTERNAL_SENSOR1_NAME}: Temperature sensor'
@@ -1110,8 +1249,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: power
+                -
+                  tag: component
+                  value: temperature
           overrides:
             -
               name: Temp
@@ -1159,8 +1301,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: humidity
+                -
+                  tag: component
+                  value: power
             -
               uuid: b7af85f894194cf39c369fcba0401cc5
               name: '{#EXTERNAL_SENSOR2_NAME}: Sensor alarm status'
@@ -1184,8 +1329,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: health
+                -
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: 9247973676c44377a4fa550990384eeb
@@ -1193,18 +1341,30 @@ zabbix_export:
                   name: '{#EXTERNAL_SENSOR2_NAME}: Sensor has status Critical'
                   priority: HIGH
                   description: 'The external sensor has returned a value greater than the critical threshold.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: 6b054505c2704c8d8e38b096885bbbe5
                   expression: 'last(/APC Smart-UPS SRT 8000 SNMP/external.sensor.status[uioSensorStatusAlarmStatus.2.{#SNMPINDEX}])=4'
                   name: '{#EXTERNAL_SENSOR2_NAME}: Sensor has status Not Applicable'
                   priority: INFO
                   description: 'The external sensor does not work or is not connected.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: f56f165d71084b75a716d04337f5fcb1
                   expression: 'last(/APC Smart-UPS SRT 8000 SNMP/external.sensor.status[uioSensorStatusAlarmStatus.2.{#SNMPINDEX}])=2'
                   name: '{#EXTERNAL_SENSOR2_NAME}: Sensor has status Warning'
                   priority: AVERAGE
                   description: 'The external sensor has returned a value greater than the warning threshold.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 84af771eee61470d9a61cede04718d88
               name: '{#EXTERNAL_SENSOR2_NAME}: Temperature sensor'
@@ -1225,8 +1385,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: power
+                -
+                  tag: component
+                  value: temperature
           overrides:
             -
               name: Temp
@@ -1277,8 +1440,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: power
             -
               uuid: 113adf39a65548abab2da39aec20c169
               name: '{#PHASEINDEX}: Phase input voltage'
@@ -1299,8 +1462,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: 755f972a32904dbf81a6da77f4ba57f0
@@ -1308,6 +1471,10 @@ zabbix_export:
                   name: '{#PHASEINDEX}: Unacceptable phase {#PHASEINDEX} input voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD})'
                   opdata: 'Current phase {#PHASEINDEX} voltage: {ITEM.LASTVALUE1}'
                   priority: HIGH
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
         -
           uuid: 0a3159e22ba640e2840789b63bee2bda
           name: 'Output phases discovery'
@@ -1342,8 +1509,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: power
             -
               uuid: 99357a267db04c8ca9385aaa15116b79
               name: '{#PHASEINDEX}: Phase output load, %'
@@ -1365,8 +1532,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: power
             -
               uuid: 13315206a94948a09fbb4a9843d2e149
               name: '{#PHASEINDEX}: Phase output voltage'
@@ -1387,8 +1554,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: 5846a7a3d56f43de8394823ed64a11ae
@@ -1396,6 +1563,20 @@ zabbix_export:
                   name: '{#PHASEINDEX}: Unacceptable phase {#PHASEINDEX} output voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD})'
                   opdata: 'Current phase {#PHASEINDEX} voltage: {ITEM.LASTVALUE1}'
                   priority: HIGH
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
+      tags:
+        -
+          tag: class
+          value: power
+        -
+          tag: target
+          value: apc
+        -
+          tag: target
+          value: apc-smart-ups-srt-8000
       macros:
         -
           macro: '{$BATTERY.CAPACITY.MIN.WARN}'
@@ -1433,178 +1614,6 @@ zabbix_export:
           macro: '{$UPS.OUTPUT.MAX.WARN}'
           value: '80'
           description: 'Maximum output load in % for trigger expression.'
-      dashboards:
-        -
-          uuid: 268ead40a9dd40798df6d75f554ec1bb
-          name: 'UPS Summary'
-          pages:
-            -
-              widgets:
-                -
-                  type: PLAIN_TEXT
-                  width: '8'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: show_as_html
-                      value: '0'
-                    -
-                      type: INTEGER
-                      name: show_lines
-                      value: '1'
-                    -
-                      type: ITEM
-                      name: itemids
-                      value:
-                        key: 'system.uptime[sysUpTime.0]'
-                        host: 'APC Smart-UPS SRT 8000 SNMP'
-                -
-                  type: PLAIN_TEXT
-                  x: '8'
-                  width: '8'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: show_as_html
-                      value: '0'
-                    -
-                      type: INTEGER
-                      name: show_lines
-                      value: '1'
-                    -
-                      type: ITEM
-                      name: itemids
-                      value:
-                        key: 'input.fail[upsAdvInputLineFailCause]'
-                        host: 'APC Smart-UPS SRT 8000 SNMP'
-                -
-                  type: PLAIN_TEXT
-                  x: '16'
-                  width: '8'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: show_as_html
-                      value: '0'
-                    -
-                      type: INTEGER
-                      name: show_lines
-                      value: '1'
-                    -
-                      type: ITEM
-                      name: itemids
-                      value:
-                        key: 'output.status[upsBasicOutputStatus]'
-                        host: 'APC Smart-UPS SRT 8000 SNMP'
-                -
-                  type: PLAIN_TEXT
-                  'y': '2'
-                  width: '8'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: show_as_html
-                      value: '0'
-                    -
-                      type: INTEGER
-                      name: show_lines
-                      value: '1'
-                    -
-                      type: ITEM
-                      name: itemids
-                      value:
-                        key: 'battery.status[upsBasicBatteryStatus]'
-                        host: 'APC Smart-UPS SRT 8000 SNMP'
-                -
-                  type: PLAIN_TEXT
-                  x: '8'
-                  'y': '2'
-                  width: '8'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: show_as_html
-                      value: '0'
-                    -
-                      type: INTEGER
-                      name: show_lines
-                      value: '1'
-                    -
-                      type: ITEM
-                      name: itemids
-                      value:
-                        key: 'battery.runtime_remaining[upsAdvBatteryRunTimeRemaining]'
-                        host: 'APC Smart-UPS SRT 8000 SNMP'
-                -
-                  type: PLAIN_TEXT
-                  x: '16'
-                  'y': '2'
-                  width: '8'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: show_as_html
-                      value: '0'
-                    -
-                      type: INTEGER
-                      name: show_lines
-                      value: '1'
-                    -
-                      type: ITEM
-                      name: itemids
-                      value:
-                        key: 'battery.last_replace_date[upsBasicBatteryLastReplaceDate]'
-                        host: 'APC Smart-UPS SRT 8000 SNMP'
-                -
-                  type: GRAPH_CLASSIC
-                  'y': '4'
-                  width: '8'
-                  height: '7'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: source_type
-                      value: '0'
-                    -
-                      type: GRAPH
-                      name: graphid
-                      value:
-                        name: 'Capacity of the UPS batteries'
-                        host: 'APC Smart-UPS SRT 8000 SNMP'
-                -
-                  type: GRAPH_CLASSIC
-                  x: '8'
-                  'y': '4'
-                  width: '8'
-                  height: '7'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: source_type
-                      value: '0'
-                    -
-                      type: GRAPH
-                      name: graphid
-                      value:
-                        name: Voltage
-                        host: 'APC Smart-UPS SRT 8000 SNMP'
-                -
-                  type: GRAPH_CLASSIC
-                  x: '16'
-                  'y': '4'
-                  width: '8'
-                  height: '7'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: source_type
-                      value: '0'
-                    -
-                      type: GRAPH
-                      name: graphid
-                      value:
-                        name: Output
-                        host: 'APC Smart-UPS SRT 8000 SNMP'
       valuemaps:
         -
           uuid: 864d59cbfcc8431cb334b812bf7ef3a3
diff --git a/templates/power/apc/apc_ups_snmp/README.md b/templates/power/apc/apc_ups_snmp/README.md
index 73c5bd46584..7228f5a3661 100644
--- a/templates/power/apc/apc_ups_snmp/README.md
+++ b/templates/power/apc/apc_ups_snmp/README.md
@@ -47,12 +47,12 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|Input phases discovery |<p>The input phase identifier. OID upsPhaseInputPhaseIndex.1.1</p> |SNMP |input.phases.discovery |
-|Output phases discovery |<p>The output phase identifier. OID upsPhaseOutputPhaseIndex.1.1</p> |SNMP |output.phases.discovery |
-|External battery packs discovery |<p>-</p> |SNMP |battery.packs.discovery<p>**Filter**:</p>AND <p>- {#CARTRIDGE_STATUS} NOT_MATCHES_REGEX `^$`</p> |
 |External bad battery packs discovery |<p>Discovery of the number of external defective battery packs.</p> |SNMP |battery.packs.bad.discovery |
+|External battery packs discovery | |SNMP |battery.packs.discovery<p>**Filter**:</p>AND <p>- {#CARTRIDGE_STATUS} NOT_MATCHES_REGEX `^$`</p> |
 |External sensor port 1 discovery |<p>uioSensorStatusTable</p> |SNMP |external.sensor1.discovery<p>**Overrides:**</p><p>Temp<br> - {#EXTERNAL_SENSOR1_NAME} MATCHES_REGEX `Temp`<br>  - ITEM_PROTOTYPE LIKE `Humidity` - NO_DISCOVER</p> |
 |External sensor port 2 discovery |<p>uioSensorStatusTable</p> |SNMP |external.sensor2.discovery<p>**Overrides:**</p><p>Temp<br> - {#EXTERNAL_SENSOR2_NAME} MATCHES_REGEX `Temp`<br>  - ITEM_PROTOTYPE LIKE `Humidity` - NO_DISCOVER</p> |
+|Input phases discovery |<p>The input phase identifier. OID upsPhaseInputPhaseIndex.1.1</p> |SNMP |input.phases.discovery |
+|Output phases discovery |<p>The output phase identifier. OID upsPhaseOutputPhaseIndex.1.1</p> |SNMP |output.phases.discovery |
 
 ## Items collected
 
@@ -143,5 +143,5 @@ There are no template links in this template.
 
 Please report any issues with the template at https://support.zabbix.com
 
-You can also provide a feedback, discuss the template or ask for help with it at [ZABBIX forums](https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/420730-discussion-thread-for-official-zabbix-template-apc-ups).
+You can also provide feedback, discuss the template or ask for help with it at [ZABBIX forums](https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/420730-discussion-thread-for-official-zabbix-template-apc-ups).
 
diff --git a/templates/power/apc/apc_ups_snmp/template_power_apc_ups_snmp.yaml b/templates/power/apc/apc_ups_snmp/template_power_apc_ups_snmp.yaml
index b81e7dc26a2..c7db05e67bd 100644
--- a/templates/power/apc/apc_ups_snmp/template_power_apc_ups_snmp.yaml
+++ b/templates/power/apc/apc_ups_snmp/template_power_apc_ups_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-15T17:57:08Z'
+  date: '2022-01-26T10:21:29Z'
   groups:
     -
       uuid: 3dcd5bbe90534f9e8eb5c2d53756af63
@@ -19,7 +19,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/420730-discussion-thread-for-official-zabbix-template-apc-ups
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Power
@@ -48,8 +48,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
           triggers:
             -
               uuid: aa0bbfb321d440438fb421825f23e140
@@ -57,6 +57,10 @@ zabbix_export:
               name: 'Battery has low capacity (below {$BATTERY.CAPACITY.MIN.WARN}%)'
               opdata: 'Current capacity: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: capacity
         -
           uuid: 390e33a7623d41d2a8a67752c6d5c733
           name: 'External battery packs count'
@@ -77,8 +81,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: inventory
         -
           uuid: 3d69adaa88e64b8084d38c1482815bf2
           name: 'Battery last replace date'
@@ -103,8 +107,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: inventory
         -
           uuid: eb74b3671b4d4335ad92bd3b027547b0
           name: 'Battery replace indicator'
@@ -124,8 +128,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
           triggers:
             -
               uuid: 7e40918732e74b5e8bd854422989e77d
@@ -133,6 +137,10 @@ zabbix_export:
               name: 'Battery needs replacement'
               priority: HIGH
               description: 'A battery installed has an internal error condition.'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: f52a3e2ae08c4b2996249c5601b4098d
           name: 'Battery runtime remaining'
@@ -157,8 +165,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
         -
           uuid: f4106603e47e40548592d60a7b8b3148
           name: 'Battery status'
@@ -184,8 +192,11 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: power
           triggers:
             -
               uuid: 7ae03f3f307b4f11ad2bc0548911cbd3
@@ -193,12 +204,20 @@ zabbix_export:
               name: 'Battery has an internal error condition'
               priority: AVERAGE
               description: 'A battery installed has an internal error condition.'
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 1282326bb61d45d88671bbbde3fab8ff
               expression: 'last(/APC UPS SNMP/battery.status[upsBasicBatteryStatus])=3'
               name: 'Battery is Low'
               priority: AVERAGE
               description: 'The UPS will be unable to sustain the current load, and its services will be lost if power is not restored.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
         -
           uuid: 7c35a9646eed4e4581edc51d42a9604c
           name: 'Battery temperature'
@@ -223,8 +242,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: temperature
           triggers:
             -
               uuid: 36a14fe061d1433e9875373307a4e0f4
@@ -232,6 +251,10 @@ zabbix_export:
               name: 'Battery has high temperature (over {$BATTERY.TEMP.MAX.WARN}℃ for {$TIME.PERIOD})'
               opdata: 'Current temperature: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: b78d2e9160c74f328b8123ba2031d7bf
           name: 'Battery voltage'
@@ -255,8 +278,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
         -
           uuid: 6ce40beab0b44248868652b0ed543afc
           name: 'Input fail cause'
@@ -299,8 +322,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
         -
           uuid: 2c0b565f2b6a44a2a91cc61fd220f056
           name: 'Input frequency'
@@ -324,8 +347,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
           triggers:
             -
               uuid: 1ddd2699b87f452a8893f75f805c0a81
@@ -333,6 +356,10 @@ zabbix_export:
               name: 'Unacceptable input frequency (out of range {$UPS.INPUT_FREQ.MIN.WARN}-{$UPS.INPUT_FREQ.MAX.WARN}Hz for {$TIME.PERIOD})'
               opdata: 'Current frequency: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: de84a2fbbb464023a7b73e01895a9e9d
           name: 'Input voltage'
@@ -356,8 +383,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
           triggers:
             -
               uuid: f6527c4fed3d41168be23f9367f18405
@@ -365,6 +392,10 @@ zabbix_export:
               name: 'Unacceptable input voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD})'
               opdata: 'Current voltage: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: a332c87a948045beae13f74984245b86
           name: 'Output current'
@@ -388,8 +419,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
         -
           uuid: c17c7fd7e6504592869dc14c4a002254
           name: 'Output load'
@@ -414,8 +445,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
           triggers:
             -
               uuid: ebef08a42d1e47ffa82ea586c1a5b3d6
@@ -424,6 +455,10 @@ zabbix_export:
               opdata: 'Current load: {ITEM.LASTVALUE1}'
               priority: HIGH
               description: 'A battery installed has an internal error condition.'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 0ae99a18a5c24fb0b812353d25459e1f
           name: 'Output status'
@@ -449,64 +484,111 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: power
           triggers:
             -
               uuid: c0e0b1db9a1f41379c340c122426778d
               expression: 'last(/APC UPS SNMP/output.status[upsBasicOutputStatus])=16'
               name: 'UPS is Emergency Static Bypass'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 381a6a75d9084ff1bfcc30b6870a2682
               expression: 'last(/APC UPS SNMP/output.status[upsBasicOutputStatus])=10'
               name: 'UPS is Hardware Failure Bypass'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: da75b5277ceb423fac8d90b58d49c21f
               expression: 'last(/APC UPS SNMP/output.status[upsBasicOutputStatus])=7'
               name: 'UPS is Off'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: b0330f707fc64605934ed95233bd2246
               expression: 'last(/APC UPS SNMP/output.status[upsBasicOutputStatus])=3'
               name: 'UPS is on battery'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: f8d75a2fdb6942e6b63831d206c78e56
               expression: 'last(/APC UPS SNMP/output.status[upsBasicOutputStatus])=4'
               name: 'UPS is on Smart Boost'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 8eb59b4873e14acfa8e05791ed30c9d1
               expression: 'last(/APC UPS SNMP/output.status[upsBasicOutputStatus])=12'
               name: 'UPS is On Smart Trim'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: e06247b357b849d3ad1886f797705320
               expression: 'last(/APC UPS SNMP/output.status[upsBasicOutputStatus])=8'
               name: 'UPS is Rebooting'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 9b4424babc284dcabfb44dc725c03f40
               expression: 'last(/APC UPS SNMP/output.status[upsBasicOutputStatus])=11'
               name: 'UPS is Sleeping Until Power Return'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 9ac2faafee484894bb304da02d6ab0b2
               expression: 'last(/APC UPS SNMP/output.status[upsBasicOutputStatus])=6'
               name: 'UPS is Software Bypass'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: ce16d33b10e74b129d22378f96ede052
               expression: 'last(/APC UPS SNMP/output.status[upsBasicOutputStatus])=9'
               name: 'UPS is Switched Bypass'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: aa84fc5fd4434101a481481beb616a7c
               expression: 'last(/APC UPS SNMP/output.status[upsBasicOutputStatus])=5'
               name: 'UPS is Timed Sleeping'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 37d7eda5664c4ae2b4a126c60a8eb40b
           name: 'Output voltage'
@@ -530,8 +612,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
         -
           uuid: 2c52ba1a964a40e1b4a75582ee6ad43b
           name: 'SNMP traps (fallback)'
@@ -544,8 +626,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: 299e4e11e0374888877e1dc386409726
           name: 'System contact details'
@@ -569,8 +651,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: ed42f6f2d8c24176b53f38e0a857a129
           name: 'System description'
@@ -593,8 +675,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 445d7a843340424ab7c09ab001d5865c
           name: 'System location'
@@ -617,8 +699,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 6030dbee3cc24dbeb15e4b802e89cbc8
           name: Model
@@ -639,8 +721,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: inventory
         -
           uuid: 45a80892f41b411e8457f99b069b59ee
           name: 'System name'
@@ -664,8 +746,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: facbfd1f8bb04401b563c162d7fe13a5
@@ -674,6 +756,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: 6780faad9fc9492f9f92915db5161e43
           name: 'System object ID'
@@ -699,8 +788,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 1df309508ac9433397f88120b2895451
           name: 'Serial number'
@@ -724,8 +813,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: inventory
         -
           uuid: 701fa778bc03444aad94343d0dbe048e
           name: Uptime
@@ -747,8 +836,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: b0959bdb606542bcb2952e820ac972c9
@@ -761,6 +850,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/APC UPS SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: ca3275f69f3c4e7c9c71108451c0b64f
           name: 'SNMP agent availability'
@@ -782,8 +875,11 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 4572d871f1d944bb855b93fdc6de5e88
@@ -792,6 +888,10 @@ zabbix_export:
               opdata: 'Current state: {ITEM.LASTVALUE1}'
               priority: WARNING
               description: 'SNMP is not available for polling. Please check device connectivity and SNMP settings.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: 52345d2975214002bdd05a24e43484a8
@@ -822,8 +922,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: inventory
         -
           uuid: f7eb1c82c6694e72b7d28ba4d71d8741
           name: 'External battery packs discovery'
@@ -860,8 +960,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: inventory
+                -
+                  tag: component
+                  value: power
             -
               uuid: fd71d1ceaf524aeaac38de5f63d101fd
               name: '{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery pack cartridge health'
@@ -888,8 +991,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: health
+                -
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: a248194aa30645c5918278b83944b20e
@@ -906,6 +1012,10 @@ zabbix_export:
                       bit 4 Battery lifetime exceeded acknowledged, replace battery
                       bit 5 Battery measured lifetime near end, order replacement cartridge
                       bit 6 Battery measured lifetime near end acknowledged, order replacement cartridge
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: fa05e062413a4c1fba4d35e3006b91f4
               name: '{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery status'
@@ -937,8 +1047,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: health
+                -
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: 834b1a48cbab46a3bfb0209fb4302674
@@ -960,6 +1073,10 @@ zabbix_export:
                     bit 9 Communication
                     bit 10 DisconnectedFrame
                     bit 11 FirmwareMismatch
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 017347865030426e9dde74e9bcf38c76
               name: '{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery temperature'
@@ -983,8 +1100,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 80f084121d56464f90e4a3ef9e198889
@@ -992,6 +1109,10 @@ zabbix_export:
                   name: '{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery has high temperature (over {$BATTERY.TEMP.MAX.WARN}℃ for {$TIME.PERIOD})'
                   opdata: 'Current temperature: {ITEM.LASTVALUE1}'
                   priority: HIGH
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 354c1d6766d6453caeb382cf7ede7951
               name: '{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Serial number'
@@ -1012,8 +1133,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: General
+                  tag: component
+                  value: inventory
         -
           uuid: 457169b3c43846739614a6ddc7155fda
           name: 'External sensor port 1 discovery'
@@ -1044,8 +1165,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: humidity
+                -
+                  tag: component
+                  value: power
             -
               uuid: 0431cf0a54b449c9b77623b69629920f
               name: '{#EXTERNAL_SENSOR1_NAME}: Sensor alarm status'
@@ -1069,8 +1193,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: health
+                -
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: 3a40f3cb0a3b411697fe8d37f82404d4
@@ -1078,18 +1205,30 @@ zabbix_export:
                   name: '{#EXTERNAL_SENSOR1_NAME}: Sensor has status Critical'
                   priority: HIGH
                   description: 'The external sensor has returned a value greater than the critical threshold.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: 63ba879a2a324ffc958b761f2010ac8e
                   expression: 'last(/APC UPS SNMP/external.sensor.status[uioSensorStatusAlarmStatus.1.{#SNMPINDEX}])=4'
                   name: '{#EXTERNAL_SENSOR1_NAME}: Sensor has status Not Applicable'
                   priority: INFO
                   description: 'The external sensor does not work or is not connected.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: dc90cd795879495fa473b71a2ff57b49
                   expression: 'last(/APC UPS SNMP/external.sensor.status[uioSensorStatusAlarmStatus.1.{#SNMPINDEX}])=2'
                   name: '{#EXTERNAL_SENSOR1_NAME}: Sensor has status Warning'
                   priority: AVERAGE
                   description: 'The external sensor has returned a value greater than the warning threshold.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 6de4920e4e87418884a82ff8b40a46ab
               name: '{#EXTERNAL_SENSOR1_NAME}: Temperature sensor'
@@ -1110,8 +1249,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: power
+                -
+                  tag: component
+                  value: temperature
           overrides:
             -
               name: Temp
@@ -1159,8 +1301,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: humidity
+                -
+                  tag: component
+                  value: power
             -
               uuid: d04af1687eb846d18b57af04ab1b594b
               name: '{#EXTERNAL_SENSOR2_NAME}: Sensor alarm status'
@@ -1184,8 +1329,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: health
+                -
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: 8a62bc38e49e4779938c45839a190856
@@ -1193,18 +1341,30 @@ zabbix_export:
                   name: '{#EXTERNAL_SENSOR2_NAME}: Sensor has status Critical'
                   priority: HIGH
                   description: 'The external sensor has returned a value greater than the critical threshold.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: ca02e8f92e134dce9834bd1d6f3ab469
                   expression: 'last(/APC UPS SNMP/external.sensor.status[uioSensorStatusAlarmStatus.2.{#SNMPINDEX}])=4'
                   name: '{#EXTERNAL_SENSOR2_NAME}: Sensor has status Not Applicable'
                   priority: INFO
                   description: 'The external sensor does not work or is not connected.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: 36ad29900db7410782daeddb9d7c648f
                   expression: 'last(/APC UPS SNMP/external.sensor.status[uioSensorStatusAlarmStatus.2.{#SNMPINDEX}])=2'
                   name: '{#EXTERNAL_SENSOR2_NAME}: Sensor has status Warning'
                   priority: AVERAGE
                   description: 'The external sensor has returned a value greater than the warning threshold.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: bbf611aad1454b38ad39fa258239394a
               name: '{#EXTERNAL_SENSOR2_NAME}: Temperature sensor'
@@ -1225,8 +1385,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: power
+                -
+                  tag: component
+                  value: temperature
           overrides:
             -
               name: Temp
@@ -1277,8 +1440,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: power
             -
               uuid: 40c05eaf739540979d11787a694cb8c9
               name: '{#PHASEINDEX}: Phase input voltage'
@@ -1299,8 +1462,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: 63c623a2a9af44f38388a17742c87486
@@ -1308,6 +1471,10 @@ zabbix_export:
                   name: '{#PHASEINDEX}: Unacceptable phase {#PHASEINDEX} input voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD})'
                   opdata: 'Current phase {#PHASEINDEX} voltage: {ITEM.LASTVALUE1}'
                   priority: HIGH
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
         -
           uuid: ba649e1239384e3e8ebe6ae29394aecb
           name: 'Output phases discovery'
@@ -1342,8 +1509,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: power
             -
               uuid: 262d5cf179e64a2596edd86adc5570e3
               name: '{#PHASEINDEX}: Phase output load, %'
@@ -1365,8 +1532,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: power
             -
               uuid: ab38f845f0e448f0b3638f6728cbf5bf
               name: '{#PHASEINDEX}: Phase output voltage'
@@ -1387,8 +1554,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: feeb23a58ccb4ec1bed9d61f5d2ffc9e
@@ -1396,6 +1563,17 @@ zabbix_export:
                   name: '{#PHASEINDEX}: Unacceptable phase {#PHASEINDEX} output voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD})'
                   opdata: 'Current phase {#PHASEINDEX} voltage: {ITEM.LASTVALUE1}'
                   priority: HIGH
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
+      tags:
+        -
+          tag: class
+          value: power
+        -
+          tag: target
+          value: apc
       macros:
         -
           macro: '{$BATTERY.CAPACITY.MIN.WARN}'
@@ -1433,178 +1611,6 @@ zabbix_export:
           macro: '{$UPS.OUTPUT.MAX.WARN}'
           value: '80'
           description: 'Maximum output load in % for trigger expression.'
-      dashboards:
-        -
-          uuid: e1b2126fa06d44e3b0984f5bb904cd9a
-          name: 'UPS Summary'
-          pages:
-            -
-              widgets:
-                -
-                  type: PLAIN_TEXT
-                  width: '8'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: show_as_html
-                      value: '0'
-                    -
-                      type: INTEGER
-                      name: show_lines
-                      value: '1'
-                    -
-                      type: ITEM
-                      name: itemids
-                      value:
-                        key: 'system.uptime[sysUpTime.0]'
-                        host: 'APC UPS SNMP'
-                -
-                  type: PLAIN_TEXT
-                  x: '8'
-                  width: '8'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: show_as_html
-                      value: '0'
-                    -
-                      type: INTEGER
-                      name: show_lines
-                      value: '1'
-                    -
-                      type: ITEM
-                      name: itemids
-                      value:
-                        key: 'input.fail[upsAdvInputLineFailCause]'
-                        host: 'APC UPS SNMP'
-                -
-                  type: PLAIN_TEXT
-                  x: '16'
-                  width: '8'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: show_as_html
-                      value: '0'
-                    -
-                      type: INTEGER
-                      name: show_lines
-                      value: '1'
-                    -
-                      type: ITEM
-                      name: itemids
-                      value:
-                        key: 'output.status[upsBasicOutputStatus]'
-                        host: 'APC UPS SNMP'
-                -
-                  type: PLAIN_TEXT
-                  'y': '2'
-                  width: '8'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: show_as_html
-                      value: '0'
-                    -
-                      type: INTEGER
-                      name: show_lines
-                      value: '1'
-                    -
-                      type: ITEM
-                      name: itemids
-                      value:
-                        key: 'battery.status[upsBasicBatteryStatus]'
-                        host: 'APC UPS SNMP'
-                -
-                  type: PLAIN_TEXT
-                  x: '8'
-                  'y': '2'
-                  width: '8'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: show_as_html
-                      value: '0'
-                    -
-                      type: INTEGER
-                      name: show_lines
-                      value: '1'
-                    -
-                      type: ITEM
-                      name: itemids
-                      value:
-                        key: 'battery.runtime_remaining[upsAdvBatteryRunTimeRemaining]'
-                        host: 'APC UPS SNMP'
-                -
-                  type: PLAIN_TEXT
-                  x: '16'
-                  'y': '2'
-                  width: '8'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: show_as_html
-                      value: '0'
-                    -
-                      type: INTEGER
-                      name: show_lines
-                      value: '1'
-                    -
-                      type: ITEM
-                      name: itemids
-                      value:
-                        key: 'battery.last_replace_date[upsBasicBatteryLastReplaceDate]'
-                        host: 'APC UPS SNMP'
-                -
-                  type: GRAPH_CLASSIC
-                  'y': '4'
-                  width: '8'
-                  height: '7'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: source_type
-                      value: '0'
-                    -
-                      type: GRAPH
-                      name: graphid
-                      value:
-                        name: 'Capacity of the UPS batteries'
-                        host: 'APC UPS SNMP'
-                -
-                  type: GRAPH_CLASSIC
-                  x: '8'
-                  'y': '4'
-                  width: '8'
-                  height: '7'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: source_type
-                      value: '0'
-                    -
-                      type: GRAPH
-                      name: graphid
-                      value:
-                        name: Voltage
-                        host: 'APC UPS SNMP'
-                -
-                  type: GRAPH_CLASSIC
-                  x: '16'
-                  'y': '4'
-                  width: '8'
-                  height: '7'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: source_type
-                      value: '0'
-                    -
-                      type: GRAPH
-                      name: graphid
-                      value:
-                        name: Output
-                        host: 'APC UPS SNMP'
       valuemaps:
         -
           uuid: a808aadebf964e0cb6b8724bf1165013
diff --git a/templates/power/apc/apc_ups_symmetra_lx_snmp/README.md b/templates/power/apc/apc_ups_symmetra_lx_snmp/README.md
index 595a6d47d70..00a5bed4fbf 100644
--- a/templates/power/apc/apc_ups_symmetra_lx_snmp/README.md
+++ b/templates/power/apc/apc_ups_symmetra_lx_snmp/README.md
@@ -51,12 +51,12 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|Input phases discovery |<p>The input phase identifier. OID upsPhaseInputPhaseIndex.1.1</p> |SNMP |input.phases.discovery |
-|Output phases discovery |<p>The output phase identifier. OID upsPhaseOutputPhaseIndex.1.1</p> |SNMP |output.phases.discovery |
-|External battery packs discovery |<p>-</p> |SNMP |battery.packs.discovery<p>**Filter**:</p>AND <p>- {#CARTRIDGE_STATUS} NOT_MATCHES_REGEX `^$`</p> |
 |External bad battery packs discovery |<p>Discovery of the number of external defective battery packs.</p> |SNMP |battery.packs.bad.discovery |
+|External battery packs discovery |<p>-</p> |SNMP |battery.packs.discovery<p>**Filter**:</p>AND <p>- {#CARTRIDGE_STATUS} NOT_MATCHES_REGEX `^$`</p> |
 |External sensor port 1 discovery |<p>uioSensorStatusTable</p> |SNMP |external.sensor1.discovery<p>**Overrides:**</p><p>Temp<br> - {#EXTERNAL_SENSOR1_NAME} MATCHES_REGEX `Temp`<br>  - ITEM_PROTOTYPE LIKE `Humidity` - NO_DISCOVER</p> |
 |External sensor port 2 discovery |<p>uioSensorStatusTable</p> |SNMP |external.sensor2.discovery<p>**Overrides:**</p><p>Temp<br> - {#EXTERNAL_SENSOR2_NAME} MATCHES_REGEX `Temp`<br>  - ITEM_PROTOTYPE LIKE `Humidity` - NO_DISCOVER</p> |
+|Input phases discovery |<p>The input phase identifier. OID upsPhaseInputPhaseIndex.1.1</p> |SNMP |input.phases.discovery |
+|Output phases discovery |<p>The output phase identifier. OID upsPhaseOutputPhaseIndex.1.1</p> |SNMP |output.phases.discovery |
 
 ## Items collected
 
@@ -147,5 +147,5 @@ There are no template links in this template.
 
 Please report any issues with the template at https://support.zabbix.com
 
-You can also provide a feedback, discuss the template or ask for help with it at [ZABBIX forums](https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/420730-discussion-thread-for-official-zabbix-template-apc-ups).
+You can also provide feedback, discuss the template or ask for help with it at [ZABBIX forums](https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/420730-discussion-thread-for-official-zabbix-template-apc-ups).
 
diff --git a/templates/power/apc/apc_ups_symmetra_lx_snmp/template_power_apc_ups_symmetra_lx_snmp.yaml b/templates/power/apc/apc_ups_symmetra_lx_snmp/template_power_apc_ups_symmetra_lx_snmp.yaml
index 7d03af1196d..9b3e1fb39f4 100644
--- a/templates/power/apc/apc_ups_symmetra_lx_snmp/template_power_apc_ups_symmetra_lx_snmp.yaml
+++ b/templates/power/apc/apc_ups_symmetra_lx_snmp/template_power_apc_ups_symmetra_lx_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-15T17:57:12Z'
+  date: '2022-01-26T10:43:02Z'
   groups:
     -
       uuid: 3dcd5bbe90534f9e8eb5c2d53756af63
@@ -19,7 +19,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/420730-discussion-thread-for-official-zabbix-template-apc-ups
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Power
@@ -48,8 +48,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
           triggers:
             -
               uuid: fdece80f2fc44ac1974fafe190ce186f
@@ -57,6 +57,10 @@ zabbix_export:
               name: 'Battery has low capacity (below {$BATTERY.CAPACITY.MIN.WARN}%)'
               opdata: 'Current capacity: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: capacity
         -
           uuid: 3fea9d328d5342b5bae6b643a0b45495
           name: 'External battery packs count'
@@ -77,8 +81,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: inventory
         -
           uuid: f4bd3a4a637640e29f50ebd36fb510e5
           name: 'Battery last replace date'
@@ -103,8 +107,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: inventory
         -
           uuid: 731d350450f742d880d81ff2be69e67e
           name: 'Battery replace indicator'
@@ -124,8 +128,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
           triggers:
             -
               uuid: a1bd434a249b48b2ac0ef69ede417a72
@@ -133,6 +137,10 @@ zabbix_export:
               name: 'Battery needs replacement'
               priority: HIGH
               description: 'A battery installed has an internal error condition.'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 8340b775b76f4e8aad6d3984c63632e9
           name: 'Battery runtime remaining'
@@ -157,8 +165,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
         -
           uuid: c1d818ee115343c8bb41bedb8de7f2bd
           name: 'Battery status'
@@ -184,8 +192,11 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: power
           triggers:
             -
               uuid: 955d79a0cf5447dd9a11d4608758e983
@@ -193,12 +204,20 @@ zabbix_export:
               name: 'Battery has an internal error condition'
               priority: AVERAGE
               description: 'A battery installed has an internal error condition.'
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 3ca8156ecc1c4ee4b5623c4a085b993f
               expression: 'last(/APC UPS Symmetra LX SNMP/battery.status[upsBasicBatteryStatus])=3'
               name: 'Battery is Low'
               priority: AVERAGE
               description: 'The UPS will be unable to sustain the current load, and its services will be lost if power is not restored.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
         -
           uuid: 6d581eae836342bb8280eb09d7894533
           name: 'Battery temperature'
@@ -223,8 +242,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: temperature
           triggers:
             -
               uuid: 5b43659a10644a51861282bc72116f9f
@@ -232,6 +251,10 @@ zabbix_export:
               name: 'Battery has high temperature (over {$BATTERY.TEMP.MAX.WARN}℃ for {$TIME.PERIOD})'
               opdata: 'Current temperature: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: ab0f5d86a40b421ba136506f7854bbbd
           name: 'Battery voltage'
@@ -255,8 +278,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
         -
           uuid: 13c0d202d19f4b64a52141062c4be6bb
           name: 'Input fail cause'
@@ -299,8 +322,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
         -
           uuid: 05ccf5bd85414ee9b5860c80f6e8323f
           name: 'Input frequency'
@@ -324,8 +347,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
           triggers:
             -
               uuid: 94a5c26b89e2416f96b61bbfc6e60a97
@@ -333,6 +356,10 @@ zabbix_export:
               name: 'Unacceptable input frequency (out of range {$UPS.INPUT_FREQ.MIN.WARN}-{$UPS.INPUT_FREQ.MAX.WARN}Hz for {$TIME.PERIOD})'
               opdata: 'Current frequency: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 5764182c547143b3b044ec1adb54c1ce
           name: 'Input voltage'
@@ -356,8 +383,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
           triggers:
             -
               uuid: 2b640b94d48446609802ce6e57c7bd46
@@ -365,6 +392,10 @@ zabbix_export:
               name: 'Unacceptable input voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD})'
               opdata: 'Current voltage: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: bbb33508be95488680bcb644a44626ef
           name: 'Output current'
@@ -388,8 +419,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
         -
           uuid: d27e991fc0f64b4f9704fb8183567e8d
           name: 'Output load'
@@ -414,8 +445,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
           triggers:
             -
               uuid: 34562b5c734d492c89c386902dfd6e90
@@ -424,6 +455,10 @@ zabbix_export:
               opdata: 'Current load: {ITEM.LASTVALUE1}'
               priority: HIGH
               description: 'A battery installed has an internal error condition.'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 978a7ee6923c40cd8097afb60c81244f
           name: 'Output status'
@@ -449,64 +484,111 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: power
           triggers:
             -
               uuid: 6ade2b9fb9ad432596d16b3df6237ec4
               expression: 'last(/APC UPS Symmetra LX SNMP/output.status[upsBasicOutputStatus])=16'
               name: 'UPS is Emergency Static Bypass'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: da9a0fa7669e454b8ba44c0458a94ea8
               expression: 'last(/APC UPS Symmetra LX SNMP/output.status[upsBasicOutputStatus])=10'
               name: 'UPS is Hardware Failure Bypass'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 01a2bcb5f20b4fe889a48e4bed2a2a63
               expression: 'last(/APC UPS Symmetra LX SNMP/output.status[upsBasicOutputStatus])=7'
               name: 'UPS is Off'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: d0b154dd92424af8bb841d91d4e7ddd5
               expression: 'last(/APC UPS Symmetra LX SNMP/output.status[upsBasicOutputStatus])=3'
               name: 'UPS is on battery'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: afc071d0ccfb4226a3c5ee3058270937
               expression: 'last(/APC UPS Symmetra LX SNMP/output.status[upsBasicOutputStatus])=4'
               name: 'UPS is on Smart Boost'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 12259f4a961a40b39de12d0202d41c56
               expression: 'last(/APC UPS Symmetra LX SNMP/output.status[upsBasicOutputStatus])=12'
               name: 'UPS is On Smart Trim'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: ef9d1e4b1ec244f6bcf36d19a9e7c9c7
               expression: 'last(/APC UPS Symmetra LX SNMP/output.status[upsBasicOutputStatus])=8'
               name: 'UPS is Rebooting'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: c673928e7b764b5db0fa3168edd2cc67
               expression: 'last(/APC UPS Symmetra LX SNMP/output.status[upsBasicOutputStatus])=11'
               name: 'UPS is Sleeping Until Power Return'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: c9b24aa16e124d8c9cd6cfb188ded816
               expression: 'last(/APC UPS Symmetra LX SNMP/output.status[upsBasicOutputStatus])=6'
               name: 'UPS is Software Bypass'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 02904426801d4d42b3f634267f8697e7
               expression: 'last(/APC UPS Symmetra LX SNMP/output.status[upsBasicOutputStatus])=9'
               name: 'UPS is Switched Bypass'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: fa08f8a60c2c4d88a3f9ebf317fcd06e
               expression: 'last(/APC UPS Symmetra LX SNMP/output.status[upsBasicOutputStatus])=5'
               name: 'UPS is Timed Sleeping'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 9cf495d14fdf4059b6c35e7857d7a18c
           name: 'Output voltage'
@@ -530,8 +612,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
         -
           uuid: 102179b315b548e289df3459bc5860c1
           name: 'SNMP traps (fallback)'
@@ -544,8 +626,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: 8dd800fbbcde431aa421eeb5a33eb798
           name: 'System contact details'
@@ -569,8 +651,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: e8c576f27f4c49ef9acd1ba7198ffbb6
           name: 'System description'
@@ -593,8 +675,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 6a06715ef4c44534a0ebc45f4e5adb5b
           name: 'System location'
@@ -617,8 +699,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 64d56d199021432886452fff5a4c6d22
           name: Model
@@ -639,8 +721,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: inventory
         -
           uuid: b15628c68d4c4e8ca761ad9fa7e40a1c
           name: 'System name'
@@ -664,8 +746,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 61d0836efd33437894e1edd595373f1e
@@ -674,6 +756,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: 9f858f7eaed545b8a35ac24e858b0826
           name: 'System object ID'
@@ -699,8 +788,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 3f61bd561e7d42fbb55b71df9ea3b5b1
           name: 'Serial number'
@@ -724,8 +813,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: inventory
         -
           uuid: 0810681a8ae74ad8b28ea38119a93f59
           name: Uptime
@@ -747,8 +836,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 9d0c32f93c0c44f69b54c91fabfa1529
@@ -761,6 +850,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/APC UPS Symmetra LX SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 9562f60b1cbd4fe08614221e69efd811
           name: 'SNMP agent availability'
@@ -782,8 +875,11 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: aeaaa7e2bd2d46a481f9d8b33ec18cb5
@@ -792,6 +888,10 @@ zabbix_export:
               opdata: 'Current state: {ITEM.LASTVALUE1}'
               priority: WARNING
               description: 'SNMP is not available for polling. Please check device connectivity and SNMP settings.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: 35a885d8f181416db86f2ffe73a30f7f
@@ -822,8 +922,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: inventory
         -
           uuid: 168bfbfc58ca46509caf54ae3562f0bc
           name: 'External battery packs discovery'
@@ -860,8 +960,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: inventory
+                -
+                  tag: component
+                  value: power
             -
               uuid: b49b4836472f45e3b4947048dcd64cf8
               name: '{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery pack cartridge health'
@@ -888,8 +991,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: health
+                -
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: 2ea1a8d2bd3746dabafed72e1f6216fd
@@ -906,6 +1012,10 @@ zabbix_export:
                       bit 4 Battery lifetime exceeded acknowledged, replace battery
                       bit 5 Battery measured lifetime near end, order replacement cartridge
                       bit 6 Battery measured lifetime near end acknowledged, order replacement cartridge
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: df73a5fd0d964c67857178a936c2dc7d
               name: '{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery status'
@@ -937,8 +1047,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: health
+                -
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: 3870634ad8c1414dabeebc10c510fba3
@@ -960,6 +1073,10 @@ zabbix_export:
                     bit 9 Communication
                     bit 10 DisconnectedFrame
                     bit 11 FirmwareMismatch
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 18c46e7d50ee4eefb669705d62e2224c
               name: '{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery temperature'
@@ -983,8 +1100,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 730bdb68d90f4bc6aaf6cb22e04e1845
@@ -992,6 +1109,10 @@ zabbix_export:
                   name: '{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery has high temperature (over {$BATTERY.TEMP.MAX.WARN}℃ for {$TIME.PERIOD})'
                   opdata: 'Current temperature: {ITEM.LASTVALUE1}'
                   priority: HIGH
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 5fadf217f7444f58ba3dca52bc6cff76
               name: '{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Serial number'
@@ -1012,8 +1133,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: General
+                  tag: component
+                  value: inventory
         -
           uuid: 598521a7c59d425d9deb58c9829e344e
           name: 'External sensor port 1 discovery'
@@ -1044,8 +1165,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: humidity
+                -
+                  tag: component
+                  value: power
             -
               uuid: 6182750c55f24110b076d95c2cdbd1fa
               name: '{#EXTERNAL_SENSOR1_NAME}: Sensor alarm status'
@@ -1069,8 +1193,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: health
+                -
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: 97b4078788d244d0b501e9465c659ff7
@@ -1078,18 +1205,30 @@ zabbix_export:
                   name: '{#EXTERNAL_SENSOR1_NAME}: Sensor has status Critical'
                   priority: HIGH
                   description: 'The external sensor has returned a value greater than the critical threshold.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: 86cd9908372045618672d6ff82bca705
                   expression: 'last(/APC UPS Symmetra LX SNMP/external.sensor.status[uioSensorStatusAlarmStatus.1.{#SNMPINDEX}])=4'
                   name: '{#EXTERNAL_SENSOR1_NAME}: Sensor has status Not Applicable'
                   priority: INFO
                   description: 'The external sensor does not work or is not connected.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: 4ba13efc27da411785410109340b6a26
                   expression: 'last(/APC UPS Symmetra LX SNMP/external.sensor.status[uioSensorStatusAlarmStatus.1.{#SNMPINDEX}])=2'
                   name: '{#EXTERNAL_SENSOR1_NAME}: Sensor has status Warning'
                   priority: AVERAGE
                   description: 'The external sensor has returned a value greater than the warning threshold.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: fc394520f4964a86ac93e87da2fc541b
               name: '{#EXTERNAL_SENSOR1_NAME}: Temperature sensor'
@@ -1110,8 +1249,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: power
+                -
+                  tag: component
+                  value: temperature
           overrides:
             -
               name: Temp
@@ -1159,8 +1301,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: humidity
+                -
+                  tag: component
+                  value: power
             -
               uuid: ecc2e5c49b004027bb9ccd5498e3d169
               name: '{#EXTERNAL_SENSOR2_NAME}: Sensor alarm status'
@@ -1184,8 +1329,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: health
+                -
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: 3155c8cf446c40d896755a25a46ec90b
@@ -1193,18 +1341,30 @@ zabbix_export:
                   name: '{#EXTERNAL_SENSOR2_NAME}: Sensor has status Critical'
                   priority: HIGH
                   description: 'The external sensor has returned a value greater than the critical threshold.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: 9ef9a4dc80c84087b44b5f0e8aa94202
                   expression: 'last(/APC UPS Symmetra LX SNMP/external.sensor.status[uioSensorStatusAlarmStatus.2.{#SNMPINDEX}])=4'
                   name: '{#EXTERNAL_SENSOR2_NAME}: Sensor has status Not Applicable'
                   priority: INFO
                   description: 'The external sensor does not work or is not connected.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: 74a3585b0cc74a4887eb3683fb1e6f64
                   expression: 'last(/APC UPS Symmetra LX SNMP/external.sensor.status[uioSensorStatusAlarmStatus.2.{#SNMPINDEX}])=2'
                   name: '{#EXTERNAL_SENSOR2_NAME}: Sensor has status Warning'
                   priority: AVERAGE
                   description: 'The external sensor has returned a value greater than the warning threshold.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: f2cd5bb0c8a64b09868ddff9b14e4cbd
               name: '{#EXTERNAL_SENSOR2_NAME}: Temperature sensor'
@@ -1225,8 +1385,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: power
+                -
+                  tag: component
+                  value: temperature
           overrides:
             -
               name: Temp
@@ -1277,8 +1440,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: power
             -
               uuid: 080719150b424168999c21ff597e6948
               name: '{#PHASEINDEX}: Phase input voltage'
@@ -1299,8 +1462,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: 90e3258375e047b594deb0ecf7300c22
@@ -1308,6 +1471,10 @@ zabbix_export:
                   name: '{#PHASEINDEX}: Unacceptable phase {#PHASEINDEX} input voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD})'
                   opdata: 'Current phase {#PHASEINDEX} voltage: {ITEM.LASTVALUE1}'
                   priority: HIGH
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
         -
           uuid: 4232ad35daa3403da085f1ba6c7af348
           name: 'Output phases discovery'
@@ -1342,8 +1509,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: power
             -
               uuid: 7b0f22672b38492e92c8551c3009baef
               name: '{#PHASEINDEX}: Phase output load, %'
@@ -1365,8 +1532,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: power
             -
               uuid: a590ab8671574e119fe3335110fdee49
               name: '{#PHASEINDEX}: Phase output voltage'
@@ -1387,8 +1554,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: b8c42d5d66d9403eba697920439ae956
@@ -1396,6 +1563,20 @@ zabbix_export:
                   name: '{#PHASEINDEX}: Unacceptable phase {#PHASEINDEX} output voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD})'
                   opdata: 'Current phase {#PHASEINDEX} voltage: {ITEM.LASTVALUE1}'
                   priority: HIGH
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
+      tags:
+        -
+          tag: class
+          value: power
+        -
+          tag: target
+          value: apc
+        -
+          tag: target
+          value: apc-ups-symmetra-lx
       macros:
         -
           macro: '{$BATTERY.CAPACITY.MIN.WARN}'
@@ -1433,178 +1614,6 @@ zabbix_export:
           macro: '{$UPS.OUTPUT.MAX.WARN}'
           value: '80'
           description: 'Maximum output load in % for trigger expression.'
-      dashboards:
-        -
-          uuid: fbf5cb79251d48bdbe4bc7b81dbd2d65
-          name: 'UPS Summary'
-          pages:
-            -
-              widgets:
-                -
-                  type: PLAIN_TEXT
-                  width: '8'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: show_as_html
-                      value: '0'
-                    -
-                      type: INTEGER
-                      name: show_lines
-                      value: '1'
-                    -
-                      type: ITEM
-                      name: itemids
-                      value:
-                        key: 'system.uptime[sysUpTime.0]'
-                        host: 'APC UPS Symmetra LX SNMP'
-                -
-                  type: PLAIN_TEXT
-                  x: '8'
-                  width: '8'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: show_as_html
-                      value: '0'
-                    -
-                      type: INTEGER
-                      name: show_lines
-                      value: '1'
-                    -
-                      type: ITEM
-                      name: itemids
-                      value:
-                        key: 'input.fail[upsAdvInputLineFailCause]'
-                        host: 'APC UPS Symmetra LX SNMP'
-                -
-                  type: PLAIN_TEXT
-                  x: '16'
-                  width: '8'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: show_as_html
-                      value: '0'
-                    -
-                      type: INTEGER
-                      name: show_lines
-                      value: '1'
-                    -
-                      type: ITEM
-                      name: itemids
-                      value:
-                        key: 'output.status[upsBasicOutputStatus]'
-                        host: 'APC UPS Symmetra LX SNMP'
-                -
-                  type: PLAIN_TEXT
-                  'y': '2'
-                  width: '8'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: show_as_html
-                      value: '0'
-                    -
-                      type: INTEGER
-                      name: show_lines
-                      value: '1'
-                    -
-                      type: ITEM
-                      name: itemids
-                      value:
-                        key: 'battery.status[upsBasicBatteryStatus]'
-                        host: 'APC UPS Symmetra LX SNMP'
-                -
-                  type: PLAIN_TEXT
-                  x: '8'
-                  'y': '2'
-                  width: '8'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: show_as_html
-                      value: '0'
-                    -
-                      type: INTEGER
-                      name: show_lines
-                      value: '1'
-                    -
-                      type: ITEM
-                      name: itemids
-                      value:
-                        key: 'battery.runtime_remaining[upsAdvBatteryRunTimeRemaining]'
-                        host: 'APC UPS Symmetra LX SNMP'
-                -
-                  type: PLAIN_TEXT
-                  x: '16'
-                  'y': '2'
-                  width: '8'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: show_as_html
-                      value: '0'
-                    -
-                      type: INTEGER
-                      name: show_lines
-                      value: '1'
-                    -
-                      type: ITEM
-                      name: itemids
-                      value:
-                        key: 'battery.last_replace_date[upsBasicBatteryLastReplaceDate]'
-                        host: 'APC UPS Symmetra LX SNMP'
-                -
-                  type: GRAPH_CLASSIC
-                  'y': '4'
-                  width: '8'
-                  height: '7'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: source_type
-                      value: '0'
-                    -
-                      type: GRAPH
-                      name: graphid
-                      value:
-                        name: 'Capacity of the UPS batteries'
-                        host: 'APC UPS Symmetra LX SNMP'
-                -
-                  type: GRAPH_CLASSIC
-                  x: '8'
-                  'y': '4'
-                  width: '8'
-                  height: '7'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: source_type
-                      value: '0'
-                    -
-                      type: GRAPH
-                      name: graphid
-                      value:
-                        name: Voltage
-                        host: 'APC UPS Symmetra LX SNMP'
-                -
-                  type: GRAPH_CLASSIC
-                  x: '16'
-                  'y': '4'
-                  width: '8'
-                  height: '7'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: source_type
-                      value: '0'
-                    -
-                      type: GRAPH
-                      name: graphid
-                      value:
-                        name: Output
-                        host: 'APC UPS Symmetra LX SNMP'
       valuemaps:
         -
           uuid: aec3362485c242ec928cb8ecfe5e61cf
diff --git a/templates/power/apc/apc_ups_symmetra_rm_snmp/README.md b/templates/power/apc/apc_ups_symmetra_rm_snmp/README.md
index 3d11b9085f3..8880d153e8d 100644
--- a/templates/power/apc/apc_ups_symmetra_rm_snmp/README.md
+++ b/templates/power/apc/apc_ups_symmetra_rm_snmp/README.md
@@ -51,12 +51,12 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|Input phases discovery |<p>The input phase identifier. OID upsPhaseInputPhaseIndex.1.1</p> |SNMP |input.phases.discovery |
-|Output phases discovery |<p>The output phase identifier. OID upsPhaseOutputPhaseIndex.1.1</p> |SNMP |output.phases.discovery |
-|External battery packs discovery |<p>-</p> |SNMP |battery.packs.discovery<p>**Filter**:</p>AND <p>- {#CARTRIDGE_STATUS} NOT_MATCHES_REGEX `^$`</p> |
 |External bad battery packs discovery |<p>Discovery of the number of external defective battery packs.</p> |SNMP |battery.packs.bad.discovery |
+|External battery packs discovery |<p>-</p> |SNMP |battery.packs.discovery<p>**Filter**:</p>AND <p>- {#CARTRIDGE_STATUS} NOT_MATCHES_REGEX `^$`</p> |
 |External sensor port 1 discovery |<p>uioSensorStatusTable</p> |SNMP |external.sensor1.discovery<p>**Overrides:**</p><p>Temp<br> - {#EXTERNAL_SENSOR1_NAME} MATCHES_REGEX `Temp`<br>  - ITEM_PROTOTYPE LIKE `Humidity` - NO_DISCOVER</p> |
 |External sensor port 2 discovery |<p>uioSensorStatusTable</p> |SNMP |external.sensor2.discovery<p>**Overrides:**</p><p>Temp<br> - {#EXTERNAL_SENSOR2_NAME} MATCHES_REGEX `Temp`<br>  - ITEM_PROTOTYPE LIKE `Humidity` - NO_DISCOVER</p> |
+|Input phases discovery |<p>The input phase identifier. OID upsPhaseInputPhaseIndex.1.1</p> |SNMP |input.phases.discovery |
+|Output phases discovery |<p>The output phase identifier. OID upsPhaseOutputPhaseIndex.1.1</p> |SNMP |output.phases.discovery |
 
 ## Items collected
 
@@ -147,5 +147,5 @@ There are no template links in this template.
 
 Please report any issues with the template at https://support.zabbix.com
 
-You can also provide a feedback, discuss the template or ask for help with it at [ZABBIX forums](https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/420730-discussion-thread-for-official-zabbix-template-apc-ups).
+You can also provide feedback, discuss the template or ask for help with it at [ZABBIX forums](https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/420730-discussion-thread-for-official-zabbix-template-apc-ups).
 
diff --git a/templates/power/apc/apc_ups_symmetra_rm_snmp/template_power_apc_ups_symmetra_rm_snmp.yaml b/templates/power/apc/apc_ups_symmetra_rm_snmp/template_power_apc_ups_symmetra_rm_snmp.yaml
index 4f4ae1a0c70..8fcb1ca1e90 100644
--- a/templates/power/apc/apc_ups_symmetra_rm_snmp/template_power_apc_ups_symmetra_rm_snmp.yaml
+++ b/templates/power/apc/apc_ups_symmetra_rm_snmp/template_power_apc_ups_symmetra_rm_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-15T17:57:16Z'
+  date: '2022-01-26T10:20:57Z'
   groups:
     -
       uuid: 3dcd5bbe90534f9e8eb5c2d53756af63
@@ -19,7 +19,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/420730-discussion-thread-for-official-zabbix-template-apc-ups
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Power
@@ -48,8 +48,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
           triggers:
             -
               uuid: dbfdc4e6eaca4d65adcde13b0682c1c2
@@ -57,6 +57,10 @@ zabbix_export:
               name: 'Battery has low capacity (below {$BATTERY.CAPACITY.MIN.WARN}%)'
               opdata: 'Current capacity: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: capacity
         -
           uuid: d26227e3d5754d8493ddaa9c3f5f2b5a
           name: 'External battery packs count'
@@ -77,8 +81,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: inventory
         -
           uuid: 138afef586634623974c1cefd45281e9
           name: 'Battery last replace date'
@@ -103,8 +107,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: inventory
         -
           uuid: abb901813d91481baef234496ddece33
           name: 'Battery replace indicator'
@@ -124,8 +128,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
           triggers:
             -
               uuid: 0af287bae1ee44ba997a02ae585bdd4b
@@ -133,6 +137,10 @@ zabbix_export:
               name: 'Battery needs replacement'
               priority: HIGH
               description: 'A battery installed has an internal error condition.'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 80a4e6cf09a147a7b166755aa182fdcd
           name: 'Battery runtime remaining'
@@ -157,8 +165,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
         -
           uuid: 322c3b48bcb74fa5829ef41015308d97
           name: 'Battery status'
@@ -184,8 +192,11 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: power
           triggers:
             -
               uuid: aedb557acbe44390809a27b95919e10f
@@ -193,12 +204,20 @@ zabbix_export:
               name: 'Battery has an internal error condition'
               priority: AVERAGE
               description: 'A battery installed has an internal error condition.'
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 1afe1859563f481faa623781028a38ca
               expression: 'last(/APC UPS Symmetra RM SNMP/battery.status[upsBasicBatteryStatus])=3'
               name: 'Battery is Low'
               priority: AVERAGE
               description: 'The UPS will be unable to sustain the current load, and its services will be lost if power is not restored.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
         -
           uuid: 17ffb34351da46e59d2288cd291a7912
           name: 'Battery temperature'
@@ -223,8 +242,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: temperature
           triggers:
             -
               uuid: 0b4490eaaf964fdabf228d34d2992d30
@@ -232,6 +251,10 @@ zabbix_export:
               name: 'Battery has high temperature (over {$BATTERY.TEMP.MAX.WARN}℃ for {$TIME.PERIOD})'
               opdata: 'Current temperature: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 9ab2309be6cc4eea8697f17e80b015d8
           name: 'Battery voltage'
@@ -255,8 +278,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
         -
           uuid: 439c87539027462c9b8210a056887885
           name: 'Input fail cause'
@@ -299,8 +322,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
         -
           uuid: e16be6095dc24b48bc541325b1675dd0
           name: 'Input frequency'
@@ -324,8 +347,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
           triggers:
             -
               uuid: af166242e3674f2da489a232c7bba6f1
@@ -333,6 +356,10 @@ zabbix_export:
               name: 'Unacceptable input frequency (out of range {$UPS.INPUT_FREQ.MIN.WARN}-{$UPS.INPUT_FREQ.MAX.WARN}Hz for {$TIME.PERIOD})'
               opdata: 'Current frequency: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: c658b02eea284fcf8e302c20a2256cf0
           name: 'Input voltage'
@@ -356,8 +383,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
           triggers:
             -
               uuid: 3b51bbae66914b19a93e7a2da289b056
@@ -365,6 +392,10 @@ zabbix_export:
               name: 'Unacceptable input voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD})'
               opdata: 'Current voltage: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 9bcae00165414f4aa15a40bc078aa44d
           name: 'Output current'
@@ -388,8 +419,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
         -
           uuid: 0e5240e578d043609fba4024db8c8df1
           name: 'Output load'
@@ -414,8 +445,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
           triggers:
             -
               uuid: a25499c49d0043cda248136eb6307ef9
@@ -424,6 +455,10 @@ zabbix_export:
               opdata: 'Current load: {ITEM.LASTVALUE1}'
               priority: HIGH
               description: 'A battery installed has an internal error condition.'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 7655b8ff3d5e41f0a5409fcfd646933a
           name: 'Output status'
@@ -449,64 +484,111 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: power
           triggers:
             -
               uuid: f7b0e2f05c9b4b14916f99ecb89fcd49
               expression: 'last(/APC UPS Symmetra RM SNMP/output.status[upsBasicOutputStatus])=16'
               name: 'UPS is Emergency Static Bypass'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 77081726414047a5a1c698fcfbf19e73
               expression: 'last(/APC UPS Symmetra RM SNMP/output.status[upsBasicOutputStatus])=10'
               name: 'UPS is Hardware Failure Bypass'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 87beb54ac57848e3896fd715a5918a88
               expression: 'last(/APC UPS Symmetra RM SNMP/output.status[upsBasicOutputStatus])=7'
               name: 'UPS is Off'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 5f46c436fab741ec86cb32339e8bd7b4
               expression: 'last(/APC UPS Symmetra RM SNMP/output.status[upsBasicOutputStatus])=3'
               name: 'UPS is on battery'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: a7457e3d6c6f4e99a3ccc08a1436d34a
               expression: 'last(/APC UPS Symmetra RM SNMP/output.status[upsBasicOutputStatus])=4'
               name: 'UPS is on Smart Boost'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 976395b6acea4f5cb4f7f3d4f0bc67af
               expression: 'last(/APC UPS Symmetra RM SNMP/output.status[upsBasicOutputStatus])=12'
               name: 'UPS is On Smart Trim'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 72c9677a2157412ebd14004a5e024a3a
               expression: 'last(/APC UPS Symmetra RM SNMP/output.status[upsBasicOutputStatus])=8'
               name: 'UPS is Rebooting'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 75d189cd8b5944c4b7987931c834e949
               expression: 'last(/APC UPS Symmetra RM SNMP/output.status[upsBasicOutputStatus])=11'
               name: 'UPS is Sleeping Until Power Return'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 24e1cfde22da48b0bf28ca2cdf8cd917
               expression: 'last(/APC UPS Symmetra RM SNMP/output.status[upsBasicOutputStatus])=6'
               name: 'UPS is Software Bypass'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 4fff7b4a29b84cdea245b2704e357f5d
               expression: 'last(/APC UPS Symmetra RM SNMP/output.status[upsBasicOutputStatus])=9'
               name: 'UPS is Switched Bypass'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 647178a4cb674815a65517c073b4adee
               expression: 'last(/APC UPS Symmetra RM SNMP/output.status[upsBasicOutputStatus])=5'
               name: 'UPS is Timed Sleeping'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 8d93b482d7c549f593c41abb9380ce2f
           name: 'Output voltage'
@@ -530,8 +612,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
         -
           uuid: 39dd21c0f2194acaa9fddbdfccde05dd
           name: 'SNMP traps (fallback)'
@@ -544,8 +626,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: 2d22b58a5c9f4fedbd03862398113546
           name: 'System contact details'
@@ -569,8 +651,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 251cc61592f543e3929aef3cb46f1b34
           name: 'System description'
@@ -593,8 +675,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 49b8ef5ff3a3400d8f412d4440040461
           name: 'System location'
@@ -617,8 +699,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: bd0dc104ded94e4cbba3a8557e642caf
           name: Model
@@ -639,8 +721,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: inventory
         -
           uuid: 155feccece4a4625b98efa206ad5e0b1
           name: 'System name'
@@ -664,8 +746,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: e3cf119c19b54dddb3d26d9b789ea4f5
@@ -674,6 +756,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: f6bd69ea5df144c996f050ded122521e
           name: 'System object ID'
@@ -699,8 +788,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 64ab7fd8a79448d580ad24ecf488241c
           name: 'Serial number'
@@ -724,8 +813,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: inventory
         -
           uuid: b4ca2f993709413b9a00fa1389ec9e3c
           name: Uptime
@@ -747,8 +836,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: fb2b4e564040422da234cdb309163b7b
@@ -761,6 +850,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/APC UPS Symmetra RM SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: d69889a19b564ed384fc96e8a70971a5
           name: 'SNMP agent availability'
@@ -782,8 +875,11 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 56f25581382a43efbddd4aba44aa86b3
@@ -792,6 +888,10 @@ zabbix_export:
               opdata: 'Current state: {ITEM.LASTVALUE1}'
               priority: WARNING
               description: 'SNMP is not available for polling. Please check device connectivity and SNMP settings.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: 82e8f10c883546ef8196e071fdd8df91
@@ -822,8 +922,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: inventory
         -
           uuid: b615a0d1ef1e49678daa4de77b47623e
           name: 'External battery packs discovery'
@@ -860,8 +960,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: inventory
+                -
+                  tag: component
+                  value: power
             -
               uuid: ebaf443cd74f4be282939032a843dcef
               name: '{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery pack cartridge health'
@@ -888,8 +991,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: health
+                -
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: 002caa5fac72437187ab9711eb2fc7ad
@@ -906,6 +1012,10 @@ zabbix_export:
                       bit 4 Battery lifetime exceeded acknowledged, replace battery
                       bit 5 Battery measured lifetime near end, order replacement cartridge
                       bit 6 Battery measured lifetime near end acknowledged, order replacement cartridge
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: a415a0d85a1146e6aadfd691fcc5da63
               name: '{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery status'
@@ -937,8 +1047,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: health
+                -
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: 9ca2e1e1a81e4e2388f735c03f9bc1de
@@ -960,6 +1073,10 @@ zabbix_export:
                     bit 9 Communication
                     bit 10 DisconnectedFrame
                     bit 11 FirmwareMismatch
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 8d1317fc38034fd78b5cff3b04dce7f1
               name: '{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery temperature'
@@ -983,8 +1100,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: b9a868a2f4a0410e9a03744eef9a5515
@@ -992,6 +1109,10 @@ zabbix_export:
                   name: '{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery has high temperature (over {$BATTERY.TEMP.MAX.WARN}℃ for {$TIME.PERIOD})'
                   opdata: 'Current temperature: {ITEM.LASTVALUE1}'
                   priority: HIGH
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 2694e29b9287464898684b711040d75a
               name: '{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Serial number'
@@ -1012,8 +1133,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: General
+                  tag: component
+                  value: inventory
         -
           uuid: 3adfddb03546462a9bcfdc5b059a29cc
           name: 'External sensor port 1 discovery'
@@ -1044,8 +1165,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: humidity
+                -
+                  tag: component
+                  value: power
             -
               uuid: e80af415f8384d0fa54c6954594b5794
               name: '{#EXTERNAL_SENSOR1_NAME}: Sensor alarm status'
@@ -1069,8 +1193,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: health
+                -
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: 1e6fa00989994e6f885c9ce2fde6ab24
@@ -1078,18 +1205,30 @@ zabbix_export:
                   name: '{#EXTERNAL_SENSOR1_NAME}: Sensor has status Critical'
                   priority: HIGH
                   description: 'The external sensor has returned a value greater than the critical threshold.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: b8b78dcb3f6d47e583565b7588cf9f4c
                   expression: 'last(/APC UPS Symmetra RM SNMP/external.sensor.status[uioSensorStatusAlarmStatus.1.{#SNMPINDEX}])=4'
                   name: '{#EXTERNAL_SENSOR1_NAME}: Sensor has status Not Applicable'
                   priority: INFO
                   description: 'The external sensor does not work or is not connected.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: ba421cf1871a4bcabb06f92be0a983dc
                   expression: 'last(/APC UPS Symmetra RM SNMP/external.sensor.status[uioSensorStatusAlarmStatus.1.{#SNMPINDEX}])=2'
                   name: '{#EXTERNAL_SENSOR1_NAME}: Sensor has status Warning'
                   priority: AVERAGE
                   description: 'The external sensor has returned a value greater than the warning threshold.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: c2e3e2ea6df84a609acdc3e05d4ea036
               name: '{#EXTERNAL_SENSOR1_NAME}: Temperature sensor'
@@ -1110,8 +1249,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: power
+                -
+                  tag: component
+                  value: temperature
           overrides:
             -
               name: Temp
@@ -1159,8 +1301,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: humidity
+                -
+                  tag: component
+                  value: power
             -
               uuid: a140c9eaef4049278bc5f2bfd28d0339
               name: '{#EXTERNAL_SENSOR2_NAME}: Sensor alarm status'
@@ -1184,8 +1329,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: health
+                -
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: 97ef6f2fc4374174912b16db90b615a8
@@ -1193,18 +1341,30 @@ zabbix_export:
                   name: '{#EXTERNAL_SENSOR2_NAME}: Sensor has status Critical'
                   priority: HIGH
                   description: 'The external sensor has returned a value greater than the critical threshold.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: 39db14da83714689b6bac140a9347c64
                   expression: 'last(/APC UPS Symmetra RM SNMP/external.sensor.status[uioSensorStatusAlarmStatus.2.{#SNMPINDEX}])=4'
                   name: '{#EXTERNAL_SENSOR2_NAME}: Sensor has status Not Applicable'
                   priority: INFO
                   description: 'The external sensor does not work or is not connected.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: d318122e192a401c95f24ad17d3bda93
                   expression: 'last(/APC UPS Symmetra RM SNMP/external.sensor.status[uioSensorStatusAlarmStatus.2.{#SNMPINDEX}])=2'
                   name: '{#EXTERNAL_SENSOR2_NAME}: Sensor has status Warning'
                   priority: AVERAGE
                   description: 'The external sensor has returned a value greater than the warning threshold.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 69ca20795352489b9efc0a0c0cc1b27f
               name: '{#EXTERNAL_SENSOR2_NAME}: Temperature sensor'
@@ -1225,8 +1385,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: power
+                -
+                  tag: component
+                  value: temperature
           overrides:
             -
               name: Temp
@@ -1277,8 +1440,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: power
             -
               uuid: e6d933f8a79248539fa9b5ce447813b5
               name: '{#PHASEINDEX}: Phase input voltage'
@@ -1299,8 +1462,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: 341c10188b984ce7aac7bb995847b69e
@@ -1308,6 +1471,10 @@ zabbix_export:
                   name: '{#PHASEINDEX}: Unacceptable phase {#PHASEINDEX} input voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD})'
                   opdata: 'Current phase {#PHASEINDEX} voltage: {ITEM.LASTVALUE1}'
                   priority: HIGH
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
         -
           uuid: a2da2392f78b4b5ea97370ef0f276973
           name: 'Output phases discovery'
@@ -1342,8 +1509,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: power
             -
               uuid: 177f5c2dcfac4bb997f778dcd58ba638
               name: '{#PHASEINDEX}: Phase output load, %'
@@ -1365,8 +1532,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: power
             -
               uuid: cc7c08b1bf924507b6d15cd9105926a5
               name: '{#PHASEINDEX}: Phase output voltage'
@@ -1387,8 +1554,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: 85551dd4ca0b4ef6994348891ad77b57
@@ -1396,6 +1563,20 @@ zabbix_export:
                   name: '{#PHASEINDEX}: Unacceptable phase {#PHASEINDEX} output voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD})'
                   opdata: 'Current phase {#PHASEINDEX} voltage: {ITEM.LASTVALUE1}'
                   priority: HIGH
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
+      tags:
+        -
+          tag: class
+          value: power
+        -
+          tag: target
+          value: apc
+        -
+          tag: target
+          value: apc-ups-symmetra-rm
       macros:
         -
           macro: '{$BATTERY.CAPACITY.MIN.WARN}'
@@ -1433,178 +1614,6 @@ zabbix_export:
           macro: '{$UPS.OUTPUT.MAX.WARN}'
           value: '80'
           description: 'Maximum output load in % for trigger expression.'
-      dashboards:
-        -
-          uuid: 3d8fa7f93f9f4a0bbc0b9f70282aa5cd
-          name: 'UPS Summary'
-          pages:
-            -
-              widgets:
-                -
-                  type: PLAIN_TEXT
-                  width: '8'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: show_as_html
-                      value: '0'
-                    -
-                      type: INTEGER
-                      name: show_lines
-                      value: '1'
-                    -
-                      type: ITEM
-                      name: itemids
-                      value:
-                        key: 'system.uptime[sysUpTime.0]'
-                        host: 'APC UPS Symmetra RM SNMP'
-                -
-                  type: PLAIN_TEXT
-                  x: '8'
-                  width: '8'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: show_as_html
-                      value: '0'
-                    -
-                      type: INTEGER
-                      name: show_lines
-                      value: '1'
-                    -
-                      type: ITEM
-                      name: itemids
-                      value:
-                        key: 'input.fail[upsAdvInputLineFailCause]'
-                        host: 'APC UPS Symmetra RM SNMP'
-                -
-                  type: PLAIN_TEXT
-                  x: '16'
-                  width: '8'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: show_as_html
-                      value: '0'
-                    -
-                      type: INTEGER
-                      name: show_lines
-                      value: '1'
-                    -
-                      type: ITEM
-                      name: itemids
-                      value:
-                        key: 'output.status[upsBasicOutputStatus]'
-                        host: 'APC UPS Symmetra RM SNMP'
-                -
-                  type: PLAIN_TEXT
-                  'y': '2'
-                  width: '8'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: show_as_html
-                      value: '0'
-                    -
-                      type: INTEGER
-                      name: show_lines
-                      value: '1'
-                    -
-                      type: ITEM
-                      name: itemids
-                      value:
-                        key: 'battery.status[upsBasicBatteryStatus]'
-                        host: 'APC UPS Symmetra RM SNMP'
-                -
-                  type: PLAIN_TEXT
-                  x: '8'
-                  'y': '2'
-                  width: '8'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: show_as_html
-                      value: '0'
-                    -
-                      type: INTEGER
-                      name: show_lines
-                      value: '1'
-                    -
-                      type: ITEM
-                      name: itemids
-                      value:
-                        key: 'battery.runtime_remaining[upsAdvBatteryRunTimeRemaining]'
-                        host: 'APC UPS Symmetra RM SNMP'
-                -
-                  type: PLAIN_TEXT
-                  x: '16'
-                  'y': '2'
-                  width: '8'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: show_as_html
-                      value: '0'
-                    -
-                      type: INTEGER
-                      name: show_lines
-                      value: '1'
-                    -
-                      type: ITEM
-                      name: itemids
-                      value:
-                        key: 'battery.last_replace_date[upsBasicBatteryLastReplaceDate]'
-                        host: 'APC UPS Symmetra RM SNMP'
-                -
-                  type: GRAPH_CLASSIC
-                  'y': '4'
-                  width: '8'
-                  height: '7'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: source_type
-                      value: '0'
-                    -
-                      type: GRAPH
-                      name: graphid
-                      value:
-                        name: 'Capacity of the UPS batteries'
-                        host: 'APC UPS Symmetra RM SNMP'
-                -
-                  type: GRAPH_CLASSIC
-                  x: '8'
-                  'y': '4'
-                  width: '8'
-                  height: '7'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: source_type
-                      value: '0'
-                    -
-                      type: GRAPH
-                      name: graphid
-                      value:
-                        name: Voltage
-                        host: 'APC UPS Symmetra RM SNMP'
-                -
-                  type: GRAPH_CLASSIC
-                  x: '16'
-                  'y': '4'
-                  width: '8'
-                  height: '7'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: source_type
-                      value: '0'
-                    -
-                      type: GRAPH
-                      name: graphid
-                      value:
-                        name: Output
-                        host: 'APC UPS Symmetra RM SNMP'
       valuemaps:
         -
           uuid: 8516e97893ed4f2ebe70766d17eeacde
diff --git a/templates/power/apc/apc_ups_symmetra_rx_snmp/README.md b/templates/power/apc/apc_ups_symmetra_rx_snmp/README.md
index d16719a8d23..eeb3b293ead 100644
--- a/templates/power/apc/apc_ups_symmetra_rx_snmp/README.md
+++ b/templates/power/apc/apc_ups_symmetra_rx_snmp/README.md
@@ -47,12 +47,12 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|Input phases discovery |<p>The input phase identifier. OID upsPhaseInputPhaseIndex.1.1</p> |SNMP |input.phases.discovery |
-|Output phases discovery |<p>The output phase identifier. OID upsPhaseOutputPhaseIndex.1.1</p> |SNMP |output.phases.discovery |
-|External battery packs discovery |<p>-</p> |SNMP |battery.packs.discovery<p>**Filter**:</p>AND <p>- {#CARTRIDGE_STATUS} NOT_MATCHES_REGEX `^$`</p> |
 |External bad battery packs discovery |<p>Discovery of the number of external defective battery packs.</p> |SNMP |battery.packs.bad.discovery |
+|External battery packs discovery |<p>-</p> |SNMP |battery.packs.discovery<p>**Filter**:</p>AND <p>- {#CARTRIDGE_STATUS} NOT_MATCHES_REGEX `^$`</p> |
 |External sensor port 1 discovery |<p>uioSensorStatusTable</p> |SNMP |external.sensor1.discovery<p>**Overrides:**</p><p>Temp<br> - {#EXTERNAL_SENSOR1_NAME} MATCHES_REGEX `Temp`<br>  - ITEM_PROTOTYPE LIKE `Humidity` - NO_DISCOVER</p> |
 |External sensor port 2 discovery |<p>uioSensorStatusTable</p> |SNMP |external.sensor2.discovery<p>**Overrides:**</p><p>Temp<br> - {#EXTERNAL_SENSOR2_NAME} MATCHES_REGEX `Temp`<br>  - ITEM_PROTOTYPE LIKE `Humidity` - NO_DISCOVER</p> |
+|Input phases discovery |<p>The input phase identifier. OID upsPhaseInputPhaseIndex.1.1</p> |SNMP |input.phases.discovery |
+|Output phases discovery |<p>The output phase identifier. OID upsPhaseOutputPhaseIndex.1.1</p> |SNMP |output.phases.discovery |
 
 ## Items collected
 
@@ -143,5 +143,5 @@ There are no template links in this template.
 
 Please report any issues with the template at https://support.zabbix.com
 
-You can also provide a feedback, discuss the template or ask for help with it at [ZABBIX forums](https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/420730-discussion-thread-for-official-zabbix-template-apc-ups).
+You can also provide feedback, discuss the template or ask for help with it at [ZABBIX forums](https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/420730-discussion-thread-for-official-zabbix-template-apc-ups).
 
diff --git a/templates/power/apc/apc_ups_symmetra_rx_snmp/template_power_apc_ups_symmetra_rx_snmp.yaml b/templates/power/apc/apc_ups_symmetra_rx_snmp/template_power_apc_ups_symmetra_rx_snmp.yaml
index b7d6967be11..ffeae697e52 100644
--- a/templates/power/apc/apc_ups_symmetra_rx_snmp/template_power_apc_ups_symmetra_rx_snmp.yaml
+++ b/templates/power/apc/apc_ups_symmetra_rx_snmp/template_power_apc_ups_symmetra_rx_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-15T17:57:19Z'
+  date: '2022-01-26T10:43:13Z'
   groups:
     -
       uuid: 3dcd5bbe90534f9e8eb5c2d53756af63
@@ -19,7 +19,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/420730-discussion-thread-for-official-zabbix-template-apc-ups
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Power
@@ -48,8 +48,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
           triggers:
             -
               uuid: 5626e87891ec4c28a17a6b5965b47e46
@@ -57,6 +57,10 @@ zabbix_export:
               name: 'Battery has low capacity (below {$BATTERY.CAPACITY.MIN.WARN}%)'
               opdata: 'Current capacity: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: capacity
         -
           uuid: a40074f9db134bc8bc4bd9800906137d
           name: 'External battery packs count'
@@ -77,8 +81,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: inventory
         -
           uuid: c069bb03f58a47b981448a33a1663463
           name: 'Battery last replace date'
@@ -103,8 +107,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: inventory
         -
           uuid: 810c9cd371c14e44b8670ad3f4e003d5
           name: 'Battery replace indicator'
@@ -124,8 +128,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
           triggers:
             -
               uuid: a74eccd4442c401a98ac3c80dd3baa13
@@ -133,6 +137,10 @@ zabbix_export:
               name: 'Battery needs replacement'
               priority: HIGH
               description: 'A battery installed has an internal error condition.'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 849b9ffa0c0b4dd59e7c5a544a135fa3
           name: 'Battery runtime remaining'
@@ -157,8 +165,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
         -
           uuid: a5ccdee4e5ff49f183adab8a283e88a0
           name: 'Battery status'
@@ -184,8 +192,11 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: power
           triggers:
             -
               uuid: 107454c372cb413bad4d4a807c254ae0
@@ -193,12 +204,20 @@ zabbix_export:
               name: 'Battery has an internal error condition'
               priority: AVERAGE
               description: 'A battery installed has an internal error condition.'
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 4a410279dba04d37924eade4bb927228
               expression: 'last(/APC UPS Symmetra RX SNMP/battery.status[upsBasicBatteryStatus])=3'
               name: 'Battery is Low'
               priority: AVERAGE
               description: 'The UPS will be unable to sustain the current load, and its services will be lost if power is not restored.'
+              tags:
+                -
+                  tag: scope
+                  value: capacity
         -
           uuid: 59cc2d65eca142adb00ec80e237b134e
           name: 'Battery temperature'
@@ -223,8 +242,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: temperature
           triggers:
             -
               uuid: 225ccc34992f4c718277b436bfecdc72
@@ -232,6 +251,10 @@ zabbix_export:
               name: 'Battery has high temperature (over {$BATTERY.TEMP.MAX.WARN}℃ for {$TIME.PERIOD})'
               opdata: 'Current temperature: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: ae8516a825b94d90b267371934bc452f
           name: 'Battery voltage'
@@ -255,8 +278,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
         -
           uuid: 598c1b4cc957455b84c2edcbe844e169
           name: 'Input fail cause'
@@ -299,8 +322,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
         -
           uuid: 8ab48c798ac94773b37228a8f725efd0
           name: 'Input frequency'
@@ -324,8 +347,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
           triggers:
             -
               uuid: 03b674d215604dc8acc3449610b05878
@@ -333,6 +356,10 @@ zabbix_export:
               name: 'Unacceptable input frequency (out of range {$UPS.INPUT_FREQ.MIN.WARN}-{$UPS.INPUT_FREQ.MAX.WARN}Hz for {$TIME.PERIOD})'
               opdata: 'Current frequency: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 5478b17ba84c4f12bc1ffa7dfc507ae1
           name: 'Input voltage'
@@ -356,8 +383,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
           triggers:
             -
               uuid: bf495f3ffefd4e65af488d91b360539c
@@ -365,6 +392,10 @@ zabbix_export:
               name: 'Unacceptable input voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD})'
               opdata: 'Current voltage: {ITEM.LASTVALUE1}'
               priority: HIGH
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 71cfc894a29f4bffb1f4199e0010aea0
           name: 'Output current'
@@ -388,8 +419,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
         -
           uuid: 3ac052b6b4e241d9af470b70212ab8d3
           name: 'Output load'
@@ -414,8 +445,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
           triggers:
             -
               uuid: f2790aa869724c5bbeff6031561f2ca4
@@ -424,6 +455,10 @@ zabbix_export:
               opdata: 'Current load: {ITEM.LASTVALUE1}'
               priority: HIGH
               description: 'A battery installed has an internal error condition.'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: f8e4bcaa71e045e09af82ee739202778
           name: 'Output status'
@@ -449,64 +484,111 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: power
           triggers:
             -
               uuid: 48a2bee152664ede98bed55c05cc437d
               expression: 'last(/APC UPS Symmetra RX SNMP/output.status[upsBasicOutputStatus])=16'
               name: 'UPS is Emergency Static Bypass'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: ccd80d5877e0401b8f56f22ca2da2f94
               expression: 'last(/APC UPS Symmetra RX SNMP/output.status[upsBasicOutputStatus])=10'
               name: 'UPS is Hardware Failure Bypass'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: e54fd69ac4354716a107d4d094b387f0
               expression: 'last(/APC UPS Symmetra RX SNMP/output.status[upsBasicOutputStatus])=7'
               name: 'UPS is Off'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 92df44ef170d471394f4cf8ff6882c39
               expression: 'last(/APC UPS Symmetra RX SNMP/output.status[upsBasicOutputStatus])=3'
               name: 'UPS is on battery'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: b6f6c160466e43d8b7f210b2efdd8ca3
               expression: 'last(/APC UPS Symmetra RX SNMP/output.status[upsBasicOutputStatus])=4'
               name: 'UPS is on Smart Boost'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 7d6323e1a03a48efb9f349ecd7e10153
               expression: 'last(/APC UPS Symmetra RX SNMP/output.status[upsBasicOutputStatus])=12'
               name: 'UPS is On Smart Trim'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 18a31f11313b47c8ab9e9cd4791c1532
               expression: 'last(/APC UPS Symmetra RX SNMP/output.status[upsBasicOutputStatus])=8'
               name: 'UPS is Rebooting'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 142e25b05d1547f0a683f6caee773ef5
               expression: 'last(/APC UPS Symmetra RX SNMP/output.status[upsBasicOutputStatus])=11'
               name: 'UPS is Sleeping Until Power Return'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: b6e22e8295c84fbebb8061c96ddd75f9
               expression: 'last(/APC UPS Symmetra RX SNMP/output.status[upsBasicOutputStatus])=6'
               name: 'UPS is Software Bypass'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 1c97c8ca6d6640fe829bf896f989bd91
               expression: 'last(/APC UPS Symmetra RX SNMP/output.status[upsBasicOutputStatus])=9'
               name: 'UPS is Switched Bypass'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
             -
               uuid: 0683dbba9f4b4480ba15e040b8b83211
               expression: 'last(/APC UPS Symmetra RX SNMP/output.status[upsBasicOutputStatus])=5'
               name: 'UPS is Timed Sleeping'
               priority: AVERAGE
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: e7969358cce84f3eb749b1c43d96c583
           name: 'Output voltage'
@@ -530,8 +612,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: power
         -
           uuid: c892c7f2ddcd4e15b1d5ab907cd70dcf
           name: 'SNMP traps (fallback)'
@@ -544,8 +626,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: 1de71b45323b4eb5bc1a38315d56ce58
           name: 'System contact details'
@@ -569,8 +651,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 9bca97c1e308421b82f4769151f5177e
           name: 'System description'
@@ -593,8 +675,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: be1280a6b2d84393ad001113bf7c80f2
           name: 'System location'
@@ -617,8 +699,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 5c5b88814e4c4dc9b90ed4a5e49a91ca
           name: Model
@@ -639,8 +721,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: inventory
         -
           uuid: 3c521e1e94da4dd2bd71719bf20e14b8
           name: 'System name'
@@ -664,8 +746,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 5224767a1bee42738c49361ddabfed4b
@@ -674,6 +756,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: 0d3fcfce413a4f6aaaa2390183ab0c82
           name: 'System object ID'
@@ -699,8 +788,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 0e72609b44094aff8acfa58b63ca97ba
           name: 'Serial number'
@@ -724,8 +813,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: inventory
         -
           uuid: 4aac942cab30432d81c4df32e01af5e2
           name: Uptime
@@ -747,8 +836,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 990c0545543c42a78022589838a8a1ff
@@ -761,6 +850,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/APC UPS Symmetra RX SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 582ff80b2df049b8acf233ad4dbfe1f1
           name: 'SNMP agent availability'
@@ -782,8 +875,11 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: c0ad0941746546aeb6de2fee087c8252
@@ -792,6 +888,10 @@ zabbix_export:
               opdata: 'Current state: {ITEM.LASTVALUE1}'
               priority: WARNING
               description: 'SNMP is not available for polling. Please check device connectivity and SNMP settings.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: eddb568fd0e34398bcee7d39a6f76319
@@ -822,8 +922,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: inventory
         -
           uuid: 0c31de1650b94f8cabef339e2ef009e3
           name: 'External battery packs discovery'
@@ -860,8 +960,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: inventory
+                -
+                  tag: component
+                  value: power
             -
               uuid: c4a7061be8f64f398ad0f3c52db29bbd
               name: '{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery pack cartridge health'
@@ -888,8 +991,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: health
+                -
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: 3a48257337a84a2296db92410a8aed8c
@@ -906,6 +1012,10 @@ zabbix_export:
                       bit 4 Battery lifetime exceeded acknowledged, replace battery
                       bit 5 Battery measured lifetime near end, order replacement cartridge
                       bit 6 Battery measured lifetime near end acknowledged, order replacement cartridge
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 8f5b3a61acad491f8ca6860f6201252d
               name: '{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery status'
@@ -937,8 +1047,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: health
+                -
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: 4498d376328e405bad7da5f1832cde8a
@@ -960,6 +1073,10 @@ zabbix_export:
                     bit 9 Communication
                     bit 10 DisconnectedFrame
                     bit 11 FirmwareMismatch
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 346f2ab5b340401880c63a6cb9eec949
               name: '{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery temperature'
@@ -983,8 +1100,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: f710e2b952054f35ab6e3e8e90ab7f83
@@ -992,6 +1109,10 @@ zabbix_export:
                   name: '{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Battery has high temperature (over {$BATTERY.TEMP.MAX.WARN}℃ for {$TIME.PERIOD})'
                   opdata: 'Current temperature: {ITEM.LASTVALUE1}'
                   priority: HIGH
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 230fc138d8f64c4f9eeee438d42b519e
               name: '{#BATTERY_PACK}.{#CARTRIDGE_INDEX}: Serial number'
@@ -1012,8 +1133,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: General
+                  tag: component
+                  value: inventory
         -
           uuid: 93941e38fd2d4b48bd8b50179692cb56
           name: 'External sensor port 1 discovery'
@@ -1044,8 +1165,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: humidity
+                -
+                  tag: component
+                  value: power
             -
               uuid: 230f3e596bbc4cb6961eda599da74f5e
               name: '{#EXTERNAL_SENSOR1_NAME}: Sensor alarm status'
@@ -1069,8 +1193,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: health
+                -
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: 0de21ba7495d41f4834170122620c37d
@@ -1078,18 +1205,30 @@ zabbix_export:
                   name: '{#EXTERNAL_SENSOR1_NAME}: Sensor has status Critical'
                   priority: HIGH
                   description: 'The external sensor has returned a value greater than the critical threshold.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: 69fbc11262f74fdfb49da43bb59c1810
                   expression: 'last(/APC UPS Symmetra RX SNMP/external.sensor.status[uioSensorStatusAlarmStatus.1.{#SNMPINDEX}])=4'
                   name: '{#EXTERNAL_SENSOR1_NAME}: Sensor has status Not Applicable'
                   priority: INFO
                   description: 'The external sensor does not work or is not connected.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: 0ce46cad353c4299ad5540a831b5c467
                   expression: 'last(/APC UPS Symmetra RX SNMP/external.sensor.status[uioSensorStatusAlarmStatus.1.{#SNMPINDEX}])=2'
                   name: '{#EXTERNAL_SENSOR1_NAME}: Sensor has status Warning'
                   priority: AVERAGE
                   description: 'The external sensor has returned a value greater than the warning threshold.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: f777176e1d7b4e328209aeeced8e680b
               name: '{#EXTERNAL_SENSOR1_NAME}: Temperature sensor'
@@ -1110,8 +1249,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: power
+                -
+                  tag: component
+                  value: temperature
           overrides:
             -
               name: Temp
@@ -1159,8 +1301,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: humidity
+                -
+                  tag: component
+                  value: power
             -
               uuid: b8a37686d5374b4fa05717987e54c2f6
               name: '{#EXTERNAL_SENSOR2_NAME}: Sensor alarm status'
@@ -1184,8 +1329,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: health
+                -
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: f27f80f391a04927bb138ba66d48d364
@@ -1193,18 +1341,30 @@ zabbix_export:
                   name: '{#EXTERNAL_SENSOR2_NAME}: Sensor has status Critical'
                   priority: HIGH
                   description: 'The external sensor has returned a value greater than the critical threshold.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: a84e1b5140b643ad8bee020d74821255
                   expression: 'last(/APC UPS Symmetra RX SNMP/external.sensor.status[uioSensorStatusAlarmStatus.2.{#SNMPINDEX}])=4'
                   name: '{#EXTERNAL_SENSOR2_NAME}: Sensor has status Not Applicable'
                   priority: INFO
                   description: 'The external sensor does not work or is not connected.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: b67ed4a3ce5a49e4ac4079e258d7fe7c
                   expression: 'last(/APC UPS Symmetra RX SNMP/external.sensor.status[uioSensorStatusAlarmStatus.2.{#SNMPINDEX}])=2'
                   name: '{#EXTERNAL_SENSOR2_NAME}: Sensor has status Warning'
                   priority: AVERAGE
                   description: 'The external sensor has returned a value greater than the warning threshold.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 15e3cf28f89043029e722b1813737c6c
               name: '{#EXTERNAL_SENSOR2_NAME}: Temperature sensor'
@@ -1225,8 +1385,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: power
+                -
+                  tag: component
+                  value: temperature
           overrides:
             -
               name: Temp
@@ -1277,8 +1440,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: power
             -
               uuid: 6993631adffb41fabc7995bd9158e448
               name: '{#PHASEINDEX}: Phase input voltage'
@@ -1299,8 +1462,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: 212cf86650fc4c189115da565111f5d3
@@ -1308,6 +1471,10 @@ zabbix_export:
                   name: '{#PHASEINDEX}: Unacceptable phase {#PHASEINDEX} input voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD})'
                   opdata: 'Current phase {#PHASEINDEX} voltage: {ITEM.LASTVALUE1}'
                   priority: HIGH
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
         -
           uuid: 262343758e9649a8a6fe2b77631f66df
           name: 'Output phases discovery'
@@ -1342,8 +1509,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: power
             -
               uuid: 5ec8aae1e2b24350b005d0177b164e6b
               name: '{#PHASEINDEX}: Phase output load, %'
@@ -1365,8 +1532,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: power
             -
               uuid: 3da95223adfc4d638406c6908bba7063
               name: '{#PHASEINDEX}: Phase output voltage'
@@ -1387,8 +1554,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: 47069f8d431f45d490674d7ba01d2bb2
@@ -1396,6 +1563,20 @@ zabbix_export:
                   name: '{#PHASEINDEX}: Unacceptable phase {#PHASEINDEX} output voltage (out of range {$UPS.INPUT_VOLT.MIN.WARN}-{$UPS.INPUT_VOLT.MAX.WARN}V for {$TIME.PERIOD})'
                   opdata: 'Current phase {#PHASEINDEX} voltage: {ITEM.LASTVALUE1}'
                   priority: HIGH
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
+      tags:
+        -
+          tag: class
+          value: power
+        -
+          tag: target
+          value: apc
+        -
+          tag: target
+          value: apc-ups-symmetra-rx
       macros:
         -
           macro: '{$BATTERY.CAPACITY.MIN.WARN}'
@@ -1433,178 +1614,6 @@ zabbix_export:
           macro: '{$UPS.OUTPUT.MAX.WARN}'
           value: '80'
           description: 'Maximum output load in % for trigger expression.'
-      dashboards:
-        -
-          uuid: b070a774806547ffa7e688b2746c8d58
-          name: 'UPS Summary'
-          pages:
-            -
-              widgets:
-                -
-                  type: PLAIN_TEXT
-                  width: '8'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: show_as_html
-                      value: '0'
-                    -
-                      type: INTEGER
-                      name: show_lines
-                      value: '1'
-                    -
-                      type: ITEM
-                      name: itemids
-                      value:
-                        key: 'system.uptime[sysUpTime.0]'
-                        host: 'APC UPS Symmetra RX SNMP'
-                -
-                  type: PLAIN_TEXT
-                  x: '8'
-                  width: '8'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: show_as_html
-                      value: '0'
-                    -
-                      type: INTEGER
-                      name: show_lines
-                      value: '1'
-                    -
-                      type: ITEM
-                      name: itemids
-                      value:
-                        key: 'input.fail[upsAdvInputLineFailCause]'
-                        host: 'APC UPS Symmetra RX SNMP'
-                -
-                  type: PLAIN_TEXT
-                  x: '16'
-                  width: '8'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: show_as_html
-                      value: '0'
-                    -
-                      type: INTEGER
-                      name: show_lines
-                      value: '1'
-                    -
-                      type: ITEM
-                      name: itemids
-                      value:
-                        key: 'output.status[upsBasicOutputStatus]'
-                        host: 'APC UPS Symmetra RX SNMP'
-                -
-                  type: PLAIN_TEXT
-                  'y': '2'
-                  width: '8'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: show_as_html
-                      value: '0'
-                    -
-                      type: INTEGER
-                      name: show_lines
-                      value: '1'
-                    -
-                      type: ITEM
-                      name: itemids
-                      value:
-                        key: 'battery.status[upsBasicBatteryStatus]'
-                        host: 'APC UPS Symmetra RX SNMP'
-                -
-                  type: PLAIN_TEXT
-                  x: '8'
-                  'y': '2'
-                  width: '8'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: show_as_html
-                      value: '0'
-                    -
-                      type: INTEGER
-                      name: show_lines
-                      value: '1'
-                    -
-                      type: ITEM
-                      name: itemids
-                      value:
-                        key: 'battery.runtime_remaining[upsAdvBatteryRunTimeRemaining]'
-                        host: 'APC UPS Symmetra RX SNMP'
-                -
-                  type: PLAIN_TEXT
-                  x: '16'
-                  'y': '2'
-                  width: '8'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: show_as_html
-                      value: '0'
-                    -
-                      type: INTEGER
-                      name: show_lines
-                      value: '1'
-                    -
-                      type: ITEM
-                      name: itemids
-                      value:
-                        key: 'battery.last_replace_date[upsBasicBatteryLastReplaceDate]'
-                        host: 'APC UPS Symmetra RX SNMP'
-                -
-                  type: GRAPH_CLASSIC
-                  'y': '4'
-                  width: '8'
-                  height: '7'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: source_type
-                      value: '0'
-                    -
-                      type: GRAPH
-                      name: graphid
-                      value:
-                        name: 'Capacity of the UPS batteries'
-                        host: 'APC UPS Symmetra RX SNMP'
-                -
-                  type: GRAPH_CLASSIC
-                  x: '8'
-                  'y': '4'
-                  width: '8'
-                  height: '7'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: source_type
-                      value: '0'
-                    -
-                      type: GRAPH
-                      name: graphid
-                      value:
-                        name: Voltage
-                        host: 'APC UPS Symmetra RX SNMP'
-                -
-                  type: GRAPH_CLASSIC
-                  x: '16'
-                  'y': '4'
-                  width: '8'
-                  height: '7'
-                  fields:
-                    -
-                      type: INTEGER
-                      name: source_type
-                      value: '0'
-                    -
-                      type: GRAPH
-                      name: graphid
-                      value:
-                        name: Output
-                        host: 'APC UPS Symmetra RX SNMP'
       valuemaps:
         -
           uuid: e2877a188bd24918992f8c7878550924
diff --git a/templates/san/huawei_5300v5_snmp/template_san_huawei_5300v5_snmp.yaml b/templates/san/huawei_5300v5_snmp/template_san_huawei_5300v5_snmp.yaml
index 557e88f39cd..f1c37f6fe2e 100644
--- a/templates/san/huawei_5300v5_snmp/template_san_huawei_5300v5_snmp.yaml
+++ b/templates/san/huawei_5300v5_snmp/template_san_huawei_5300v5_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:39:05Z'
+  date: '2022-01-26T10:39:52Z'
   groups:
     -
       uuid: 7c2cb727f85b492d88cd56e17127c64d
@@ -38,8 +38,11 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Huawei
+              tag: component
+              value: health
+            -
+              tag: component
+              value: system
         -
           uuid: 04c8d7f53668449ea32c4ed611b71237
           name: 'OceanStor 5300 V5: Capacity total'
@@ -60,8 +63,8 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: Huawei
+              tag: component
+              value: storage
         -
           uuid: ef77f126052b4f9e9cddafdab20577d1
           name: 'OceanStor 5300 V5: Capacity used'
@@ -78,8 +81,8 @@ zabbix_export:
                 - '1048576'
           tags:
             -
-              tag: Application
-              value: Huawei
+              tag: component
+              value: storage
         -
           uuid: 0a2e129d84d14e88bf953f3a9ca76b46
           name: 'OceanStor 5300 V5: Version'
@@ -97,8 +100,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Huawei
+              tag: component
+              value: system
           triggers:
             -
               uuid: b6eb791cc14644dfb0a69a2cce150ab1
@@ -107,6 +110,10 @@ zabbix_export:
               priority: INFO
               description: 'OceanStor 5300 V5 version has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 030530f5193246f4b983ec802030e49b
           name: 'ICMP ping'
@@ -117,8 +124,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: ef6b5dc40f9a49599aae97c2cf68d3cb
@@ -126,6 +136,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: c82fa3f20c7443e4849ea8e8aec1e49d
           name: 'ICMP loss'
@@ -136,8 +150,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: c9765f7f271d46c99ad7dd45efa79849
@@ -149,6 +166,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/Huawei OceanStor 5300 V5 SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 0a95c43c70e54ad49f073fee69a2452d
           name: 'ICMP response time'
@@ -159,8 +183,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: b8815a9e952047e09d1e657cea5d538e
@@ -175,6 +202,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/Huawei OceanStor 5300 V5 SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 2ec396a7adf64637ae453d7f26cd5b20
           name: 'SNMP traps (fallback)'
@@ -187,8 +221,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: e98719af84414ef5ab3dd788c7d2d72f
           name: 'System contact details'
@@ -210,8 +244,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: cf59fb53834d4b14bdb0251e66c5143f
           name: 'System description'
@@ -234,8 +268,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: fed7a954ea614cb086b901b2e6957621
           name: 'System location'
@@ -257,8 +291,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 354fe7cd2632425b9f937e8714d79798
           name: 'System name'
@@ -280,8 +314,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 72a31faa805b40e795a57649c724da1e
@@ -290,6 +324,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: bf571c06cc264eca89d68f0b0b7559f7
           name: 'System object ID'
@@ -310,8 +351,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: f14eaa207ac9480995d2a2a10bea1467
           name: Uptime
@@ -332,8 +373,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 0e3713bdf52e40d692cf256ac2a01988
@@ -346,6 +387,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/Huawei OceanStor 5300 V5 SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 197767da1b3c4c4f8f3c59ab3c3fc5b8
           name: 'SNMP agent availability'
@@ -362,8 +407,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: b0c4103eac9447ee9f7f31627baf4eea
@@ -376,6 +424,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/Huawei OceanStor 5300 V5 SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: 6de9606d1f594546b76e79bbb72a8a56
@@ -405,14 +457,27 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'BBU {#ID}'
+                  tag: bbu
+                  value: '{#ID}'
+                -
+                  tag: component
+                  value: health
+                -
+                  tag: component
+                  value: power
+                -
+                  tag: location
+                  value: '{#LOCATION}'
               trigger_prototypes:
                 -
                   uuid: fb73cddd30164af8aa243bd3e2b2f803
                   expression: 'last(/Huawei OceanStor 5300 V5 SNMP/huawei.5300.v5[hwInfoBBUHealthStatus, "{#ID}:{#LOCATION}"])<>1'
                   name: 'BBU {#ID} on {#LOCATION}: Health status is not Normal'
                   priority: HIGH
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: a861b76edde842448f39afd9788fa852
               name: 'BBU {#ID} on {#LOCATION}: Running status'
@@ -432,14 +497,27 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'BBU {#ID}'
+                  tag: bbu
+                  value: '{#ID}'
+                -
+                  tag: component
+                  value: health
+                -
+                  tag: component
+                  value: power
+                -
+                  tag: location
+                  value: '{#LOCATION}'
               trigger_prototypes:
                 -
                   uuid: 15d809b0be1c4d1da9158a83d303789c
                   expression: 'last(/Huawei OceanStor 5300 V5 SNMP/huawei.5300.v5[hwInfoBBURunningStatus, "{#ID}:{#LOCATION}"])<>2'
                   name: 'BBU {#ID} on {#LOCATION}: Running status is not Online'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
         -
           uuid: c676eae5d7c548e788f7addc2343389f
           name: 'Controllers discovery'
@@ -461,8 +539,11 @@ zabbix_export:
               description: 'CPU usage of a controller {#ID}.'
               tags:
                 -
-                  tag: Application
-                  value: 'Controller {#ID}'
+                  tag: component
+                  value: cpu
+                -
+                  tag: controller
+                  value: '{#ID}'
               trigger_prototypes:
                 -
                   uuid: a51b4e42efaa4924b6c2990c9c0abf30
@@ -471,6 +552,10 @@ zabbix_export:
                   opdata: 'Current utilization: {ITEM.LASTVALUE1}'
                   priority: WARNING
                   description: 'CPU utilization is too high. The system might be slow to respond.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 99798c647f2344d2896b644f2bd7e1c0
               name: 'Controller {#ID}: Health status'
@@ -490,14 +575,21 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Controller {#ID}'
+                  tag: component
+                  value: health
+                -
+                  tag: controller
+                  value: '{#ID}'
               trigger_prototypes:
                 -
                   uuid: 52cf517dd30146578b32fd1399ec81cc
                   expression: 'last(/Huawei OceanStor 5300 V5 SNMP/huawei.5300.v5[hwInfoControllerHealthStatus, "{#ID}"])<>1'
                   name: 'Controller {#ID}: Health status is not Normal'
                   priority: HIGH
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 42b61bf322fb495d94802c23f85f22b2
               name: 'Controller {#ID}: Memory utilization'
@@ -509,14 +601,21 @@ zabbix_export:
               description: 'Memory usage of a controller {#ID}.'
               tags:
                 -
-                  tag: Application
-                  value: 'Controller {#ID}'
+                  tag: component
+                  value: memory
+                -
+                  tag: controller
+                  value: '{#ID}'
               trigger_prototypes:
                 -
                   uuid: 8d4fe305737f41a595c1d2efb3e8a153
                   expression: 'min(/Huawei OceanStor 5300 V5 SNMP/huawei.5300.v5[hwInfoControllerMemoryUsage, "{#ID}"],{$HUAWEI.5300.MEM.MAX.TIME})>{$HUAWEI.5300.MEM.MAX.WARN}'
                   name: 'Controller {#ID}: Memory usage is too high (over {$HUAWEI.5300.MEM.MAX.WARN} for {$HUAWEI.5300.MEM.MAX.TIME})'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 4797e9608d2445e385ad9db6097feeeb
               name: 'Controller {#ID}: Role'
@@ -534,8 +633,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Controller {#ID}'
+                  tag: component
+                  value: system
+                -
+                  tag: controller
+                  value: '{#ID}'
               trigger_prototypes:
                 -
                   uuid: 8b8ec3f843e74533a43f24393004cc84
@@ -543,6 +645,10 @@ zabbix_export:
                   name: 'Controller {#ID}: Role has been changed'
                   priority: WARNING
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: b9a0053b16c04cefbdfc320659d79754
               name: 'Controller {#ID}: Running status'
@@ -562,14 +668,21 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Controller {#ID}'
+                  tag: component
+                  value: health
+                -
+                  tag: controller
+                  value: '{#ID}'
               trigger_prototypes:
                 -
                   uuid: 6ab64eb5e1c146838ad48b7b9b063587
                   expression: 'last(/Huawei OceanStor 5300 V5 SNMP/huawei.5300.v5[hwInfoControllerRunningStatus, "{#ID}"])<>27'
                   name: 'Controller {#ID}: Running status is not Online'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
           graph_prototypes:
             -
               uuid: ac083f05484846e6a8c4799410e1f566
@@ -607,8 +720,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Disk {#MODEL}'
+                  tag: component
+                  value: health
+                -
+                  tag: disk
+                  value: '{#MODEL}'
+                -
+                  tag: location
+                  value: '{#LOCATION}'
             -
               uuid: d30c2d9d18d54af08c18bd35b5664a0d
               name: 'Disk {#MODEL} on {#LOCATION}: Health status'
@@ -628,14 +747,24 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Disk {#NAME}'
+                  tag: component
+                  value: health
+                -
+                  tag: disk
+                  value: '{#MODEL}'
+                -
+                  tag: location
+                  value: '{#LOCATION}'
               trigger_prototypes:
                 -
                   uuid: fc1c8d30f09c49a3999e282bff6ea370
                   expression: 'last(/Huawei OceanStor 5300 V5 SNMP/huawei.5300.v5[hwInfoDiskHealthStatus, "{#ID}"])<>1'
                   name: 'Disk {#MODEL} on {#LOCATION}: Health status is not Normal'
                   priority: HIGH
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: d5f1c54d524847ebae2015968e772d92
               name: 'Disk {#MODEL} on {#LOCATION}: Running status'
@@ -655,14 +784,24 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Disk {#MODEL}'
+                  tag: component
+                  value: health
+                -
+                  tag: disk
+                  value: '{#MODEL}'
+                -
+                  tag: location
+                  value: '{#LOCATION}'
               trigger_prototypes:
                 -
                   uuid: 53aaf06848a346f188799d1cbb5d948f
                   expression: 'last(/Huawei OceanStor 5300 V5 SNMP/huawei.5300.v5[hwInfoDiskRunningStatus, "{#ID}"])<>27'
                   name: 'Disk {#MODEL} on {#LOCATION}: Running status is not Online'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 769abd2f1a8d43cda52c8021c20fe3c4
               name: 'Disk {#MODEL} on {#LOCATION}: Temperature'
@@ -674,8 +813,14 @@ zabbix_export:
               description: 'Disk temperature.'
               tags:
                 -
-                  tag: Application
-                  value: 'Disk {#MODEL}'
+                  tag: component
+                  value: environment
+                -
+                  tag: disk
+                  value: '{#MODEL}'
+                -
+                  tag: location
+                  value: '{#LOCATION}'
               trigger_prototypes:
                 -
                   uuid: 906de152d3594f1d8cc15b4b717d6202
@@ -683,6 +828,13 @@ zabbix_export:
                   name: 'Disk {#MODEL} on {#LOCATION}: Temperature is too high (over {$HUAWEI.5300.DISK.TEMP.MAX.WARN:"{#MODEL}"} for {$HUAWEI.5300.DISK.TEMP.MAX.TIME})'
                   opdata: 'Current value: {ITEM.LASTVALUE}'
                   priority: HIGH
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: notice
         -
           uuid: 21e6235b6b314ce6a6392aafc9a3de07
           name: 'Enclosure discovery'
@@ -711,14 +863,21 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Enclosure {#NAME}'
+                  tag: component
+                  value: health
+                -
+                  tag: enclosure
+                  value: '{#NAME}'
               trigger_prototypes:
                 -
                   uuid: 9b8fb5b02b0b4158a2b564f47281f716
                   expression: 'last(/Huawei OceanStor 5300 V5 SNMP/huawei.5300.v5[hwInfoEnclosureHealthStatus, "{#NAME}"])<>1'
                   name: 'Enclosure {#NAME}: Health status is not Normal'
                   priority: HIGH
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: b96af65318d64932bc13e8e81155644c
               name: 'Enclosure {#NAME}: Running status'
@@ -738,14 +897,21 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Enclosure {#NAME}'
+                  tag: component
+                  value: health
+                -
+                  tag: enclosure
+                  value: '{#NAME}'
               trigger_prototypes:
                 -
                   uuid: 3c430a2073ff42d9908490858c9c2817
                   expression: 'last(/Huawei OceanStor 5300 V5 SNMP/huawei.5300.v5[hwInfoEnclosureRunningStatus, "{#NAME}"])<>27'
                   name: 'Enclosure {#NAME}: Running status is not Online'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 37fa5a5f2d7d440dbb38781bddf5cd46
               name: 'Enclosure {#NAME}: Temperature'
@@ -757,8 +923,11 @@ zabbix_export:
               description: 'Enclosure temperature.'
               tags:
                 -
-                  tag: Application
-                  value: 'Enclosure {#NAME}'
+                  tag: component
+                  value: environment
+                -
+                  tag: enclosure
+                  value: '{#NAME}'
               trigger_prototypes:
                 -
                   uuid: 622fcc16c03e4ba4ad8371ea5c1c314f
@@ -766,6 +935,13 @@ zabbix_export:
                   name: 'Enclosure {#NAME}: Temperature is too high (over {$HUAWEI.5300.TEMP.MAX.WARN} for {$HUAWEI.5300.TEMP.MAX.TIME})'
                   opdata: 'Current value: {ITEM.LASTVALUE}'
                   priority: HIGH
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: notice
         -
           uuid: ae390e1c100d490ab4e878bac8951744
           name: 'FANs discovery'
@@ -794,14 +970,24 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'FAN {#ID}'
+                  tag: component
+                  value: health
+                -
+                  tag: fan
+                  value: '{#ID}'
+                -
+                  tag: location
+                  value: '{#LOCATION}'
               trigger_prototypes:
                 -
                   uuid: 1f41c20696d44eb29a1273718c9faf2f
                   expression: 'last(/Huawei OceanStor 5300 V5 SNMP/huawei.5300.v5[hwInfoFanHealthStatus, "{#ID}:{#LOCATION}"])<>1'
                   name: 'FAN {#ID} on {#LOCATION}: Health status is not Normal'
                   priority: HIGH
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 800d348ca4394215800c227b421e9bea
               name: 'FAN {#ID} on {#LOCATION}: Running status'
@@ -821,14 +1007,24 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'FAN {#ID}'
+                  tag: component
+                  value: health
+                -
+                  tag: fan
+                  value: '{#ID}'
+                -
+                  tag: location
+                  value: '{#LOCATION}'
               trigger_prototypes:
                 -
                   uuid: c225c9d853184d579d18c27f7e906fd2
                   expression: 'last(/Huawei OceanStor 5300 V5 SNMP/huawei.5300.v5[hwInfoFanRunningStatus, "{#ID}:{#LOCATION}"])<>2'
                   name: 'FAN {#ID} on {#LOCATION}: Running status is not Running'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
         -
           uuid: aeb30b2aec4842bfb0a9f946988783a2
           name: 'LUNs discovery'
@@ -854,14 +1050,21 @@ zabbix_export:
                     - '0.001'
               tags:
                 -
-                  tag: Application
-                  value: 'LUN {#NAME}'
+                  tag: component
+                  value: operations
+                -
+                  tag: lun
+                  value: '{#NAME}'
               trigger_prototypes:
                 -
                   uuid: aae494cb840049fb83df354c13daaf53
                   expression: 'min(/Huawei OceanStor 5300 V5 SNMP/huawei.5300.v5[hwPerfLunAverageIOResponseTime, "{#NAME}"],{$HUAWEI.5300.LUN.IO.TIME.MAX.TIME})>{$HUAWEI.5300.LUN.IO.TIME.MAX.WARN}'
                   name: 'LUN {#NAME}: Average I/O response time is too high (over {$HUAWEI.5300.LUN.IO.TIME.MAX.WARN}ms for {$HUAWEI.5300.LUN.IO.TIME.MAX.TIME})'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 75e6ce80f06c4b3b86a13de4aadf25d7
               name: 'LUN {#NAME}: Average read I/O latency'
@@ -878,8 +1081,11 @@ zabbix_export:
                     - '0.001'
               tags:
                 -
-                  tag: Application
-                  value: 'LUN {#NAME}'
+                  tag: component
+                  value: operations
+                -
+                  tag: lun
+                  value: '{#NAME}'
             -
               uuid: b639b6cc20524fe1a5c415a6218b5382
               name: 'LUN {#NAME}: Average write I/O latency'
@@ -896,8 +1102,11 @@ zabbix_export:
                     - '0.001'
               tags:
                 -
-                  tag: Application
-                  value: 'LUN {#NAME}'
+                  tag: component
+                  value: operations
+                -
+                  tag: lun
+                  value: '{#NAME}'
             -
               uuid: 6e2c299282f045cca7a07dedd30b5f89
               name: 'LUN {#NAME}: Read operations per second'
@@ -909,8 +1118,11 @@ zabbix_export:
               description: 'Read IOPS of the node.'
               tags:
                 -
-                  tag: Application
-                  value: 'LUN {#NAME}'
+                  tag: component
+                  value: operations
+                -
+                  tag: lun
+                  value: '{#NAME}'
             -
               uuid: 8e376b38196b4954895b10aefbdf65ba
               name: 'LUN {#NAME}: Read traffic per second'
@@ -927,8 +1139,11 @@ zabbix_export:
                     - '1048576'
               tags:
                 -
-                  tag: Application
-                  value: 'LUN {#NAME}'
+                  tag: component
+                  value: traffic
+                -
+                  tag: lun
+                  value: '{#NAME}'
             -
               uuid: 4d83d160c92845c9ac0f51f5f0158c3b
               name: 'LUN {#NAME}: Total I/O per second'
@@ -940,8 +1155,11 @@ zabbix_export:
               description: 'Current IOPS of the LUN.'
               tags:
                 -
-                  tag: Application
-                  value: 'LUN {#NAME}'
+                  tag: component
+                  value: operations
+                -
+                  tag: lun
+                  value: '{#NAME}'
             -
               uuid: 1bbe8185981349dcb8a867955ff19c2f
               name: 'LUN {#NAME}: Total traffic per second'
@@ -958,8 +1176,11 @@ zabbix_export:
                     - '1048576'
               tags:
                 -
-                  tag: Application
-                  value: 'LUN {#NAME}'
+                  tag: component
+                  value: traffic
+                -
+                  tag: lun
+                  value: '{#NAME}'
             -
               uuid: 1aed4e060c9743caa13d1ace2cee16f3
               name: 'LUN {#NAME}: Write operations per second'
@@ -971,8 +1192,11 @@ zabbix_export:
               description: 'Write IOPS of the node.'
               tags:
                 -
-                  tag: Application
-                  value: 'LUN {#NAME}'
+                  tag: component
+                  value: operations
+                -
+                  tag: lun
+                  value: '{#NAME}'
             -
               uuid: 4a21edb8ea37437f8435565e04c5ce28
               name: 'LUN {#NAME}: Write traffic per second'
@@ -989,8 +1213,11 @@ zabbix_export:
                     - '1048576'
               tags:
                 -
-                  tag: Application
-                  value: 'LUN {#NAME}'
+                  tag: component
+                  value: traffic
+                -
+                  tag: lun
+                  value: '{#NAME}'
             -
               uuid: 4c85003e7f7441adb4490efcb03e477e
               name: 'LUN {#NAME}: Capacity'
@@ -1011,8 +1238,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'LUN {#NAME}'
+                  tag: component
+                  value: traffic
+                -
+                  tag: lun
+                  value: '{#NAME}'
             -
               uuid: f613af109f2846c88e845f626743232b
               name: 'LUN {#NAME}: Status'
@@ -1030,14 +1260,21 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'LUN {#NAME}'
+                  tag: component
+                  value: health
+                -
+                  tag: lun
+                  value: '{#NAME}'
               trigger_prototypes:
                 -
                   uuid: 757eef04912d44b4b4f9e1abab54fb4d
                   expression: 'last(/Huawei OceanStor 5300 V5 SNMP/huawei.5300.v5[hwStorageLunStatus, "{#NAME}"])<>1'
                   name: 'LUN {#NAME}: Status is not Normal'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
           graph_prototypes:
             -
               uuid: 36d1eb7893f54db28afb1f4725aef1a1
@@ -1123,8 +1360,11 @@ zabbix_export:
               description: 'CPU usage of the node {#NODE}.'
               tags:
                 -
-                  tag: Application
-                  value: 'Node {#NODE}'
+                  tag: component
+                  value: cpu
+                -
+                  tag: node
+                  value: '{#NODE}'
               trigger_prototypes:
                 -
                   uuid: 8495a55d6549460d9b132675a39b818b
@@ -1133,6 +1373,10 @@ zabbix_export:
                   opdata: 'Current utilization: {ITEM.LASTVALUE1}'
                   priority: WARNING
                   description: 'CPU utilization is too high. The system might be slow to respond.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 336022218b44497f84056fce4ed4d2bf
               name: 'Node {#NODE}: Average I/O latency'
@@ -1145,14 +1389,21 @@ zabbix_export:
               description: 'Average I/O latency of the node.'
               tags:
                 -
-                  tag: Application
-                  value: 'Node {#NODE}'
+                  tag: component
+                  value: operations
+                -
+                  tag: node
+                  value: '{#NODE}'
               trigger_prototypes:
                 -
                   uuid: 8f54bfe029fe43c7a049c6a97c8598bf
                   expression: 'min(/Huawei OceanStor 5300 V5 SNMP/huawei.5300.v5[hwPerfNodeDelay, "{#NODE}"],{$HUAWEI.5300.NODE.IO.DELAY.MAX.TIME})>{$HUAWEI.5300.NODE.IO.DELAY.MAX.WARN}'
                   name: 'Node {#NODE}: Average I/O latency is too high (over {$HUAWEI.5300.NODE.IO.DELAY.MAX.WARN}ms for {$HUAWEI.5300.NODE.IO.DELAY.MAX.TIME})'
                   priority: WARNING
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 3019a48ac4d34552a00c3344d04ec055
               name: 'Node {#NODE}: Read operations per second'
@@ -1164,8 +1415,11 @@ zabbix_export:
               description: 'Read IOPS of the node.'
               tags:
                 -
-                  tag: Application
-                  value: 'Node {#NODE}'
+                  tag: component
+                  value: operations
+                -
+                  tag: node
+                  value: '{#NODE}'
             -
               uuid: e0c9807e30cc49c480f4862bf7228da8
               name: 'Node {#NODE}: Read traffic per second'
@@ -1182,8 +1436,11 @@ zabbix_export:
                     - '1048576'
               tags:
                 -
-                  tag: Application
-                  value: 'Node {#NODE}'
+                  tag: component
+                  value: traffic
+                -
+                  tag: node
+                  value: '{#NODE}'
             -
               uuid: 1c3d8562d32d4412b649738c05350c4d
               name: 'Node {#NODE}: Total I/O per second'
@@ -1195,8 +1452,11 @@ zabbix_export:
               description: 'Total IOPS of the node.'
               tags:
                 -
-                  tag: Application
-                  value: 'Node {#NODE}'
+                  tag: component
+                  value: operations
+                -
+                  tag: node
+                  value: '{#NODE}'
             -
               uuid: 604ab970767b4a4e80e5e2e29d30f9a1
               name: 'Node {#NODE}: Total traffic per second'
@@ -1213,8 +1473,11 @@ zabbix_export:
                     - '1048576'
               tags:
                 -
-                  tag: Application
-                  value: 'Node {#NODE}'
+                  tag: component
+                  value: traffic
+                -
+                  tag: node
+                  value: '{#NODE}'
             -
               uuid: bd0c930ef95b4bb6838cac49dd38bf6f
               name: 'Node {#NODE}: Write operations per second'
@@ -1226,8 +1489,11 @@ zabbix_export:
               description: 'Write IOPS of the node.'
               tags:
                 -
-                  tag: Application
-                  value: 'Node {#NODE}'
+                  tag: component
+                  value: operations
+                -
+                  tag: node
+                  value: '{#NODE}'
             -
               uuid: 4f5105903075422cb6643dca913df933
               name: 'Node {#NODE}: Write traffic per second'
@@ -1244,8 +1510,11 @@ zabbix_export:
                     - '1048576'
               tags:
                 -
-                  tag: Application
-                  value: 'Node {#NODE}'
+                  tag: component
+                  value: traffic
+                -
+                  tag: node
+                  value: '{#NODE}'
           graph_prototypes:
             -
               uuid: 62f3a059a92a454eba1a71fb3a62b787
@@ -1326,8 +1595,11 @@ zabbix_export:
                     - '1048576'
               tags:
                 -
-                  tag: Application
-                  value: 'Pool {#MODEL}'
+                  tag: component
+                  value: storage
+                -
+                  tag: pool
+                  value: '{#NAME}'
             -
               uuid: a800b047bda64f528ad4d22698efaa7d
               name: 'Pool {#NAME}: Capacity used percentage'
@@ -1339,14 +1611,21 @@ zabbix_export:
               description: 'Used capacity of a storage pool in percents.'
               tags:
                 -
-                  tag: Application
-                  value: 'Pool {#MODEL}'
+                  tag: component
+                  value: storage
+                -
+                  tag: pool
+                  value: '{#NAME}'
               trigger_prototypes:
                 -
                   uuid: 2ea46713fe664a64a851edca422257f8
                   expression: 'min(/Huawei OceanStor 5300 V5 SNMP/huawei.5300.v5[hwInfoStoragePoolFreeCapacityPct, "{#NAME}"],{$HUAWEI.5300.POOL.CAPACITY.THRESH.TIME})>{#THRESHOLD}'
                   name: 'Pool {#NAME}: Used capacity is too high (over {#THRESHOLD}%)'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
             -
               uuid: 8a8bb086e75b4476af3686e5d28d8cfc
               name: 'Pool {#NAME}: Health status'
@@ -1366,14 +1645,21 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Pool {#NAME}'
+                  tag: component
+                  value: health
+                -
+                  tag: pool
+                  value: '{#NAME}'
               trigger_prototypes:
                 -
                   uuid: 8089b48aafb4403fa3187164685f8ca3
                   expression: 'last(/Huawei OceanStor 5300 V5 SNMP/huawei.5300.v5[hwInfoStoragePoolHealthStatus, "{#NAME}"])<>1'
                   name: 'Pool {#NAME}: Health status is not Normal'
                   priority: HIGH
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: a5e886744b82456e8a028f01d458307a
               name: 'Pool {#NAME}: Running status'
@@ -1393,14 +1679,21 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Pool {#MODEL}'
+                  tag: component
+                  value: health
+                -
+                  tag: pool
+                  value: '{#NAME}'
               trigger_prototypes:
                 -
                   uuid: 5ff1d6b5d90040928b90908859c2e8cd
                   expression: 'last(/Huawei OceanStor 5300 V5 SNMP/huawei.5300.v5[hwInfoStoragePoolRunningStatus, "{#NAME}"])<>27'
                   name: 'Pool {#NAME}: Running status is not Online'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 8e59b01ae52b403a8e0da860c909faa1
               name: 'Pool {#NAME}: Capacity used'
@@ -1417,8 +1710,11 @@ zabbix_export:
                     - '1048576'
               tags:
                 -
-                  tag: Application
-                  value: 'Pool {#MODEL}'
+                  tag: component
+                  value: storage
+                -
+                  tag: pool
+                  value: '{#NAME}'
             -
               uuid: e82a9a0946814522a517694df270a400
               name: 'Pool {#NAME}: Capacity total'
@@ -1439,8 +1735,11 @@ zabbix_export:
                     - 10m
               tags:
                 -
-                  tag: Application
-                  value: 'Pool {#MODEL}'
+                  tag: component
+                  value: storage
+                -
+                  tag: pool
+                  value: '{#NAME}'
           graph_prototypes:
             -
               uuid: 6a2ef2bf36e44139b8550d7f1950669a
@@ -1463,6 +1762,19 @@ zabbix_export:
                   item:
                     host: 'Huawei OceanStor 5300 V5 SNMP'
                     key: 'huawei.5300.v5[hwInfoStoragePoolFreeCapacity, "{#NAME}"]'
+      tags:
+        -
+          tag: class
+          value: hardware
+        -
+          tag: class
+          value: storage
+        -
+          tag: target
+          value: huawei
+        -
+          tag: target
+          value: huawei-oceanstor-5300-v5
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
diff --git a/templates/san/netapp_aff_a700_http/README.md b/templates/san/netapp_aff_a700_http/README.md
index 91e89535e98..12ca637b61c 100644
--- a/templates/san/netapp_aff_a700_http/README.md
+++ b/templates/san/netapp_aff_a700_http/README.md
@@ -45,14 +45,14 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|Nodes discovery |<p>-</p> |HTTP_AGENT |netapp.nodes.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
+|Chassis discovery |<p>-</p> |HTTP_AGENT |netapp.chassis.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
+|Disks discovery |<p>-</p> |HTTP_AGENT |netapp.disks.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
 |Ethernet ports discovery |<p>-</p> |HTTP_AGENT |netapp.ports.ether.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
 |FC ports discovery |<p>-</p> |HTTP_AGENT |netapp.ports.fc.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
-|Disks discovery |<p>-</p> |HTTP_AGENT |netapp.disks.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
-|Chassis discovery |<p>-</p> |HTTP_AGENT |netapp.chassis.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
 |FRUs discovery |<p>-</p> |DEPENDENT |netapp.frus.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|SVMs discovery |<p>-</p> |HTTP_AGENT |netapp.svms.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
 |LUNs discovery |<p>-</p> |HTTP_AGENT |netapp.luns.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
+|Nodes discovery |<p>-</p> |HTTP_AGENT |netapp.nodes.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
+|SVMs discovery |<p>-</p> |HTTP_AGENT |netapp.svms.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
 |Volumes discovery |<p>-</p> |HTTP_AGENT |netapp.volumes.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
 
 ## Items collected
@@ -112,32 +112,32 @@ There are no template links in this template.
 |General |{#VOLUMENAME}: Volume latency, read |<p>The average latency per I/O operation in milliseconds observed at the storage object. Performance metric for read I/O operations.</p> |CALCULATED |netapp.volume.statistics.latency.read[{#VOLUMENAME}]<p>**Expression**:</p>`(last(//netapp.volume.statistics.latency_raw.read[{#VOLUMENAME}]) - last(//netapp.volume.statistics.latency_raw.read[{#VOLUMENAME}],#2)) / ( last(//netapp.volume.statistics.iops_raw.read[{#VOLUMENAME}]) - last(//netapp.volume.statistics.iops_raw.read[{#VOLUMENAME}],#2) + (last(//netapp.volume.statistics.iops_raw.read[{#VOLUMENAME}]) - last(//netapp.volume.statistics.iops_raw.read[{#VOLUMENAME}],#2) = 0)) * 0.001 ` |
 |General |{#VOLUMENAME}: Volume latency, write |<p>The average latency per I/O operation in milliseconds observed at the storage object. Performance metric for write I/O operations.</p> |CALCULATED |netapp.volume.statistics.latency.write[{#VOLUMENAME}]<p>**Expression**:</p>`(last(//netapp.volume.statistics.latency_raw.write[{#VOLUMENAME}]) - last(//netapp.volume.statistics.latency_raw.write[{#VOLUMENAME}],#2)) / ( last(//netapp.volume.statistics.iops_raw.write[{#VOLUMENAME}]) - last(//netapp.volume.statistics.iops_raw.write[{#VOLUMENAME}],#2) + (last(//netapp.volume.statistics.iops_raw.write[{#VOLUMENAME}]) - last(//netapp.volume.statistics.iops_raw.write[{#VOLUMENAME}],#2) = 0) ) * 0.001 ` |
 |General |{#VOLUMENAME}: Volume latency, total |<p>The average latency per I/O operation in milliseconds observed at the storage object. Performance metric aggregated over all types of I/O operations.</p> |CALCULATED |netapp.volume.statistics.latency.total[{#VOLUMENAME}]<p>**Expression**:</p>`(last(//netapp.volume.statistics.latency_raw.total[{#VOLUMENAME}]) - last(//netapp.volume.statistics.latency_raw.total[{#VOLUMENAME}],#2)) / ( last(//netapp.volume.statistics.iops_raw.total[{#VOLUMENAME}]) - last(//netapp.volume.statistics.iops_raw.total[{#VOLUMENAME}],#2) + (last(//netapp.volume.statistics.iops_raw.total[{#VOLUMENAME}]) - last(//netapp.volume.statistics.iops_raw.total[{#VOLUMENAME}],#2) = 0) ) * 0.001 ` |
-|Zabbix_raw_items |Get cluster |<p>-</p> |HTTP_AGENT |netapp.cluster.get |
-|Zabbix_raw_items |Get nodes |<p>-</p> |HTTP_AGENT |netapp.nodes.get |
-|Zabbix_raw_items |Get disks |<p>-</p> |HTTP_AGENT |netapp.disks.get |
-|Zabbix_raw_items |Get volumes |<p>-</p> |HTTP_AGENT |netapp.volumes.get |
-|Zabbix_raw_items |Get ethernet ports |<p>-</p> |HTTP_AGENT |netapp.ports.eth.get |
-|Zabbix_raw_items |Get FC ports |<p>-</p> |HTTP_AGENT |netapp.ports.fc.get |
-|Zabbix_raw_items |Get SVMs |<p>-</p> |HTTP_AGENT |netapp.svms.get |
-|Zabbix_raw_items |Get LUNs |<p>-</p> |HTTP_AGENT |netapp.luns.get |
-|Zabbix_raw_items |Get chassis |<p>-</p> |HTTP_AGENT |netapp.chassis.get |
-|Zabbix_raw_items |Get FRUs |<p>-</p> |HTTP_AGENT |netapp.frus.get<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
-|Zabbix_raw_items |Cluster latency raw, other |<p>The raw latency in microseconds observed at the storage object. This can be divided by the raw IOPS value to calculate the average latency per I/O operation. Performance metric for other I/O operations. Other I/O operations can be metadata operations, such as directory lookups and so on.</p> |DEPENDENT |netapp.cluster.statistics.latency_raw.other<p>**Preprocessing**:</p><p>- JSONPATH: `$.statistics.latency_raw.other`</p> |
-|Zabbix_raw_items |Cluster latency raw, read |<p>The raw latency in microseconds observed at the storage object. This can be divided by the raw IOPS value to calculate the average latency per I/O operation. Performance metric for read I/O operations.</p> |DEPENDENT |netapp.cluster.statistics.latency_raw.read<p>**Preprocessing**:</p><p>- JSONPATH: `$.statistics.latency_raw.read`</p> |
-|Zabbix_raw_items |Cluster latency raw, write |<p>The raw latency in microseconds observed at the storage object. This can be divided by the raw IOPS value to calculate the average latency per I/O operation. Performance metric for write I/O operations.</p> |DEPENDENT |netapp.cluster.statistics.latency_raw.write<p>**Preprocessing**:</p><p>- JSONPATH: `$.statistics.latency_raw.write`</p> |
-|Zabbix_raw_items |Cluster latency raw, total |<p>The raw latency in microseconds observed at the storage object. This can be divided by the raw IOPS value to calculate the average latency per I/O operation. Performance metric aggregated over all types of I/O operations.</p> |DEPENDENT |netapp.cluster.statistics.latency_raw.total<p>**Preprocessing**:</p><p>- JSONPATH: `$.statistics.latency_raw.total`</p> |
-|Zabbix_raw_items |Cluster IOPS raw, other |<p>The number of I/O operations observed at the storage object. Performance metric for other I/O operations. Other I/O operations can be metadata operations, such as directory lookups and so on.</p> |DEPENDENT |netapp.cluster.statistics.iops_raw.other<p>**Preprocessing**:</p><p>- JSONPATH: `$.statistics.iops_raw.other`</p> |
-|Zabbix_raw_items |Cluster IOPS raw, read |<p>The number of I/O operations observed at the storage object. Performance metric for read I/O operations.</p> |DEPENDENT |netapp.cluster.statistics.iops_raw.read<p>**Preprocessing**:</p><p>- JSONPATH: `$.statistics.iops_raw.read`</p> |
-|Zabbix_raw_items |Cluster IOPS raw, write |<p>The number of I/O operations observed at the storage object. Performance metric for write I/O operations.</p> |DEPENDENT |netapp.cluster.statistics.iops_raw.write<p>**Preprocessing**:</p><p>- JSONPATH: `$.statistics.iops_raw.write`</p> |
-|Zabbix_raw_items |Cluster IOPS raw, total |<p>The number of I/O operations observed at the storage object. Performance metric aggregated over all types of I/O operations.</p> |DEPENDENT |netapp.cluster.statistics.iops_raw.total<p>**Preprocessing**:</p><p>- JSONPATH: `$.statistics.iops_raw.total`</p> |
-|Zabbix_raw_items |{#VOLUMENAME}: Volume latency raw, other |<p>The raw latency in microseconds observed at the storage object. Performance metric for other I/O operations. Other I/O operations can be metadata operations, such as directory lookups and so on.</p> |DEPENDENT |netapp.volume.statistics.latency_raw.other[{#VOLUMENAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.records[?(@.name=='{#VOLUMENAME}')].statistics.latency_raw.other.first()`</p> |
-|Zabbix_raw_items |{#VOLUMENAME}: Volume latency raw, read |<p>The raw latency in microseconds observed at the storage object. Performance metric for read I/O operations.</p> |DEPENDENT |netapp.volume.statistics.latency_raw.read[{#VOLUMENAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.records[?(@.name=='{#VOLUMENAME}')].statistics.latency_raw.read.first()`</p> |
-|Zabbix_raw_items |{#VOLUMENAME}: Volume latency raw, write |<p>The raw latency in microseconds observed at the storage object. Performance metric for write I/O operations.</p> |DEPENDENT |netapp.volume.statistics.latency_raw.write[{#VOLUMENAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.records[?(@.name=='{#VOLUMENAME}')].statistics.latency_raw.write.first()`</p> |
-|Zabbix_raw_items |{#VOLUMENAME}: Volume latency raw, total |<p>The raw latency in microseconds observed at the storage object. Performance metric aggregated over all types of I/O operations.</p> |DEPENDENT |netapp.volume.statistics.latency_raw.total[{#VOLUMENAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.records[?(@.name=='{#VOLUMENAME}')].statistics.latency_raw.total.first()`</p> |
-|Zabbix_raw_items |{#VOLUMENAME}: Volume IOPS raw, other |<p>The number of I/O operations observed at the storage object. Performance metric for other I/O operations. Other I/O operations can be metadata operations, such as directory lookups and so on.</p> |DEPENDENT |netapp.volume.statistics.iops_raw.other[{#VOLUMENAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.records[?(@.name=='{#VOLUMENAME}')].statistics.iops_raw.other.first()`</p> |
-|Zabbix_raw_items |{#VOLUMENAME}: Volume IOPS raw, read |<p>The number of I/O operations observed at the storage object. Performance metric for read I/O operations.</p> |DEPENDENT |netapp.volume.statistics.iops_raw.read[{#VOLUMENAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.records[?(@.name=='{#VOLUMENAME}')].statistics.iops_raw.read.first()`</p> |
-|Zabbix_raw_items |{#VOLUMENAME}: Volume IOPS raw, write |<p>The number of I/O operations observed at the storage object. Performance metric for write I/O operations.</p> |DEPENDENT |netapp.volume.statistics.iops_raw.write[{#VOLUMENAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.records[?(@.name=='{#VOLUMENAME}')].statistics.iops_raw.write.first()`</p> |
-|Zabbix_raw_items |{#VOLUMENAME}: Volume IOPS raw, total |<p>The number of I/O operations observed at the storage object. Performance metric aggregated over all types of I/O operations.</p> |DEPENDENT |netapp.volume.statistics.iops_raw.total[{#VOLUMENAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.records[?(@.name=='{#VOLUMENAME}')].statistics.iops_raw.total.first()`</p> |
+|Zabbix raw items |Get cluster |<p>-</p> |HTTP_AGENT |netapp.cluster.get |
+|Zabbix raw items |Get nodes |<p>-</p> |HTTP_AGENT |netapp.nodes.get |
+|Zabbix raw items |Get disks |<p>-</p> |HTTP_AGENT |netapp.disks.get |
+|Zabbix raw items |Get volumes |<p>-</p> |HTTP_AGENT |netapp.volumes.get |
+|Zabbix raw items |Get ethernet ports |<p>-</p> |HTTP_AGENT |netapp.ports.eth.get |
+|Zabbix raw items |Get FC ports |<p>-</p> |HTTP_AGENT |netapp.ports.fc.get |
+|Zabbix raw items |Get SVMs |<p>-</p> |HTTP_AGENT |netapp.svms.get |
+|Zabbix raw items |Get LUNs |<p>-</p> |HTTP_AGENT |netapp.luns.get |
+|Zabbix raw items |Get chassis |<p>-</p> |HTTP_AGENT |netapp.chassis.get |
+|Zabbix raw items |Get FRUs |<p>-</p> |HTTP_AGENT |netapp.frus.get<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p> |
+|Zabbix raw items |Cluster latency raw, other |<p>The raw latency in microseconds observed at the storage object. This can be divided by the raw IOPS value to calculate the average latency per I/O operation. Performance metric for other I/O operations. Other I/O operations can be metadata operations, such as directory lookups and so on.</p> |DEPENDENT |netapp.cluster.statistics.latency_raw.other<p>**Preprocessing**:</p><p>- JSONPATH: `$.statistics.latency_raw.other`</p> |
+|Zabbix raw items |Cluster latency raw, read |<p>The raw latency in microseconds observed at the storage object. This can be divided by the raw IOPS value to calculate the average latency per I/O operation. Performance metric for read I/O operations.</p> |DEPENDENT |netapp.cluster.statistics.latency_raw.read<p>**Preprocessing**:</p><p>- JSONPATH: `$.statistics.latency_raw.read`</p> |
+|Zabbix raw items |Cluster latency raw, write |<p>The raw latency in microseconds observed at the storage object. This can be divided by the raw IOPS value to calculate the average latency per I/O operation. Performance metric for write I/O operations.</p> |DEPENDENT |netapp.cluster.statistics.latency_raw.write<p>**Preprocessing**:</p><p>- JSONPATH: `$.statistics.latency_raw.write`</p> |
+|Zabbix raw items |Cluster latency raw, total |<p>The raw latency in microseconds observed at the storage object. This can be divided by the raw IOPS value to calculate the average latency per I/O operation. Performance metric aggregated over all types of I/O operations.</p> |DEPENDENT |netapp.cluster.statistics.latency_raw.total<p>**Preprocessing**:</p><p>- JSONPATH: `$.statistics.latency_raw.total`</p> |
+|Zabbix raw items |Cluster IOPS raw, other |<p>The number of I/O operations observed at the storage object. Performance metric for other I/O operations. Other I/O operations can be metadata operations, such as directory lookups and so on.</p> |DEPENDENT |netapp.cluster.statistics.iops_raw.other<p>**Preprocessing**:</p><p>- JSONPATH: `$.statistics.iops_raw.other`</p> |
+|Zabbix raw items |Cluster IOPS raw, read |<p>The number of I/O operations observed at the storage object. Performance metric for read I/O operations.</p> |DEPENDENT |netapp.cluster.statistics.iops_raw.read<p>**Preprocessing**:</p><p>- JSONPATH: `$.statistics.iops_raw.read`</p> |
+|Zabbix raw items |Cluster IOPS raw, write |<p>The number of I/O operations observed at the storage object. Performance metric for write I/O operations.</p> |DEPENDENT |netapp.cluster.statistics.iops_raw.write<p>**Preprocessing**:</p><p>- JSONPATH: `$.statistics.iops_raw.write`</p> |
+|Zabbix raw items |Cluster IOPS raw, total |<p>The number of I/O operations observed at the storage object. Performance metric aggregated over all types of I/O operations.</p> |DEPENDENT |netapp.cluster.statistics.iops_raw.total<p>**Preprocessing**:</p><p>- JSONPATH: `$.statistics.iops_raw.total`</p> |
+|Zabbix raw items |{#VOLUMENAME}: Volume latency raw, other |<p>The raw latency in microseconds observed at the storage object. Performance metric for other I/O operations. Other I/O operations can be metadata operations, such as directory lookups and so on.</p> |DEPENDENT |netapp.volume.statistics.latency_raw.other[{#VOLUMENAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.records[?(@.name=='{#VOLUMENAME}')].statistics.latency_raw.other.first()`</p> |
+|Zabbix raw items |{#VOLUMENAME}: Volume latency raw, read |<p>The raw latency in microseconds observed at the storage object. Performance metric for read I/O operations.</p> |DEPENDENT |netapp.volume.statistics.latency_raw.read[{#VOLUMENAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.records[?(@.name=='{#VOLUMENAME}')].statistics.latency_raw.read.first()`</p> |
+|Zabbix raw items |{#VOLUMENAME}: Volume latency raw, write |<p>The raw latency in microseconds observed at the storage object. Performance metric for write I/O operations.</p> |DEPENDENT |netapp.volume.statistics.latency_raw.write[{#VOLUMENAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.records[?(@.name=='{#VOLUMENAME}')].statistics.latency_raw.write.first()`</p> |
+|Zabbix raw items |{#VOLUMENAME}: Volume latency raw, total |<p>The raw latency in microseconds observed at the storage object. Performance metric aggregated over all types of I/O operations.</p> |DEPENDENT |netapp.volume.statistics.latency_raw.total[{#VOLUMENAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.records[?(@.name=='{#VOLUMENAME}')].statistics.latency_raw.total.first()`</p> |
+|Zabbix raw items |{#VOLUMENAME}: Volume IOPS raw, other |<p>The number of I/O operations observed at the storage object. Performance metric for other I/O operations. Other I/O operations can be metadata operations, such as directory lookups and so on.</p> |DEPENDENT |netapp.volume.statistics.iops_raw.other[{#VOLUMENAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.records[?(@.name=='{#VOLUMENAME}')].statistics.iops_raw.other.first()`</p> |
+|Zabbix raw items |{#VOLUMENAME}: Volume IOPS raw, read |<p>The number of I/O operations observed at the storage object. Performance metric for read I/O operations.</p> |DEPENDENT |netapp.volume.statistics.iops_raw.read[{#VOLUMENAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.records[?(@.name=='{#VOLUMENAME}')].statistics.iops_raw.read.first()`</p> |
+|Zabbix raw items |{#VOLUMENAME}: Volume IOPS raw, write |<p>The number of I/O operations observed at the storage object. Performance metric for write I/O operations.</p> |DEPENDENT |netapp.volume.statistics.iops_raw.write[{#VOLUMENAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.records[?(@.name=='{#VOLUMENAME}')].statistics.iops_raw.write.first()`</p> |
+|Zabbix raw items |{#VOLUMENAME}: Volume IOPS raw, total |<p>The number of I/O operations observed at the storage object. Performance metric aggregated over all types of I/O operations.</p> |DEPENDENT |netapp.volume.statistics.iops_raw.total[{#VOLUMENAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$.records[?(@.name=='{#VOLUMENAME}')].statistics.iops_raw.total.first()`</p> |
 
 ## Triggers
 
@@ -163,5 +163,5 @@ There are no template links in this template.
 
 Please report any issues with the template at https://support.zabbix.com
 
-You can also provide a feedback, discuss the template or ask for help with it at [ZABBIX forums](https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/).
+You can also provide feedback, discuss the template or ask for help with it at [ZABBIX forums](https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/).
 
diff --git a/templates/san/netapp_aff_a700_http/template_san_netapp_aff_a700_http.yaml b/templates/san/netapp_aff_a700_http/template_san_netapp_aff_a700_http.yaml
index 85ea35f18db..a1cdc0e430a 100644
--- a/templates/san/netapp_aff_a700_http/template_san_netapp_aff_a700_http.yaml
+++ b/templates/san/netapp_aff_a700_http/template_san_netapp_aff_a700_http.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-15T15:01:55Z'
+  date: '2022-01-26T10:39:41Z'
   groups:
     -
       uuid: 7c2cb727f85b492d88cd56e17127c64d
@@ -15,7 +15,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/SAN
@@ -35,8 +35,8 @@ zabbix_export:
           url: '{$URL}/api/cluster/chassis?fields=id,state'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
         -
           uuid: 49490a886b5f4e5c9e8cc121a6ffd713
           name: 'Get cluster'
@@ -52,8 +52,8 @@ zabbix_export:
           url: '{$URL}/api/cluster'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
         -
           uuid: 2c98b9d6353a4b1f9c0a794681788c22
           name: 'Cluster location'
@@ -77,8 +77,8 @@ zabbix_export:
             key: netapp.cluster.get
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: cluster
         -
           uuid: a052583b18b44ed9b8df1c1eca375113
           name: 'Cluster name'
@@ -102,8 +102,8 @@ zabbix_export:
             key: netapp.cluster.get
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: cluster
         -
           uuid: 63c3ea4634024fb88841cee7e64c964b
           name: 'Cluster IOPS, other rate'
@@ -127,8 +127,11 @@ zabbix_export:
             key: netapp.cluster.get
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: cluster
+            -
+              tag: component
+              value: iops
         -
           uuid: 5f38f233c9c0446e8bb9e60229294cdf
           name: 'Cluster IOPS, read rate'
@@ -152,8 +155,11 @@ zabbix_export:
             key: netapp.cluster.get
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: cluster
+            -
+              tag: component
+              value: iops
         -
           uuid: 8380db1dbf2a4c2e95eff184d3a61fde
           name: 'Cluster IOPS, total rate'
@@ -177,8 +183,11 @@ zabbix_export:
             key: netapp.cluster.get
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: cluster
+            -
+              tag: component
+              value: iops
         -
           uuid: 65a4b938010045ef9735a7d9f6239ccd
           name: 'Cluster IOPS, write rate'
@@ -202,8 +211,11 @@ zabbix_export:
             key: netapp.cluster.get
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: cluster
+            -
+              tag: component
+              value: iops
         -
           uuid: 77253d87ce8242afa45a3c79ab96a91e
           name: 'Cluster IOPS raw, other'
@@ -222,8 +234,11 @@ zabbix_export:
             key: netapp.cluster.get
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: cluster
+            -
+              tag: component
+              value: iops
         -
           uuid: 14262390978b45729fa3ac593cf21a69
           name: 'Cluster IOPS raw, read'
@@ -242,8 +257,11 @@ zabbix_export:
             key: netapp.cluster.get
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: cluster
+            -
+              tag: component
+              value: iops
         -
           uuid: 7a0407b68348478f9bc56bf0629f59d2
           name: 'Cluster IOPS raw, total'
@@ -262,8 +280,11 @@ zabbix_export:
             key: netapp.cluster.get
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: cluster
+            -
+              tag: component
+              value: iops
         -
           uuid: 92640d6a2d044100a59c5d180d43fbce
           name: 'Cluster IOPS raw, write'
@@ -282,8 +303,11 @@ zabbix_export:
             key: netapp.cluster.get
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: cluster
+            -
+              tag: component
+              value: iops
         -
           uuid: 4bd4fe94e9a54fa2b8ab9bdf0475edff
           name: 'Cluster latency, other'
@@ -299,8 +323,11 @@ zabbix_export:
           description: 'The average latency per I/O operation in milliseconds observed at the storage object. Performance metric for other I/O operations. Other I/O operations can be metadata operations, such as directory lookups and so on.'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: cluster
+            -
+              tag: component
+              value: latency
         -
           uuid: 4b89e603f9cf4b92a85293b1ad15c005
           name: 'Cluster latency, read'
@@ -316,8 +343,11 @@ zabbix_export:
           description: 'The average latency per I/O operation in milliseconds observed at the storage object. Performance metric for read I/O operations.'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: cluster
+            -
+              tag: component
+              value: latency
         -
           uuid: 2c953f67a7484e389d11ac5ef6b06c44
           name: 'Cluster latency, total'
@@ -333,8 +363,11 @@ zabbix_export:
           description: 'The average latency per I/O operation in milliseconds observed at the storage object. Performance metric aggregated over all types of I/O operations.'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: cluster
+            -
+              tag: component
+              value: latency
         -
           uuid: 543ba306d85e41c98d34dab39463dd87
           name: 'Cluster latency, write'
@@ -350,8 +383,11 @@ zabbix_export:
           description: 'The average latency per I/O operation in milliseconds observed at the storage object. Performance metric for write I/O operations.'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: cluster
+            -
+              tag: component
+              value: latency
         -
           uuid: acd5b961c4d843589514771fa9a0aaa3
           name: 'Cluster latency raw, other'
@@ -370,8 +406,11 @@ zabbix_export:
             key: netapp.cluster.get
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: cluster
+            -
+              tag: component
+              value: latency
         -
           uuid: 3e81e918028d412eaa2cb27718ae3b98
           name: 'Cluster latency raw, read'
@@ -390,8 +429,11 @@ zabbix_export:
             key: netapp.cluster.get
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: cluster
+            -
+              tag: component
+              value: latency
         -
           uuid: 78253f625b7e468898f6dd48c9707ad3
           name: 'Cluster latency raw, total'
@@ -410,8 +452,11 @@ zabbix_export:
             key: netapp.cluster.get
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: cluster
+            -
+              tag: component
+              value: latency
         -
           uuid: fb73702348d3468cad5312af772eaeb9
           name: 'Cluster latency raw, write'
@@ -430,8 +475,11 @@ zabbix_export:
             key: netapp.cluster.get
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: cluster
+            -
+              tag: component
+              value: latency
         -
           uuid: 61acb5f1435f4452a789c44bfd105da3
           name: 'Cluster throughput, other rate'
@@ -455,8 +503,11 @@ zabbix_export:
             key: netapp.cluster.get
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: cluster
+            -
+              tag: component
+              value: throughput
         -
           uuid: a1fad2e35b8f4c1da450b953d3952263
           name: 'Cluster throughput, read rate'
@@ -480,8 +531,11 @@ zabbix_export:
             key: netapp.cluster.get
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: cluster
+            -
+              tag: component
+              value: throughput
         -
           uuid: e894ad01c2d74edfb8f954198979070c
           name: 'Cluster throughput, total rate'
@@ -505,8 +559,11 @@ zabbix_export:
             key: netapp.cluster.get
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: cluster
+            -
+              tag: component
+              value: throughput
         -
           uuid: c06c118d3fbe48b78db12e43232d6d97
           name: 'Cluster throughput, write rate'
@@ -530,8 +587,11 @@ zabbix_export:
             key: netapp.cluster.get
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: cluster
+            -
+              tag: component
+              value: throughput
         -
           uuid: 5029bccf54f542b1a2dc760067ddabe3
           name: 'Cluster status'
@@ -555,8 +615,8 @@ zabbix_export:
             key: netapp.cluster.get
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: cluster
           triggers:
             -
               uuid: c823a2eb325a4153871be705d7c24c72
@@ -564,6 +624,13 @@ zabbix_export:
               name: 'Cluster status is abnormal'
               priority: AVERAGE
               description: 'Any errors associated with the sample. For example, if the aggregation of data over multiple nodes fails then any of the partial errors might be returned, “ok” on success, or “error” on any internal uncategorized failure. Whenever a sample collection is missed but done at a later time, it is back filled to the previous 15 second timestamp and tagged with "backfilled_data". “Inconsistent_ delta_time” is encountered when the time between two collections is not the same for all nodes. Therefore, the aggregated value might be over or under inflated. “Negative_delta” is returned when an expected monotonically increasing value has decreased in value. “Inconsistent_old_data” is returned when one or more nodes do not have the latest data.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: cd56dc70e28f4a3382f2f1b08a4fa584
           name: 'Cluster software version'
@@ -587,8 +654,8 @@ zabbix_export:
             key: netapp.cluster.get
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 4a2936f068ed486f8c8a2cf2cfa7440b
@@ -597,6 +664,10 @@ zabbix_export:
               priority: INFO
               description: '__RESOURCE__ version has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: c9bf91e0f23c4961aed8ee5b32ff7767
           name: 'Get disks'
@@ -612,8 +683,8 @@ zabbix_export:
           url: '{$URL}/api/storage/disks?fields=state,node.name'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
         -
           uuid: 54163ca73a8c40188048ef5d89ec4927
           name: 'Get FRUs'
@@ -644,8 +715,8 @@ zabbix_export:
           url: '{$URL}/api/cluster/chassis?fields=id,frus.id,frus.state'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
         -
           uuid: c9b6ac2405af48c0899d1536662f752b
           name: 'Get LUNs'
@@ -661,8 +732,8 @@ zabbix_export:
           url: '{$URL}/api/storage/luns?fields=name,svm.name,space.size,space.used,status.state,status.container_state'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
         -
           uuid: 5c36efc545ba4dcbb0be84da5e8088cc
           name: 'Get nodes'
@@ -678,8 +749,8 @@ zabbix_export:
           url: '{$URL}/api/cluster/nodes?fields=*'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
         -
           uuid: c677a3caf7a04710bc67b165b4152808
           name: 'Get ethernet ports'
@@ -695,8 +766,8 @@ zabbix_export:
           url: '{$URL}/api/network/ethernet/ports?fields=name,type,node.name,broadcast_domain.name,enabled,state,mtu,speed'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
         -
           uuid: 2a6abfe87cc548bb81fcb217cde4f805
           name: 'Get FC ports'
@@ -712,8 +783,8 @@ zabbix_export:
           url: '{$URL}/api/network/fc/ports?fields=name,node.name,description,enabled,fabric.switch_port,state'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
         -
           uuid: 7a813b7cb05d497fbf77bf11b01757dd
           name: 'Get SVMs'
@@ -729,8 +800,8 @@ zabbix_export:
           url: '{$URL}/api/svm/svms?fields=name,state,comment'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
         -
           uuid: fa7fa8daaaa640d494af38614ba12c2e
           name: 'Get volumes'
@@ -746,8 +817,8 @@ zabbix_export:
           url: '{$URL}/api/storage/volumes?fields=name,comment,state,type,svm.name,space.size,space.available,space.used,statistics'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
       discovery_rules:
         -
           uuid: c5265605c1b5440999b7c0dbff8ce328
@@ -782,8 +853,11 @@ zabbix_export:
                 key: netapp.chassis.get
               tags:
                 -
-                  tag: Application
-                  value: 'Chassis "{#ID}"'
+                  tag: chassis
+                  value: '{#ID}'
+                -
+                  tag: component
+                  value: chassis
               trigger_prototypes:
                 -
                   uuid: 381eb797545d452a84d3dba43865bbed
@@ -794,6 +868,10 @@ zabbix_export:
                   priority: AVERAGE
                   description: 'Something is wrong with the chassis.'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           timeout: '{$HTTP.AGENT.TIMEOUT}'
           url: '{$URL}/api/cluster/chassis?fields=id'
           preprocessing:
@@ -841,8 +919,14 @@ zabbix_export:
                 key: netapp.disks.get
               tags:
                 -
-                  tag: Application
-                  value: 'Node "{#NODENAME}" disks'
+                  tag: component
+                  value: disk
+                -
+                  tag: disk
+                  value: '{#DISKNAME}'
+                -
+                  tag: node
+                  value: '{#NODENAME}'
               trigger_prototypes:
                 -
                   uuid: 72c1925f51c149eca27c7ddd1c81e44f
@@ -853,6 +937,10 @@ zabbix_export:
                   priority: AVERAGE
                   description: 'Something is wrong with the disk.'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           timeout: '{$HTTP.AGENT.TIMEOUT}'
           url: '{$URL}/api/storage/disks?fields=name,node.name'
           preprocessing:
@@ -897,8 +985,14 @@ zabbix_export:
                 key: netapp.frus.get
               tags:
                 -
-                  tag: Application
-                  value: 'Chassis "{#CHASSISID}"'
+                  tag: chassis
+                  value: '{#CHASSISID}'
+                -
+                  tag: component
+                  value: fru
+                -
+                  tag: fru
+                  value: '{#FRUID}'
               trigger_prototypes:
                 -
                   uuid: a17cb2ea98b6415d9e22e7f591d80adb
@@ -909,6 +1003,13 @@ zabbix_export:
                   priority: AVERAGE
                   description: 'Something is wrong with the FRU.'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
           master_item:
             key: netapp.frus.get
           preprocessing:
@@ -959,8 +1060,14 @@ zabbix_export:
                 key: netapp.luns.get
               tags:
                 -
-                  tag: Application
-                  value: 'SVM "{#SVMNAME}"'
+                  tag: component
+                  value: lun
+                -
+                  tag: lun
+                  value: '{#LUNNAME}'
+                -
+                  tag: svm
+                  value: '{#SVMNAME}'
             -
               uuid: e12b5d04f3264ee2b602d459fb64c6ee
               name: '{#LUNNAME}: Space used'
@@ -983,8 +1090,14 @@ zabbix_export:
                 key: netapp.luns.get
               tags:
                 -
-                  tag: Application
-                  value: 'SVM "{#SVMNAME}"'
+                  tag: component
+                  value: lun
+                -
+                  tag: lun
+                  value: '{#LUNNAME}'
+                -
+                  tag: svm
+                  value: '{#SVMNAME}'
             -
               uuid: 701fdb0345874ea39afc3362faa2f5a4
               name: '{#LUNNAME}: Container state'
@@ -1008,8 +1121,14 @@ zabbix_export:
                 key: netapp.luns.get
               tags:
                 -
-                  tag: Application
-                  value: 'SVM "{#SVMNAME}"'
+                  tag: component
+                  value: lun
+                -
+                  tag: lun
+                  value: '{#LUNNAME}'
+                -
+                  tag: svm
+                  value: '{#SVMNAME}'
               trigger_prototypes:
                 -
                   uuid: 7a4e0a681edd4db6b701b131fea0e5e4
@@ -1020,6 +1139,10 @@ zabbix_export:
                   priority: AVERAGE
                   description: 'LUNs are only available when their containers are available.'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: ae15b98b9de2472e8c56ddb2a13d7981
               name: '{#LUNNAME}: State'
@@ -1043,8 +1166,14 @@ zabbix_export:
                 key: netapp.luns.get
               tags:
                 -
-                  tag: Application
-                  value: 'SVM "{#SVMNAME}"'
+                  tag: component
+                  value: lun
+                -
+                  tag: lun
+                  value: '{#LUNNAME}'
+                -
+                  tag: svm
+                  value: '{#SVMNAME}'
               trigger_prototypes:
                 -
                   uuid: 5b065dd69e654bee881ae60464a5c9fe
@@ -1055,6 +1184,10 @@ zabbix_export:
                   priority: AVERAGE
                   description: 'Normal states for a LUN are online and offline. Other states indicate errors.'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
           timeout: '{$HTTP.AGENT.TIMEOUT}'
           url: '{$URL}/api/storage/luns?fields=name,svm.name,space.size,space.used,status.state,status.container_state'
           preprocessing:
@@ -1102,8 +1235,11 @@ zabbix_export:
                 key: netapp.nodes.get
               tags:
                 -
-                  tag: Application
-                  value: 'Node "{#NODENAME}"'
+                  tag: component
+                  value: node
+                -
+                  tag: node
+                  value: '{#NODENAME}'
               trigger_prototypes:
                 -
                   uuid: 34092a7ade784221ae50eb74a6fbcb5d
@@ -1112,6 +1248,10 @@ zabbix_export:
                   priority: INFO
                   description: '{#NODENAME} version has changed. Ack to close.'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 416e2a3d707d4a5389c90566b588bf7f
               name: '{#NODENAME}: Controller over temperature'
@@ -1135,8 +1275,11 @@ zabbix_export:
                 key: netapp.nodes.get
               tags:
                 -
-                  tag: Application
-                  value: 'Node "{#NODENAME}"'
+                  tag: component
+                  value: node
+                -
+                  tag: node
+                  value: '{#NODENAME}'
               trigger_prototypes:
                 -
                   uuid: 4dbb3a9da15f45989b8fa4217f3f25c3
@@ -1144,6 +1287,13 @@ zabbix_export:
                   name: '{#NODENAME}: Node has over temperature'
                   priority: AVERAGE
                   description: 'The hardware shuts down if the temperature exceeds critical thresholds(item''s value is "over").'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: f554158202d347388304751c8bdf7515
               name: '{#NODENAME}: Location'
@@ -1167,8 +1317,11 @@ zabbix_export:
                 key: netapp.nodes.get
               tags:
                 -
-                  tag: Application
-                  value: 'Node "{#NODENAME}"'
+                  tag: component
+                  value: node
+                -
+                  tag: node
+                  value: '{#NODENAME}'
             -
               uuid: be634e1ba1ea454fbc6c7c8224909187
               name: '{#NODENAME}: Membership'
@@ -1196,8 +1349,11 @@ zabbix_export:
                 key: netapp.nodes.get
               tags:
                 -
-                  tag: Application
-                  value: 'Node "{#NODENAME}"'
+                  tag: component
+                  value: node
+                -
+                  tag: node
+                  value: '{#NODENAME}'
             -
               uuid: 5b3b6fab8fe54f3585c1a270caad2b3e
               name: '{#NODENAME}: State'
@@ -1229,8 +1385,11 @@ zabbix_export:
                 key: netapp.nodes.get
               tags:
                 -
-                  tag: Application
-                  value: 'Node "{#NODENAME}"'
+                  tag: component
+                  value: node
+                -
+                  tag: node
+                  value: '{#NODENAME}'
               trigger_prototypes:
                 -
                   uuid: db8ff0f2cd294cc5952992a0d476e798
@@ -1245,6 +1404,13 @@ zabbix_export:
                     waiting_for_giveback - Node has been taken over by its HA partner and is waiting for the HA partner to giveback disks.
                     degraded - Node has one or more critical services offline.
                     unknown - Node or its HA partner cannot be contacted and there is no information on the node's state.
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 56e0b6df4dbd456880c2481bec40b41e
               name: '{#NODENAME}: Uptime'
@@ -1263,8 +1429,11 @@ zabbix_export:
                 key: netapp.nodes.get
               tags:
                 -
-                  tag: Application
-                  value: 'Node "{#NODENAME}"'
+                  tag: component
+                  value: node
+                -
+                  tag: node
+                  value: '{#NODENAME}'
               trigger_prototypes:
                 -
                   uuid: 61357dfdb08846c4935f62ba894b159a
@@ -1273,6 +1442,10 @@ zabbix_export:
                   priority: INFO
                   description: 'Uptime is less than 10 minutes'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
           timeout: '{$HTTP.AGENT.TIMEOUT}'
           url: '{$URL}/api/cluster/nodes?fields=name'
           preprocessing:
@@ -1320,8 +1493,14 @@ zabbix_export:
                 key: netapp.ports.eth.get
               tags:
                 -
-                  tag: Application
-                  value: 'Node "{#NODENAME}" Ethernet ports'
+                  tag: component
+                  value: interfaces
+                -
+                  tag: interfaces
+                  value: '{#ETHPORTNAME}'
+                -
+                  tag: node
+                  value: '{#NODENAME}'
               trigger_prototypes:
                 -
                   uuid: 0fa3a54b559349d58b616720ee33cdf5
@@ -1332,6 +1511,10 @@ zabbix_export:
                   priority: AVERAGE
                   description: 'Something is wrong with the ethernet port.'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
           timeout: '{$HTTP.AGENT.TIMEOUT}'
           url: '{$URL}/api/network/ethernet/ports?fields=name,state,node.name'
           preprocessing:
@@ -1379,8 +1562,14 @@ zabbix_export:
                 key: netapp.ports.fc.get
               tags:
                 -
-                  tag: Application
-                  value: 'Node "{#NODENAME}" FC ports'
+                  tag: component
+                  value: fc-port
+                -
+                  tag: fc-port
+                  value: '{#FCPORTNAME}'
+                -
+                  tag: node
+                  value: '{#NODENAME}'
             -
               uuid: e939576d865041dd8f4af24bb7811117
               name: '{#FCPORTNAME}: State'
@@ -1412,8 +1601,14 @@ zabbix_export:
                 key: netapp.ports.fc.get
               tags:
                 -
-                  tag: Application
-                  value: 'Node "{#NODENAME}" FC ports'
+                  tag: component
+                  value: fc-port
+                -
+                  tag: fc-port
+                  value: '{#FCPORTNAME}'
+                -
+                  tag: node
+                  value: '{#NODENAME}'
               trigger_prototypes:
                 -
                   uuid: a985c047b9834081bf21ae50836cef46
@@ -1424,6 +1619,13 @@ zabbix_export:
                   priority: AVERAGE
                   description: 'Something is wrong with the FC port.'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
           timeout: '{$HTTP.AGENT.TIMEOUT}'
           url: '{$URL}/api/network/fc/ports?fields=node.name,name,state'
           preprocessing:
@@ -1471,8 +1673,11 @@ zabbix_export:
                 key: netapp.svms.get
               tags:
                 -
-                  tag: Application
-                  value: 'SVM "{#SVMNAME}"'
+                  tag: component
+                  value: svm
+                -
+                  tag: svm
+                  value: '{#SVMNAME}'
             -
               uuid: 6534f78b5b6c4e61b8ee0ab05bcc6fa3
               name: '{#SVMNAME}: State'
@@ -1496,8 +1701,11 @@ zabbix_export:
                 key: netapp.svms.get
               tags:
                 -
-                  tag: Application
-                  value: 'SVM "{#SVMNAME}"'
+                  tag: component
+                  value: svm
+                -
+                  tag: svm
+                  value: '{#SVMNAME}'
               trigger_prototypes:
                 -
                   uuid: 7c5695fd13a4489ca1c9772f1d3376a7
@@ -1508,6 +1716,13 @@ zabbix_export:
                   priority: AVERAGE
                   description: 'Something is wrong with the SVM.'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
           timeout: '{$HTTP.AGENT.TIMEOUT}'
           url: '{$URL}/api/svm/svms?fields=name'
           preprocessing:
@@ -1555,8 +1770,11 @@ zabbix_export:
                 key: netapp.volumes.get
               tags:
                 -
-                  tag: Application
-                  value: 'Volume "{#VOLUMENAME}"'
+                  tag: component
+                  value: volume
+                -
+                  tag: volume
+                  value: '{#VOLUMENAME}'
             -
               uuid: 63c67432c4dd48f3a9b2736b1d8eda60
               name: '{#VOLUMENAME}: Available size'
@@ -1579,8 +1797,11 @@ zabbix_export:
                 key: netapp.volumes.get
               tags:
                 -
-                  tag: Application
-                  value: 'Volume "{#VOLUMENAME}"'
+                  tag: component
+                  value: volume
+                -
+                  tag: volume
+                  value: '{#VOLUMENAME}'
             -
               uuid: b17602cccbb84012b6cb8edd8bd80374
               name: '{#VOLUMENAME}: Space size'
@@ -1603,8 +1824,11 @@ zabbix_export:
                 key: netapp.volumes.get
               tags:
                 -
-                  tag: Application
-                  value: 'Volume "{#VOLUMENAME}"'
+                  tag: component
+                  value: volume
+                -
+                  tag: volume
+                  value: '{#VOLUMENAME}'
             -
               uuid: 0166239c8d4a4e42ba2f9b3b530143a8
               name: '{#VOLUMENAME}: Used size'
@@ -1627,8 +1851,11 @@ zabbix_export:
                 key: netapp.volumes.get
               tags:
                 -
-                  tag: Application
-                  value: 'Volume "{#VOLUMENAME}"'
+                  tag: component
+                  value: volume
+                -
+                  tag: volume
+                  value: '{#VOLUMENAME}'
             -
               uuid: fa2ae9b23fce43a49efa9c66369cce27
               name: '{#VOLUMENAME}: State'
@@ -1652,8 +1879,11 @@ zabbix_export:
                 key: netapp.volumes.get
               tags:
                 -
-                  tag: Application
-                  value: 'Volume "{#VOLUMENAME}"'
+                  tag: component
+                  value: volume
+                -
+                  tag: volume
+                  value: '{#VOLUMENAME}'
               trigger_prototypes:
                 -
                   uuid: b00f339ed1a9450ba096cabababcf76e
@@ -1664,6 +1894,10 @@ zabbix_export:
                   priority: AVERAGE
                   description: 'A volume can only be brought online if it is offline. Taking a volume offline removes its junction path. The ''mixed'' state applies to FlexGroup volumes only and cannot be specified as a target state. An ''error'' state implies that the volume is not in a state to serve data.'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: cb4cfb0ce84f405ebfbf2e4a64c12ca2
               name: '{#VOLUMENAME}: Volume IOPS, other rate'
@@ -1687,8 +1921,14 @@ zabbix_export:
                 key: netapp.volumes.get
               tags:
                 -
-                  tag: Application
-                  value: 'Volume "{#VOLUMENAME}"'
+                  tag: component
+                  value: iops
+                -
+                  tag: component
+                  value: volume
+                -
+                  tag: volume
+                  value: '{#VOLUMENAME}'
             -
               uuid: ae3142dae1294a16a4cdd0ef153f7cfb
               name: '{#VOLUMENAME}: Volume IOPS, read rate'
@@ -1712,8 +1952,14 @@ zabbix_export:
                 key: netapp.volumes.get
               tags:
                 -
-                  tag: Application
-                  value: 'Volume "{#VOLUMENAME}"'
+                  tag: component
+                  value: iops
+                -
+                  tag: component
+                  value: volume
+                -
+                  tag: volume
+                  value: '{#VOLUMENAME}'
             -
               uuid: b767b6185c744ddc8061bef36d16581d
               name: '{#VOLUMENAME}: Volume IOPS, total rate'
@@ -1737,8 +1983,14 @@ zabbix_export:
                 key: netapp.volumes.get
               tags:
                 -
-                  tag: Application
-                  value: 'Volume "{#VOLUMENAME}"'
+                  tag: component
+                  value: iops
+                -
+                  tag: component
+                  value: volume
+                -
+                  tag: volume
+                  value: '{#VOLUMENAME}'
             -
               uuid: ffe8787aeaa2414e82a925ab0dbfb9aa
               name: '{#VOLUMENAME}: Volume IOPS, write rate'
@@ -1762,8 +2014,14 @@ zabbix_export:
                 key: netapp.volumes.get
               tags:
                 -
-                  tag: Application
-                  value: 'Volume "{#VOLUMENAME}"'
+                  tag: component
+                  value: iops
+                -
+                  tag: component
+                  value: volume
+                -
+                  tag: volume
+                  value: '{#VOLUMENAME}'
             -
               uuid: 64a56ed125f249308d0f525aa0a3e56d
               name: '{#VOLUMENAME}: Volume IOPS raw, other'
@@ -1782,8 +2040,14 @@ zabbix_export:
                 key: netapp.volumes.get
               tags:
                 -
-                  tag: Application
-                  value: 'Zabbix raw items'
+                  tag: component
+                  value: iops
+                -
+                  tag: component
+                  value: volume
+                -
+                  tag: volume
+                  value: '{#VOLUMENAME}'
             -
               uuid: 01ee6910b06e42e294e2c80229cc960e
               name: '{#VOLUMENAME}: Volume IOPS raw, read'
@@ -1802,8 +2066,14 @@ zabbix_export:
                 key: netapp.volumes.get
               tags:
                 -
-                  tag: Application
-                  value: 'Zabbix raw items'
+                  tag: component
+                  value: iops
+                -
+                  tag: component
+                  value: volume
+                -
+                  tag: volume
+                  value: '{#VOLUMENAME}'
             -
               uuid: 5964ea1edbb74fa4a7c04a79ef776ff3
               name: '{#VOLUMENAME}: Volume IOPS raw, total'
@@ -1822,8 +2092,14 @@ zabbix_export:
                 key: netapp.volumes.get
               tags:
                 -
-                  tag: Application
-                  value: 'Zabbix raw items'
+                  tag: component
+                  value: iops
+                -
+                  tag: component
+                  value: volume
+                -
+                  tag: volume
+                  value: '{#VOLUMENAME}'
             -
               uuid: 77329ceefeef490e98f7d23689765c87
               name: '{#VOLUMENAME}: Volume IOPS raw, write'
@@ -1842,8 +2118,14 @@ zabbix_export:
                 key: netapp.volumes.get
               tags:
                 -
-                  tag: Application
-                  value: 'Zabbix raw items'
+                  tag: component
+                  value: iops
+                -
+                  tag: component
+                  value: volume
+                -
+                  tag: volume
+                  value: '{#VOLUMENAME}'
             -
               uuid: fc21c2c1ff87454ea9fc59af4d0d4693
               name: '{#VOLUMENAME}: Volume latency, other'
@@ -1859,8 +2141,14 @@ zabbix_export:
               description: 'The average latency per I/O operation in milliseconds observed at the storage object. Performance metric for other I/O operations. Other I/O operations can be metadata operations, such as directory lookups and so on.'
               tags:
                 -
-                  tag: Application
-                  value: 'Volume "{#VOLUMENAME}"'
+                  tag: component
+                  value: latency
+                -
+                  tag: component
+                  value: volume
+                -
+                  tag: volume
+                  value: '{#VOLUMENAME}'
             -
               uuid: 3e80e6c55bd0497f87d4f4e71f11f0aa
               name: '{#VOLUMENAME}: Volume latency, read'
@@ -1876,8 +2164,14 @@ zabbix_export:
               description: 'The average latency per I/O operation in milliseconds observed at the storage object. Performance metric for read I/O operations.'
               tags:
                 -
-                  tag: Application
-                  value: 'Volume "{#VOLUMENAME}"'
+                  tag: component
+                  value: latency
+                -
+                  tag: component
+                  value: volume
+                -
+                  tag: volume
+                  value: '{#VOLUMENAME}'
             -
               uuid: ff804a090b064bfeb60183d7d7d2abe1
               name: '{#VOLUMENAME}: Volume latency, total'
@@ -1893,8 +2187,14 @@ zabbix_export:
               description: 'The average latency per I/O operation in milliseconds observed at the storage object. Performance metric aggregated over all types of I/O operations.'
               tags:
                 -
-                  tag: Application
-                  value: 'Volume "{#VOLUMENAME}"'
+                  tag: component
+                  value: latency
+                -
+                  tag: component
+                  value: volume
+                -
+                  tag: volume
+                  value: '{#VOLUMENAME}'
             -
               uuid: eb2b3a3c4807415a8a88d11b19ae7fe6
               name: '{#VOLUMENAME}: Volume latency, write'
@@ -1910,8 +2210,14 @@ zabbix_export:
               description: 'The average latency per I/O operation in milliseconds observed at the storage object. Performance metric for write I/O operations.'
               tags:
                 -
-                  tag: Application
-                  value: 'Volume "{#VOLUMENAME}"'
+                  tag: component
+                  value: latency
+                -
+                  tag: component
+                  value: volume
+                -
+                  tag: volume
+                  value: '{#VOLUMENAME}'
             -
               uuid: 4fdf1c23cad2453aa00710289fde1460
               name: '{#VOLUMENAME}: Volume latency raw, other'
@@ -1930,8 +2236,14 @@ zabbix_export:
                 key: netapp.volumes.get
               tags:
                 -
-                  tag: Application
-                  value: 'Zabbix raw items'
+                  tag: component
+                  value: latency
+                -
+                  tag: component
+                  value: volume
+                -
+                  tag: volume
+                  value: '{#VOLUMENAME}'
             -
               uuid: 0923b8b2933e4b309a4b751eea06353a
               name: '{#VOLUMENAME}: Volume latency raw, read'
@@ -1950,8 +2262,14 @@ zabbix_export:
                 key: netapp.volumes.get
               tags:
                 -
-                  tag: Application
-                  value: 'Zabbix raw items'
+                  tag: component
+                  value: latency
+                -
+                  tag: component
+                  value: volume
+                -
+                  tag: volume
+                  value: '{#VOLUMENAME}'
             -
               uuid: 48479110a92b4b3094e72882ec9d4812
               name: '{#VOLUMENAME}: Volume latency raw, total'
@@ -1970,8 +2288,14 @@ zabbix_export:
                 key: netapp.volumes.get
               tags:
                 -
-                  tag: Application
-                  value: 'Zabbix raw items'
+                  tag: component
+                  value: latency
+                -
+                  tag: component
+                  value: volume
+                -
+                  tag: volume
+                  value: '{#VOLUMENAME}'
             -
               uuid: a6c653c4a6164de9971b22e7a28c40d9
               name: '{#VOLUMENAME}: Volume latency raw, write'
@@ -1990,8 +2314,14 @@ zabbix_export:
                 key: netapp.volumes.get
               tags:
                 -
-                  tag: Application
-                  value: 'Zabbix raw items'
+                  tag: component
+                  value: latency
+                -
+                  tag: component
+                  value: volume
+                -
+                  tag: volume
+                  value: '{#VOLUMENAME}'
             -
               uuid: f23b393e033a4285b7f5b8742b0be669
               name: '{#VOLUMENAME}: Volume throughput, other rate'
@@ -2015,8 +2345,14 @@ zabbix_export:
                 key: netapp.volumes.get
               tags:
                 -
-                  tag: Application
-                  value: 'Volume "{#VOLUMENAME}"'
+                  tag: component
+                  value: throughput
+                -
+                  tag: component
+                  value: volume
+                -
+                  tag: volume
+                  value: '{#VOLUMENAME}'
             -
               uuid: fcbef2bcc3004ba6b1f122f00419fc2c
               name: '{#VOLUMENAME}: Volume throughput, read rate'
@@ -2040,8 +2376,14 @@ zabbix_export:
                 key: netapp.volumes.get
               tags:
                 -
-                  tag: Application
-                  value: 'Volume "{#VOLUMENAME}"'
+                  tag: component
+                  value: throughput
+                -
+                  tag: component
+                  value: volume
+                -
+                  tag: volume
+                  value: '{#VOLUMENAME}'
             -
               uuid: 9218d4e861244353bc779fc2dfd561b9
               name: '{#VOLUMENAME}: Volume throughput, total rate'
@@ -2065,8 +2407,14 @@ zabbix_export:
                 key: netapp.volumes.get
               tags:
                 -
-                  tag: Application
-                  value: 'Volume "{#VOLUMENAME}"'
+                  tag: component
+                  value: throughput
+                -
+                  tag: component
+                  value: volume
+                -
+                  tag: volume
+                  value: '{#VOLUMENAME}'
             -
               uuid: 9d1cf308b4de4b88a632eee0b5a90267
               name: '{#VOLUMENAME}: Volume throughput, write rate'
@@ -2090,8 +2438,14 @@ zabbix_export:
                 key: netapp.volumes.get
               tags:
                 -
-                  tag: Application
-                  value: 'Volume "{#VOLUMENAME}"'
+                  tag: component
+                  value: throughput
+                -
+                  tag: component
+                  value: volume
+                -
+                  tag: volume
+                  value: '{#VOLUMENAME}'
             -
               uuid: 1b48c3ecd33f4acd88b57f5c76c2892c
               name: '{#VOLUMENAME}: SVM name'
@@ -2115,8 +2469,11 @@ zabbix_export:
                 key: netapp.volumes.get
               tags:
                 -
-                  tag: Application
-                  value: 'Volume "{#VOLUMENAME}"'
+                  tag: component
+                  value: volume
+                -
+                  tag: volume
+                  value: '{#VOLUMENAME}'
             -
               uuid: 540405e59a93446cbbe71b05206a50be
               name: '{#VOLUMENAME}: Type'
@@ -2144,8 +2501,11 @@ zabbix_export:
                 key: netapp.volumes.get
               tags:
                 -
-                  tag: Application
-                  value: 'Volume "{#VOLUMENAME}"'
+                  tag: component
+                  value: volume
+                -
+                  tag: volume
+                  value: '{#VOLUMENAME}'
           graph_prototypes:
             -
               uuid: 5f9bc8697c9c4e22ab55781366fbb9c4
@@ -2203,6 +2563,16 @@ zabbix_export:
                   });
                   
                   return JSON.stringify(result);
+      tags:
+        -
+          tag: class
+          value: network
+        -
+          tag: target
+          value: netapp
+        -
+          tag: target
+          value: netapp-aff-a700
       macros:
         -
           macro: '{$HTTP.AGENT.TIMEOUT}'
diff --git a/templates/san/netapp_fas3220_snmp/template_san_netapp_fas3220_snmp.yaml b/templates/san/netapp_fas3220_snmp/template_san_netapp_fas3220_snmp.yaml
index 0060bda2d51..4171556324a 100644
--- a/templates/san/netapp_fas3220_snmp/template_san_netapp_fas3220_snmp.yaml
+++ b/templates/san/netapp_fas3220_snmp/template_san_netapp_fas3220_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:39:14Z'
+  date: '2022-01-26T10:40:03Z'
   groups:
     -
       uuid: 7c2cb727f85b492d88cd56e17127c64d
@@ -40,8 +40,8 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: 'NetApp FAS3220'
+              tag: component
+              value: storage
         -
           uuid: 980e2c347d254c4d88d918b2171679bb
           name: 'NetApp FAS3220: Failed disks message'
@@ -59,8 +59,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: 'NetApp FAS3220'
+              tag: component
+              value: storage
         -
           uuid: 7b6d8c8272714343bd420a32c6763c9e
           name: 'NetApp FAS3220: Product firmware version'
@@ -78,8 +78,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: 'NetApp FAS3220'
+              tag: component
+              value: system
         -
           uuid: 3f0418935b9d40e98d129f280ba5ba6b
           name: 'NetApp FAS3220: Product version'
@@ -99,8 +99,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: 'NetApp FAS3220'
+              tag: component
+              value: system
         -
           uuid: 62c6bb1b70ee4ece865b562e298cafb0
           name: 'ICMP ping'
@@ -111,8 +111,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 826eb817329249f59b7989c92ca62d99
@@ -120,6 +123,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: f7c934ef77d04c00bdec19f8e3950d85
           name: 'ICMP loss'
@@ -130,8 +137,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 4fb4b0022ca3433c8da1402f1d996760
@@ -143,6 +153,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/NetApp FAS3220 SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 72f8c27991b7440ba186f6eb037605cf
           name: 'ICMP response time'
@@ -153,8 +170,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: bb13f4d369294c0d83f8e6d888cbb062
@@ -169,6 +189,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/NetApp FAS3220 SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 4380826947fc4df6a341fe074f42da6a
           name: 'SNMP traps (fallback)'
@@ -181,8 +208,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: 045800cfeaf6448ab9a9e97f8b5172c1
           name: 'System contact details'
@@ -204,8 +231,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: c12c6668d9564855b227dee42a9d86f8
           name: 'System description'
@@ -228,8 +255,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: f46b736cdb7f44fcacf33d272d905db8
           name: 'System location'
@@ -251,8 +278,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 65c5b2a3742c4c6d8a04c63bb96b46c6
           name: 'System name'
@@ -274,8 +301,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 5266fcf7c9db457885c219385cfd5025
@@ -284,6 +311,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: 2d9d7b390c774a188a07dbb5bb4a583e
           name: 'System object ID'
@@ -304,8 +338,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 564b458cee7a4a2bb2b4f4777bead32d
           name: Uptime
@@ -326,8 +360,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: d33ca3f0d2f14feca01dce7bdf476776
@@ -340,6 +374,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/NetApp FAS3220 SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: fff713712c44477aa081445d9962c002
           name: 'SNMP agent availability'
@@ -356,8 +394,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: e778b1ae80174f7aa82085b4882e1160
@@ -370,6 +411,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/NetApp FAS3220 SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: c999a3f338934982aa4359d9f0a8df30
@@ -395,8 +440,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Node {#NODE.NAME} Health'
+                  tag: component
+                  value: node
+                -
+                  tag: node
+                  value: '{#NODE.NAME}'
             -
               uuid: ac1d666db8c0495c860a59d98caeb4ab
               name: 'Node {#NODE.NAME}: Failed FAN message'
@@ -414,8 +462,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Node {#NODE.NAME} Health'
+                  tag: component
+                  value: node
+                -
+                  tag: node
+                  value: '{#NODE.NAME}'
             -
               uuid: ad74f96ff33249e1937c2702c4bbce94
               name: 'Node {#NODE.NAME}: Degraded power supplies count'
@@ -431,8 +482,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Node {#NODE.NAME} Health'
+                  tag: component
+                  value: node
+                -
+                  tag: node
+                  value: '{#NODE.NAME}'
             -
               uuid: 343e02ff8f9f417292a2bb548db355ee
               name: 'Node {#NODE.NAME}: Degraded power supplies message'
@@ -450,8 +504,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Node {#NODE.NAME} Health'
+                  tag: component
+                  value: node
+                -
+                  tag: node
+                  value: '{#NODE.NAME}'
             -
               uuid: 73853db2e6924c8395aac1655fab24b4
               name: 'Node {#NODE.NAME}: Over-temperature'
@@ -467,8 +524,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Node {#NODE.NAME} Health'
+                  tag: component
+                  value: node
+                -
+                  tag: node
+                  value: '{#NODE.NAME}'
               trigger_prototypes:
                 -
                   uuid: e03547e4ede74580909ed57c7f53dac1
@@ -476,6 +536,10 @@ zabbix_export:
                   name: 'Node {#NODE.NAME}: Temperature is over than recommended'
                   priority: HIGH
                   description: 'The hardware will shutdown if the temperature exceeds critical thresholds.'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: c6663dc780f14fd4bb01a108d0d2c6b0
               name: 'Node {#NODE.NAME}: Health'
@@ -493,8 +557,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Node {#NODE.NAME} Health'
+                  tag: component
+                  value: health
+                -
+                  tag: component
+                  value: node
+                -
+                  tag: node
+                  value: '{#NODE.NAME}'
               trigger_prototypes:
                 -
                   uuid: 0c331366ac9d4398bfc815c3cb241e7c
@@ -502,6 +572,13 @@ zabbix_export:
                   name: 'Node {#NODE.NAME}: Node can not communicate with the cluster'
                   priority: HIGH
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: b8c922cbd60e4432822268c2a642fd95
               name: 'Node {#NODE.NAME}: Location'
@@ -519,8 +596,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Node {#NODE.NAME} Inventory'
+                  tag: component
+                  value: node
+                -
+                  tag: node
+                  value: '{#NODE.NAME}'
             -
               uuid: eae21d81e97a47dfa80701fb343294b4
               name: 'Node {#NODE.NAME}: Model'
@@ -538,8 +618,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Node {#NODE.NAME} Inventory'
+                  tag: component
+                  value: node
+                -
+                  tag: node
+                  value: '{#NODE.NAME}'
             -
               uuid: cd00e7ff616f4b69a94af9e9494b060e
               name: 'Node {#NODE.NAME}: NVRAM battery status'
@@ -569,8 +652,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Node {#NODE.NAME} Health'
+                  tag: component
+                  value: node
+                -
+                  tag: node
+                  value: '{#NODE.NAME}'
               trigger_prototypes:
                 -
                   uuid: 567a28dd5b364aea84a43438aee24c5c
@@ -578,6 +664,10 @@ zabbix_export:
                   name: 'Node {#NODE.NAME}: NVRAM battery status is not OK'
                   priority: AVERAGE
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 4fc5f0cdd87147d59fe8d073e361c2d8
               name: 'Node {#NODE.NAME}: Serial number'
@@ -595,8 +685,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Node {#NODE.NAME} Inventory'
+                  tag: component
+                  value: node
+                -
+                  tag: node
+                  value: '{#NODE.NAME}'
             -
               uuid: 8ed05a8e28bd4b87b2b5981b45ec9fbe
               name: 'Node {#NODE.NAME}: Uptime'
@@ -613,8 +706,11 @@ zabbix_export:
                     - '0.01'
               tags:
                 -
-                  tag: Application
-                  value: 'Node {#NODE.NAME} Health'
+                  tag: component
+                  value: node
+                -
+                  tag: node
+                  value: '{#NODE.NAME}'
               trigger_prototypes:
                 -
                   uuid: 6040422dc0b34863a90af558d72956ee
@@ -623,6 +719,10 @@ zabbix_export:
                   priority: INFO
                   description: 'Uptime is less than 10 minutes'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
           trigger_prototypes:
             -
               uuid: 64a737bc63b1463eb533d2a187c6b58a
@@ -630,12 +730,23 @@ zabbix_export:
               name: 'Node {#NODE.NAME}: Degraded power supplies count is more than zero'
               priority: AVERAGE
               description: '{{ITEM.VALUE2}.regsub("(.*)", \1)}'
+              tags:
+                -
+                  tag: scope
+                  value: availability
             -
               uuid: 36b7326a738e41b7be3e0a478bc9f858
               expression: 'last(/NetApp FAS3220 SNMP/fas3220.cluster[nodeEnvFailedFanCount, "{#NODE.NAME}"])>0 and last(/NetApp FAS3220 SNMP/fas3220.cluster[nodeEnvFailedFanMessage, "{#NODE.NAME}"])=last(/NetApp FAS3220 SNMP/fas3220.cluster[nodeEnvFailedFanMessage, "{#NODE.NAME}"])'
               name: 'Node {#NODE.NAME}: Failed FAN count is over than zero'
               priority: HIGH
               description: '{{ITEM.VALUE2}.regsub("(.*)", \1)}'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: e0b97a8434f94d0ba14023cc434a8926
           name: 'CPU discovery'
@@ -657,8 +768,11 @@ zabbix_export:
               description: 'The average, over the last minute, of the percentage of time that this processor was not idle.'
               tags:
                 -
-                  tag: Application
-                  value: 'Node {#NODE.NAME} CPU'
+                  tag: component
+                  value: cpu
+                -
+                  tag: node
+                  value: '{#NODE.NAME}'
               trigger_prototypes:
                 -
                   uuid: adb98d2d2f13435bbe1897208bb86989
@@ -667,6 +781,13 @@ zabbix_export:
                   opdata: 'Current utilization: {ITEM.LASTVALUE1}'
                   priority: WARNING
                   description: 'CPU utilization is too high. The system might be slow to respond.'
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 5e87cb453b3f41138d75783eabeeb17b
@@ -726,14 +847,24 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: '{#VSERVER}{#FSNAME}'
+                  tag: filesystem
+                  value: '{#FSNAME}'
+                -
+                  tag: vserver
+                  value: '{#VSERVER}'
               trigger_prototypes:
                 -
                   uuid: 6ab014a44ad84966a97125c478b10789
                   expression: 'min(/NetApp FAS3220 SNMP/fas3220.fs[df64AvailKBytes, "{#VSERVER}{#FSNAME}"],{$FAS3220.FS.TIME:"{#FSNAME}"})<{$FAS3220.FS.AVAIL.MIN.CRIT:"{#FSNAME}"} and {$FAS3220.FS.USE.PCT:"{#FSNAME}"}=0'
                   name: '{#VSERVER}{#FSNAME}: Disk space is too low (below {$FAS3220.FS.AVAIL.MIN.CRIT:"{#FSNAME}"} for {$FAS3220.FS.TIME:"{#FSNAME}"})'
                   priority: HIGH
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: be517380be12421c867ed48e16fe5c4e
               name: '{#VSERVER}{#FSNAME}: Total space'
@@ -750,8 +881,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: '{#VSERVER}{#FSNAME}'
+                  tag: filesystem
+                  value: '{#FSNAME}'
+                -
+                  tag: vserver
+                  value: '{#VSERVER}'
             -
               uuid: d4989438446a4d228b83b0b22c11af90
               name: '{#VSERVER}{#FSNAME}: Total space used'
@@ -768,8 +902,11 @@ zabbix_export:
                     - '1024'
               tags:
                 -
-                  tag: Application
-                  value: '{#VSERVER}{#FSNAME}'
+                  tag: filesystem
+                  value: '{#FSNAME}'
+                -
+                  tag: vserver
+                  value: '{#VSERVER}'
             -
               uuid: 74868589894f468fa5daada73c042aca
               name: '{#VSERVER}{#FSNAME}: Saved by compression percents'
@@ -782,8 +919,11 @@ zabbix_export:
               description: 'Provides the percentage of compression savings in a volume, which is ((compr_saved/used)) * 10(compr_saved + 0). This is only returned for volumes.'
               tags:
                 -
-                  tag: Application
-                  value: '{#VSERVER}{#FSNAME}'
+                  tag: filesystem
+                  value: '{#FSNAME}'
+                -
+                  tag: vserver
+                  value: '{#VSERVER}'
             -
               uuid: 6fd01f706f8f4088b91cd6aad58a65ce
               name: '{#VSERVER}{#FSNAME}: Saved by deduplication percents'
@@ -796,8 +936,11 @@ zabbix_export:
               description: 'Provides the percentage of deduplication savings in a volume, which is ((dedup_saved/(dedup_saved + used)) * 100). This is only returned for volumes.'
               tags:
                 -
-                  tag: Application
-                  value: '{#VSERVER}{#FSNAME}'
+                  tag: filesystem
+                  value: '{#FSNAME}'
+                -
+                  tag: vserver
+                  value: '{#VSERVER}'
             -
               uuid: b74fafe10c844feda4e72346b2fe88f6
               name: '{#VSERVER}{#FSNAME}: Used space percents'
@@ -809,14 +952,24 @@ zabbix_export:
               description: 'The percentage of disk space currently in use on {#FSNAME}.'
               tags:
                 -
-                  tag: Application
-                  value: '{#VSERVER}{#FSNAME}'
+                  tag: filesystem
+                  value: '{#FSNAME}'
+                -
+                  tag: vserver
+                  value: '{#VSERVER}'
               trigger_prototypes:
                 -
                   uuid: 712d9096c8064ef19005c4989794db45
                   expression: 'max(/NetApp FAS3220 SNMP/fas3220.fs[dfPerCentKBytesCapacity, "{#VSERVER}{#FSNAME}"],{$FAS3220.FS.TIME:"{#FSNAME}"})>{$FAS3220.FS.PUSED.MAX.CRIT:"{#FSNAME}"} and {$FAS3220.FS.USE.PCT:"{#FSNAME}"}=1'
                   name: '{#VSERVER}{#FSNAME}: Disk space is too low (used over {$FAS3220.FS.PUSED.MAX.CRIT:"{#FSNAME}"}% for {$FAS3220.FS.TIME:"{#FSNAME}"})'
                   priority: HIGH
+                  tags:
+                    -
+                      tag: scope
+                      value: capacity
+                    -
+                      tag: scope
+                      value: performance
           graph_prototypes:
             -
               uuid: 938f484a19454b8d9c80be5dbc1887df
@@ -900,8 +1053,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Node {#NODE.NAME} HA'
+                  tag: component
+                  value: ha
+                -
+                  tag: node
+                  value: '{#NODE.NAME}'
               trigger_prototypes:
                 -
                   uuid: 798e093f3c9941e6a2d7edc24dd22835
@@ -928,6 +1084,13 @@ zabbix_export:
                       alreadyInTakenoverMode(17),
                       nvramLogUnsynchronized(18),
                       stateofBackupMailboxIsDoubtful(19).
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 70624f45000443999b416d5806ead949
               name: 'Node {#NODE.NAME}: HA settings'
@@ -945,8 +1108,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Node {#NODE.NAME} HA'
+                  tag: component
+                  value: ha
+                -
+                  tag: node
+                  value: '{#NODE.NAME}'
               trigger_prototypes:
                 -
                   uuid: f4ee8e2a63e8471598b6aad929151404
@@ -954,12 +1120,26 @@ zabbix_export:
                   name: 'Node {#NODE.NAME}: HA is not licensed'
                   priority: AVERAGE
                   description: 'The value notConfigured(1) indicates that the HA is not licensed.'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: db2c37150e1649fba89898459150ada8
                   expression: 'last(/NetApp FAS3220 SNMP/fas3220.ha[haSettings, "{#NODE.NAME}"])=5'
                   name: 'Node {#NODE.NAME}: Node has been taken over'
                   priority: HIGH
                   description: 'The thisNodeDead(5) setting indicates that this node has been takenover.'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 0984cb890ec64f748e6bc5531bf80112
           name: 'Network ports discovery'
@@ -1017,8 +1197,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: '{#IFDESCR}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 6f8c273e8efa40e3888716c7cad79f3f
               name: 'Node {#NODE}: port {#IFNAME} ({#TYPE}): Inbound packets with errors'
@@ -1037,8 +1223,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: '{#IFDESCR}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 6fa2bb39354e4024805a82acf4feab29
               name: 'Node {#NODE}: port {#IFNAME} ({#TYPE}): Bits received'
@@ -1079,8 +1271,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: '{#IFDESCR}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: baf565d001c044f8b8b5ea5caf09ea60
               name: 'Node {#NODE}: port {#IFNAME} ({#TYPE}): Outbound packets with errors'
@@ -1099,8 +1297,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: '{#IFDESCR}'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: cd474bb9b7b741e8a19654f9e2a67890
               name: 'Node {#NODE}: port {#IFNAME} ({#TYPE}): Bits sent'
@@ -1253,6 +1457,10 @@ zabbix_export:
               priority: WARNING
               description: 'Recovers when below 80% of {$IF.ERRORS.WARN:"{#IFNAME}"} threshold'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 2c7730f4606a4833bc729c108349d7b4
               expression: 'last(/NetApp FAS3220 SNMP/fas3220.net.port[netportLinkState, "{#NODE}", "{#IFNAME}"])<>2 and last(/NetApp FAS3220 SNMP/fas3220.net.port[netportUpAdmin, "{#NODE}", "{#IFNAME}"])=1'
@@ -1260,12 +1468,26 @@ zabbix_export:
               priority: AVERAGE
               description: 'Link state is not UP and the port status is set ''UP'' by an administrator.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: a95e60addfe04055bb15138dd9d1f37f
               expression: 'last(/NetApp FAS3220 SNMP/fas3220.net.port[netportHealthStatus, "{#NODE}", "{#IFNAME}"])<>0 and length(last(/NetApp FAS3220 SNMP/fas3220.net.port[netportDegradedReason, "{#NODE}", "{#IFNAME}"]))>0'
               name: 'Node {#NODE}: port {#IFNAME} ({#TYPE}): Port is not healthy'
               priority: INFO
               description: '{{ITEM.LASTVALUE2}.regsub("(.*)", \1)}'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: 252ef20da69f43fd90afd5a560fdbd1e
@@ -1360,6 +1582,16 @@ zabbix_export:
                   });
                   
                   return JSON.stringify(out);
+      tags:
+        -
+          tag: class
+          value: hardware
+        -
+          tag: target
+          value: netapp
+        -
+          tag: target
+          value: netapp-fas3220
       macros:
         -
           macro: '{$CPU.UTIL.CRIT}'
@@ -1697,3 +1929,10 @@ zabbix_export:
       priority: WARNING
       description: '{{ITEM.LASTVALUE2}.regsub("(.*)", \1)}'
       type: MULTIPLE
+      tags:
+        -
+          tag: scope
+          value: availability
+        -
+          tag: scope
+          value: performance
diff --git a/templates/server/chassis_ipmi/template_server_chassis_ipmi.yaml b/templates/server/chassis_ipmi/template_server_chassis_ipmi.yaml
index 6a7e392084d..ed51e741ff9 100644
--- a/templates/server/chassis_ipmi/template_server_chassis_ipmi.yaml
+++ b/templates/server/chassis_ipmi/template_server_chassis_ipmi.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-17T06:14:13Z'
+  date: '2022-01-26T10:33:53Z'
   groups:
     -
       uuid: e960332b3f6c46a1956486d4f3f99fce
@@ -22,7 +22,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/398023-discussion-thread-for-official-zabbix-template-ipmi
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: 'Templates/Server hardware'
@@ -38,8 +38,8 @@ zabbix_export:
           description: 'The master item that receives all sensors with values for LLD and dependent elements from BMC.'
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
       discovery_rules:
         -
           uuid: d0a3bd3c62d7438d8acde8ff0a9bb4db
@@ -89,8 +89,11 @@ zabbix_export:
                 key: ipmi.get
               tags:
                 -
-                  tag: Application
-                  value: 'IPMI {#SENSOR_TYPE}'
+                  tag: component
+                  value: environment
+                -
+                  tag: sensor
+                  value: '{#SENSOR_TYPE}'
               trigger_prototypes:
                 -
                   uuid: efe107571d704895bbb43c95407e6689
@@ -99,6 +102,10 @@ zabbix_export:
                   priority: INFO
                   description: 'The trigger is informing about changes in a state of the discrete IPMI sensor. A problem generated by this trigger can be manually closed.'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
           master_item:
             key: ipmi.get
           lld_macro_paths:
@@ -160,8 +167,11 @@ zabbix_export:
                 key: ipmi.get
               tags:
                 -
-                  tag: Application
-                  value: 'IPMI {#SENSOR_TYPE}'
+                  tag: component
+                  value: environment
+                -
+                  tag: sensor
+                  value: '{#SENSOR_TYPE}'
               trigger_prototypes:
                 -
                   uuid: e9c37c1847d64920b80a20cc764b6c81
@@ -173,6 +183,10 @@ zabbix_export:
                     -
                       name: 'IPMI: {#SENSOR_ID} value is above non-recoverable high (greater than {#SENSOR_HI_DISAST} for 5m)'
                       expression: 'min(/Chassis by IPMI/ipmi.value[{#SENSOR_ID}],5m)>{#SENSOR_HI_DISAST}'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: 0fc9d9baa3dd4d3db841e2153b6c39b2
                   expression: 'min(/Chassis by IPMI/ipmi.value[{#SENSOR_ID}],5m)>{#SENSOR_HI_WARN}'
@@ -186,12 +200,20 @@ zabbix_export:
                     -
                       name: 'IPMI: {#SENSOR_ID} value is above non-recoverable high (greater than {#SENSOR_HI_DISAST} for 5m)'
                       expression: 'min(/Chassis by IPMI/ipmi.value[{#SENSOR_ID}],5m)>{#SENSOR_HI_DISAST}'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: 2c3dbc3f68db44f1924682a8241e0086
                   expression: 'min(/Chassis by IPMI/ipmi.value[{#SENSOR_ID}],5m)>{#SENSOR_HI_DISAST}'
                   name: 'IPMI: {#SENSOR_ID} value is above non-recoverable high (greater than {#SENSOR_HI_DISAST} for 5m)'
                   priority: DISASTER
                   description: 'The trigger is informing that a value higher than the upper non-recoverable threshold has been reached.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: adbb7e20a46d42329e4744548aa9d5f6
                   expression: 'min(/Chassis by IPMI/ipmi.value[{#SENSOR_ID}],5m)<{#SENSOR_LO_CRIT}'
@@ -202,6 +224,10 @@ zabbix_export:
                     -
                       name: 'IPMI: {#SENSOR_ID} value is below non-recoverable low (less than {#SENSOR_LO_DISAST} for 5m)'
                       expression: 'min(/Chassis by IPMI/ipmi.value[{#SENSOR_ID}],5m)<{#SENSOR_LO_DISAST}'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: 7b712e7b11a34635948517467f77ad9d
                   expression: 'min(/Chassis by IPMI/ipmi.value[{#SENSOR_ID}],5m)<{#SENSOR_LO_WARN}'
@@ -215,12 +241,20 @@ zabbix_export:
                     -
                       name: 'IPMI: {#SENSOR_ID} value is below non-recoverable low (less than {#SENSOR_LO_DISAST} for 5m)'
                       expression: 'min(/Chassis by IPMI/ipmi.value[{#SENSOR_ID}],5m)<{#SENSOR_LO_DISAST}'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: b078ee6b820f44f2871c2e3fcd0ce4cf
                   expression: 'min(/Chassis by IPMI/ipmi.value[{#SENSOR_ID}],5m)<{#SENSOR_LO_DISAST}'
                   name: 'IPMI: {#SENSOR_ID} value is below non-recoverable low (less than {#SENSOR_LO_DISAST} for 5m)'
                   priority: DISASTER
                   description: 'The trigger is informing that a value less than the lower non-recoverable threshold has been reached.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
           graph_prototypes:
             -
               uuid: 85099badf8d547d89f498cf29bcd51a8
@@ -325,6 +359,13 @@ zabbix_export:
                   value: '{#SENSOR_LO_WARN}'
                   status: ENABLED
                   discover: NO_DISCOVER
+      tags:
+        -
+          tag: class
+          value: hardware
+        -
+          tag: target
+          value: server
       macros:
         -
           macro: '{$IPMI.PASSWORD}'
diff --git a/templates/server/cisco_ucs_manager_snmp/template_server_cisco_ucs_manager_snmp.yaml b/templates/server/cisco_ucs_manager_snmp/template_server_cisco_ucs_manager_snmp.yaml
index a9da64333f8..04e7894287b 100644
--- a/templates/server/cisco_ucs_manager_snmp/template_server_cisco_ucs_manager_snmp.yaml
+++ b/templates/server/cisco_ucs_manager_snmp/template_server_cisco_ucs_manager_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-16T20:04:06Z'
+  date: '2022-01-26T10:34:26Z'
   groups:
     -
       uuid: e960332b3f6c46a1956486d4f3f99fce
@@ -24,7 +24,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/418396-discussion-thread-for-official-zabbix-templates-for-cisco
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: 'Templates/Server hardware'
@@ -52,8 +52,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 286fdb0fa49a4b378a6219a5ed76aac4
           name: 'System description'
@@ -76,8 +76,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 88bd32f8520144858a8ddb03dd200638
           name: 'System location'
@@ -100,8 +100,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 8bd3a60e4c70450492432c6abfa7b5f9
           name: 'System name'
@@ -125,8 +125,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 622ac72c0e534bba94bb93636e4dc103
@@ -135,6 +135,10 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 10d22e53318347658b2418ff33c26e0d
           name: 'System object ID'
@@ -160,8 +164,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: b87e425f1bdf404a8e53ff277c0ff0c0
           name: Uptime
@@ -183,8 +187,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 9026e680b409424e8fa29934878cb771
@@ -197,6 +201,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/Cisco UCS Manager SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 5d839f68b6534dc8bd1fb5db7a757f02
           name: 'SNMP traps (fallback)'
@@ -209,8 +217,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: 0926417e279a4e52a7f12587e9422e92
           name: 'SNMP agent availability'
@@ -232,8 +240,11 @@ zabbix_export:
                 - 1h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 010a749e3a3242cd8e3ea30459fae5a4
@@ -242,6 +253,10 @@ zabbix_export:
               opdata: 'Current state: {ITEM.LASTVALUE1}'
               priority: WARNING
               description: 'SNMP is not available for polling. Please check device connectivity and SNMP settings.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: f44bb3e5a8ad4d0c98df56267700b171
@@ -270,8 +285,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Disk arrays'
+                  tag: component
+                  value: array
+                -
+                  tag: component
+                  value: disk
+                -
+                  tag: component
+                  value: storage
               trigger_prototypes:
                 -
                   uuid: 0300b4bf4e0b42adb1b9e4985e80e356
@@ -280,6 +301,13 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the device for faults'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 158561ecab8b4bbd9c0a616f419bda10
                   expression: 'last(/Cisco UCS Manager SNMP/cisco.ucs.hw.diskarray.cache.battery.status[cucsStorageRaidBatteryOperability.{#SNMPINDEX}])<>{$DISK.ARRAY.CACHE.BATTERY.STATUS.OK}'
@@ -291,6 +319,13 @@ zabbix_export:
                     -
                       name: '{#DISKARRAY_CACHE_LOCATION}: Disk array cache controller battery is in critical state!'
                       expression: 'last(/Cisco UCS Manager SNMP/cisco.ucs.hw.diskarray.cache.battery.status[cucsStorageRaidBatteryOperability.{#SNMPINDEX}])={$DISK.ARRAY.CACHE.BATTERY.STATUS.CRIT}'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: bd1cf5ecd41f4dc49c6e31f32119787b
           name: 'Array controller discovery'
@@ -317,8 +352,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Disk arrays'
+                  tag: component
+                  value: array
+                -
+                  tag: component
+                  value: disk
+                -
+                  tag: component
+                  value: storage
             -
               uuid: a732688d6fa347b597854078dd084935
               name: '{#DISKARRAY_LOCATION}: Disk array controller status'
@@ -339,8 +380,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Disk arrays'
+                  tag: component
+                  value: array
+                -
+                  tag: component
+                  value: disk
+                -
+                  tag: component
+                  value: storage
               trigger_prototypes:
                 -
                   uuid: 28c32222815f47e193d09afe5aafae79
@@ -349,6 +396,13 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'Please check the device for faults'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 4e758fac4df54388b5f4555bb170bdd3
                   expression: 'last(/Cisco UCS Manager SNMP/cisco.ucs.hw.diskarray.status[cucsStorageControllerOperState.{#SNMPINDEX}])={$DISK.ARRAY.STATUS.WARN:"degraded"}'
@@ -360,6 +414,13 @@ zabbix_export:
                     -
                       name: '{#DISKARRAY_LOCATION}: Disk array controller is in critical state'
                       expression: 'last(/Cisco UCS Manager SNMP/cisco.ucs.hw.diskarray.status[cucsStorageControllerOperState.{#SNMPINDEX}])={$DISK.ARRAY.STATUS.CRIT:"inoperable"}'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 264e15d04626432987c2193bf190c56c
                   expression: 'last(/Cisco UCS Manager SNMP/cisco.ucs.hw.diskarray.status[cucsStorageControllerOperState.{#SNMPINDEX}])>{$DISK.ARRAY.STATUS.OK:"operable"}'
@@ -374,6 +435,13 @@ zabbix_export:
                     -
                       name: '{#DISKARRAY_LOCATION}: Disk array controller is in warning state'
                       expression: 'last(/Cisco UCS Manager SNMP/cisco.ucs.hw.diskarray.status[cucsStorageControllerOperState.{#SNMPINDEX}])={$DISK.ARRAY.STATUS.WARN:"degraded"}'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: c799941bb99a4ce0af2ab50253c40259
           name: 'FAN discovery'
@@ -403,8 +471,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Fans
+                  tag: component
+                  value: fan
               trigger_prototypes:
                 -
                   uuid: 7417bd7646c248eb9664875d7d19e9ea
@@ -413,6 +481,13 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the fan unit'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: b3d6cb64470e4e4c9bf1d619c0015823
                   expression: 'last(/Cisco UCS Manager SNMP/cisco.ucs.sensor.fan.status[cucsEquipmentFanOperState.{#SNMPINDEX}])={$FAN.STATUS.WARN:"degraded"}'
@@ -424,6 +499,13 @@ zabbix_export:
                     -
                       name: '{#FAN_LOCATION}: Fan is in critical state'
                       expression: 'last(/Cisco UCS Manager SNMP/cisco.ucs.sensor.fan.status[cucsEquipmentFanOperState.{#SNMPINDEX}])={$FAN.STATUS.CRIT:"inoperable"}'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 20b43c2620114a9da4ff4d97b409f53e
           name: 'Network interface discovery'
@@ -513,8 +595,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 009aeec02b3b46dc93bd52c2f1a4de0a
               name: 'Interface {#IFNAME}({#IFALIAS}): Broadcast packets received'
@@ -540,8 +628,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 533b7352983e4adfbd9ca1c0e2e5e4b1
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets discarded'
@@ -564,8 +658,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 84e21f59350248c185a79dd916587140
               name: 'Interface {#IFNAME}({#IFALIAS}): Inbound packets with errors'
@@ -584,8 +684,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: d72b570e01f5479db47628e399932988
               name: 'Interface {#IFNAME}({#IFALIAS}): Multicast packets received'
@@ -612,8 +718,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: eef7c3f6945a48e886de08a842c08f72
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits received'
@@ -637,8 +749,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: f682fdf3144145f3998066a77353c4e2
               name: 'Interface {#IFNAME}({#IFALIAS}): Broadcast packets sent'
@@ -665,8 +783,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: b61c1b8a08aa40d696d03ae584230e8e
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded'
@@ -689,8 +813,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 0b9d7feb75674225ac8e6ad0952380ac
               name: 'Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors'
@@ -709,8 +839,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 3ddc4cca78f14dfc8e6d51efae831ba2
               name: 'Interface {#IFNAME}({#IFALIAS}): Multicast packets sent'
@@ -738,8 +874,14 @@ zabbix_export:
                     - ''
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: e48a1926828645c49afec898d01fa81a
               name: 'Interface {#IFNAME}({#IFALIAS}): Bits sent'
@@ -763,8 +905,14 @@ zabbix_export:
                     - '8'
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 56aa529b14b14f6f8f9a9b5f1a2ba0d8
               name: 'Interface {#IFNAME}({#IFALIAS}): Speed'
@@ -789,8 +937,14 @@ zabbix_export:
                     - 1h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
             -
               uuid: 16a4394c6b824bacbc7f074d487fcdfb
               name: 'Interface {#IFNAME}({#IFALIAS}): Operational status'
@@ -817,8 +971,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
               trigger_prototypes:
                 -
                   uuid: edfbf339b2664fae88e2a9003383e37f
@@ -836,6 +996,10 @@ zabbix_export:
                     
                     WARNING: if closed manually - won't fire again on next poll, because of .diff.
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
             -
               uuid: 00b0f0fb6c0b4026b438627edab908fb
               name: 'Interface {#IFNAME}({#IFALIAS}): Interface type'
@@ -859,8 +1023,14 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Interface {#IFNAME}({#IFALIAS})'
+                  tag: component
+                  value: interface
+                -
+                  tag: component
+                  value: network
+                -
+                  tag: interface
+                  value: 'port-{#SNMPINDEX}'
           trigger_prototypes:
             -
               uuid: caaa61b8d89540c496678d739610ae38
@@ -877,6 +1047,10 @@ zabbix_export:
                   name: 'Interface {#IFNAME}({#IFALIAS}): Link down'
                   expression: '{$IFCONTROL:"{#IFNAME}"}=1 and last(/Cisco UCS Manager SNMP/cisco.ucs.if.status[ifOperStatus.{#SNMPINDEX}])=2 and (last(/Cisco UCS Manager SNMP/cisco.ucs.if.status[ifOperStatus.{#SNMPINDEX}],#1)<>last(/Cisco UCS Manager SNMP/cisco.ucs.if.status[ifOperStatus.{#SNMPINDEX}],#2))'
                   recovery_expression: 'last(/Cisco UCS Manager SNMP/cisco.ucs.if.status[ifOperStatus.{#SNMPINDEX}])<>2 or {$IFCONTROL:"{#IFNAME}"}=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
           graph_prototypes:
             -
               uuid: d5e5f60602cc41ba8e0b79a63644bf08
@@ -972,8 +1146,11 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Physical disks'
+                  tag: component
+                  value: disk
+                -
+                  tag: component
+                  value: storage
             -
               uuid: 317d489e9bf94467a228f5bbccb03436
               name: '{#DISK_LOCATION}: Physical disk model name'
@@ -994,8 +1171,11 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Physical disks'
+                  tag: component
+                  value: disk
+                -
+                  tag: component
+                  value: storage
             -
               uuid: d768239496f2457fbec3a1103e84914d
               name: '{#DISK_LOCATION}: Physical disk serial number'
@@ -1015,8 +1195,11 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Physical disks'
+                  tag: component
+                  value: disk
+                -
+                  tag: component
+                  value: storage
               trigger_prototypes:
                 -
                   uuid: 693cdcf58cb34def90ade23e2f2485cb
@@ -1025,6 +1208,10 @@ zabbix_export:
                   priority: INFO
                   description: 'Disk serial number has changed. Ack to close'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: c3c38ffc10fb4d139099c551b3c21728
               name: '{#DISK_LOCATION}: Disk size'
@@ -1049,8 +1236,11 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Physical disks'
+                  tag: component
+                  value: disk
+                -
+                  tag: component
+                  value: storage
             -
               uuid: ad4616916d6644f480a2687dbc56a4a3
               name: '{#DISK_LOCATION}: Physical disk status'
@@ -1071,8 +1261,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Physical disks'
+                  tag: component
+                  value: disk
+                -
+                  tag: component
+                  value: storage
               trigger_prototypes:
                 -
                   uuid: ba92b99606fa4bf0bc4f1b6a362c2cdb
@@ -1085,6 +1278,13 @@ zabbix_export:
                     -
                       name: '{#DISK_LOCATION}: Physical disk failed'
                       expression: 'last(/Cisco UCS Manager SNMP/cisco.ucs.hw.physicaldisk.status[cucsStorageLocalDiskDiskState.{#SNMPINDEX}])={$DISK.STATUS.FAIL:"failed"}'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: eabf5aa62f004a2c996cc11bb5a6716a
                   expression: 'last(/Cisco UCS Manager SNMP/cisco.ucs.hw.physicaldisk.status[cucsStorageLocalDiskDiskState.{#SNMPINDEX}])={$DISK.STATUS.FAIL:"failed"}'
@@ -1092,6 +1292,13 @@ zabbix_export:
                   opdata: 'Current status: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'Please check physical disk for warnings or errors'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 8ac363db6f2346bba13b63f75cdabd22
           name: 'PSU discovery'
@@ -1121,8 +1328,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Power supply'
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: 0d2713cf2b72472c8d8896880476c20e
@@ -1131,6 +1338,13 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the power supply unit for errors'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 468f08407a7448a384e5dcde589cb9d0
                   expression: 'last(/Cisco UCS Manager SNMP/cisco.ucs.sensor.psu.status[cucsEquipmentPsuOperState.{#SNMPINDEX}])={$PSU.STATUS.WARN:"degraded"}'
@@ -1142,6 +1356,13 @@ zabbix_export:
                     -
                       name: '{#PSU_LOCATION}: Power supply is in critical state'
                       expression: 'last(/Cisco UCS Manager SNMP/cisco.ucs.sensor.psu.status[cucsEquipmentPsuOperState.{#SNMPINDEX}])={$PSU.STATUS.CRIT:"inoperable"}'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 90b24337c3304ff6a30428c7d46c26fd
           name: 'Temperature CPU discovery'
@@ -1169,8 +1390,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: c3b3933ceb504207a87054a1f9773a76
@@ -1181,6 +1402,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 13b393265f59431687b776297cb0b104
                   expression: 'avg(/Cisco UCS Manager SNMP/cisco.ucs.sensor.temp.value[cucsProcessorEnvStatsTemperature.{#SNMPINDEX}],5m)>{$TEMP.MAX.WARN:"CPU"}'
@@ -1195,6 +1423,13 @@ zabbix_export:
                       name: '{#SENSOR_LOCATION}: Temperature is above critical threshold: >{$TEMP.MAX.CRIT:"CPU"}'
                       expression: 'avg(/Cisco UCS Manager SNMP/cisco.ucs.sensor.temp.value[cucsProcessorEnvStatsTemperature.{#SNMPINDEX}],5m)>{$TEMP.MAX.CRIT:"CPU"}'
                       recovery_expression: 'max(/Cisco UCS Manager SNMP/cisco.ucs.sensor.temp.value[cucsProcessorEnvStatsTemperature.{#SNMPINDEX}],5m)<{$TEMP.MAX.CRIT:"CPU"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: b99a5c977c32418ea9efded6d507e3b5
           name: 'Temperature discovery'
@@ -1222,8 +1457,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: aa4bf1c8b942462dbd21ccf8bd8c4a6b
@@ -1234,6 +1469,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 7751dd6bf1394daa9d918005d2d99d10
                   expression: 'avg(/Cisco UCS Manager SNMP/cisco.ucs.sensor.temp.value[cucsComputeRackUnitMbTempSltatsIoh1Temp.{#SNMPINDEX}],5m)>{$TEMP.MAX.WARN:"Ambient"}'
@@ -1248,6 +1490,13 @@ zabbix_export:
                       name: '{#SENSOR_LOCATION}.IOH: Temperature is above critical threshold: >{$TEMP.MAX.CRIT:"Ambient"}'
                       expression: 'avg(/Cisco UCS Manager SNMP/cisco.ucs.sensor.temp.value[cucsComputeRackUnitMbTempSltatsIoh1Temp.{#SNMPINDEX}],5m)>{$TEMP.MAX.CRIT:"Ambient"}'
                       recovery_expression: 'max(/Cisco UCS Manager SNMP/cisco.ucs.sensor.temp.value[cucsComputeRackUnitMbTempSltatsIoh1Temp.{#SNMPINDEX}],5m)<{$TEMP.MAX.CRIT:"Ambient"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: d5e4b5b7e18c4545853c48db018dc127
               name: '{#SENSOR_LOCATION}.Ambient: Temperature'
@@ -1267,8 +1516,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 230958b560374a118857b77418c6ba11
@@ -1279,6 +1528,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 4cdcddd04b0e4625893a1e20ce22a10f
                   expression: 'avg(/Cisco UCS Manager SNMP/cisco.ucs.sensor.temp.value[cucsComputeRackUnitMbTempStatsAmbientTemp.{#SNMPINDEX}],5m)>{$TEMP.MAX.WARN:"Ambient"}'
@@ -1293,6 +1549,13 @@ zabbix_export:
                       name: '{#SENSOR_LOCATION}.Ambient: Temperature is above critical threshold: >{$TEMP.MAX.CRIT:"Ambient"}'
                       expression: 'avg(/Cisco UCS Manager SNMP/cisco.ucs.sensor.temp.value[cucsComputeRackUnitMbTempStatsAmbientTemp.{#SNMPINDEX}],5m)>{$TEMP.MAX.CRIT:"Ambient"}'
                       recovery_expression: 'max(/Cisco UCS Manager SNMP/cisco.ucs.sensor.temp.value[cucsComputeRackUnitMbTempStatsAmbientTemp.{#SNMPINDEX}],5m)<{$TEMP.MAX.CRIT:"Ambient"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 9980042de8d74353bf4a386bb0f28d30
               name: '{#SENSOR_LOCATION}.Front: Temperature'
@@ -1312,8 +1575,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 8ee1dfc360aa4aca84a03b452ead92ce
@@ -1324,6 +1587,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 196c9fe3facf4e3db348337714c77e17
                   expression: 'avg(/Cisco UCS Manager SNMP/cisco.ucs.sensor.temp.value[cucsComputeRackUnitMbTempStatsFrontTemp.{#SNMPINDEX}],5m)>{$TEMP.MAX.WARN:"Ambient"}'
@@ -1338,6 +1608,13 @@ zabbix_export:
                       name: '{#SENSOR_LOCATION}.Front: Temperature is above critical threshold: >{$TEMP.MAX.CRIT:"Ambient"}'
                       expression: 'avg(/Cisco UCS Manager SNMP/cisco.ucs.sensor.temp.value[cucsComputeRackUnitMbTempStatsFrontTemp.{#SNMPINDEX}],5m)>{$TEMP.MAX.CRIT:"Ambient"}'
                       recovery_expression: 'max(/Cisco UCS Manager SNMP/cisco.ucs.sensor.temp.value[cucsComputeRackUnitMbTempStatsFrontTemp.{#SNMPINDEX}],5m)<{$TEMP.MAX.CRIT:"Ambient"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: e20bfa52f31f4a1a9f08ba02fe27f90c
               name: '{#SENSOR_LOCATION}.Rear: Temperature'
@@ -1357,8 +1634,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: a8714fcba51c46f9aa84fa02fba37743
@@ -1369,6 +1646,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 87068c693e574cd3952ca90e95a7a681
                   expression: 'avg(/Cisco UCS Manager SNMP/cisco.ucs.sensor.temp.value[cucsComputeRackUnitMbTempStatsRearTemp.{#SNMPINDEX}],5m)>{$TEMP.MAX.WARN:"Ambient"}'
@@ -1383,6 +1667,13 @@ zabbix_export:
                       name: '{#SENSOR_LOCATION}.Rear: Temperature is above critical threshold: >{$TEMP.MAX.CRIT:"Ambient"}'
                       expression: 'avg(/Cisco UCS Manager SNMP/cisco.ucs.sensor.temp.value[cucsComputeRackUnitMbTempStatsRearTemp.{#SNMPINDEX}],5m)>{$TEMP.MAX.CRIT:"Ambient"}'
                       recovery_expression: 'max(/Cisco UCS Manager SNMP/cisco.ucs.sensor.temp.value[cucsComputeRackUnitMbTempStatsRearTemp.{#SNMPINDEX}],5m)<{$TEMP.MAX.CRIT:"Ambient"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 9c5d5ce2f672487db83cf91f22c1a413
           name: 'Unit discovery'
@@ -1411,8 +1702,8 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: Inventory
+                  tag: component
+                  value: system
             -
               uuid: ac3217187db3453eb8b9932fce7c79c4
               name: '{#UNIT_LOCATION}: Hardware serial number'
@@ -1433,8 +1724,8 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: Inventory
+                  tag: component
+                  value: system
               trigger_prototypes:
                 -
                   uuid: 27253665837647bb9c3be58f7d0881ae
@@ -1443,6 +1734,10 @@ zabbix_export:
                   priority: INFO
                   description: 'Device serial number has changed. Ack to close'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: c6ebb7db809f4c62aae795a8b1c4b740
               name: '{#UNIT_LOCATION}: Overall system health status'
@@ -1464,8 +1759,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: system
               trigger_prototypes:
                 -
                   uuid: 7f7c337f4f9f44a3a176acce5bf27f29
@@ -1474,6 +1769,13 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'Please check the device for errors'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 15ee6a98f2af4da4bcaa95821ffff524
                   expression: 'last(/Cisco UCS Manager SNMP/cisco.ucs.status[cucsComputeRackUnitOperState.{#SNMPINDEX}])={$HEALTH.STATUS.WARN:"testFailed"} or last(/Cisco UCS Manager SNMP/cisco.ucs.status[cucsComputeRackUnitOperState.{#SNMPINDEX}])={$HEALTH.STATUS.WARN:"thermalProblem"} or last(/Cisco UCS Manager SNMP/cisco.ucs.status[cucsComputeRackUnitOperState.{#SNMPINDEX}])={$HEALTH.STATUS.WARN:"powerProblem"} or last(/Cisco UCS Manager SNMP/cisco.ucs.status[cucsComputeRackUnitOperState.{#SNMPINDEX}])={$HEALTH.STATUS.WARN:"voltageProblem"} or last(/Cisco UCS Manager SNMP/cisco.ucs.status[cucsComputeRackUnitOperState.{#SNMPINDEX}])={$HEALTH.STATUS.WARN:"diagnosticsFailed"}'
@@ -1485,6 +1787,13 @@ zabbix_export:
                     -
                       name: '{#UNIT_LOCATION}: System status is in critical state'
                       expression: 'last(/Cisco UCS Manager SNMP/cisco.ucs.status[cucsComputeRackUnitOperState.{#SNMPINDEX}])={$HEALTH.STATUS.CRIT:"computeFailed"} or last(/Cisco UCS Manager SNMP/cisco.ucs.status[cucsComputeRackUnitOperState.{#SNMPINDEX}])={$HEALTH.STATUS.CRIT:"configFailure"} or last(/Cisco UCS Manager SNMP/cisco.ucs.status[cucsComputeRackUnitOperState.{#SNMPINDEX}])={$HEALTH.STATUS.CRIT:"unconfigFailure"} or last(/Cisco UCS Manager SNMP/cisco.ucs.status[cucsComputeRackUnitOperState.{#SNMPINDEX}])={$HEALTH.STATUS.CRIT:"inoperable"}'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 6d0760c4d29d4113b179b0e5c18f7e3b
           name: 'Virtual disk discovery'
@@ -1514,8 +1823,11 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Virtual disks'
+                  tag: component
+                  value: disk
+                -
+                  tag: component
+                  value: storage
             -
               uuid: 59a403629e8b40d981c2926ead601966
               name: '{#VDISK_LOCATION}: Disk size'
@@ -1542,8 +1854,11 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: 'Virtual disks'
+                  tag: component
+                  value: disk
+                -
+                  tag: component
+                  value: storage
             -
               uuid: 39504e417781414081e1198adef562d4
               name: '{#VDISK_LOCATION}: Status'
@@ -1564,8 +1879,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Virtual disks'
+                  tag: component
+                  value: disk
+                -
+                  tag: component
+                  value: storage
               trigger_prototypes:
                 -
                   uuid: 63232b4e1f6b411a93ff8abad1ff3200
@@ -1574,6 +1892,23 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: WARNING
                   description: 'Please check virtual disk for warnings or errors'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
+      tags:
+        -
+          tag: class
+          value: hardware
+        -
+          tag: target
+          value: cisco
+        -
+          tag: target
+          value: cisco-ucs-manager
       macros:
         -
           macro: '{$DISK.ARRAY.CACHE.BATTERY.STATUS.CRIT}'
diff --git a/templates/server/cisco_ucs_snmp/template_server_cisco_ucs_snmp.yaml b/templates/server/cisco_ucs_snmp/template_server_cisco_ucs_snmp.yaml
index d84fb0febe6..b97e5f1178d 100644
--- a/templates/server/cisco_ucs_snmp/template_server_cisco_ucs_snmp.yaml
+++ b/templates/server/cisco_ucs_snmp/template_server_cisco_ucs_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:39:24Z'
+  date: '2022-01-26T10:35:42Z'
   groups:
     -
       uuid: e960332b3f6c46a1956486d4f3f99fce
@@ -35,8 +35,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 301541972752471e86046ce494a2febb
@@ -44,6 +47,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: c7eaba8c2b7d4b4aa14081957252e33e
           name: 'ICMP loss'
@@ -54,8 +61,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: e051db53cf32406bb0d5ff9cc8d5ce7b
@@ -67,6 +77,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/Cisco UCS SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 88b4a6cc507748e19f08d0ffc9a15368
           name: 'ICMP response time'
@@ -77,8 +94,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: a11942dac3504b64977c2de3e575d2eb
@@ -93,6 +113,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/Cisco UCS SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 00b0172971e34784836d03e76b3480bd
           name: 'SNMP traps (fallback)'
@@ -105,8 +132,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: 50df0ad347d94cffb871256c6340af11
           name: 'System contact details'
@@ -128,8 +155,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 235302070dc54f148b92027967a6ff2f
           name: 'System description'
@@ -152,8 +179,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 7ba9b86064ad432a9e6d1922ca29edda
           name: 'System location'
@@ -175,8 +202,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 4674d8adc39343f7b46d21cae2ec1310
           name: 'System name'
@@ -198,8 +225,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 3544e4ac11b44d14a6161523081c470e
@@ -208,6 +235,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: 05fe3cb6d2004e7ea2d37742fc2549d3
           name: 'System object ID'
@@ -228,8 +262,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 1b0551aa2d184c8d923788b5d159ed7c
           name: Uptime
@@ -250,8 +284,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: a933ba0e5c7f4e908afaba4381f65482
@@ -264,6 +298,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/Cisco UCS SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: b80f6a30ad124a1ea863f2fdb868ba6f
           name: 'SNMP agent availability'
@@ -280,8 +318,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 3c487a6b20c746eca9a7efc6058a60d9
@@ -294,6 +335,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/Cisco UCS SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: 5c6518a1df0b45c09f3a2f186c3d4e3b
@@ -317,8 +362,14 @@ zabbix_export:
                 name: 'CISCO-UNIFIED-COMPUTING-TC-MIB::CucsEquipmentOperability'
               tags:
                 -
-                  tag: Application
-                  value: 'Disk arrays'
+                  tag: component
+                  value: array
+                -
+                  tag: component
+                  value: disk
+                -
+                  tag: component
+                  value: storage
               trigger_prototypes:
                 -
                   uuid: 0b09b93602c94821ae1126e4f9550436
@@ -327,6 +378,13 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the device for faults'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: d2af6de00e57412d8a2efcb20b1524a4
                   expression: 'count(/Cisco UCS SNMP/system.hw.diskarray.cache.battery.status[cucsStorageRaidBatteryOperability.{#SNMPINDEX}],#1,"ne","{$DISK_ARRAY_CACHE_BATTERY_OK_STATUS}")=1'
@@ -338,6 +396,13 @@ zabbix_export:
                     -
                       name: '{#DISKARRAY_CACHE_LOCATION}: Disk array cache controller battery is in critical state!'
                       expression: 'count(/Cisco UCS SNMP/system.hw.diskarray.cache.battery.status[cucsStorageRaidBatteryOperability.{#SNMPINDEX}],#1,"eq","{$DISK_ARRAY_CACHE_BATTERY_CRIT_STATUS}")=1'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: b77a56dcaa1947dd8c74b5764c36c22a
           name: 'Array Controller Discovery'
@@ -359,8 +424,14 @@ zabbix_export:
               description: 'MIB: CISCO-UNIFIED-COMPUTING-STORAGE-MIB'
               tags:
                 -
-                  tag: Application
-                  value: 'Disk arrays'
+                  tag: component
+                  value: array
+                -
+                  tag: component
+                  value: disk
+                -
+                  tag: component
+                  value: storage
             -
               uuid: 262d45ac58734c0096de2b96d8294f4c
               name: '{#DISKARRAY_LOCATION}: Disk array controller status'
@@ -374,8 +445,14 @@ zabbix_export:
                 name: 'CISCO-UNIFIED-COMPUTING-TC-MIB::CucsEquipmentOperability'
               tags:
                 -
-                  tag: Application
-                  value: 'Disk arrays'
+                  tag: component
+                  value: array
+                -
+                  tag: component
+                  value: disk
+                -
+                  tag: component
+                  value: storage
               trigger_prototypes:
                 -
                   uuid: 44ec209460fb4010a087e971427b2fde
@@ -384,6 +461,13 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'Please check the device for faults'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: b419e0d296614f4285645954f8a7a970
                   expression: 'count(/Cisco UCS SNMP/system.hw.diskarray.status[cucsStorageControllerOperState.{#SNMPINDEX}],#1,"eq","{$DISK_ARRAY_WARN_STATUS:\"degraded\"}")=1'
@@ -395,6 +479,13 @@ zabbix_export:
                     -
                       name: '{#DISKARRAY_LOCATION}: Disk array controller is in critical state'
                       expression: 'count(/Cisco UCS SNMP/system.hw.diskarray.status[cucsStorageControllerOperState.{#SNMPINDEX}],#1,"eq","{$DISK_ARRAY_CRIT_STATUS:\"inoperable\"}")=1'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: a83202bb105d481c93464650272c14eb
                   expression: 'count(/Cisco UCS SNMP/system.hw.diskarray.status[cucsStorageControllerOperState.{#SNMPINDEX}],#1,"ne","{$DISK_ARRAY_OK_STATUS:\"operable\"}")=1'
@@ -409,6 +500,13 @@ zabbix_export:
                     -
                       name: '{#DISKARRAY_LOCATION}: Disk array controller is in warning state'
                       expression: 'count(/Cisco UCS SNMP/system.hw.diskarray.status[cucsStorageControllerOperState.{#SNMPINDEX}],#1,"eq","{$DISK_ARRAY_WARN_STATUS:\"degraded\"}")=1'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 3c067096a2fc40c390a335e40bacc089
           name: 'FAN Discovery'
@@ -433,8 +531,8 @@ zabbix_export:
                 name: 'CISCO-UNIFIED-COMPUTING-TC-MIB::CucsEquipmentOperability'
               tags:
                 -
-                  tag: Application
-                  value: Fans
+                  tag: component
+                  value: fan
               trigger_prototypes:
                 -
                   uuid: 5135b24c775f448c8998cadea3042e5b
@@ -443,6 +541,13 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the fan unit'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 895df7f89587441fa61223d5b2e442a2
                   expression: 'count(/Cisco UCS SNMP/sensor.fan.status[cucsEquipmentFanOperState.{#SNMPINDEX}],#1,"eq","{$FAN_WARN_STATUS:\"degraded\"}")=1'
@@ -454,6 +559,13 @@ zabbix_export:
                     -
                       name: '{#FAN_LOCATION}: Fan is in critical state'
                       expression: 'count(/Cisco UCS SNMP/sensor.fan.status[cucsEquipmentFanOperState.{#SNMPINDEX}],#1,"eq","{$FAN_CRIT_STATUS:\"inoperable\"}")=1'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 93247d3808394f7195356ced554d0d55
           name: 'Physical Disk Discovery'
@@ -478,8 +590,11 @@ zabbix_export:
                 Cisco UCS storage:LocalDisk:model managed object property. Actually returns 'HDD' or 'SSD'
               tags:
                 -
-                  tag: Application
-                  value: 'Physical disks'
+                  tag: component
+                  value: disk
+                -
+                  tag: component
+                  value: storage
             -
               uuid: 6d45ac307cce40d481c556660dea3157
               name: '{#DISK_LOCATION}: Physical disk model name'
@@ -495,8 +610,11 @@ zabbix_export:
                 Cisco UCS storage:LocalDisk:serial managed object property. Actually returns part number code
               tags:
                 -
-                  tag: Application
-                  value: 'Physical disks'
+                  tag: component
+                  value: disk
+                -
+                  tag: component
+                  value: storage
             -
               uuid: da12b7742c0343709ab4c1d97c0b0f4c
               name: '{#DISK_LOCATION}: Disk size'
@@ -517,8 +635,11 @@ zabbix_export:
                     - '1048576'
               tags:
                 -
-                  tag: Application
-                  value: 'Physical disks'
+                  tag: component
+                  value: disk
+                -
+                  tag: component
+                  value: storage
             -
               uuid: cb73c8de596549888d5f94b13619da3d
               name: '{#DISK_LOCATION}: Physical disk status'
@@ -534,8 +655,11 @@ zabbix_export:
                 name: 'CISCO-UNIFIED-COMPUTING-TC-MIB::CucsStoragePDriveStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Physical disks'
+                  tag: component
+                  value: disk
+                -
+                  tag: component
+                  value: storage
               trigger_prototypes:
                 -
                   uuid: 445919e1ec414fd888f8911abc65650b
@@ -548,6 +672,13 @@ zabbix_export:
                     -
                       name: '{#DISK_LOCATION}: Physical disk failed'
                       expression: 'count(/Cisco UCS SNMP/system.hw.physicaldisk.status[cucsStorageLocalDiskDiskState.{#SNMPINDEX}],#1,"eq","{$DISK_FAIL_STATUS:\"failed\"}")=1'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 77ce5c74eefd4a9b818c11c8c1581cd8
                   expression: 'count(/Cisco UCS SNMP/system.hw.physicaldisk.status[cucsStorageLocalDiskDiskState.{#SNMPINDEX}],#1,"eq","{$DISK_FAIL_STATUS:\"failed\"}")=1'
@@ -555,6 +686,13 @@ zabbix_export:
                   opdata: 'Current status: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'Please check physical disk for warnings or errors'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: f8be95a8eb5a487c8c8f05d62e90f041
           name: 'PSU Discovery'
@@ -579,8 +717,8 @@ zabbix_export:
                 name: 'CISCO-UNIFIED-COMPUTING-TC-MIB::CucsEquipmentOperability'
               tags:
                 -
-                  tag: Application
-                  value: 'Power supply'
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: 480d51d19be74b6e95f702b31baa5666
@@ -589,6 +727,13 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the power supply unit for errors'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 07fa90b5296b48d9b45cc6a76e72ceeb
                   expression: 'count(/Cisco UCS SNMP/sensor.psu.status[cucsEquipmentPsuOperState.{#SNMPINDEX}],#1,"eq","{$PSU_WARN_STATUS:\"degraded\"}")=1'
@@ -600,6 +745,13 @@ zabbix_export:
                     -
                       name: '{#PSU_LOCATION}: Power supply is in critical state'
                       expression: 'count(/Cisco UCS SNMP/sensor.psu.status[cucsEquipmentPsuOperState.{#SNMPINDEX}],#1,"eq","{$PSU_CRIT_STATUS:\"inoperable\"}")=1'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 098a87f2e7094da9853bf2cb94677092
           name: 'Temperature CPU Discovery'
@@ -622,8 +774,8 @@ zabbix_export:
                 Cisco UCS processor:EnvStats:temperature managed object property
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 35549eb00faf48ff8fdb7769b8a13895
@@ -634,6 +786,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: eaadcea2dc0d468d886654c3ec380390
                   expression: 'avg(/Cisco UCS SNMP/sensor.temp.value[cucsProcessorEnvStatsTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
@@ -648,6 +807,13 @@ zabbix_export:
                       name: '{#SENSOR_LOCATION}: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
                       expression: 'avg(/Cisco UCS SNMP/sensor.temp.value[cucsProcessorEnvStatsTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
                       recovery_expression: 'max(/Cisco UCS SNMP/sensor.temp.value[cucsProcessorEnvStatsTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: ccb9b9edd7ba4a62b33e34ebf3647825
                   expression: 'avg(/Cisco UCS SNMP/sensor.temp.value[cucsProcessorEnvStatsTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
@@ -656,6 +822,13 @@ zabbix_export:
                   name: '{#SENSOR_LOCATION}: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 06216bba529b4fb2b1c52fb57d365c6a
           name: 'Temperature Discovery'
@@ -678,8 +851,8 @@ zabbix_export:
                 Cisco UCS compute:RackUnitMbTempStats:ioh1Temp managed object property
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: a43eb91c4ae044729f4312466fcbd5da
@@ -690,6 +863,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: da5d63d3411a4d2299d50cc21beae1c4
                   expression: 'avg(/Cisco UCS SNMP/sensor.temp.value[cucsComputeRackUnitMbTempSltatsIoh1Temp.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Ambient"}'
@@ -704,6 +884,13 @@ zabbix_export:
                       name: '{#SENSOR_LOCATION}.IOH: Temperature is above critical threshold: >{$TEMP_CRIT:"Ambient"}'
                       expression: 'avg(/Cisco UCS SNMP/sensor.temp.value[cucsComputeRackUnitMbTempSltatsIoh1Temp.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Ambient"}'
                       recovery_expression: 'max(/Cisco UCS SNMP/sensor.temp.value[cucsComputeRackUnitMbTempSltatsIoh1Temp.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Ambient"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: ce811e4247d5484caf4b095e829f162e
                   expression: 'avg(/Cisco UCS SNMP/sensor.temp.value[cucsComputeRackUnitMbTempSltatsIoh1Temp.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Ambient"}'
@@ -712,6 +899,13 @@ zabbix_export:
                   name: '{#SENSOR_LOCATION}.IOH: Temperature is too low: <{$TEMP_CRIT_LOW:"Ambient"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 9ee4d857346541c6870586a0c7989fc5
               name: '{#SENSOR_LOCATION}.Ambient: Temperature'
@@ -726,8 +920,8 @@ zabbix_export:
                 Temperature readings of testpoint: {#SENSOR_LOCATION}.Ambient
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 4e293138ca374c96a18e4dbca8e45c72
@@ -738,6 +932,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: cf21a0259b6e4402815651357cdcce76
                   expression: 'avg(/Cisco UCS SNMP/sensor.temp.value[cucsComputeRackUnitMbTempStatsAmbientTemp.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Ambient"}'
@@ -752,6 +953,13 @@ zabbix_export:
                       name: '{#SENSOR_LOCATION}.Ambient: Temperature is above critical threshold: >{$TEMP_CRIT:"Ambient"}'
                       expression: 'avg(/Cisco UCS SNMP/sensor.temp.value[cucsComputeRackUnitMbTempStatsAmbientTemp.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Ambient"}'
                       recovery_expression: 'max(/Cisco UCS SNMP/sensor.temp.value[cucsComputeRackUnitMbTempStatsAmbientTemp.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Ambient"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 5139f8dd56094561a573a0b7b15a5ef0
                   expression: 'avg(/Cisco UCS SNMP/sensor.temp.value[cucsComputeRackUnitMbTempStatsAmbientTemp.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Ambient"}'
@@ -760,6 +968,13 @@ zabbix_export:
                   name: '{#SENSOR_LOCATION}.Ambient: Temperature is too low: <{$TEMP_CRIT_LOW:"Ambient"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 9dc8ac1ccf2a4671bef441db6297b2f9
               name: '{#SENSOR_LOCATION}.Front: Temperature'
@@ -774,8 +989,8 @@ zabbix_export:
                 Cisco UCS compute:RackUnitMbTempStats:frontTemp managed object property
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 98b9a6bd22e648e1bce3e5ee3ed5f6b4
@@ -786,6 +1001,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 068f42b490ad41eb97a65dbc718ae566
                   expression: 'avg(/Cisco UCS SNMP/sensor.temp.value[cucsComputeRackUnitMbTempStatsFrontTemp.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Ambient"}'
@@ -800,6 +1022,13 @@ zabbix_export:
                       name: '{#SENSOR_LOCATION}.Front: Temperature is above critical threshold: >{$TEMP_CRIT:"Ambient"}'
                       expression: 'avg(/Cisco UCS SNMP/sensor.temp.value[cucsComputeRackUnitMbTempStatsFrontTemp.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Ambient"}'
                       recovery_expression: 'max(/Cisco UCS SNMP/sensor.temp.value[cucsComputeRackUnitMbTempStatsFrontTemp.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Ambient"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: f208cad426cf45338b6487cf87588220
                   expression: 'avg(/Cisco UCS SNMP/sensor.temp.value[cucsComputeRackUnitMbTempStatsFrontTemp.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Ambient"}'
@@ -808,6 +1037,13 @@ zabbix_export:
                   name: '{#SENSOR_LOCATION}.Front: Temperature is too low: <{$TEMP_CRIT_LOW:"Ambient"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 631d46aad1b2403b9512299e2446a24e
               name: '{#SENSOR_LOCATION}.Rear: Temperature'
@@ -822,8 +1058,8 @@ zabbix_export:
                 Cisco UCS compute:RackUnitMbTempStats:rearTemp managed object property
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: ef03cd1e2356409ea2651fab589c9d19
@@ -834,6 +1070,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: ed302fd9bdbe47cda2456aa7cdc6ce66
                   expression: 'avg(/Cisco UCS SNMP/sensor.temp.value[cucsComputeRackUnitMbTempStatsRearTemp.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Ambient"}'
@@ -848,6 +1091,13 @@ zabbix_export:
                       name: '{#SENSOR_LOCATION}.Rear: Temperature is above critical threshold: >{$TEMP_CRIT:"Ambient"}'
                       expression: 'avg(/Cisco UCS SNMP/sensor.temp.value[cucsComputeRackUnitMbTempStatsRearTemp.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Ambient"}'
                       recovery_expression: 'max(/Cisco UCS SNMP/sensor.temp.value[cucsComputeRackUnitMbTempStatsRearTemp.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Ambient"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: bb81b628d804411480d3b4066d626f82
                   expression: 'avg(/Cisco UCS SNMP/sensor.temp.value[cucsComputeRackUnitMbTempStatsRearTemp.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Ambient"}'
@@ -856,6 +1106,13 @@ zabbix_export:
                   name: '{#SENSOR_LOCATION}.Rear: Temperature is too low: <{$TEMP_CRIT_LOW:"Ambient"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 0a96ab839bde40cf9d1d4db602c57a5e
           name: 'Unit Discovery'
@@ -884,8 +1141,8 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: Inventory
+                  tag: component
+                  value: system
             -
               uuid: b0c955f0fc184c6686fa2fe3fce29f1a
               name: '{#UNIT_LOCATION}: Hardware serial number'
@@ -906,8 +1163,8 @@ zabbix_export:
                     - 1d
               tags:
                 -
-                  tag: Application
-                  value: Inventory
+                  tag: component
+                  value: system
               trigger_prototypes:
                 -
                   uuid: b9667c535fe542eeb21dea7aaf2bbf80
@@ -916,6 +1173,10 @@ zabbix_export:
                   priority: INFO
                   description: 'Device serial number has changed. Ack to close'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 00a0fe6510064375a1736433a17904c0
               name: '{#UNIT_LOCATION}: Overall system health status'
@@ -932,8 +1193,8 @@ zabbix_export:
                 name: 'CISCO-UNIFIED-COMPUTING-TC-MIB::CucsLsOperState'
               tags:
                 -
-                  tag: Application
-                  value: Status
+                  tag: component
+                  value: system
               trigger_prototypes:
                 -
                   uuid: 70fbf187bc474aa88a26fb5a8d862694
@@ -942,6 +1203,13 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'Please check the device for errors'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: b69f6876b7de4e1c89934281696249c8
                   expression: 'count(/Cisco UCS SNMP/system.status[cucsComputeRackUnitOperState.{#SNMPINDEX}],#1,"eq","{$HEALTH_WARN_STATUS:\"testFailed\"}")=1 or count(/Cisco UCS SNMP/system.status[cucsComputeRackUnitOperState.{#SNMPINDEX}],#1,"eq","{$HEALTH_WARN_STATUS:\"thermalProblem\"}")=1 or count(/Cisco UCS SNMP/system.status[cucsComputeRackUnitOperState.{#SNMPINDEX}],#1,"eq","{$HEALTH_WARN_STATUS:\"powerProblem\"}")=1 or count(/Cisco UCS SNMP/system.status[cucsComputeRackUnitOperState.{#SNMPINDEX}],#1,"eq","{$HEALTH_WARN_STATUS:\"voltageProblem\"}")=1 or count(/Cisco UCS SNMP/system.status[cucsComputeRackUnitOperState.{#SNMPINDEX}],#1,"eq","{$HEALTH_WARN_STATUS:\"diagnosticsFailed\"}")=1'
@@ -953,6 +1221,13 @@ zabbix_export:
                     -
                       name: '{#UNIT_LOCATION}: System status is in critical state'
                       expression: 'count(/Cisco UCS SNMP/system.status[cucsComputeRackUnitOperState.{#SNMPINDEX}],#1,"eq","{$HEALTH_CRIT_STATUS:\"computeFailed\"}")=1 or count(/Cisco UCS SNMP/system.status[cucsComputeRackUnitOperState.{#SNMPINDEX}],#1,"eq","{$HEALTH_CRIT_STATUS:\"configFailure\"}")=1 or count(/Cisco UCS SNMP/system.status[cucsComputeRackUnitOperState.{#SNMPINDEX}],#1,"eq","{$HEALTH_CRIT_STATUS:\"unconfigFailure\"}")=1 or count(/Cisco UCS SNMP/system.status[cucsComputeRackUnitOperState.{#SNMPINDEX}],#1,"eq","{$HEALTH_CRIT_STATUS:\"inoperable\"}")=1'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: b76c04b65a8348539434d8857d1450aa
           name: 'Virtual Disk Discovery'
@@ -977,8 +1252,11 @@ zabbix_export:
                 name: 'CISCO-UNIFIED-COMPUTING-TC-MIB::CucsStorageLunType'
               tags:
                 -
-                  tag: Application
-                  value: 'Virtual disks'
+                  tag: component
+                  value: disk
+                -
+                  tag: component
+                  value: storage
             -
               uuid: db7e07e0325145d0a8f6bcef0cd0dff2
               name: '{#VDISK_LOCATION}: Disk size'
@@ -1001,8 +1279,11 @@ zabbix_export:
                     - '1048576'
               tags:
                 -
-                  tag: Application
-                  value: 'Virtual disks'
+                  tag: component
+                  value: disk
+                -
+                  tag: component
+                  value: storage
             -
               uuid: 5c0d7116c19940608ca40058e47fd595
               name: '{#VDISK_LOCATION}: Status'
@@ -1018,8 +1299,11 @@ zabbix_export:
                 name: 'CISCO-UNIFIED-COMPUTING-TC-MIB::CucsEquipmentPresence'
               tags:
                 -
-                  tag: Application
-                  value: 'Virtual disks'
+                  tag: component
+                  value: disk
+                -
+                  tag: component
+                  value: storage
               trigger_prototypes:
                 -
                   uuid: 97b0c8177dca421f9535cb6f0abea7aa
@@ -1028,6 +1312,23 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: WARNING
                   description: 'Please check virtual disk for warnings or errors'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
+      tags:
+        -
+          tag: class
+          value: hardware
+        -
+          tag: target
+          value: cisco
+        -
+          tag: target
+          value: cisco-ucs
       macros:
         -
           macro: '{$DISK_ARRAY_CACHE_BATTERY_CRIT_STATUS}'
diff --git a/templates/server/dell_idrac_snmp/template_server_dell_idrac_snmp.yaml b/templates/server/dell_idrac_snmp/template_server_dell_idrac_snmp.yaml
index a96ee25e624..b6e01ac3de5 100644
--- a/templates/server/dell_idrac_snmp/template_server_dell_idrac_snmp.yaml
+++ b/templates/server/dell_idrac_snmp/template_server_dell_idrac_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:39:29Z'
+  date: '2022-01-26T10:34:37Z'
   groups:
     -
       uuid: e960332b3f6c46a1956486d4f3f99fce
@@ -32,8 +32,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: a6e3c67a99104c6f8672e3826cba009f
@@ -41,6 +44,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 98ab999f96db4eceb4f347baf2df80a9
           name: 'ICMP loss'
@@ -51,8 +58,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 145ea57d03d3460cb86272493e99356a
@@ -64,6 +74,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/Dell iDRAC SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 52b385efc0a54f5590f55716e4a179bf
           name: 'ICMP response time'
@@ -74,8 +91,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: cd49c04001c74051b585f519503861d0
@@ -90,6 +110,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/Dell iDRAC SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 2f3d32242b0740e7830a4dff872308ac
           name: 'SNMP traps (fallback)'
@@ -102,8 +129,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: ca82831e78f74372bb9be8f2c97ee9ac
           name: 'System contact details'
@@ -125,8 +152,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 13bd109b9a814ba4837eb98b8daf98a5
           name: 'System description'
@@ -149,8 +176,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: e49f14d4a51f4018b17bd200d4819975
           name: 'Firmware version'
@@ -171,8 +198,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: e816b86474e6471eb48cbda563dfddd6
@@ -182,6 +209,10 @@ zabbix_export:
               priority: INFO
               description: 'Firmware version has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 9fc4348dc3c641dcbd0bb04b58145c91
           name: 'Hardware model name'
@@ -203,8 +234,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
         -
           uuid: 4951ab6260b145ccb0c21abdcf5bb361
           name: 'Hardware serial number'
@@ -226,8 +257,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 6f5b00a889804fbeb41c4246b29bd5f1
@@ -236,6 +267,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 59a77e7fe66f4412bb117f8283216ce3
           name: 'System location'
@@ -257,8 +292,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 2f76314dc3204e898df338f238f7d407
           name: 'System name'
@@ -280,8 +315,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: ce1b064b2a07450d9b51b6b12bd752a9
@@ -290,6 +325,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: 737d790ef008450b81a69559ed1ee963
           name: 'System object ID'
@@ -310,8 +352,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 9750f3ffa5d648ce9e99adea1d92b54c
           name: 'Overall system health status'
@@ -328,8 +370,8 @@ zabbix_export:
             name: 'IDRAC-MIB-SMIv2::ObjectStatusEnum'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 6d07848a4ded4e4fb0383ff12234ed25
@@ -338,6 +380,13 @@ zabbix_export:
               opdata: 'Current state: {ITEM.LASTVALUE1}'
               priority: HIGH
               description: 'Please check the device for faults'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: b47601a02003409896d79e3c99093aca
               expression: 'count(/Dell iDRAC SNMP/system.status[globalSystemStatus.0],#1,"eq","{$HEALTH_CRIT_STATUS}")=1'
@@ -349,6 +398,13 @@ zabbix_export:
                 -
                   name: 'System is in unrecoverable state!'
                   expression: 'count(/Dell iDRAC SNMP/system.status[globalSystemStatus.0],#1,"eq","{$HEALTH_DISASTER_STATUS}")=1'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: a323c8f5ca8d4517b0451677bd43c4db
               expression: 'count(/Dell iDRAC SNMP/system.status[globalSystemStatus.0],#1,"eq","{$HEALTH_WARN_STATUS}")=1'
@@ -363,6 +419,13 @@ zabbix_export:
                 -
                   name: 'System status is in critical state'
                   expression: 'count(/Dell iDRAC SNMP/system.status[globalSystemStatus.0],#1,"eq","{$HEALTH_CRIT_STATUS}")=1'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 83ebf3d38c92457a9d0462e3849d83ce
           name: 'Operating system'
@@ -384,8 +447,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: os
           triggers:
             -
               uuid: fba72cbc4f12495b9f35d0f77a9330b8
@@ -398,6 +461,10 @@ zabbix_export:
                 -
                   name: 'System name has changed (new name: {ITEM.VALUE})'
                   expression: 'last(/Dell iDRAC SNMP/system.name,#1)<>last(/Dell iDRAC SNMP/system.name,#2) and length(last(/Dell iDRAC SNMP/system.name))>0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 522c04c2c624478b8de4287f863ea67a
           name: Uptime
@@ -418,8 +485,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: c0efbe61effc494a970e0e02b9ce8f55
@@ -432,6 +499,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/Dell iDRAC SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 6bcba0816ea942f6a87078070c82e7c3
           name: 'SNMP agent availability'
@@ -448,8 +519,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 22ae441fffdd48919be0041e1507a479
@@ -462,6 +536,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/Dell iDRAC SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: 2bb1759d46264c92b7cb70e7a1d18236
@@ -495,8 +573,14 @@ zabbix_export:
                 name: 'IDRAC-MIB-SMIv2::batteryState'
               tags:
                 -
-                  tag: Application
-                  value: 'Disk arrays'
+                  tag: component
+                  value: array
+                -
+                  tag: component
+                  value: disk
+                -
+                  tag: component
+                  value: storage
               trigger_prototypes:
                 -
                   uuid: 7b9a7b970ac049589912d8e208baf2e2
@@ -505,6 +589,13 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the device for faults'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: fc2eeac871464a65930bbbb2341c803f
                   expression: 'count(/Dell iDRAC SNMP/system.hw.diskarray.cache.battery.status[batteryState.{#SNMPINDEX}],#1,"eq","{$DISK_ARRAY_CACHE_BATTERY_WARN_STATUS}")=1'
@@ -516,6 +607,13 @@ zabbix_export:
                     -
                       name: 'Battery {#BATTERY_NUM}: Disk array cache controller battery is in critical state!'
                       expression: 'count(/Dell iDRAC SNMP/system.hw.diskarray.cache.battery.status[batteryState.{#SNMPINDEX}],#1,"eq","{$DISK_ARRAY_CACHE_BATTERY_CRIT_STATUS}")=1'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: d36acb231d99493b9a760bf231001b4d
                   expression: 'count(/Dell iDRAC SNMP/system.hw.diskarray.cache.battery.status[batteryState.{#SNMPINDEX}],#1,"ne","{$DISK_ARRAY_CACHE_BATTERY_OK_STATUS}")=1'
@@ -530,6 +628,13 @@ zabbix_export:
                     -
                       name: 'Battery {#BATTERY_NUM}: Disk array cache controller battery is in warning state'
                       expression: 'count(/Dell iDRAC SNMP/system.hw.diskarray.cache.battery.status[batteryState.{#SNMPINDEX}],#1,"eq","{$DISK_ARRAY_CACHE_BATTERY_WARN_STATUS}")=1'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 10eaaac3051e47d9bf8fd5e6f0ff840e
           name: 'FAN Discovery'
@@ -562,8 +667,8 @@ zabbix_export:
                 coolingDeviceSubTypeIsDiscrete, a value is not returned for this attribute.
               tags:
                 -
-                  tag: Application
-                  value: Fans
+                  tag: component
+                  value: fan
             -
               uuid: 363a909cc7eb4dc6a225417b2487bad8
               name: '{#FAN_DESCR}: Fan status'
@@ -580,8 +685,8 @@ zabbix_export:
                 name: 'IDRAC-MIB-SMIv2::StatusProbeEnum'
               tags:
                 -
-                  tag: Application
-                  value: Fans
+                  tag: component
+                  value: fan
               trigger_prototypes:
                 -
                   uuid: a1bca91682e84a7b8866ce443cfcbd44
@@ -590,6 +695,13 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the fan unit'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 981f52ec4ba44b558bdbc5775622bc0c
                   expression: 'count(/Dell iDRAC SNMP/sensor.fan.status[coolingDeviceStatus.{#SNMPINDEX}],#1,"eq","{$FAN_WARN_STATUS:\"nonCriticalUpper\"}")=1 or count(/Dell iDRAC SNMP/sensor.fan.status[coolingDeviceStatus.{#SNMPINDEX}],#1,"eq","{$FAN_WARN_STATUS:\"nonCriticalLower\"}")=1'
@@ -601,6 +713,13 @@ zabbix_export:
                     -
                       name: '{#FAN_DESCR}: Fan is in critical state'
                       expression: 'count(/Dell iDRAC SNMP/sensor.fan.status[coolingDeviceStatus.{#SNMPINDEX}],#1,"eq","{$FAN_CRIT_STATUS:\"criticalUpper\"}")=1 or count(/Dell iDRAC SNMP/sensor.fan.status[coolingDeviceStatus.{#SNMPINDEX}],#1,"eq","{$FAN_CRIT_STATUS:\"nonRecoverableUpper\"}")=1 or count(/Dell iDRAC SNMP/sensor.fan.status[coolingDeviceStatus.{#SNMPINDEX}],#1,"eq","{$FAN_CRIT_STATUS:\"criticalLower\"}")=1 or count(/Dell iDRAC SNMP/sensor.fan.status[coolingDeviceStatus.{#SNMPINDEX}],#1,"eq","{$FAN_CRIT_STATUS:\"nonRecoverableLower\"}")=1 or count(/Dell iDRAC SNMP/sensor.fan.status[coolingDeviceStatus.{#SNMPINDEX}],#1,"eq","{$FAN_CRIT_STATUS:\"failed\"}")=1'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 49d6570731ad4cd9a33bf4afa660eaf8
           name: 'Array Controller Discovery'
@@ -624,8 +743,14 @@ zabbix_export:
                 The controller's name as represented in Storage Management.
               tags:
                 -
-                  tag: Application
-                  value: 'Disk arrays'
+                  tag: component
+                  value: array
+                -
+                  tag: component
+                  value: disk
+                -
+                  tag: component
+                  value: storage
             -
               uuid: 55504ef472384a8689a72ae70881fe71
               name: '{#CNTLR_NAME}: Disk array controller status'
@@ -648,8 +773,14 @@ zabbix_export:
                 name: 'IDRAC-MIB-SMIv2::ObjectStatusEnum'
               tags:
                 -
-                  tag: Application
-                  value: 'Disk arrays'
+                  tag: component
+                  value: array
+                -
+                  tag: component
+                  value: disk
+                -
+                  tag: component
+                  value: storage
               trigger_prototypes:
                 -
                   uuid: b037fad011764721a030bdde50f6ede3
@@ -662,6 +793,13 @@ zabbix_export:
                     -
                       name: '{#CNTLR_NAME}: Disk array controller is in unrecoverable state!'
                       expression: 'count(/Dell iDRAC SNMP/system.hw.diskarray.status[controllerComponentStatus.{#SNMPINDEX}],#1,"eq","{$DISK_ARRAY_FAIL_STATUS:\"nonRecoverable\"}")=1'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 55a0631d0ab24bc6ad5a6c4ef7d1be30
                   expression: 'count(/Dell iDRAC SNMP/system.hw.diskarray.status[controllerComponentStatus.{#SNMPINDEX}],#1,"eq","{$DISK_ARRAY_FAIL_STATUS:\"nonRecoverable\"}")=1'
@@ -669,6 +807,13 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: DISASTER
                   description: 'Please check the device for faults'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 226ab2efc25d46c9adda8f763fe4a65f
                   expression: 'count(/Dell iDRAC SNMP/system.hw.diskarray.status[controllerComponentStatus.{#SNMPINDEX}],#1,"eq","{$DISK_ARRAY_WARN_STATUS:\"nonCritical\"}")=1'
@@ -683,6 +828,13 @@ zabbix_export:
                     -
                       name: '{#CNTLR_NAME}: Disk array controller is in unrecoverable state!'
                       expression: 'count(/Dell iDRAC SNMP/system.hw.diskarray.status[controllerComponentStatus.{#SNMPINDEX}],#1,"eq","{$DISK_ARRAY_FAIL_STATUS:\"nonRecoverable\"}")=1'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 3a7ac779581345b9b4791390dee3baf4
           name: 'Physical Disk Discovery'
@@ -711,8 +863,11 @@ zabbix_export:
                 name: 'IDRAC-MIB-SMIv2::physicalDiskMediaType'
               tags:
                 -
-                  tag: Application
-                  value: 'Physical disks'
+                  tag: component
+                  value: disk
+                -
+                  tag: component
+                  value: storage
             -
               uuid: f094adc420fc49b19e23a3071b8dc15f
               name: '{#DISK_NAME}: Physical disk model name'
@@ -728,8 +883,11 @@ zabbix_export:
                 The model number of the physical disk.
               tags:
                 -
-                  tag: Application
-                  value: 'Physical disks'
+                  tag: component
+                  value: disk
+                -
+                  tag: component
+                  value: storage
             -
               uuid: 6a6a8198b9c6485290acb703d87ec7c9
               name: '{#DISK_NAME}: Physical disk part number'
@@ -745,8 +903,11 @@ zabbix_export:
                 The part number of the disk.
               tags:
                 -
-                  tag: Application
-                  value: 'Physical disks'
+                  tag: component
+                  value: disk
+                -
+                  tag: component
+                  value: storage
             -
               uuid: 1cfaa7f506144a06a3ee159528a1a8fb
               name: '{#DISK_NAME}: Physical disk serial number'
@@ -761,8 +922,11 @@ zabbix_export:
                 The physical disk's unique identification number from the manufacturer.
               tags:
                 -
-                  tag: Application
-                  value: 'Physical disks'
+                  tag: component
+                  value: disk
+                -
+                  tag: component
+                  value: storage
               trigger_prototypes:
                 -
                   uuid: eb26b6915b9f4ce6983566df9ee4db96
@@ -771,6 +935,10 @@ zabbix_export:
                   priority: INFO
                   description: 'Disk serial number has changed. Ack to close'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 17b6d1e6664e4c3e90f3e68df2316fb4
               name: '{#DISK_NAME}: Disk size'
@@ -791,8 +959,11 @@ zabbix_export:
                     - '1048576'
               tags:
                 -
-                  tag: Application
-                  value: 'Physical disks'
+                  tag: component
+                  value: disk
+                -
+                  tag: component
+                  value: storage
             -
               uuid: 5c9de9677d214c8fa6ba706a57c46f9f
               name: '{#DISK_NAME}: Physical disk S.M.A.R.T. status'
@@ -808,8 +979,11 @@ zabbix_export:
                 name: 'IDRAC-MIB-SMIv2::BooleanType'
               tags:
                 -
-                  tag: Application
-                  value: 'Physical disks'
+                  tag: component
+                  value: disk
+                -
+                  tag: component
+                  value: storage
               trigger_prototypes:
                 -
                   uuid: 7dc1a088ebd74702b0fb4e0a20edbed2
@@ -822,6 +996,13 @@ zabbix_export:
                     -
                       name: '{#DISK_NAME}: Physical disk failed'
                       expression: 'count(/Dell iDRAC SNMP/system.hw.physicaldisk.status[physicalDiskComponentStatus.{#SNMPINDEX}],#1,"eq","{$DISK_FAIL_STATUS:\"critical\"}")=1 or count(/Dell iDRAC SNMP/system.hw.physicaldisk.status[physicalDiskComponentStatus.{#SNMPINDEX}],#1,"eq","{$DISK_FAIL_STATUS:\"nonRecoverable\"}")=1'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 7b1d2992683d404db552abd870c6c627
               name: '{#DISK_NAME}: Physical disk status'
@@ -844,8 +1025,11 @@ zabbix_export:
                 name: 'IDRAC-MIB-SMIv2::physicalDiskComponentStatus'
               tags:
                 -
-                  tag: Application
-                  value: 'Physical disks'
+                  tag: component
+                  value: disk
+                -
+                  tag: component
+                  value: storage
               trigger_prototypes:
                 -
                   uuid: 5eedc39db9a348df8e547be6401c0814
@@ -854,6 +1038,13 @@ zabbix_export:
                   opdata: 'Current status: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'Please check physical disk for warnings or errors'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 6defa44f91ee4fb5b11b92ba64f07b48
                   expression: 'count(/Dell iDRAC SNMP/system.hw.physicaldisk.status[physicalDiskComponentStatus.{#SNMPINDEX}],#1,"eq","{$DISK_WARN_STATUS:\"nonCritical\"}")=1'
@@ -865,6 +1056,13 @@ zabbix_export:
                     -
                       name: '{#DISK_NAME}: Physical disk failed'
                       expression: 'count(/Dell iDRAC SNMP/system.hw.physicaldisk.status[physicalDiskComponentStatus.{#SNMPINDEX}],#1,"eq","{$DISK_FAIL_STATUS:\"critical\"}")=1 or count(/Dell iDRAC SNMP/system.hw.physicaldisk.status[physicalDiskComponentStatus.{#SNMPINDEX}],#1,"eq","{$DISK_FAIL_STATUS:\"nonRecoverable\"}")=1'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 2a4ea81f9ecd4d04ad508c50395551da
           name: 'PSU Discovery'
@@ -890,8 +1088,8 @@ zabbix_export:
                 name: 'IDRAC-MIB-SMIv2::ObjectStatusEnum'
               tags:
                 -
-                  tag: Application
-                  value: 'Power supply'
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: 9f57b49984864af188b178dc2da85b71
@@ -900,6 +1098,13 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the power supply unit for errors'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: d7d1b3d889254ae288348cd6b77bad5f
                   expression: 'count(/Dell iDRAC SNMP/sensor.psu.status[powerSupplyStatus.{#SNMPINDEX}],#1,"eq","{$PSU_WARN_STATUS:\"nonCritical\"}")=1'
@@ -911,6 +1116,13 @@ zabbix_export:
                     -
                       name: '{#PSU_DESCR}: Power supply is in critical state'
                       expression: 'count(/Dell iDRAC SNMP/sensor.psu.status[powerSupplyStatus.{#SNMPINDEX}],#1,"eq","{$PSU_CRIT_STATUS:\"critical\"}")=1 or count(/Dell iDRAC SNMP/sensor.psu.status[powerSupplyStatus.{#SNMPINDEX}],#1,"eq","{$PSU_CRIT_STATUS:\"nonRecoverable\"}")=1'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: c3769c4cc3f3480ebad7b7c6e458c1c0
           name: 'Temperature Ambient Discovery'
@@ -942,8 +1154,8 @@ zabbix_export:
                 name: 'IDRAC-MIB-SMIv2::StatusProbeEnum'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
             -
               uuid: 406352e7250740939c22dd5cba8cd361
               name: '{#SENSOR_LOCALE}: Temperature'
@@ -965,8 +1177,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 992e0a871cef40f6b859e251fd5d75fd
@@ -976,6 +1188,13 @@ zabbix_export:
                   name: '{#SENSOR_LOCALE}: Temperature is too low: <{$TEMP_CRIT_LOW:"Ambient"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
           trigger_prototypes:
             -
               uuid: 8d659cefdff143bbaff8d6cdc8bbf7a3
@@ -991,6 +1210,13 @@ zabbix_export:
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
               description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 45ab3beb5a3b4271861330632ff37c55
               expression: |
@@ -1013,6 +1239,13 @@ zabbix_export:
                     or
                     last(/Dell iDRAC SNMP/sensor.temp.status[temperatureProbeStatus.Ambient.{#SNMPINDEX}])={$TEMP_DISASTER_STATUS}
                   recovery_expression: 'max(/Dell iDRAC SNMP/sensor.temp.value[temperatureProbeReading.Ambient.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Ambient"}-3'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 3e79192b1bba479faaf852cb15fe9e26
           name: 'Temperature CPU Discovery'
@@ -1044,8 +1277,8 @@ zabbix_export:
                 name: 'IDRAC-MIB-SMIv2::StatusProbeEnum'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
             -
               uuid: 9b4381f5a34a4ff4bde7294fb34f2a27
               name: '{#SENSOR_LOCALE}: Temperature'
@@ -1067,8 +1300,8 @@ zabbix_export:
                     - '0.1'
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: edb89d83ecc144cdbccdb41f8842d572
@@ -1078,6 +1311,13 @@ zabbix_export:
                   name: '{#SENSOR_LOCALE}: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
           trigger_prototypes:
             -
               uuid: 54c2b7095b7d4550a2d1dbe14990dd0a
@@ -1093,6 +1333,13 @@ zabbix_export:
               opdata: 'Current value: {ITEM.LASTVALUE1}'
               priority: HIGH
               description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: eb2182b46c294fa381b35ab31c7ac6d4
               expression: |
@@ -1115,6 +1362,13 @@ zabbix_export:
                     or
                     last(/Dell iDRAC SNMP/sensor.temp.status[temperatureProbeStatus.CPU.{#SNMPINDEX}])={$TEMP_DISASTER_STATUS}
                   recovery_expression: 'max(/Dell iDRAC SNMP/sensor.temp.value[temperatureProbeReading.CPU.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 57a914e4d66d4babaadde1b0787ba734
           name: 'Virtual Disk Discovery'
@@ -1150,8 +1404,11 @@ zabbix_export:
                 name: 'IDRAC-MIB-SMIv2::virtualDiskLayout'
               tags:
                 -
-                  tag: Application
-                  value: 'Virtual disks'
+                  tag: component
+                  value: disk
+                -
+                  tag: component
+                  value: storage
             -
               uuid: 5859b6822849438fa355694f42cc0b12
               name: 'Disk {#SNMPVALUE}({#DISK_NAME}): Read policy'
@@ -1169,8 +1426,11 @@ zabbix_export:
                 3: Adaptive Read Ahead.
               tags:
                 -
-                  tag: Application
-                  value: 'Virtual disks'
+                  tag: component
+                  value: disk
+                -
+                  tag: component
+                  value: storage
             -
               uuid: f42ea3af24564ba09c306e16580df656
               name: 'Disk {#SNMPVALUE}({#DISK_NAME}): Disk size'
@@ -1191,8 +1451,11 @@ zabbix_export:
                     - '1048576'
               tags:
                 -
-                  tag: Application
-                  value: 'Virtual disks'
+                  tag: component
+                  value: disk
+                -
+                  tag: component
+                  value: storage
             -
               uuid: 3134da694a68466cbe811c1658be24af
               name: 'Disk {#SNMPVALUE}({#DISK_NAME}): Current state'
@@ -1214,8 +1477,11 @@ zabbix_export:
                 name: 'IDRAC-MIB-SMIv2::virtualDiskOperationalState'
               tags:
                 -
-                  tag: Application
-                  value: 'Virtual disks'
+                  tag: component
+                  value: disk
+                -
+                  tag: component
+                  value: storage
             -
               uuid: 1e749a7717b94b42ad52d45bebaf9dd5
               name: 'Disk {#SNMPVALUE}({#DISK_NAME}): Status'
@@ -1237,8 +1503,11 @@ zabbix_export:
                 name: 'IDRAC-MIB-SMIv2::virtualDiskState'
               tags:
                 -
-                  tag: Application
-                  value: 'Virtual disks'
+                  tag: component
+                  value: disk
+                -
+                  tag: component
+                  value: storage
               trigger_prototypes:
                 -
                   uuid: 457783fb014a4cae9d47a1cb17d8d31e
@@ -1247,6 +1516,13 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'Please check virtual disk for warnings or errors'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: d0c6dbaa042f40559d855acb1b61977a
                   expression: 'count(/Dell iDRAC SNMP/system.hw.virtualdisk.status[virtualDiskState.{#SNMPINDEX}],#1,"eq","{$VDISK_WARN_STATUS:\"degraded\"}")=1'
@@ -1258,6 +1534,13 @@ zabbix_export:
                     -
                       name: 'Disk {#SNMPVALUE}({#DISK_NAME}): Virtual disk failed'
                       expression: 'count(/Dell iDRAC SNMP/system.hw.virtualdisk.status[virtualDiskState.{#SNMPINDEX}],#1,"eq","{$VDISK_CRIT_STATUS:\"failed\"}")=1'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 0e469e2e2a7c40998a72a986ef61a4e6
               name: 'Disk {#SNMPVALUE}({#DISK_NAME}): Write policy'
@@ -1277,8 +1560,21 @@ zabbix_export:
                 name: 'IDRAC-MIB-SMIv2::virtualDiskWritePolicy'
               tags:
                 -
-                  tag: Application
-                  value: 'Virtual disks'
+                  tag: component
+                  value: disk
+                -
+                  tag: component
+                  value: storage
+      tags:
+        -
+          tag: class
+          value: hardware
+        -
+          tag: target
+          value: dell
+        -
+          tag: target
+          value: idrac
       macros:
         -
           macro: '{$DISK_ARRAY_CACHE_BATTERY_CRIT_STATUS}'
diff --git a/templates/server/hp_ilo_snmp/template_server_hp_ilo_snmp.yaml b/templates/server/hp_ilo_snmp/template_server_hp_ilo_snmp.yaml
index 7ce57ddbfd3..1444dedafa4 100644
--- a/templates/server/hp_ilo_snmp/template_server_hp_ilo_snmp.yaml
+++ b/templates/server/hp_ilo_snmp/template_server_hp_ilo_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:40:28Z'
+  date: '2022-01-26T10:36:14Z'
   groups:
     -
       uuid: e960332b3f6c46a1956486d4f3f99fce
@@ -34,8 +34,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 755a4c5e809d418cbb1162102b0d1c26
@@ -43,6 +46,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 1db2fcdd357e4d15a989c0511bbed8bd
           name: 'ICMP loss'
@@ -53,8 +60,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 0492380bc6374f24b92b4661b27d8f2c
@@ -66,6 +76,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/HP iLO SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 8be612f43d1d40ce9efd3c36d18e6a20
           name: 'ICMP response time'
@@ -76,8 +93,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: a869db9f341c479c80dca50bac0ff309
@@ -92,6 +112,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/HP iLO SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 399110973c134983bd5020b9e5b509f4
           name: 'System: Temperature status'
@@ -117,8 +144,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Temperature
+              tag: component
+              value: temperature
         -
           uuid: 0107bcd0d6b840c4a64061ee83e69f11
           name: 'SNMP traps (fallback)'
@@ -131,8 +158,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: 2203e586148a418f9e2f06b38c340b53
           name: 'System contact details'
@@ -154,8 +181,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 03ff0b6d9c7a483eaae565d90473d291
           name: 'System description'
@@ -178,8 +205,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 2708e6cb2ba240a791685ebdcab3407f
           name: 'Hardware model name'
@@ -200,8 +227,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
         -
           uuid: 96e27ad668944845a7f598f35b577d18
           name: 'Hardware serial number'
@@ -222,8 +249,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: 7e8d377e1b49469a8b19b94e6dad97ce
@@ -232,6 +259,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 84ed489ba1be43738be79f8a71b60381
           name: 'System location'
@@ -253,8 +284,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 88baf9f1da184fc78a49b064f0b4de85
           name: 'System name'
@@ -276,8 +307,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: df3c9e64b0f844ddac8f40f6df956595
@@ -286,6 +317,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: d02b8e2d5c7a4afabc2fbadc8674288c
           name: 'System object ID'
@@ -306,8 +344,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 5f30715570c449ecb4e07858256a3e05
           name: 'Overall system health status'
@@ -328,8 +366,8 @@ zabbix_export:
                 - 6h
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 6d0d0554e1c945dc90701aebd531f9cb
@@ -338,6 +376,13 @@ zabbix_export:
               opdata: 'Current state: {ITEM.LASTVALUE1}'
               priority: HIGH
               description: 'Please check the device for errors'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 273c27c7929649f1a45ddc92c09ab982
               expression: 'count(/HP iLO SNMP/system.status[cpqHeMibCondition.0],#1,"eq","{$HEALTH_WARN_STATUS}")=1'
@@ -349,6 +394,13 @@ zabbix_export:
                 -
                   name: 'System status is in critical state'
                   expression: 'count(/HP iLO SNMP/system.status[cpqHeMibCondition.0],#1,"eq","{$HEALTH_CRIT_STATUS}")=1'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 05166eb015534cae9798f9266d3d0a6b
           name: Uptime
@@ -369,8 +421,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 261749b9936c4a26b48d660f01435fb7
@@ -383,6 +435,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/HP iLO SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: e5ebd75f34f24502b3cdc2a707fb24c5
           name: 'SNMP agent availability'
@@ -399,8 +455,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 8870beab300f41ea8d54619fd2bf0371
@@ -413,6 +472,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/HP iLO SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: 7589f2f30c7e4cf88bb7cd1d57f543a4
@@ -462,8 +525,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Disk arrays'
+                  tag: component
+                  value: array
+                -
+                  tag: component
+                  value: disk
+                -
+                  tag: component
+                  value: storage
               trigger_prototypes:
                 -
                   uuid: b3049aa19e5d45d28937c1af262aba3e
@@ -472,6 +541,13 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the device for faults'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 384fd446bcb042f89ca348ec7459f1aa
                   expression: 'count(/HP iLO SNMP/system.hw.diskarray.cache.battery.status[cpqDaAccelBattery.{#SNMPINDEX}],#1,"eq","{$DISK_ARRAY_CACHE_BATTERY_WARN_STATUS:\"degraded\"}")=1'
@@ -483,6 +559,13 @@ zabbix_export:
                     -
                       name: '#{#CACHE_CNTRL_INDEX}: Disk array cache controller battery is in critical state!'
                       expression: 'count(/HP iLO SNMP/system.hw.diskarray.cache.battery.status[cpqDaAccelBattery.{#SNMPINDEX}],#1,"eq","{$DISK_ARRAY_CACHE_BATTERY_CRIT_STATUS:\"failed\"}")=1 or count(/HP iLO SNMP/system.hw.diskarray.cache.battery.status[cpqDaAccelBattery.{#SNMPINDEX}],#1,"eq","{$DISK_ARRAY_CACHE_BATTERY_CRIT_STATUS:\"capacitorFailed\"}")=1'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 2e20ec1d27374dceb363a6cdd568d23d
               name: '#{#CACHE_CNTRL_INDEX}: Disk array cache controller status'
@@ -532,8 +615,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Disk arrays'
+                  tag: component
+                  value: array
+                -
+                  tag: component
+                  value: disk
+                -
+                  tag: component
+                  value: storage
               trigger_prototypes:
                 -
                   uuid: a4c81fb1ef6140199bbde241691183cd
@@ -542,6 +631,16 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the device for faults'
+                  tags:
+                    -
+                      tag: component
+                      value: array
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 7370a7c6388c4ff8b094959ca0c34a72
                   expression: 'count(/HP iLO SNMP/system.hw.diskarray.cache.status[cpqDaAccelStatus.{#SNMPINDEX}],#1,"eq","{$DISK_ARRAY_CACHE_WARN_STATUS:\"cacheModDegradedFailsafeSpeed\"}")=1 or count(/HP iLO SNMP/system.hw.diskarray.cache.status[cpqDaAccelStatus.{#SNMPINDEX}],#1,"eq","{$DISK_ARRAY_CACHE_WARN_STATUS:\"cacheReadCacheNotMapped\"}")=1 or count(/HP iLO SNMP/system.hw.diskarray.cache.status[cpqDaAccelStatus.{#SNMPINDEX}],#1,"eq","{$DISK_ARRAY_CACHE_WARN_STATUS:\"cacheModFlashMemNotAttached\"}")=1'
@@ -553,6 +652,13 @@ zabbix_export:
                     -
                       name: '#{#CACHE_CNTRL_INDEX}: Disk array cache controller is in critical state!'
                       expression: 'count(/HP iLO SNMP/system.hw.diskarray.cache.status[cpqDaAccelStatus.{#SNMPINDEX}],#1,"eq","{$DISK_ARRAY_CACHE_CRIT_STATUS:\"cacheModCriticalFailure\"}")=1'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 4db3b402580c43eba0d9dc6349cf95ca
                   expression: 'count(/HP iLO SNMP/system.hw.diskarray.cache.status[cpqDaAccelStatus.{#SNMPINDEX}],#1,"ne","{$DISK_ARRAY_CACHE_OK_STATUS:\"enabled\"}")=1 and last(/HP iLO SNMP/system.hw.diskarray.cache.status[cpqDaAccelStatus.{#SNMPINDEX}])<>{$DISK_ARRAY_CACHE_WARN_STATUS:"invalid"}'
@@ -567,6 +673,13 @@ zabbix_export:
                     -
                       name: '#{#CACHE_CNTRL_INDEX}: Disk array cache controller is in warning state'
                       expression: 'count(/HP iLO SNMP/system.hw.diskarray.cache.status[cpqDaAccelStatus.{#SNMPINDEX}],#1,"eq","{$DISK_ARRAY_CACHE_WARN_STATUS:\"cacheModDegradedFailsafeSpeed\"}")=1 or count(/HP iLO SNMP/system.hw.diskarray.cache.status[cpqDaAccelStatus.{#SNMPINDEX}],#1,"eq","{$DISK_ARRAY_CACHE_WARN_STATUS:\"cacheReadCacheNotMapped\"}")=1 or count(/HP iLO SNMP/system.hw.diskarray.cache.status[cpqDaAccelStatus.{#SNMPINDEX}],#1,"eq","{$DISK_ARRAY_CACHE_WARN_STATUS:\"cacheModFlashMemNotAttached\"}")=1'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
           preprocessing:
             -
               type: DISCARD_UNCHANGED_HEARTBEAT
@@ -601,8 +714,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Disk arrays'
+                  tag: component
+                  value: array
+                -
+                  tag: component
+                  value: disk
+                -
+                  tag: component
+                  value: storage
             -
               uuid: 71ae1496057044819a80f0660d838083
               name: '{#CNTLR_LOCATION}: Disk array controller status'
@@ -624,8 +743,14 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Disk arrays'
+                  tag: component
+                  value: array
+                -
+                  tag: component
+                  value: disk
+                -
+                  tag: component
+                  value: storage
               trigger_prototypes:
                 -
                   uuid: a318564fe4eb488eba251f3cba3d31b6
@@ -634,6 +759,13 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'Please check the device for faults'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 6b65d2b2477c4567953fcec31b1ab9a3
                   expression: 'count(/HP iLO SNMP/system.hw.diskarray.status[cpqDaCntlrCondition.{#SNMPINDEX}],#1,"eq","{$DISK_ARRAY_WARN_STATUS}")=1'
@@ -645,6 +777,13 @@ zabbix_export:
                     -
                       name: '{#CNTLR_LOCATION}: Disk array controller is in critical state'
                       expression: 'count(/HP iLO SNMP/system.hw.diskarray.status[cpqDaCntlrCondition.{#SNMPINDEX}],#1,"eq","{$DISK_ARRAY_CRIT_STATUS}")=1'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
           preprocessing:
             -
               type: DISCARD_UNCHANGED_HEARTBEAT
@@ -684,8 +823,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Fans
+                  tag: component
+                  value: fan
               trigger_prototypes:
                 -
                   uuid: 0731e25040504428acb466b0d4e2803a
@@ -694,6 +833,13 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the fan unit'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: c8c9ea062fa849b0b550ad4dd1d2cec7
                   expression: 'count(/HP iLO SNMP/sensor.fan.status[cpqHeFltTolFanCondition.{#SNMPINDEX}],#1,"eq","{$FAN_WARN_STATUS}")=1'
@@ -705,6 +851,13 @@ zabbix_export:
                     -
                       name: 'Fan {#SNMPINDEX}: Fan is in critical state'
                       expression: 'count(/HP iLO SNMP/sensor.fan.status[cpqHeFltTolFanCondition.{#SNMPINDEX}],#1,"eq","{$FAN_CRIT_STATUS}")=1'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
           preprocessing:
             -
               type: DISCARD_UNCHANGED_HEARTBEAT
@@ -742,8 +895,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Physical disks'
+                  tag: component
+                  value: disk
+                -
+                  tag: component
+                  value: storage
             -
               uuid: 82f09b232147488fb9bd7253ce1432c2
               name: '{#DISK_LOCATION}: Physical disk model name'
@@ -766,8 +922,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Physical disks'
+                  tag: component
+                  value: disk
+                -
+                  tag: component
+                  value: storage
             -
               uuid: 5eca1a95575f4cb891545bde063aae7b
               name: '{#DISK_LOCATION}: Physical disk serial number'
@@ -790,8 +949,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Physical disks'
+                  tag: component
+                  value: disk
+                -
+                  tag: component
+                  value: storage
               trigger_prototypes:
                 -
                   uuid: 87bcd812474b44729da19f49344ba976
@@ -800,6 +962,10 @@ zabbix_export:
                   priority: INFO
                   description: 'Disk serial number has changed. Ack to close'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 03cf9c027f9b4557a0d0a233347c58d2
               name: '{#DISK_LOCATION}: Disk size'
@@ -829,8 +995,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Physical disks'
+                  tag: component
+                  value: disk
+                -
+                  tag: component
+                  value: storage
             -
               uuid: e0864c9d70204f048fc0c597a996b19f
               name: '{#DISK_LOCATION}: Physical disk S.M.A.R.T. status'
@@ -854,8 +1023,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Physical disks'
+                  tag: component
+                  value: disk
+                -
+                  tag: component
+                  value: storage
               trigger_prototypes:
                 -
                   uuid: 180f8f9124a041d0bf1c350d0226c3d3
@@ -868,6 +1040,13 @@ zabbix_export:
                     -
                       name: '{#DISK_LOCATION}: Physical disk failed'
                       expression: 'count(/HP iLO SNMP/system.hw.physicaldisk.status[cpqDaPhyDrvStatus.{#SNMPINDEX}],#1,"eq","{$DISK_FAIL_STATUS}")=1'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: d88cd26724fd4f19b899b4767fb33814
               name: '{#DISK_LOCATION}: Physical disk status'
@@ -893,8 +1072,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Physical disks'
+                  tag: component
+                  value: disk
+                -
+                  tag: component
+                  value: storage
               trigger_prototypes:
                 -
                   uuid: 95e887baa0b9480a8a59848b07418c6b
@@ -903,6 +1085,13 @@ zabbix_export:
                   opdata: 'Current status: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'Please check physical disk for warnings or errors'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 857540089794495799eb1a04b172c70c
                   expression: 'count(/HP iLO SNMP/system.hw.physicaldisk.status[cpqDaPhyDrvStatus.{#SNMPINDEX}],#1,"eq","{$DISK_WARN_STATUS}")=1'
@@ -914,6 +1103,13 @@ zabbix_export:
                     -
                       name: '{#DISK_LOCATION}: Physical disk failed'
                       expression: 'count(/HP iLO SNMP/system.hw.physicaldisk.status[cpqDaPhyDrvStatus.{#SNMPINDEX}],#1,"eq","{$DISK_FAIL_STATUS}")=1'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
           preprocessing:
             -
               type: DISCARD_UNCHANGED_HEARTBEAT
@@ -952,8 +1148,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Power supply'
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: 7a34714fcbb74294af97bc4f39c21413
@@ -962,6 +1158,13 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
                   description: 'Please check the power supply unit for errors'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: db7679204aa544cb8ffe38df5c68b7ce
                   expression: 'count(/HP iLO SNMP/sensor.psu.status[cpqHeFltTolPowerSupplyCondition.{#SNMPINDEX}],#1,"eq","{$PSU_WARN_STATUS}")=1'
@@ -973,6 +1176,13 @@ zabbix_export:
                     -
                       name: 'Chassis {#CHASSIS_NUM}, bay {#BAY_NUM}: Power supply is in critical state'
                       expression: 'count(/HP iLO SNMP/sensor.psu.status[cpqHeFltTolPowerSupplyCondition.{#SNMPINDEX}],#1,"eq","{$PSU_CRIT_STATUS}")=1'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
           preprocessing:
             -
               type: DISCARD_UNCHANGED_HEARTBEAT
@@ -1023,8 +1233,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: b7786ff4c57a4143b79e95bfc5470dcd
@@ -1033,18 +1243,30 @@ zabbix_export:
                   priority: INFO
                   description: 'Temperature could not be determined.'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: 11365923a7b242fea930250e26fcc548
                   expression: 'last(/HP iLO SNMP/sensor.temp.condition[cpqHeTemperatureCondition.{#SNMPINDEX}]) = 4'
                   name: '{#SNMPINDEX}: The temperature sensor detects a condition that could permanently damage the system.'
                   priority: HIGH
                   description: 'The system will automatically shutdown if the failed(4) condition results, so it is unlikely that this value will ever be returned by the agent.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: dd0fd44bd7bb43bd85fdd63a199e0e69
                   expression: 'last(/HP iLO SNMP/sensor.temp.condition[cpqHeTemperatureCondition.{#SNMPINDEX}]) = 3'
                   name: '{#SNMPINDEX}: The temperature sensor is outside of normal operating range'
                   priority: WARNING
                   description: 'If the cpqHeThermalDegradedAction is set to shutdown(3) the system will be shutdown if the degraded(3) condition occurs.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 63fd55c6dee6427bbba7daa023d8f91a
               name: '{#SNMPINDEX}: Temperature sensor location'
@@ -1065,8 +1287,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
             -
               uuid: 7c7d2807f0714bca8c8f263c2a4be8e6
               name: '{#SNMPINDEX}: Temperature'
@@ -1086,8 +1308,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
           preprocessing:
             -
               type: DISCARD_UNCHANGED_HEARTBEAT
@@ -1142,8 +1364,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: e955550a2496435eb799d317f2036c55
@@ -1152,18 +1374,30 @@ zabbix_export:
                   priority: INFO
                   description: 'Temperature could not be determined.'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: 8cd2c8b62b164923afed02da2be52dcc
                   expression: 'last(/HP iLO SNMP/sensor.temp.condition[cpqHeTemperatureCondition.Ambient.{#SNMPINDEX}]) = 4'
                   name: 'Ambient: The temperature sensor detects a condition that could permanently damage the system.'
                   priority: HIGH
                   description: 'The system will automatically shutdown if the failed(4) condition results, so it is unlikely that this value will ever be returned by the agent.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: d11e13c5714a42d49bea54d837f9f418
                   expression: 'last(/HP iLO SNMP/sensor.temp.condition[cpqHeTemperatureCondition.Ambient.{#SNMPINDEX}]) = 3'
                   name: 'Ambient: The temperature sensor is outside of normal operating range'
                   priority: WARNING
                   description: 'If the cpqHeThermalDegradedAction is set to shutdown(3) the system will be shutdown if the degraded(3) condition occurs.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: fd9c9a22a2a946ef895f92300de12004
               name: 'Ambient: Temperature'
@@ -1183,8 +1417,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
           preprocessing:
             -
               type: DISCARD_UNCHANGED_HEARTBEAT
@@ -1235,8 +1469,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 512654c27ea94ed4993380793a67f68b
@@ -1245,18 +1479,30 @@ zabbix_export:
                   priority: INFO
                   description: 'Temperature could not be determined.'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: 7853d0c8ed4a4ebe98e38c7499417ebe
                   expression: 'last(/HP iLO SNMP/sensor.temp.condition[cpqHeTemperatureCondition.CPU.{#SNMPINDEX}]) = 4'
                   name: 'CPU-{#SNMPINDEX}: The temperature sensor detects a condition that could permanently damage the system.'
                   priority: HIGH
                   description: 'The system will automatically shutdown if the failed(4) condition results, so it is unlikely that this value will ever be returned by the agent.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: 0434d2a6a1b54cb7bcd0e6f58d973be4
                   expression: 'last(/HP iLO SNMP/sensor.temp.condition[cpqHeTemperatureCondition.CPU.{#SNMPINDEX}]) = 3'
                   name: 'CPU-{#SNMPINDEX}: The temperature sensor is outside of normal operating range'
                   priority: WARNING
                   description: 'If the cpqHeThermalDegradedAction is set to shutdown(3) the system will be shutdown if the degraded(3) condition occurs.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 0bfe29bdf06e4432aafbbddb5bc02272
               name: 'CPU-{#SNMPINDEX}: Temperature'
@@ -1276,8 +1522,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
           preprocessing:
             -
               type: DISCARD_UNCHANGED_HEARTBEAT
@@ -1328,8 +1574,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 2875e5ebea474eccac8d53dd13539bd6
@@ -1338,18 +1584,30 @@ zabbix_export:
                   priority: INFO
                   description: 'Temperature could not be determined.'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: 593b167fe62e4a7fae35ebb508540325
                   expression: 'last(/HP iLO SNMP/sensor.temp.condition[cpqHeTemperatureCondition."I/O.{#SNMPINDEX}"]) = 4'
                   name: 'I/O-{#SNMPINDEX}: The temperature sensor detects a condition that could permanently damage the system.'
                   priority: HIGH
                   description: 'The system will automatically shutdown if the failed(4) condition results, so it is unlikely that this value will ever be returned by the agent.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: bf6a10f0596a45b4b8f8a2f0acf7c778
                   expression: 'last(/HP iLO SNMP/sensor.temp.condition[cpqHeTemperatureCondition."I/O.{#SNMPINDEX}"]) = 3'
                   name: 'I/O-{#SNMPINDEX}: The temperature sensor is outside of normal operating range'
                   priority: WARNING
                   description: 'If the cpqHeThermalDegradedAction is set to shutdown(3) the system will be shutdown if the degraded(3) condition occurs.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: 5a37a9c96a9748468d10562bd1242aa0
               name: 'I/O-{#SNMPINDEX}: Temperature'
@@ -1369,8 +1627,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
           preprocessing:
             -
               type: DISCARD_UNCHANGED_HEARTBEAT
@@ -1421,8 +1679,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 881f28f6411c467493c56a64237d8ca8
@@ -1431,18 +1689,30 @@ zabbix_export:
                   priority: INFO
                   description: 'Temperature could not be determined.'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: c05402995e6146d28c53fc33e88d8164
                   expression: 'last(/HP iLO SNMP/sensor.temp.condition[cpqHeTemperatureCondition.Memory.{#SNMPINDEX}]) = 4'
                   name: 'Memory-{#SNMPINDEX}: The temperature sensor detects a condition that could permanently damage the system.'
                   priority: HIGH
                   description: 'The system will automatically shutdown if the failed(4) condition results, so it is unlikely that this value will ever be returned by the agent.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: bfac7287a9d842cb89d8089af72e2e12
                   expression: 'last(/HP iLO SNMP/sensor.temp.condition[cpqHeTemperatureCondition.Memory.{#SNMPINDEX}]) = 3'
                   name: 'Memory-{#SNMPINDEX}: The temperature sensor is outside of normal operating range'
                   priority: WARNING
                   description: 'If the cpqHeThermalDegradedAction is set to shutdown(3) the system will be shutdown if the degraded(3) condition occurs.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: feb78ed0e9c640f2b2e122bebca181a7
               name: 'Memory-{#SNMPINDEX}: Temperature'
@@ -1462,8 +1732,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
           preprocessing:
             -
               type: DISCARD_UNCHANGED_HEARTBEAT
@@ -1514,8 +1784,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 14ab7adae80c4859952381bfe17a14a3
@@ -1524,18 +1794,30 @@ zabbix_export:
                   priority: INFO
                   description: 'Temperature could not be determined.'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: 97481f1183c3444c851fe99428bd7bf3
                   expression: 'last(/HP iLO SNMP/sensor.temp.condition[cpqHeTemperatureCondition.PSU.{#SNMPINDEX}]) = 4'
                   name: 'PSU-{#SNMPINDEX}: The temperature sensor detects a condition that could permanently damage the system.'
                   priority: HIGH
                   description: 'The system will automatically shutdown if the failed(4) condition results, so it is unlikely that this value will ever be returned by the agent.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: 8c7f5250756946a595b742519e4890a5
                   expression: 'last(/HP iLO SNMP/sensor.temp.condition[cpqHeTemperatureCondition.PSU.{#SNMPINDEX}]) = 3'
                   name: 'PSU-{#SNMPINDEX}: The temperature sensor is outside of normal operating range'
                   priority: WARNING
                   description: 'If the cpqHeThermalDegradedAction is set to shutdown(3) the system will be shutdown if the degraded(3) condition occurs.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: d2e8eb2989364732b85dbef4eb7d1ce4
               name: 'PSU-{#SNMPINDEX}: Temperature'
@@ -1555,8 +1837,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
           preprocessing:
             -
               type: DISCARD_UNCHANGED_HEARTBEAT
@@ -1607,8 +1889,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: d161829ab0ec496bb4718ed156853c3f
@@ -1617,18 +1899,30 @@ zabbix_export:
                   priority: INFO
                   description: 'Temperature could not be determined.'
                   manual_close: 'YES'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: a65a8386fdd048f986a3aa3fcf29a959
                   expression: 'last(/HP iLO SNMP/sensor.temp.condition[cpqHeTemperatureCondition.System.{#SNMPINDEX}]) = 4'
                   name: 'System-{#SNMPINDEX}: The temperature sensor detects a condition that could permanently damage the system.'
                   priority: HIGH
                   description: 'The system will automatically shutdown if the failed(4) condition results, so it is unlikely that this value will ever be returned by the agent.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
                 -
                   uuid: 0b13f436c7984eef9624632bb5f43970
                   expression: 'last(/HP iLO SNMP/sensor.temp.condition[cpqHeTemperatureCondition.System.{#SNMPINDEX}]) = 3'
                   name: 'System-{#SNMPINDEX}: The temperature sensor is outside of normal operating range'
                   priority: WARNING
                   description: 'If the cpqHeThermalDegradedAction is set to shutdown(3) the system will be shutdown if the degraded(3) condition occurs.'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
             -
               uuid: aa985d3fb0084e24bd9f3e81c249cae4
               name: 'System-{#SNMPINDEX}: Temperature'
@@ -1648,8 +1942,8 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
           preprocessing:
             -
               type: DISCARD_UNCHANGED_HEARTBEAT
@@ -1683,8 +1977,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Virtual disks'
+                  tag: component
+                  value: disk
+                -
+                  tag: component
+                  value: storage
             -
               uuid: 39add64d1cef451091f5416440ea0adc
               name: 'Disk {#SNMPINDEX}({#DISK_NAME}): Disk size'
@@ -1712,8 +2009,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Virtual disks'
+                  tag: component
+                  value: disk
+                -
+                  tag: component
+                  value: storage
             -
               uuid: e0de2e2cc2ac423c95bcca5c77b1a53c
               name: 'Disk {#SNMPINDEX}({#DISK_NAME}): Status'
@@ -1731,8 +2031,11 @@ zabbix_export:
                     - 6h
               tags:
                 -
-                  tag: Application
-                  value: 'Virtual disks'
+                  tag: component
+                  value: disk
+                -
+                  tag: component
+                  value: storage
               trigger_prototypes:
                 -
                   uuid: 3f809df0d34f47a2bc1addbf2f4387ac
@@ -1741,6 +2044,13 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'Please check virtual disk for warnings or errors'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 439b8dfa246f42d190d8f4deeebfeb53
                   expression: 'count(/HP iLO SNMP/system.hw.virtualdisk.status[cpqDaLogDrvStatus.{#SNMPINDEX}],#1,"ne","{$VDISK_OK_STATUS}")=1'
@@ -1752,11 +2062,28 @@ zabbix_export:
                     -
                       name: 'Disk {#SNMPINDEX}({#DISK_NAME}): Virtual disk failed'
                       expression: 'count(/HP iLO SNMP/system.hw.virtualdisk.status[cpqDaLogDrvStatus.{#SNMPINDEX}],#1,"eq","{$VDISK_CRIT_STATUS}")=1'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
           preprocessing:
             -
               type: DISCARD_UNCHANGED_HEARTBEAT
               parameters:
                 - 6h
+      tags:
+        -
+          tag: class
+          value: hardware
+        -
+          tag: target
+          value: hp
+        -
+          tag: target
+          value: ilo
       macros:
         -
           macro: '{$DISK_ARRAY_CACHE_BATTERY_CRIT_STATUS:"capacitorFailed"}'
diff --git a/templates/server/ibm_imm_snmp/template_server_ibm_imm_snmp.yaml b/templates/server/ibm_imm_snmp/template_server_ibm_imm_snmp.yaml
index 1e344597540..3492fd2a4e8 100644
--- a/templates/server/ibm_imm_snmp/template_server_ibm_imm_snmp.yaml
+++ b/templates/server/ibm_imm_snmp/template_server_ibm_imm_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:40:33Z'
+  date: '2022-01-26T10:36:03Z'
   groups:
     -
       uuid: e960332b3f6c46a1956486d4f3f99fce
@@ -50,8 +50,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 937225d93eea44b3a8328eee03cf66f0
@@ -59,6 +62,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 4af423253e1b4960825b49041d9c8feb
           name: 'ICMP loss'
@@ -69,8 +76,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: ec37a141b33c46308b8d810069ce9142
@@ -82,6 +92,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/IBM IMM SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: b1659e3298fb447f8ee93e8bab98a22d
           name: 'ICMP response time'
@@ -92,8 +109,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 0541700de60549da8439f9b75cf83e7f
@@ -108,6 +128,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/IBM IMM SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: e0a1cdb1df4d408087a8ed3d473ce1fe
           name: 'SNMP traps (fallback)'
@@ -120,8 +147,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: 6686560b390540b593a2d3bb3289ea41
           name: 'System contact details'
@@ -143,8 +170,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 905c91ce799849dfb56b800c93849826
           name: 'System description'
@@ -167,8 +194,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 7075609a2d2545828a93f701d7b02c17
           name: 'Hardware model name'
@@ -188,8 +215,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
         -
           uuid: db393421a28b44148b0a1e1273186900
           name: 'Hardware serial number'
@@ -211,8 +238,8 @@ zabbix_export:
                 - 1d
           tags:
             -
-              tag: Application
-              value: Inventory
+              tag: component
+              value: system
           triggers:
             -
               uuid: b2bf06198d5840c6905ea6cf6d9e443c
@@ -221,6 +248,10 @@ zabbix_export:
               priority: INFO
               description: 'Device serial number has changed. Ack to close'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 589def06a1b74a7f8ada7cc4576aa9eb
           name: 'System location'
@@ -242,8 +273,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 596ce9f7e6b848e4869cd195996c7114
           name: 'System name'
@@ -265,8 +296,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 188852025e644d5ab583f9d7a9dea06c
@@ -275,6 +306,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: ad8eada79b464821a14759f32f6d7f2a
           name: 'System object ID'
@@ -295,8 +333,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 33572e0e11214d8b8454e6947e0d282d
           name: 'Overall system health status'
@@ -313,8 +351,8 @@ zabbix_export:
             name: 'IMM-MIB::systemHealthStat'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: ea8fbc9446d34033b60a8214b8199ea1
@@ -323,6 +361,13 @@ zabbix_export:
               opdata: 'Current state: {ITEM.LASTVALUE1}'
               priority: HIGH
               description: 'Please check the device for faults'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: a76c198aeb7d452a8c710ddde21aa12e
               expression: 'count(/IBM IMM SNMP/system.status[systemHealthStat.0],#1,"eq","{$HEALTH_CRIT_STATUS}")=1'
@@ -334,6 +379,13 @@ zabbix_export:
                 -
                   name: 'System is in unrecoverable state!'
                   expression: 'count(/IBM IMM SNMP/system.status[systemHealthStat.0],#1,"eq","{$HEALTH_DISASTER_STATUS}")=1'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: acd147a3d41b49478410f4d49562cde2
               expression: 'count(/IBM IMM SNMP/system.status[systemHealthStat.0],#1,"eq","{$HEALTH_WARN_STATUS}")=1'
@@ -348,6 +400,13 @@ zabbix_export:
                 -
                   name: 'System status is in critical state'
                   expression: 'count(/IBM IMM SNMP/system.status[systemHealthStat.0],#1,"eq","{$HEALTH_CRIT_STATUS}")=1'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 97cd7cf6a9a545788a2f709bacb925ed
           name: Uptime
@@ -368,8 +427,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 7dd529ec3f1a4a59846a3a76536a7fa0
@@ -382,6 +441,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/IBM IMM SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 59d2bec423a84ca186d5785ddea5270b
           name: 'SNMP agent availability'
@@ -398,8 +461,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: fbec2f12ac244723bb31dec5efcc6f85
@@ -412,6 +478,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/IBM IMM SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: c93e3c9379a4434f84334e5989ec2592
@@ -442,8 +512,8 @@ zabbix_export:
                     - \1
               tags:
                 -
-                  tag: Application
-                  value: Fans
+                  tag: component
+                  value: fan
             -
               uuid: 6e576c4059c84b6fa80376ee59fd373b
               name: '{#FAN_DESCR}: Fan status'
@@ -459,8 +529,8 @@ zabbix_export:
                 A description of the fan component status.
               tags:
                 -
-                  tag: Application
-                  value: Fans
+                  tag: component
+                  value: fan
               trigger_prototypes:
                 -
                   uuid: b2d4ae5922174af6b0ef274accc8ae21
@@ -469,6 +539,10 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: INFO
                   description: 'Please check the fan unit'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
         -
           uuid: dbf08da1d50c4a919bd2bbb1ee15f77e
           name: 'Physical Disk Discovery'
@@ -492,8 +566,11 @@ zabbix_export:
                 disk module FRU name.
               tags:
                 -
-                  tag: Application
-                  value: 'Physical disks'
+                  tag: component
+                  value: disk
+                -
+                  tag: component
+                  value: storage
             -
               uuid: da7aa00e553c4014a70fe08f5fdb67fd
               name: '{#SNMPINDEX}: Physical disk status'
@@ -506,8 +583,11 @@ zabbix_export:
               description: 'MIB: IMM-MIB'
               tags:
                 -
-                  tag: Application
-                  value: 'Physical disks'
+                  tag: component
+                  value: disk
+                -
+                  tag: component
+                  value: storage
               trigger_prototypes:
                 -
                   uuid: 45eb3fe3369a41b199179e2eca725027
@@ -516,6 +596,13 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: WARNING
                   description: 'Please check physical disk for warnings or errors'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: e83e43db572d4a25b80629a115214ae8
           name: 'PSU Discovery'
@@ -540,8 +627,8 @@ zabbix_export:
                 A description of the power module status.
               tags:
                 -
-                  tag: Application
-                  value: 'Power supply'
+                  tag: component
+                  value: power
               trigger_prototypes:
                 -
                   uuid: 4e7767484cff49b098e73b068ef04160
@@ -550,6 +637,10 @@ zabbix_export:
                   opdata: 'Current state: {ITEM.LASTVALUE1}'
                   priority: INFO
                   description: 'Please check the power supply unit for errors'
+                  tags:
+                    -
+                      tag: scope
+                      value: notice
         -
           uuid: b5ac4b78efca4e8a9d8b2eb875f49c49
           name: 'Temperature Discovery'
@@ -579,8 +670,8 @@ zabbix_export:
                 Temperature readings of testpoint: {#SNMPVALUE}
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 958eebe18bd94670b2b9029064a84bc9
@@ -591,6 +682,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: ecb8ac5828e44a94a32164dce9811fbc
                   expression: 'avg(/IBM IMM SNMP/sensor.temp.value[tempReading.{#SNMPINDEX}],5m)>{$TEMP_WARN:""}'
@@ -605,6 +703,13 @@ zabbix_export:
                       name: '{#SNMPVALUE}: Temperature is above critical threshold: >{$TEMP_CRIT:""}'
                       expression: 'avg(/IBM IMM SNMP/sensor.temp.value[tempReading.{#SNMPINDEX}],5m)>{$TEMP_CRIT:""}'
                       recovery_expression: 'max(/IBM IMM SNMP/sensor.temp.value[tempReading.{#SNMPINDEX}],5m)<{$TEMP_CRIT:""}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 8ff82421c9f74d509766e7dc139ab2c8
                   expression: 'avg(/IBM IMM SNMP/sensor.temp.value[tempReading.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:""}'
@@ -613,6 +718,13 @@ zabbix_export:
                   name: '{#SNMPVALUE}: Temperature is too low: <{$TEMP_CRIT_LOW:""}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 1e4d30dcff7f48bc872127d11f2e22b8
           name: 'Temperature Discovery Ambient'
@@ -642,8 +754,8 @@ zabbix_export:
                 Temperature readings of testpoint: Ambient
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 615967071d6b40f6b02e386c9586a66e
@@ -654,6 +766,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: e6bcdf201e304471aa84cc8d34b290ec
                   expression: 'avg(/IBM IMM SNMP/sensor.temp.value[tempReading.Ambient.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Ambient"}'
@@ -668,6 +787,13 @@ zabbix_export:
                       name: 'Ambient: Temperature is above critical threshold: >{$TEMP_CRIT:"Ambient"}'
                       expression: 'avg(/IBM IMM SNMP/sensor.temp.value[tempReading.Ambient.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Ambient"}'
                       recovery_expression: 'max(/IBM IMM SNMP/sensor.temp.value[tempReading.Ambient.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Ambient"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: dd773e52746840e4b6f7517740873102
                   expression: 'avg(/IBM IMM SNMP/sensor.temp.value[tempReading.Ambient.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Ambient"}'
@@ -676,6 +802,13 @@ zabbix_export:
                   name: 'Ambient: Temperature is too low: <{$TEMP_CRIT_LOW:"Ambient"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
         -
           uuid: 7eb45db4b05e42d39e0e2cf889dec2b8
           name: 'Temperature Discovery CPU'
@@ -705,8 +838,8 @@ zabbix_export:
                 Temperature readings of testpoint: CPU
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: e994d3d8398147c49062bc712dc4c204
@@ -717,6 +850,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 3b7396311de1487e90416aa2c42cb03d
                   expression: 'avg(/IBM IMM SNMP/sensor.temp.value[tempReading.CPU.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
@@ -731,6 +871,13 @@ zabbix_export:
                       name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
                       expression: 'avg(/IBM IMM SNMP/sensor.temp.value[tempReading.CPU.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
                       recovery_expression: 'max(/IBM IMM SNMP/sensor.temp.value[tempReading.CPU.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: e39d0e009efb4216ac7cbbe544ad4bc0
                   expression: 'avg(/IBM IMM SNMP/sensor.temp.value[tempReading.CPU.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
@@ -739,6 +886,23 @@ zabbix_export:
                   name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
+      tags:
+        -
+          tag: class
+          value: hardware
+        -
+          tag: target
+          value: ibm
+        -
+          tag: target
+          value: imm
       macros:
         -
           macro: '{$DISK_OK_STATUS}'
diff --git a/templates/server/intel_sr1530_ipmi/README.md b/templates/server/intel_sr1530_ipmi/README.md
new file mode 100644
index 00000000000..75c5610f7f0
--- /dev/null
+++ b/templates/server/intel_sr1530_ipmi/README.md
@@ -0,0 +1,56 @@
+
+# Intel SR1530 IPMI
+
+## Overview
+
+For Zabbix version: 6.0 and higher  
+
+## Setup
+
+Refer to the vendor documentation.
+
+## Zabbix configuration
+
+No specific Zabbix configuration is required.
+
+
+## Template links
+
+There are no template links in this template.
+
+## Discovery rules
+
+
+## Items collected
+
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|Fans |System Fan 3 |<p>-</p> |IPMI |system_fan_3 |
+|Temperature |BB Ambient Temp |<p>-</p> |IPMI |bb_ambient_temp |
+|Voltage |BB +1.8V SM |<p>-</p> |IPMI |bb_1.8v_sm |
+|Voltage |BB +3.3V |<p>-</p> |IPMI |bb_3.3v |
+|Voltage |BB +3.3V STBY |<p>-</p> |IPMI |bb_3.3v_stby |
+|Voltage |BB +5.0V |<p>-</p> |IPMI |bb_5.0v |
+|Voltage |Power |<p>-</p> |IPMI |power |
+|Voltage |Processor Vcc |<p>-</p> |IPMI |processor_vcc |
+
+## Triggers
+
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|BB Ambient Temp Critical [{ITEM.VALUE}] |<p>-</p> |`last(/Intel SR1530 IPMI/bb_ambient_temp)<5 or last(/Intel SR1530 IPMI/bb_ambient_temp)>66` |DISASTER | |
+|BB Ambient Temp Non-Critical [{ITEM.VALUE}] |<p>-</p> |`last(/Intel SR1530 IPMI/bb_ambient_temp)<10 or last(/Intel SR1530 IPMI/bb_ambient_temp)>61` |HIGH |<p>**Depends on**:</p><p>- BB Ambient Temp Critical [{ITEM.VALUE}]</p> |
+|BB +1.8V SM Critical [{ITEM.VALUE}] |<p>-</p> |`last(/Intel SR1530 IPMI/bb_1.8v_sm)<1.597 or last(/Intel SR1530 IPMI/bb_1.8v_sm)>2.019` |DISASTER |<p>**Depends on**:</p><p>- Power</p> |
+|BB +1.8V SM Non-Critical [{ITEM.VALUE}] |<p>-</p> |`last(/Intel SR1530 IPMI/bb_1.8v_sm)<1.646 or last(/Intel SR1530 IPMI/bb_1.8v_sm)>1.960` |HIGH |<p>**Depends on**:</p><p>- BB +1.8V SM Critical [{ITEM.VALUE}]</p><p>- Power</p> |
+|BB +3.3V Critical [{ITEM.VALUE}] |<p>-</p> |`last(/Intel SR1530 IPMI/bb_3.3v)<2.876 or last(/Intel SR1530 IPMI/bb_3.3v)>3.729` |DISASTER |<p>**Depends on**:</p><p>- Power</p> |
+|BB +3.3V Non-Critical [{ITEM.VALUE}] |<p>-</p> |`last(/Intel SR1530 IPMI/bb_3.3v)<2.970 or last(/Intel SR1530 IPMI/bb_3.3v)>3.618` |HIGH |<p>**Depends on**:</p><p>- BB +3.3V Critical [{ITEM.VALUE}]</p><p>- Power</p> |
+|BB +3.3V STBY Critical [{ITEM.VALUE}] |<p>-</p> |`last(/Intel SR1530 IPMI/bb_3.3v_stby)<2.876 or last(/Intel SR1530 IPMI/bb_3.3v_stby)>3.729` |DISASTER | |
+|BB +3.3V STBY Non-Critical [{ITEM.VALUE}] |<p>-</p> |`last(/Intel SR1530 IPMI/bb_3.3v_stby)<2.970 or last(/Intel SR1530 IPMI/bb_3.3v_stby)>3.618` |HIGH |<p>**Depends on**:</p><p>- BB +3.3V STBY Critical [{ITEM.VALUE}]</p> |
+|BB +5.0V Critical [{ITEM.VALUE}] |<p>-</p> |`last(/Intel SR1530 IPMI/bb_5.0v)<4.362 or last(/Intel SR1530 IPMI/bb_5.0v)>5.663` |DISASTER |<p>**Depends on**:</p><p>- Power</p> |
+|BB +5.0V Non-Critical [{ITEM.VALUE}] |<p>-</p> |`last(/Intel SR1530 IPMI/bb_5.0v)<4.483 or last(/Intel SR1530 IPMI/bb_5.0v)>5.495` |HIGH |<p>**Depends on**:</p><p>- BB +5.0V Critical [{ITEM.VALUE}]</p><p>- Power</p> |
+|Power |<p>-</p> |`last(/Intel SR1530 IPMI/power)=0` |WARNING | |
+
+## Feedback
+
+Please report any issues with the template at https://support.zabbix.com
+
diff --git a/templates/classic/template_server_intel_sr1530_ipmi.yaml b/templates/server/intel_sr1530_ipmi/template_intel_sr1530_ipmi.yaml
index dc000df6554..a2f90ee2e4d 100644
--- a/templates/classic/template_server_intel_sr1530_ipmi.yaml
+++ b/templates/server/intel_sr1530_ipmi/template_intel_sr1530_ipmi.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:32Z'
+  version: '6.0'
+  date: '2022-01-26T10:20:03Z'
   groups:
     -
       uuid: e960332b3f6c46a1956486d4f3f99fce
@@ -10,6 +10,10 @@ zabbix_export:
       uuid: f01bd64eef4049fabe087cccae590226
       template: 'Intel SR1530 IPMI'
       name: 'Intel SR1530 IPMI'
+      description: |
+        Template for monitoring Intel SR1530 server system
+        
+        Template tooling version used: 0.41
       groups:
         -
           name: 'Templates/Server hardware'
@@ -25,8 +29,11 @@ zabbix_export:
           ipmi_sensor: 'BB +1.8V SM'
           tags:
             -
-              tag: Application
-              value: Voltage
+              tag: component
+              value: system
+            -
+              tag: component
+              value: voltage
           triggers:
             -
               uuid: 55cc8ccf46954499a9c274ab301dd857
@@ -37,6 +44,10 @@ zabbix_export:
                 -
                   name: Power
                   expression: 'last(/Intel SR1530 IPMI/power)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
             -
               uuid: 55e3dc7d5bd34da0862d724ab5d18bb7
               expression: 'last(/Intel SR1530 IPMI/bb_1.8v_sm)<1.646 or last(/Intel SR1530 IPMI/bb_1.8v_sm)>1.960'
@@ -49,6 +60,10 @@ zabbix_export:
                 -
                   name: Power
                   expression: 'last(/Intel SR1530 IPMI/power)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 21820c76180446ff9965f8937e6d1ba0
           name: 'BB +3.3V'
@@ -60,8 +75,11 @@ zabbix_export:
           ipmi_sensor: 'BB +3.3V'
           tags:
             -
-              tag: Application
-              value: Voltage
+              tag: component
+              value: system
+            -
+              tag: component
+              value: voltage
           triggers:
             -
               uuid: 35a0dedd6fb244759a4feca2c1aff961
@@ -72,6 +90,10 @@ zabbix_export:
                 -
                   name: Power
                   expression: 'last(/Intel SR1530 IPMI/power)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
             -
               uuid: bd2472feb90f40429fbbcd0bddbdd455
               expression: 'last(/Intel SR1530 IPMI/bb_3.3v)<2.970 or last(/Intel SR1530 IPMI/bb_3.3v)>3.618'
@@ -84,6 +106,10 @@ zabbix_export:
                 -
                   name: Power
                   expression: 'last(/Intel SR1530 IPMI/power)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 7bd5269be38c417aba374c9e8af28f8c
           name: 'BB +3.3V STBY'
@@ -95,14 +121,21 @@ zabbix_export:
           ipmi_sensor: 'BB +3.3V STBY'
           tags:
             -
-              tag: Application
-              value: Voltage
+              tag: component
+              value: system
+            -
+              tag: component
+              value: voltage
           triggers:
             -
               uuid: c0f82f508d38405d978c746f5c95a178
               expression: 'last(/Intel SR1530 IPMI/bb_3.3v_stby)<2.876 or last(/Intel SR1530 IPMI/bb_3.3v_stby)>3.729'
               name: 'BB +3.3V STBY Critical [{ITEM.VALUE}]'
               priority: DISASTER
+              tags:
+                -
+                  tag: scope
+                  value: availability
             -
               uuid: 8f957e674af84229aa2e1ee78bf941a0
               expression: 'last(/Intel SR1530 IPMI/bb_3.3v_stby)<2.970 or last(/Intel SR1530 IPMI/bb_3.3v_stby)>3.618'
@@ -112,6 +145,10 @@ zabbix_export:
                 -
                   name: 'BB +3.3V STBY Critical [{ITEM.VALUE}]'
                   expression: 'last(/Intel SR1530 IPMI/bb_3.3v_stby)<2.876 or last(/Intel SR1530 IPMI/bb_3.3v_stby)>3.729'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 7931e499e1894942a4763432a6a446fd
           name: 'BB +5.0V'
@@ -123,8 +160,11 @@ zabbix_export:
           ipmi_sensor: 'BB +5.0V'
           tags:
             -
-              tag: Application
-              value: Voltage
+              tag: component
+              value: system
+            -
+              tag: component
+              value: voltage
           triggers:
             -
               uuid: dec3da3d68b04f3c9ea16fabe17b8faa
@@ -135,6 +175,10 @@ zabbix_export:
                 -
                   name: Power
                   expression: 'last(/Intel SR1530 IPMI/power)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
             -
               uuid: e2683b71d36b4ab4ad8a98c964b19118
               expression: 'last(/Intel SR1530 IPMI/bb_5.0v)<4.483 or last(/Intel SR1530 IPMI/bb_5.0v)>5.495'
@@ -147,6 +191,10 @@ zabbix_export:
                 -
                   name: Power
                   expression: 'last(/Intel SR1530 IPMI/power)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 2e6d7059cbb349889c639e9fba09bd8c
           name: 'BB Ambient Temp'
@@ -158,14 +206,24 @@ zabbix_export:
           ipmi_sensor: 'BB Ambient Temp'
           tags:
             -
-              tag: Application
-              value: Temperature
+              tag: component
+              value: system
+            -
+              tag: component
+              value: temperature
           triggers:
             -
               uuid: 0adcefe86a99468d9d7f0db2021ec8c9
               expression: 'last(/Intel SR1530 IPMI/bb_ambient_temp)<5 or last(/Intel SR1530 IPMI/bb_ambient_temp)>66'
               name: 'BB Ambient Temp Critical [{ITEM.VALUE}]'
               priority: DISASTER
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 6630637c02224bacbe3456a388233775
               expression: 'last(/Intel SR1530 IPMI/bb_ambient_temp)<10 or last(/Intel SR1530 IPMI/bb_ambient_temp)>61'
@@ -175,6 +233,13 @@ zabbix_export:
                 -
                   name: 'BB Ambient Temp Critical [{ITEM.VALUE}]'
                   expression: 'last(/Intel SR1530 IPMI/bb_ambient_temp)<5 or last(/Intel SR1530 IPMI/bb_ambient_temp)>66'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 1821294a921d401f822678ce1d246163
           name: Power
@@ -184,14 +249,21 @@ zabbix_export:
           ipmi_sensor: power
           tags:
             -
-              tag: Application
-              value: Voltage
+              tag: component
+              value: system
+            -
+              tag: component
+              value: voltage
           triggers:
             -
               uuid: 85722b8734df45d589afd69262a498a4
               expression: 'last(/Intel SR1530 IPMI/power)=0'
               name: Power
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: efc577d6deba4f46b1fe79e6a1a26fdd
           name: 'Processor Vcc'
@@ -203,8 +275,11 @@ zabbix_export:
           ipmi_sensor: 'Processor Vcc'
           tags:
             -
-              tag: Application
-              value: Voltage
+              tag: component
+              value: system
+            -
+              tag: component
+              value: voltage
         -
           uuid: 89e5edc9cd6d4984a7a76320f7800ae9
           name: 'System Fan 3'
@@ -216,66 +291,73 @@ zabbix_export:
           ipmi_sensor: 'System Fan 3'
           tags:
             -
-              tag: Application
-              value: Fans
+              tag: component
+              value: fan
+            -
+              tag: component
+              value: system
+      tags:
+        -
+          tag: class
+          value: hardware
+        -
+          tag: target
+          value: intel
+        -
+          tag: target
+          value: intel-sr1530
   graphs:
     -
       uuid: e1fff55999a6420f987659ca0dc8c102
       name: 'Fan speed and ambient temperature'
       graph_items:
         -
-          drawtype: GRADIENT_LINE
-          color: EE0000
+          color: 1A7C11
           item:
             host: 'Intel SR1530 IPMI'
             key: bb_ambient_temp
         -
           sortorder: '1'
-          color: '000000'
-          yaxisside: RIGHT
+          color: 2774A4
           item:
             host: 'Intel SR1530 IPMI'
             key: system_fan_3
     -
       uuid: bec82c29b93c4841a89d0978a899c70b
       name: Voltage
-      yaxismax: '5.5'
-      ymin_type_1: FIXED
-      ymax_type_1: FIXED
       graph_items:
         -
-          drawtype: BOLD_LINE
-          color: '880000'
+          color: 1A7C11
           item:
             host: 'Intel SR1530 IPMI'
             key: power
         -
           sortorder: '1'
-          color: '009900'
+          color: 2774A4
           item:
             host: 'Intel SR1530 IPMI'
             key: bb_1.8v_sm
         -
           sortorder: '2'
-          color: 00CCCC
+          color: F63100
           item:
             host: 'Intel SR1530 IPMI'
             key: bb_3.3v
         -
           sortorder: '3'
-          color: '000000'
+          color: A54F10
           item:
             host: 'Intel SR1530 IPMI'
             key: bb_3.3v_stby
         -
           sortorder: '4'
-          color: 3333FF
+          color: FC6EA3
           item:
             host: 'Intel SR1530 IPMI'
             key: bb_5.0v
         -
           sortorder: '5'
-          color: '777700'
+          color: 6C59DC
           item:
             host: 'Intel SR1530 IPMI'
             key: processor_vcc
diff --git a/templates/server/intel_sr1630_ipmi/README.md b/templates/server/intel_sr1630_ipmi/README.md
new file mode 100644
index 00000000000..9c859342630
--- /dev/null
+++ b/templates/server/intel_sr1630_ipmi/README.md
@@ -0,0 +1,69 @@
+
+# Intel SR1630 IPMI
+
+## Overview
+
+For Zabbix version: 6.0 and higher  
+
+## Setup
+
+Refer to the vendor documentation.
+
+## Zabbix configuration
+
+No specific Zabbix configuration is required.
+
+
+## Template links
+
+There are no template links in this template.
+
+## Discovery rules
+
+
+## Items collected
+
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|Fans |System Fan 2 |<p>-</p> |IPMI |system_fan_2 |
+|Fans |System Fan 3 |<p>-</p> |IPMI |system_fan_3 |
+|Temperature |Baseboard Temp |<p>-</p> |IPMI |baseboard_temp |
+|Temperature |Front Panel Temp |<p>-</p> |IPMI |front_panel_temp |
+|Voltage |BB +1.05V PCH |<p>-</p> |IPMI |bb_1.05v_pch |
+|Voltage |BB +1.1V P1 Vccp |<p>-</p> |IPMI |bb_1.1v_p1_vccp |
+|Voltage |BB +1.5V P1 DDR3 |<p>-</p> |IPMI |bb_1.5v_p1_ddr3 |
+|Voltage |BB +3.3V |<p>-</p> |IPMI |bb_3.3v |
+|Voltage |BB +3.3V STBY |<p>-</p> |IPMI |bb_3.3v_stby |
+|Voltage |BB +5.0V |<p>-</p> |IPMI |bb_5.0v |
+|Voltage |Power |<p>-</p> |IPMI |power |
+
+## Triggers
+
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|System Fan 2 Critical [{ITEM.VALUE}] |<p>-</p> |`last(/Intel SR1630 IPMI/system_fan_2)<324` |DISASTER |<p>**Depends on**:</p><p>- Power</p> |
+|System Fan 2 Non-Critical [{ITEM.VALUE}] |<p>-</p> |`last(/Intel SR1630 IPMI/system_fan_2)<378` |HIGH |<p>**Depends on**:</p><p>- Power</p><p>- System Fan 2 Critical [{ITEM.VALUE}]</p> |
+|System Fan 3 Critical [{ITEM.VALUE}] |<p>-</p> |`last(/Intel SR1630 IPMI/system_fan_3)<324` |DISASTER |<p>**Depends on**:</p><p>- Power</p> |
+|System Fan 3 Non-Critical [{ITEM.VALUE}] |<p>-</p> |`last(/Intel SR1630 IPMI/system_fan_3)<378` |HIGH |<p>**Depends on**:</p><p>- Power</p><p>- System Fan 3 Critical [{ITEM.VALUE}]</p> |
+|Baseboard Temp Critical [{ITEM.VALUE}] |<p>-</p> |`last(/Intel SR1630 IPMI/baseboard_temp)<5 or last(/Intel SR1630 IPMI/baseboard_temp)>90` |DISASTER |<p>**Depends on**:</p><p>- Power</p> |
+|Baseboard Temp Non-Critical [{ITEM.VALUE}] |<p>-</p> |`last(/Intel SR1630 IPMI/baseboard_temp)<10 or last(/Intel SR1630 IPMI/baseboard_temp)>83` |HIGH |<p>**Depends on**:</p><p>- Baseboard Temp Critical [{ITEM.VALUE}]</p><p>- Power</p> |
+|Front Panel Temp Critical [{ITEM.VALUE}] |<p>-</p> |`last(/Intel SR1630 IPMI/front_panel_temp)<0 or last(/Intel SR1630 IPMI/front_panel_temp)>48` |DISASTER |<p>**Depends on**:</p><p>- Power</p> |
+|Front Panel Temp Non-Critical [{ITEM.VALUE}] |<p>-</p> |`last(/Intel SR1630 IPMI/front_panel_temp)<5 or last(/Intel SR1630 IPMI/front_panel_temp)>44` |HIGH |<p>**Depends on**:</p><p>- Front Panel Temp Critical [{ITEM.VALUE}]</p><p>- Power</p> |
+|BB +1.05V PCH Critical [{ITEM.VALUE}] |<p>-</p> |`last(/Intel SR1630 IPMI/bb_1.05v_pch)<0.953 or last(/Intel SR1630 IPMI/bb_1.05v_pch)>1.149` |DISASTER |<p>**Depends on**:</p><p>- Power</p> |
+|BB +1.05V PCH Non-Critical [{ITEM.VALUE}] |<p>-</p> |`last(/Intel SR1630 IPMI/bb_1.05v_pch)<0.985 or last(/Intel SR1630 IPMI/bb_1.05v_pch)>1.117` |HIGH |<p>**Depends on**:</p><p>- BB +1.05V PCH Critical [{ITEM.VALUE}]</p><p>- Power</p> |
+|BB +1.1V P1 Vccp Critical [{ITEM.VALUE}] |<p>-</p> |`last(/Intel SR1630 IPMI/bb_1.1v_p1_vccp)<0.683 or last(/Intel SR1630 IPMI/bb_1.1v_p1_vccp)>1.543` |DISASTER |<p>**Depends on**:</p><p>- Power</p> |
+|BB +1.1V P1 Vccp Non-Critical [{ITEM.VALUE}] |<p>-</p> |`last(/Intel SR1630 IPMI/bb_1.1v_p1_vccp)<0.708 or last(/Intel SR1630 IPMI/bb_1.1v_p1_vccp)>1.501` |HIGH |<p>**Depends on**:</p><p>- BB +1.1V P1 Vccp Critical [{ITEM.VALUE}]</p><p>- Power</p> |
+|BB +1.5V P1 DDR3 Critical [{ITEM.VALUE}] |<p>-</p> |`last(/Intel SR1630 IPMI/bb_1.5v_p1_ddr3)<1.362 or last(/Intel SR1630 IPMI/bb_1.5v_p1_ddr3)>1.635` |DISASTER |<p>**Depends on**:</p><p>- Power</p> |
+|BB +1.5V P1 DDR3 Non-Critical [{ITEM.VALUE}] |<p>-</p> |`last(/Intel SR1630 IPMI/bb_1.5v_p1_ddr3)<1.401 or last(/Intel SR1630 IPMI/bb_1.5v_p1_ddr3)>1.589` |HIGH |<p>**Depends on**:</p><p>- BB +1.5V P1 DDR3 Critical [{ITEM.VALUE}]</p><p>- Power</p> |
+|BB +3.3V Critical [{ITEM.VALUE}] |<p>-</p> |`last(/Intel SR1630 IPMI/bb_3.3v)<2.982 or last(/Intel SR1630 IPMI/bb_3.3v)>3.625` |DISASTER |<p>**Depends on**:</p><p>- Power</p> |
+|BB +3.3V Non-Critical [{ITEM.VALUE}] |<p>-</p> |`last(/Intel SR1630 IPMI/bb_3.3v)<3.067 or last(/Intel SR1630 IPMI/bb_3.3v)>3.525` |HIGH |<p>**Depends on**:</p><p>- BB +3.3V Critical [{ITEM.VALUE}]</p><p>- Power</p> |
+|BB +3.3V STBY Critical [{ITEM.VALUE}] |<p>-</p> |`last(/Intel SR1630 IPMI/bb_3.3v_stby)<2.982 or last(/Intel SR1630 IPMI/bb_3.3v_stby)>3.625` |DISASTER | |
+|BB +3.3V STBY Non-Critical [{ITEM.VALUE}] |<p>-</p> |`last(/Intel SR1630 IPMI/bb_3.3v_stby)<3.067 or last(/Intel SR1630 IPMI/bb_3.3v_stby)>3.525` |HIGH |<p>**Depends on**:</p><p>- BB +3.3V STBY Critical [{ITEM.VALUE}]</p> |
+|BB +5.0V Critical [{ITEM.VALUE}] |<p>-</p> |`last(/Intel SR1630 IPMI/bb_5.0v)<4.471 or last(/Intel SR1630 IPMI/bb_5.0v)>5.538` |DISASTER |<p>**Depends on**:</p><p>- Power</p> |
+|BB +5.0V Non-Critical [{ITEM.VALUE}] |<p>-</p> |`last(/Intel SR1630 IPMI/bb_5.0v)<4.630 or last(/Intel SR1630 IPMI/bb_5.0v)>5.380` |HIGH |<p>**Depends on**:</p><p>- BB +5.0V Critical [{ITEM.VALUE}]</p><p>- Power</p> |
+|Power |<p>-</p> |`last(/Intel SR1630 IPMI/power)=0` |WARNING | |
+
+## Feedback
+
+Please report any issues with the template at https://support.zabbix.com
+
diff --git a/templates/classic/template_server_intel_sr1630_ipmi.yaml b/templates/server/intel_sr1630_ipmi/template_intel_sr1630_ipmi.yaml
index c9ec6fa59c8..1229c628743 100644
--- a/templates/classic/template_server_intel_sr1630_ipmi.yaml
+++ b/templates/server/intel_sr1630_ipmi/template_intel_sr1630_ipmi.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:31Z'
+  version: '6.0'
+  date: '2022-01-26T10:20:14Z'
   groups:
     -
       uuid: e960332b3f6c46a1956486d4f3f99fce
@@ -10,6 +10,10 @@ zabbix_export:
       uuid: 2327c665b46e4aa781d41240168c3867
       template: 'Intel SR1630 IPMI'
       name: 'Intel SR1630 IPMI'
+      description: |
+        Template for monitoring Intel SR1630 server system
+        
+        Template tooling version used: 0.41
       groups:
         -
           name: 'Templates/Server hardware'
@@ -25,8 +29,11 @@ zabbix_export:
           ipmi_sensor: 'Baseboard Temp'
           tags:
             -
-              tag: Application
-              value: Temperature
+              tag: component
+              value: system
+            -
+              tag: component
+              value: temperature
           triggers:
             -
               uuid: 2e1ee68913a34cb78f31d5001f10793d
@@ -37,6 +44,13 @@ zabbix_export:
                 -
                   name: Power
                   expression: 'last(/Intel SR1630 IPMI/power)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: c51b207bcbd041039a1f5a1a7973e262
               expression: 'last(/Intel SR1630 IPMI/baseboard_temp)<10 or last(/Intel SR1630 IPMI/baseboard_temp)>83'
@@ -49,6 +63,13 @@ zabbix_export:
                 -
                   name: Power
                   expression: 'last(/Intel SR1630 IPMI/power)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: d2827f4cc6c4470daf4fd20868ed94c8
           name: 'BB +1.05V PCH'
@@ -60,8 +81,11 @@ zabbix_export:
           ipmi_sensor: 'BB +1.05V PCH'
           tags:
             -
-              tag: Application
-              value: Voltage
+              tag: component
+              value: system
+            -
+              tag: component
+              value: voltage
           triggers:
             -
               uuid: ec813e0d4ccb48d2af680281034a901f
@@ -72,6 +96,10 @@ zabbix_export:
                 -
                   name: Power
                   expression: 'last(/Intel SR1630 IPMI/power)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
             -
               uuid: 2b0db1b054f842a4891162fbe33e50e8
               expression: 'last(/Intel SR1630 IPMI/bb_1.05v_pch)<0.985 or last(/Intel SR1630 IPMI/bb_1.05v_pch)>1.117'
@@ -84,6 +112,10 @@ zabbix_export:
                 -
                   name: Power
                   expression: 'last(/Intel SR1630 IPMI/power)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 3bbcfcb625fa4805806601284c3eda20
           name: 'BB +1.1V P1 Vccp'
@@ -95,8 +127,11 @@ zabbix_export:
           ipmi_sensor: 'BB +1.1V P1 Vccp'
           tags:
             -
-              tag: Application
-              value: Voltage
+              tag: component
+              value: system
+            -
+              tag: component
+              value: voltage
           triggers:
             -
               uuid: 2e18cf768c2b468eae5549a326325c61
@@ -107,6 +142,10 @@ zabbix_export:
                 -
                   name: Power
                   expression: 'last(/Intel SR1630 IPMI/power)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
             -
               uuid: 465d51e2a260431dbc7e8e7d39994274
               expression: 'last(/Intel SR1630 IPMI/bb_1.1v_p1_vccp)<0.708 or last(/Intel SR1630 IPMI/bb_1.1v_p1_vccp)>1.501'
@@ -119,6 +158,10 @@ zabbix_export:
                 -
                   name: Power
                   expression: 'last(/Intel SR1630 IPMI/power)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 350b21b2a569489a9c4c7376bf788a0e
           name: 'BB +1.5V P1 DDR3'
@@ -130,8 +173,11 @@ zabbix_export:
           ipmi_sensor: 'BB +1.5V P1 DDR3'
           tags:
             -
-              tag: Application
-              value: Voltage
+              tag: component
+              value: system
+            -
+              tag: component
+              value: voltage
           triggers:
             -
               uuid: cb2aa635a08c495f9a540c60ce5d1333
@@ -142,6 +188,10 @@ zabbix_export:
                 -
                   name: Power
                   expression: 'last(/Intel SR1630 IPMI/power)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
             -
               uuid: db42f9fd43f04849a07048f5b5a38a4c
               expression: 'last(/Intel SR1630 IPMI/bb_1.5v_p1_ddr3)<1.401 or last(/Intel SR1630 IPMI/bb_1.5v_p1_ddr3)>1.589'
@@ -154,6 +204,10 @@ zabbix_export:
                 -
                   name: Power
                   expression: 'last(/Intel SR1630 IPMI/power)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 6bc6b9c60ce24189b8b0f8a928fab701
           name: 'BB +3.3V'
@@ -165,8 +219,11 @@ zabbix_export:
           ipmi_sensor: 'BB +3.3V'
           tags:
             -
-              tag: Application
-              value: Voltage
+              tag: component
+              value: system
+            -
+              tag: component
+              value: voltage
           triggers:
             -
               uuid: 9eea7fcd8b574f35aee3e3acb4267f4a
@@ -177,6 +234,10 @@ zabbix_export:
                 -
                   name: Power
                   expression: 'last(/Intel SR1630 IPMI/power)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
             -
               uuid: 93fd529afb20436f94f9184bb2213335
               expression: 'last(/Intel SR1630 IPMI/bb_3.3v)<3.067 or last(/Intel SR1630 IPMI/bb_3.3v)>3.525'
@@ -189,6 +250,10 @@ zabbix_export:
                 -
                   name: Power
                   expression: 'last(/Intel SR1630 IPMI/power)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: aef2b61786354719a6d99f60cff59f14
           name: 'BB +3.3V STBY'
@@ -200,14 +265,21 @@ zabbix_export:
           ipmi_sensor: 'BB +3.3V STBY'
           tags:
             -
-              tag: Application
-              value: Voltage
+              tag: component
+              value: system
+            -
+              tag: component
+              value: voltage
           triggers:
             -
               uuid: 3f5aa41308714b73ab555e36ecbe889e
               expression: 'last(/Intel SR1630 IPMI/bb_3.3v_stby)<2.982 or last(/Intel SR1630 IPMI/bb_3.3v_stby)>3.625'
               name: 'BB +3.3V STBY Critical [{ITEM.VALUE}]'
               priority: DISASTER
+              tags:
+                -
+                  tag: scope
+                  value: availability
             -
               uuid: e631b683ce8f4d0ca5f22adb8ae791c7
               expression: 'last(/Intel SR1630 IPMI/bb_3.3v_stby)<3.067 or last(/Intel SR1630 IPMI/bb_3.3v_stby)>3.525'
@@ -217,6 +289,10 @@ zabbix_export:
                 -
                   name: 'BB +3.3V STBY Critical [{ITEM.VALUE}]'
                   expression: 'last(/Intel SR1630 IPMI/bb_3.3v_stby)<2.982 or last(/Intel SR1630 IPMI/bb_3.3v_stby)>3.625'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 5a60f33969e54742989571dc2f93be57
           name: 'BB +5.0V'
@@ -228,8 +304,11 @@ zabbix_export:
           ipmi_sensor: 'BB +5.0V'
           tags:
             -
-              tag: Application
-              value: Voltage
+              tag: component
+              value: system
+            -
+              tag: component
+              value: voltage
           triggers:
             -
               uuid: 54f7b55a71b544bf877b283593a2ca32
@@ -240,6 +319,10 @@ zabbix_export:
                 -
                   name: Power
                   expression: 'last(/Intel SR1630 IPMI/power)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
             -
               uuid: a1e9f3ba84c54a39a255c682e43e793b
               expression: 'last(/Intel SR1630 IPMI/bb_5.0v)<4.630 or last(/Intel SR1630 IPMI/bb_5.0v)>5.380'
@@ -252,6 +335,10 @@ zabbix_export:
                 -
                   name: Power
                   expression: 'last(/Intel SR1630 IPMI/power)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: d59236617a234098b0cd62ac30cba975
           name: 'Front Panel Temp'
@@ -263,8 +350,11 @@ zabbix_export:
           ipmi_sensor: 'Front Panel Temp'
           tags:
             -
-              tag: Application
-              value: Temperature
+              tag: component
+              value: system
+            -
+              tag: component
+              value: temperature
           triggers:
             -
               uuid: b4b5e024b8b44e9eb3238405a0b1d223
@@ -275,6 +365,13 @@ zabbix_export:
                 -
                   name: Power
                   expression: 'last(/Intel SR1630 IPMI/power)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: b7125d20d8664530a78c9b3b56b2f479
               expression: 'last(/Intel SR1630 IPMI/front_panel_temp)<5 or last(/Intel SR1630 IPMI/front_panel_temp)>44'
@@ -287,6 +384,13 @@ zabbix_export:
                 -
                   name: Power
                   expression: 'last(/Intel SR1630 IPMI/power)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: e4f51e8a51fb4f23afe9d505ede91891
           name: Power
@@ -296,14 +400,21 @@ zabbix_export:
           ipmi_sensor: power
           tags:
             -
-              tag: Application
-              value: Voltage
+              tag: component
+              value: system
+            -
+              tag: component
+              value: voltage
           triggers:
             -
               uuid: dea67d2c71804d369e9b948922a4e86b
               expression: 'last(/Intel SR1630 IPMI/power)=0'
               name: Power
               priority: WARNING
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: ede3efc70c794c3390531b41a28411ef
           name: 'System Fan 2'
@@ -315,8 +426,11 @@ zabbix_export:
           ipmi_sensor: 'System Fan 2'
           tags:
             -
-              tag: Application
-              value: Fans
+              tag: component
+              value: fan
+            -
+              tag: component
+              value: system
           triggers:
             -
               uuid: 95653ec3aa484822888818ea0fd6261b
@@ -327,6 +441,13 @@ zabbix_export:
                 -
                   name: Power
                   expression: 'last(/Intel SR1630 IPMI/power)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: 0a6c1831607a4f059e5325fcc11e34cf
               expression: 'last(/Intel SR1630 IPMI/system_fan_2)<378'
@@ -339,6 +460,13 @@ zabbix_export:
                 -
                   name: 'System Fan 2 Critical [{ITEM.VALUE}]'
                   expression: 'last(/Intel SR1630 IPMI/system_fan_2)<324'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: b51ab327c547413fb94dae69e93458d2
           name: 'System Fan 3'
@@ -350,8 +478,11 @@ zabbix_export:
           ipmi_sensor: 'System Fan 3'
           tags:
             -
-              tag: Application
-              value: Fans
+              tag: component
+              value: fan
+            -
+              tag: component
+              value: system
           triggers:
             -
               uuid: dc2255a797ef424ea22f553f8de53061
@@ -362,6 +493,13 @@ zabbix_export:
                 -
                   name: Power
                   expression: 'last(/Intel SR1630 IPMI/power)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
             -
               uuid: f1c938c42c6a4933b108da70cb2daf5d
               expression: 'last(/Intel SR1630 IPMI/system_fan_3)<378'
@@ -374,73 +512,81 @@ zabbix_export:
                 -
                   name: 'System Fan 3 Critical [{ITEM.VALUE}]'
                   expression: 'last(/Intel SR1630 IPMI/system_fan_3)<324'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
+      tags:
+        -
+          tag: class
+          value: hardware
+        -
+          tag: target
+          value: intel
+        -
+          tag: target
+          value: intel-sr1630
   graphs:
     -
       uuid: aab06155f8aa4bc991603a3c8c335d6e
       name: 'Fan speed and temperature'
       graph_items:
         -
-          drawtype: BOLD_LINE
-          color: EE0000
+          color: 1A7C11
           item:
             host: 'Intel SR1630 IPMI'
             key: front_panel_temp
         -
           sortorder: '1'
-          drawtype: BOLD_LINE
-          color: EE00EE
+          color: 2774A4
           item:
             host: 'Intel SR1630 IPMI'
             key: baseboard_temp
         -
           sortorder: '2'
-          color: '000000'
-          yaxisside: RIGHT
+          color: F63100
           item:
             host: 'Intel SR1630 IPMI'
             key: system_fan_2
         -
           sortorder: '3'
-          drawtype: DASHED_LINE
-          color: '000000'
-          yaxisside: RIGHT
+          color: A54F10
           item:
             host: 'Intel SR1630 IPMI'
             key: system_fan_3
     -
       uuid: d4e77359d3fe4a75b0bbf9d7919834da
       name: Voltage
-      yaxismax: '5.5'
-      ymin_type_1: FIXED
-      ymax_type_1: FIXED
       graph_items:
         -
-          drawtype: BOLD_LINE
-          color: '880000'
+          color: 1A7C11
           item:
             host: 'Intel SR1630 IPMI'
             key: power
         -
           sortorder: '1'
-          color: '009900'
+          color: 2774A4
           item:
             host: 'Intel SR1630 IPMI'
             key: bb_1.05v_pch
         -
           sortorder: '2'
-          color: 00CCCC
+          color: F63100
           item:
             host: 'Intel SR1630 IPMI'
             key: bb_3.3v
         -
           sortorder: '3'
-          color: '000000'
+          color: A54F10
           item:
             host: 'Intel SR1630 IPMI'
             key: bb_3.3v_stby
         -
           sortorder: '4'
-          color: 3333FF
+          color: FC6EA3
           item:
             host: 'Intel SR1630 IPMI'
             key: bb_5.0v
diff --git a/templates/server/supermicro_aten_snmp/template_server_supermicro_aten_snmp.yaml b/templates/server/supermicro_aten_snmp/template_server_supermicro_aten_snmp.yaml
index 4d572e21601..19f620e9118 100644
--- a/templates/server/supermicro_aten_snmp/template_server_supermicro_aten_snmp.yaml
+++ b/templates/server/supermicro_aten_snmp/template_server_supermicro_aten_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2022-01-18T20:40:37Z'
+  date: '2022-01-26T10:51:29Z'
   groups:
     -
       uuid: e960332b3f6c46a1956486d4f3f99fce
@@ -32,8 +32,11 @@ zabbix_export:
             name: 'Service state'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 680c72ab6bb441779553b198081e3bf4
@@ -41,6 +44,10 @@ zabbix_export:
               name: 'Unavailable by ICMP ping'
               priority: HIGH
               description: 'Last three attempts returned timeout.  Please check device connectivity.'
+              tags:
+                -
+                  tag: scope
+                  value: availability
         -
           uuid: 4a8bd0d13bab4666aaf4c53b7722ec74
           name: 'ICMP loss'
@@ -51,8 +58,11 @@ zabbix_export:
           units: '%'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: e2e4bfca2d0c4f8ebd64bef322d2a368
@@ -64,6 +74,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/Supermicro Aten SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: feb1b9189b904b42b17ac4e1db49806e
           name: 'ICMP response time'
@@ -74,8 +91,11 @@ zabbix_export:
           units: s
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: b6fb489c6a624b2994c5e50ba75539b2
@@ -90,6 +110,13 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/Supermicro Aten SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: cadc501d69624baa8ad292c2c8f6fd52
           name: 'SNMP traps (fallback)'
@@ -102,8 +129,8 @@ zabbix_export:
           logtimefmt: 'hh:mm:sszyyyy/MM/dd'
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: network
         -
           uuid: ccba865de57a41718b53ff1f82b2ca87
           name: 'System contact details'
@@ -125,8 +152,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 70f51b4370c64c2bab2c811359ef690b
           name: 'System description'
@@ -149,8 +176,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: 52169be1d3924c638476a290590066f3
           name: 'System location'
@@ -172,8 +199,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: afa2acff36034dccb96a1946e7039f39
           name: 'System name'
@@ -195,8 +222,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
           triggers:
             -
               uuid: 07b7a49bffea4c03a022eed632754f47
@@ -205,6 +232,13 @@ zabbix_export:
               priority: INFO
               description: 'System name has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
+                -
+                  tag: scope
+                  value: security
         -
           uuid: a0c0d3ee729b4a159719271232024b45
           name: 'System object ID'
@@ -225,8 +259,8 @@ zabbix_export:
                 - 12h
           tags:
             -
-              tag: Application
-              value: General
+              tag: component
+              value: system
         -
           uuid: cc33c0e22893432280d642c75020a222
           name: Uptime
@@ -247,8 +281,8 @@ zabbix_export:
                 - '0.01'
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: system
           triggers:
             -
               uuid: 37aab043ea474548ab1e54e504720bed
@@ -261,6 +295,10 @@ zabbix_export:
                 -
                   name: 'No SNMP data collection'
                   expression: 'max(/Supermicro Aten SNMP/zabbix[host,snmp,available],{$SNMP.TIMEOUT})=0'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: e205f1aa96a448a2955e988fa8528600
           name: 'SNMP agent availability'
@@ -277,8 +315,11 @@ zabbix_export:
             name: zabbix.host.available
           tags:
             -
-              tag: Application
-              value: Status
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: caeb9732846b4ae586ee103ac0c4a65b
@@ -291,6 +332,10 @@ zabbix_export:
                 -
                   name: 'Unavailable by ICMP ping'
                   expression: 'max(/Supermicro Aten SNMP/icmpping,#3)=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: e31995e21b3942e58b7ed451f57f0360
@@ -325,8 +370,8 @@ zabbix_export:
                 This string should include the name of the manufacturer, the product name and the version of the interface hardware/software.
               tags:
                 -
-                  tag: Application
-                  value: Fans
+                  tag: component
+                  value: fan
         -
           uuid: c03c556ed8e441099513aaacaf4a3752
           name: 'Temperature Discovery'
@@ -362,8 +407,8 @@ zabbix_export:
                 This string should include the name of the manufacturer, the product name and the version of the interface hardware/software.
               tags:
                 -
-                  tag: Application
-                  value: Temperature
+                  tag: component
+                  value: temperature
               trigger_prototypes:
                 -
                   uuid: 1a48aee477d54d34bdea47fc6027968c
@@ -374,6 +419,13 @@ zabbix_export:
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: HIGH
                   description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 2c2914d1c8c846d180ee308fa861540e
                   expression: 'avg(/Supermicro Aten SNMP/sensor.temp.value[sensorReading.{#SNMPINDEX}],5m)>{$TEMP_WARN:""}'
@@ -388,6 +440,13 @@ zabbix_export:
                       name: '{#SENSOR_DESCR}: Temperature is above critical threshold: >{$TEMP_CRIT:""}'
                       expression: 'avg(/Supermicro Aten SNMP/sensor.temp.value[sensorReading.{#SNMPINDEX}],5m)>{$TEMP_CRIT:""}'
                       recovery_expression: 'max(/Supermicro Aten SNMP/sensor.temp.value[sensorReading.{#SNMPINDEX}],5m)<{$TEMP_CRIT:""}-3'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
                 -
                   uuid: 1439e7a34bbf4046836890f208f99a48
                   expression: 'avg(/Supermicro Aten SNMP/sensor.temp.value[sensorReading.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:""}'
@@ -396,6 +455,23 @@ zabbix_export:
                   name: '{#SENSOR_DESCR}: Temperature is too low: <{$TEMP_CRIT_LOW:""}'
                   opdata: 'Current value: {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
+                    -
+                      tag: scope
+                      value: performance
+      tags:
+        -
+          tag: class
+          value: hardware
+        -
+          tag: target
+          value: aten
+        -
+          tag: target
+          value: supermicro
       macros:
         -
           macro: '{$ICMP_LOSS_WARN}'
diff --git a/templates/tel/asterisk_http/template_tel_asterisk_http.yaml b/templates/tel/asterisk_http/template_tel_asterisk_http.yaml
index f100feca491..1ed08c2b94b 100644
--- a/templates/tel/asterisk_http/template_tel_asterisk_http.yaml
+++ b/templates/tel/asterisk_http/template_tel_asterisk_http.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '6.0'
-  date: '2021-12-14T17:44:29Z'
+  date: '2022-01-26T10:42:41Z'
   groups:
     -
       uuid: 1d12408342854fd5a4436dd6d5d1bd4a
@@ -25,7 +25,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/410060-discussion-thread-for-official-zabbix-template-asterisk
         
-        Template tooling version used: 0.40
+        Template tooling version used: 0.41
       groups:
         -
           name: Templates/Telephony
@@ -47,8 +47,8 @@ zabbix_export:
             key: asterisk.get_stats
           tags:
             -
-              tag: Application
-              value: Asterisk
+              tag: component
+              value: calls
         -
           uuid: bb9ac1ac188b43239456477e13ae555f
           name: 'Asterisk: Active channels'
@@ -66,8 +66,8 @@ zabbix_export:
             key: asterisk.get_stats
           tags:
             -
-              tag: Application
-              value: Asterisk
+              tag: component
+              value: channels
         -
           uuid: ccfc2a8a5880430196e2c874b66370ca
           name: 'Asterisk: Calls processed'
@@ -85,8 +85,8 @@ zabbix_export:
             key: asterisk.get_stats
           tags:
             -
-              tag: Application
-              value: Asterisk
+              tag: component
+              value: calls
         -
           uuid: 196af875a190438abd8de5a6803a550f
           name: 'Asterisk: Calls processed per second'
@@ -109,8 +109,8 @@ zabbix_export:
             key: asterisk.get_stats
           tags:
             -
-              tag: Application
-              value: Asterisk
+              tag: component
+              value: calls
         -
           uuid: 7db3e9cdae3d4bffa7429617e351fce1
           name: 'Asterisk: Get stats'
@@ -448,8 +448,8 @@ zabbix_export:
           retrieve_mode: HEADERS
           tags:
             -
-              tag: Application
-              value: 'Zabbix raw items'
+              tag: component
+              value: raw
         -
           uuid: d9900a1f096a4b89a2aa4af89f30b2cc
           name: 'Asterisk: IAX trunks active channels'
@@ -467,8 +467,8 @@ zabbix_export:
             key: asterisk.get_stats
           tags:
             -
-              tag: Application
-              value: Asterisk
+              tag: component
+              value: channels
           triggers:
             -
               uuid: 0ae0a5b6123a42dd9722219e5e5839df
@@ -476,6 +476,10 @@ zabbix_export:
               name: 'Asterisk: Total number of active channels of IAX trunks is too high (over {$AMI.TRUNK_ACTIVE_CHANNELS_TOTAL.MAX.WARN:"IAX"} for 10m)'
               priority: WARNING
               description: 'The IAX trunks may not be able to process new calls.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 0798cf46d82041e6a7091698c7693ec5
           name: 'Asterisk: IAX offline peers'
@@ -493,8 +497,8 @@ zabbix_export:
             key: asterisk.get_stats
           tags:
             -
-              tag: Application
-              value: Asterisk
+              tag: component
+              value: peers
         -
           uuid: bf741f5560734530be352341071c5984
           name: 'Asterisk: IAX online peers'
@@ -512,8 +516,8 @@ zabbix_export:
             key: asterisk.get_stats
           tags:
             -
-              tag: Application
-              value: Asterisk
+              tag: component
+              value: peers
         -
           uuid: ccb62e9b41da4f20b4ab19e4eecd598b
           name: 'Asterisk: IAX peers'
@@ -531,8 +535,8 @@ zabbix_export:
             key: asterisk.get_stats
           tags:
             -
-              tag: Application
-              value: Asterisk
+              tag: component
+              value: peers
         -
           uuid: cf5c07c1a09b4a10af21292b876fcb20
           name: 'Asterisk: IAX unmonitored peers'
@@ -550,8 +554,8 @@ zabbix_export:
             key: asterisk.get_stats
           tags:
             -
-              tag: Application
-              value: Asterisk
+              tag: component
+              value: peers
         -
           uuid: 5ae6135a49764db7b496f5d2378ddd77
           name: 'Asterisk: PJSIP trunks active channels'
@@ -569,8 +573,8 @@ zabbix_export:
             key: asterisk.get_stats
           tags:
             -
-              tag: Application
-              value: Asterisk
+              tag: component
+              value: channels
           triggers:
             -
               uuid: 9b158fe0efb4416cb6ad5d53b38c3e38
@@ -578,6 +582,10 @@ zabbix_export:
               name: 'Asterisk: Total number of active channels of PJSIP trunks is too high (over {$AMI.TRUNK_ACTIVE_CHANNELS_TOTAL.MAX.WARN:"PJSIP"} for 10m)'
               priority: WARNING
               description: 'The PJSIP trunks may not be able to process new calls.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: cc07f186104842aabec3d26dcd4322d2
           name: 'Asterisk: PJSIP available endpoints'
@@ -595,8 +603,8 @@ zabbix_export:
             key: asterisk.get_stats
           tags:
             -
-              tag: Application
-              value: Asterisk
+              tag: component
+              value: peers
         -
           uuid: fdc888cb355a4b738be8a77354a7ce76
           name: 'Asterisk: PJSIP endpoints'
@@ -614,8 +622,8 @@ zabbix_export:
             key: asterisk.get_stats
           tags:
             -
-              tag: Application
-              value: Asterisk
+              tag: component
+              value: peers
         -
           uuid: 5c10fe1a4bfb4628be20137d0f1ec725
           name: 'Asterisk: PJSIP unavailable endpoints'
@@ -633,8 +641,8 @@ zabbix_export:
             key: asterisk.get_stats
           tags:
             -
-              tag: Application
-              value: Asterisk
+              tag: component
+              value: peers
         -
           uuid: 2df0dca89a744e86b4f5a2cec673d427
           name: 'Asterisk: SIP trunks active channels'
@@ -652,8 +660,8 @@ zabbix_export:
             key: asterisk.get_stats
           tags:
             -
-              tag: Application
-              value: Asterisk
+              tag: component
+              value: channels
           triggers:
             -
               uuid: d2fde5d26d284a129346a12ba0949b60
@@ -661,6 +669,10 @@ zabbix_export:
               name: 'Asterisk: Total number of active channels of SIP trunks is too high (over {$AMI.TRUNK_ACTIVE_CHANNELS_TOTAL.MAX.WARN:"SIP"} for 10m)'
               priority: WARNING
               description: 'The SIP trunks may not be able to process new calls.'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: fb08ec8d143a41a097f8652c8261bad8
           name: 'Asterisk: SIP monitored offline'
@@ -678,8 +690,8 @@ zabbix_export:
             key: asterisk.get_stats
           tags:
             -
-              tag: Application
-              value: Asterisk
+              tag: component
+              value: peers
         -
           uuid: 23744b0a04b54637a7dbe1c7f8f5200f
           name: 'Asterisk: SIP monitored online'
@@ -697,8 +709,8 @@ zabbix_export:
             key: asterisk.get_stats
           tags:
             -
-              tag: Application
-              value: Asterisk
+              tag: component
+              value: peers
         -
           uuid: fb78998a342942ac942a7e1632b98208
           name: 'Asterisk: SIP peers'
@@ -716,8 +728,8 @@ zabbix_export:
             key: asterisk.get_stats
           tags:
             -
-              tag: Application
-              value: Asterisk
+              tag: component
+              value: peers
         -
           uuid: ae21f8c13063402d9eece400a18c6167
           name: 'Asterisk: SIP unmonitored offline'
@@ -735,8 +747,8 @@ zabbix_export:
             key: asterisk.get_stats
           tags:
             -
-              tag: Application
-              value: Asterisk
+              tag: component
+              value: peers
         -
           uuid: 1cd5fb5232ca4f4398f85d959ac11b2c
           name: 'Asterisk: SIP unmonitored online'
@@ -754,8 +766,8 @@ zabbix_export:
             key: asterisk.get_stats
           tags:
             -
-              tag: Application
-              value: Asterisk
+              tag: component
+              value: peers
         -
           uuid: 9c64cb54c2c541c1862558dcf8c6e3a3
           name: 'Asterisk: Total queues'
@@ -773,8 +785,8 @@ zabbix_export:
             key: asterisk.get_stats
           tags:
             -
-              tag: Application
-              value: Asterisk
+              tag: component
+              value: queues
         -
           uuid: 8395ab5b70a7433eb508c513995988bb
           name: 'Asterisk: Uptime'
@@ -794,8 +806,8 @@ zabbix_export:
             key: asterisk.get_stats
           tags:
             -
-              tag: Application
-              value: Asterisk
+              tag: component
+              value: system
           triggers:
             -
               uuid: 35ca01e504a548db9d4db8be1390d6b9
@@ -808,6 +820,10 @@ zabbix_export:
                 -
                   name: 'Asterisk: Service is down'
                   expression: 'last(/Asterisk by HTTP/net.tcp.service["tcp","{HOST.CONN}","{$AMI.PORT}"])=0'
+              tags:
+                -
+                  tag: scope
+                  value: availability
             -
               uuid: 100d38b62c1d4ce298a9fadfbab19e4c
               expression: 'last(/Asterisk by HTTP/asterisk.uptime)<10m'
@@ -815,6 +831,10 @@ zabbix_export:
               priority: INFO
               description: 'Uptime is less than 10 minutes'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 86e23b5b9fd64e6e840588d25921fcbf
           name: 'Asterisk: Uptime after reload'
@@ -834,8 +854,8 @@ zabbix_export:
             key: asterisk.get_stats
           tags:
             -
-              tag: Application
-              value: Asterisk
+              tag: component
+              value: system
           triggers:
             -
               uuid: 4e99b65188264ba1aa80e24662f9b3cd
@@ -844,6 +864,10 @@ zabbix_export:
               priority: INFO
               description: 'Uptime is less than 10 minutes'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 8ed124c5d61541c0ab1dcc3491fb05c6
           name: 'Asterisk: Version'
@@ -863,8 +887,8 @@ zabbix_export:
             key: asterisk.get_stats
           tags:
             -
-              tag: Application
-              value: Asterisk
+              tag: component
+              value: application
           triggers:
             -
               uuid: f1a260626ae6446d89e1e725e14c1098
@@ -873,6 +897,10 @@ zabbix_export:
               priority: INFO
               description: 'Asterisk version has changed. Ack to close.'
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: notice
         -
           uuid: 09102393dc6a4ac598f02d95801c6ca0
           name: 'Asterisk: Service response time'
@@ -884,8 +912,8 @@ zabbix_export:
           description: 'Asterisk Manager API performance.'
           tags:
             -
-              tag: Application
-              value: Asterisk
+              tag: component
+              value: network
           triggers:
             -
               uuid: dbc74502be01498194003dc1a3d90014
@@ -897,6 +925,10 @@ zabbix_export:
                 -
                   name: 'Asterisk: Service is down'
                   expression: 'last(/Asterisk by HTTP/net.tcp.service["tcp","{HOST.CONN}","{$AMI.PORT}"])=0'
+              tags:
+                -
+                  tag: scope
+                  value: performance
         -
           uuid: 58e18df6a5534395bf74d3babdb73170
           name: 'Asterisk: Service status'
@@ -913,8 +945,11 @@ zabbix_export:
                 - 10m
           tags:
             -
-              tag: Application
-              value: Asterisk
+              tag: component
+              value: health
+            -
+              tag: component
+              value: network
           triggers:
             -
               uuid: 1fa3370fa93f4d07a2c470f993096554
@@ -922,6 +957,10 @@ zabbix_export:
               name: 'Asterisk: Service is down'
               priority: AVERAGE
               manual_close: 'YES'
+              tags:
+                -
+                  tag: scope
+                  value: availability
       discovery_rules:
         -
           uuid: 3e7facc25a344cec8e384e8a9f8b372a
@@ -947,8 +986,11 @@ zabbix_export:
                 key: asterisk.get_stats
               tags:
                 -
-                  tag: Application
-                  value: 'Asterisk IAX trunks'
+                  tag: component
+                  value: channels
+                -
+                  tag: trunk
+                  value: '{#OBJECTNAME}'
               trigger_prototypes:
                 -
                   uuid: e2a6c7a9b6234e2aae20c9aa480f9ef1
@@ -956,6 +998,10 @@ zabbix_export:
                   name: 'IAX trunk "{#OBJECTNAME}": Number of the IAX trunk "{#OBJECTNAME}" active channels is too high (over {$AMI.TRUNK_ACTIVE_CHANNELS.MAX.WARN:"{#OBJECTNAME}"} for 10m)'
                   priority: WARNING
                   description: 'The IAX trunk may not be able to process new calls.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: bbde7e898b4b4d34b27308d6ddaf86fc
               name: 'IAX trunk "{#OBJECTNAME}": Status'
@@ -984,8 +1030,11 @@ zabbix_export:
                 key: asterisk.get_stats
               tags:
                 -
-                  tag: Application
-                  value: 'Asterisk IAX trunks'
+                  tag: component
+                  value: health
+                -
+                  tag: trunk
+                  value: '{#OBJECTNAME}'
               trigger_prototypes:
                 -
                   uuid: db595245acef4ec9b771c266c14100d2
@@ -993,6 +1042,10 @@ zabbix_export:
                   name: 'IAX trunk "{#OBJECTNAME}": IAX trunk {#OBJECTNAME} has a state {ITEM.VALUE}'
                   priority: AVERAGE
                   description: 'The IAX trunk is unable to establish a connection with a neighbor due to network issues or incorrect configuration.'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
           master_item:
             key: asterisk.get_stats
           lld_macro_paths:
@@ -1032,8 +1085,11 @@ zabbix_export:
                 key: asterisk.get_stats
               tags:
                 -
-                  tag: Application
-                  value: 'Asterisk PJSIP trunks'
+                  tag: component
+                  value: channels
+                -
+                  tag: trunk
+                  value: '{#OBJECTNAME}'
               trigger_prototypes:
                 -
                   uuid: f192d555011c42c28c6a8f52c0388fe1
@@ -1041,6 +1097,10 @@ zabbix_export:
                   name: 'PJSIP trunk "{#OBJECTNAME}": Number of the PJSIP trunk "{#OBJECTNAME}" active channels is too high (over {$AMI.TRUNK_ACTIVE_CHANNELS.MAX.WARN:"{#OBJECTNAME}"} for 10m)'
                   priority: WARNING
                   description: 'The PJSIP trunk may not be able to process new calls.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: c364b2ac50344372b155cbb98d9a7afe
               name: 'PJSIP trunk "{#OBJECTNAME}": Device state'
@@ -1068,8 +1128,11 @@ zabbix_export:
                 key: asterisk.get_stats
               tags:
                 -
-                  tag: Application
-                  value: 'Asterisk PJSIP trunks'
+                  tag: component
+                  value: health
+                -
+                  tag: trunk
+                  value: '{#OBJECTNAME}'
               trigger_prototypes:
                 -
                   uuid: 6f31d886d6954b82874d38646b233689
@@ -1077,6 +1140,10 @@ zabbix_export:
                   name: 'PJSIP trunk "{#OBJECTNAME}": PJSIP trunk {#OBJECTNAME} has a state Unavailable'
                   priority: AVERAGE
                   description: 'The PJSIP trunk is unable to establish a connection with a neighbor due to network issues or incorrect configuration.'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
           master_item:
             key: asterisk.get_stats
           lld_macro_paths:
@@ -1116,8 +1183,11 @@ zabbix_export:
                 key: asterisk.get_stats
               tags:
                 -
-                  tag: Application
-                  value: 'Asterisk queue "{#QUEUE}"'
+                  tag: component
+                  value: members
+                -
+                  tag: queue
+                  value: '{#QUEUE}'
             -
               uuid: c271c7d76b2e49dea386bb08d60307d0
               name: '"{#QUEUE}": Callers'
@@ -1135,8 +1205,11 @@ zabbix_export:
                 key: asterisk.get_stats
               tags:
                 -
-                  tag: Application
-                  value: 'Asterisk queue "{#QUEUE}"'
+                  tag: component
+                  value: calls
+                -
+                  tag: queue
+                  value: '{#QUEUE}'
               trigger_prototypes:
                 -
                   uuid: 4f72c6a755be465287f36b8b12d3175b
@@ -1144,6 +1217,10 @@ zabbix_export:
                   name: '"{#QUEUE}": Number of callers in the queue "{#QUEUE}" is too high (over {$AMI.QUEUE_CALLERS.MAX.WARN:"{#QUEUE}"} for 10m)'
                   priority: WARNING
                   description: 'There is a large number of calls in the queue.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: 8319ec55cf6f4e8590f180f1a81f37ed
               name: '"{#QUEUE}": Logged in'
@@ -1161,8 +1238,11 @@ zabbix_export:
                 key: asterisk.get_stats
               tags:
                 -
-                  tag: Application
-                  value: 'Asterisk queue "{#QUEUE}"'
+                  tag: component
+                  value: members
+                -
+                  tag: queue
+                  value: '{#QUEUE}'
           master_item:
             key: asterisk.get_stats
           lld_macro_paths:
@@ -1202,8 +1282,11 @@ zabbix_export:
                 key: asterisk.get_stats
               tags:
                 -
-                  tag: Application
-                  value: 'Asterisk SIP trunks'
+                  tag: component
+                  value: channels
+                -
+                  tag: trunk
+                  value: '{#OBJECTNAME}'
               trigger_prototypes:
                 -
                   uuid: 51820b1326f84f51ba0e561946275133
@@ -1211,6 +1294,10 @@ zabbix_export:
                   name: 'SIP trunk "{#OBJECTNAME}": Number of the SIP trunk "{#OBJECTNAME}" active channels is too high (over {$AMI.TRUNK_ACTIVE_CHANNELS.MAX.WARN:"{#OBJECTNAME}"} for 10m)'
                   priority: WARNING
                   description: 'The SIP trunk may not be able to process new calls.'
+                  tags:
+                    -
+                      tag: scope
+                      value: performance
             -
               uuid: df33da749e874f55be5f0c33cd201f62
               name: 'SIP trunk "{#OBJECTNAME}": Status'
@@ -1239,8 +1326,11 @@ zabbix_export:
                 key: asterisk.get_stats
               tags:
                 -
-                  tag: Application
-                  value: 'Asterisk SIP trunks'
+                  tag: component
+                  value: health
+                -
+                  tag: trunk
+                  value: '{#OBJECTNAME}'
               trigger_prototypes:
                 -
                   uuid: 39cac88e9263470da6e4b1a08f806c58
@@ -1248,6 +1338,10 @@ zabbix_export:
                   name: 'SIP trunk "{#OBJECTNAME}": SIP trunk {#OBJECTNAME} has a state {ITEM.VALUE}'
                   priority: AVERAGE
                   description: 'The SIP trunk is unable to establish a connection with a neighbor due to network issues or incorrect configuration.'
+                  tags:
+                    -
+                      tag: scope
+                      value: availability
           master_item:
             key: asterisk.get_stats
           lld_macro_paths:
@@ -1263,6 +1357,13 @@ zabbix_export:
               type: DISCARD_UNCHANGED_HEARTBEAT
               parameters:
                 - 1h
+      tags:
+        -
+          tag: class
+          value: voip
+        -
+          tag: target
+          value: asterisk
       macros:
         -
           macro: '{$AMI.PORT}'